From 473ecf304b43b763f571648f0c1127da022c9c89 Mon Sep 17 00:00:00 2001 From: zeus Date: Sat, 30 Jan 2021 19:25:57 +0200 Subject: [PATCH] hybrid join --- src-local/llo/new.js | 40 + src/App.vue | 4 +- src/components/manageservices.vue | 14 +- .../manageservices/deploy-bootstrap.vue | 3 +- .../manageservices/join-service.vue | 717 ++++++++++++++++++ .../manageservices/view-service.vue | 2 +- src/components/myconnect-server.vue | 11 +- src/components/mynetwork/mytable.vue | 27 +- src/store/modules/create_pipelineLLO.js | 125 ++- viwsession/session1 | 179 +++-- 10 files changed, 1026 insertions(+), 96 deletions(-) create mode 100644 src/components/manageservices/join-service.vue diff --git a/src-local/llo/new.js b/src-local/llo/new.js index 8999452..9e77a83 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -249,6 +249,46 @@ app.get('/getmountinfo', (req, res, next) => { }); +app.get('/getserviceshybridstatus', (req, res, next) => { + + var RES = new Object(); + RES.bootstrapnameid = req.query["bootstrapnameid"] + RES.bootstrapstackname = req.query["bootstrapstackname"] + var showexec = `docker ps --format '{"Names":"{{ .Names }}", "Status":"{{.Status}}"}' | jq . -s ` + exec(showexec, (err, stdout, stderr) => { + if (err) { + console.error(`exec error: ${err}`); + return; + } + if (stdout) { + var string = stdout.toString() + var datajson = JSON.parse(string); + var search = RES.bootstrapstackname+'_master'+RES.bootstrapnameid + var extenderror = new RegExp(search); + var found = 'no'; + for(var i = 0; i < datajson.length; i++) { + var servicename = datajson[i].Names + console.log(JSON.stringify(search+' '+servicename)) + if(extenderror.test(servicename)){ + found = 'yes'; + } + } + RES.error = false + RES.error_msg = "ok" + RES.test = datajson; + RES.data = found; + res.json(RES) + + }else{ + var found = 'no' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + res.json(RES) + } + }); + +}); app.get('/getservicesstatus', (req, res, next) => { var RES = new Object(); diff --git a/src/App.vue b/src/App.vue index ba24be2..ef9cda3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -130,7 +130,7 @@ Hybrid - Zone + Join Deploy @@ -243,7 +243,7 @@ diff --git a/src/components/manageservices.vue b/src/components/manageservices.vue index 3687863..fd259f6 100644 --- a/src/components/manageservices.vue +++ b/src/components/manageservices.vue @@ -2,21 +2,21 @@
-
+

-
-
+ -->
@@ -25,13 +25,13 @@ + diff --git a/src/components/manageservices/view-service.vue b/src/components/manageservices/view-service.vue index 4a15457..b236496 100644 --- a/src/components/manageservices/view-service.vue +++ b/src/components/manageservices/view-service.vue @@ -316,7 +316,7 @@ export default { }, { name: 'bootstrapusersjoin', - title: 'Join', + title: 'Public', sortField: 'bootstrapusersjoin', titleClass: 'center aligned', visible:true, diff --git a/src/components/myconnect-server.vue b/src/components/myconnect-server.vue index 8c216ab..75d5d5c 100644 --- a/src/components/myconnect-server.vue +++ b/src/components/myconnect-server.vue @@ -11,9 +11,14 @@

+ + + +
@@ -23,13 +28,15 @@