*/
- console.log(row)
- console.log(event)
+ //console.log(row)
+ //console.log(this.testtest)
+ //console.log(this.testtestdir)
// -----------------------------
// check status run start it
// -----------------------------
if(this.testtest[row.swarmlabname] != row.swarmlabname && this.testtestdir[row.swarmlabname] == row.swarmlabname){
if(!this.swarmlabinfonow){
this.hybridoptions = row
- console.log('start '+row.swarmlabname)
+ //console.log('start '+row.swarmlabname)
this.startservice = true
this.onAction ('run-item', row, row._id)
}
@@ -1194,7 +1205,7 @@ info +='
Click on hyperlink opens Directory in new tab'
// -----------------------------
// check status run is running stop it
// -----------------------------
- console.log('stop ' + row.swarmlabname)
+ //console.log('stop ' + row.swarmlabname)
this.hybridoptions = row
this.startservice = false
this.onAction ('run-item', row, row._id)
diff --git a/src/components/mynetwork/availablemicroservicescustom.vue b/src/components/mynetwork/availablemicroservicescustom.vue
index d324e85..dd78dc7 100644
--- a/src/components/mynetwork/availablemicroservicescustom.vue
+++ b/src/components/mynetwork/availablemicroservicescustom.vue
@@ -7,7 +7,7 @@
-
+
@@ -157,6 +157,7 @@
Save
Remove
+
+ Remove
+
@@ -574,21 +584,21 @@ export default {
async onActionstop(result) {
if (result.isConfirmed) {
this.resetcustom()
- this.$wait.start('myRunInstancetutor');
+ this.$wait.start('myRunInstancetutorcustom');
var res = await store.dispatch('pipelineLLO/rmswarmlablocaluser', this.hybridoptions)
- this.$wait.end('myRunInstancetutor');
+ this.$wait.end('myRunInstancetutorcustom');
var obj = {}
obj.token = this.token
obj.instance = this.hybridoptions
//check if exists
- var res2 = await store.dispatch('pipelineLLO/getservicesinfo', obj)
+ var res2 = await store.dispatch('pipelineLLO/getservicesinfocustom', obj)
if(res2.data.data == 'yes'){
if(res2.data.data == 'yes'){
var winfo=' swarmlab encountered a problem while deleting your labroom files.
This propably means that you have created some files while operating the labroom.
To remove those files please run the following command as root.
Copy-and-run-command
'
- winfo += 'sudo rm -rf '+res.data.path+'/community/'+data.swarmlabname+'
'
+ winfo += 'sudo rm -rf '+res.data.mydir+'/community/'+res.data.path+'
'
winfo += ' You can back up content using:
'
- winfo += 'sudo tar -zcvf /home/\$USER/swarmlabbackup_'+data.swarmlabname+'.tar.gz '+res.data.path+'/community/'+data.swarmlabname+' '
- var info='Labroom remove
'
+ winfo += 'sudo tar -zcvf /home/\$USER/swarmlabbackup_'+data.service+'.tar.gz '+res.data.mydir+'/community/'+res.data.path+' '
+ var info='Microservice remove
'
this.$swal({
type: 'info',
html: info+winfo,
@@ -789,22 +799,29 @@ export default {
}else if(action == 'rm-install' ){
this.resetcustom()
this.hybridoptions.swarmlabname = data.swarmlabname
- this.$wait.start('myRunInstancetutor');
+ this.$wait.start('myRunInstancetutorcustom');
//console.log(this.hybridoptions.swarmlabname)
var res = await store.dispatch('pipelineLLO/rmswarmlablocaluser', data)
- this.$wait.end('myRunInstancetutor');
+ this.$wait.end('myRunInstancetutorcustom');
var obj = {}
obj.token = this.token
- obj.instance = data.swarmlabname
+ obj.instance = this.hybridoptions
//check if exists
- var res2 = await store.dispatch('pipelineLLO/getservicesinfo', obj)
+ var res2 = await store.dispatch('pipelineLLO/getservicesinfocustom', obj)
if(res2.data.data == 'yes'){
if(res2.data.data == 'yes'){
+ /*
var winfo=' swarmlab encountered a problem while deleting your labroom files.
This propably means that you have created some files while operating the labroom.
To remove those files please run the following command as root.
Copy-and-run-command
'
winfo += 'sudo rm -rf '+res.data.path+'/instance/'+data.swarmlabname+'
'
winfo += ' You can back up content using:
'
winfo += 'sudo tar -zcvf /home/\$USER/swarmlabbackup_'+data.swarmlabname+'.tar.gz '+res.data.path+'/instance/'+data.swarmlabname+' '
var info='Labroom remove
'
+*/
+ var winfo=' swarmlab encountered a problem while deleting your labroom files.
This propably means that you have created some files while operating the labroom.
To remove those files please run the following command as root.
Copy-and-run-command
'
+ winfo += 'sudo rm -rf '+res.data.mydir+'/community/'+res.data.path+'
'
+ winfo += ' You can back up content using:
'
+ winfo += 'sudo tar -zcvf /home/\$USER/swarmlabbackup_'+data.service+'.tar.gz '+res.data.mydir+'/community/'+res.data.path+' '
+ var info='Microservice remove
'
this.$swal({
type: 'info',
html: info+winfo,
@@ -825,7 +842,7 @@ export default {
this.$root.$emit('hybrid_refresh_info_deploy_local')
}else if(action == 'run-install' ){
this.swarmlabinfonow = true
- this.$wait.start('myRunInstancetutor');
+ this.$wait.start('myRunInstancetutorcustom');
this.hybridoptions.swarmlabname = data.swarmlabname
this.hybridoptions.baseservice = data.baseservice
this.hybridoptions.service = data.service
@@ -872,14 +889,14 @@ export default {
this.$root.$emit('hybrid_install_instance_custom', value)
- this.$wait.end('myRunInstancetutor');
+ this.$wait.end('myRunInstancetutorcustom');
//Vue.nextTick( () => this.$refs.vuetable.refresh())
this.refreshVuetable()
}else if(action == 'run-item' ){
- console.log('log1')
- console.log(this.hybridoptions)
+ //console.log('log1')
+ //console.log(this.hybridoptions)
this.swarmlabinfonow = true
this.resetcustom()
@@ -904,8 +921,8 @@ export default {
this.hybridoptions.url3 = data.url3
this.hybridoptions.name3 = data.name3
- console.log('log')
- console.log(data)
+ //console.log('log')
+ //console.log(data)
//this.custom.sh = ''
this.heavy = false
@@ -1219,12 +1236,12 @@ info +=' Click on hyperlink opens Directory in new tab'
return this.playbookInfo=value
},
async rowClicked(row, event) {
- console.log(row)
+ //console.log(row)
if(this.testtest[row.service] != row.service && this.testtestdir[row.service] == row.service && this.testtestdiruser[row.service] == row.user){
if(!this.swarmlabinfonow){
this.hybridoptions = row
this.startservice = true
- console.log('start '+row.service)
+ //console.log('start '+row.service)
await this.onAction ('run-item', row, row._id)
this.swarmlabinfonow = false
}
diff --git a/src/components/mynetwork/availablepoc.vue b/src/components/mynetwork/availablepoc.vue
index cccbc26..5041f8f 100644
--- a/src/components/mynetwork/availablepoc.vue
+++ b/src/components/mynetwork/availablepoc.vue
@@ -145,14 +145,14 @@
diff --git a/src/components/mynetwork/availableservices.vue b/src/components/mynetwork/availableservices.vue
index 12881d8..caf2bee 100644
--- a/src/components/mynetwork/availableservices.vue
+++ b/src/components/mynetwork/availableservices.vue
@@ -197,13 +197,13 @@
@@ -457,7 +457,8 @@ export default {
//console.log('resiiiiiiii yes '+JSON.stringify(this.testactionrowindex[index]))
}else{
//Vue.delete(this.testactionrowindex, index)
- console.log('resi NO data '+JSON.stringify(res))
+ //console.log('resi NO data '+JSON.stringify(res))
+ console.log('resi NO data ')
}
}
},
diff --git a/src/components/mynetwork/availablestorage.vue b/src/components/mynetwork/availablestorage.vue
index 5aa4811..cca7f79 100644
--- a/src/components/mynetwork/availablestorage.vue
+++ b/src/components/mynetwork/availablestorage.vue
@@ -113,7 +113,7 @@
diff --git a/src/components/mynetwork/images.vue b/src/components/mynetwork/images.vue
index 6d23a44..a032f50 100644
--- a/src/components/mynetwork/images.vue
+++ b/src/components/mynetwork/images.vue
@@ -217,7 +217,7 @@
diff --git a/src/components/mynetwork/mytable.vue b/src/components/mynetwork/mytable.vue
index 57486e1..f0548ac 100755
--- a/src/components/mynetwork/mytable.vue
+++ b/src/components/mynetwork/mytable.vue
@@ -103,6 +103,14 @@
disabled
>
stop
+
+ Close Console
@@ -1505,6 +1513,8 @@ info +='This permits the docker user on the local machine to connect to X window
this.$socket.client.open();
this.$socket.client.emit('installcustom', obj);
}else if(action == 'container-stop'){
+ this.actionrowindexconsole = true
+ this.$root.$emit('hybrid_show_instance_images','console')
// refresh adhocview.vue on console await
this.$root.$emit('SERVER_hybrid_table_start')
this.$socket.client.emit('container-stop', this.swarmlabname, this.hybridshowdata.ID);
@@ -1842,7 +1852,12 @@ info +='This permits the docker user on the local machine to connect to X window
// data: 0 gia na doume ean ine afto
// to lathos exafanistike
if(val.data != 0){
- this.$root.$emit('hybrid_log_in',val)
+ if(val.data){
+ //console.log(val)
+ //console.log(val.data)
+ this.$root.$emit('hybrid_log_in',val)
+ }
+ //console.log(val)
}
// refresh table availableservices
this.$root.$emit('hybrid_refresh_table')
diff --git a/src/components/mynetwork/networks.vue b/src/components/mynetwork/networks.vue
index a7d5e9e..378971c 100644
--- a/src/components/mynetwork/networks.vue
+++ b/src/components/mynetwork/networks.vue
@@ -160,7 +160,7 @@
diff --git a/src/store/modules/create_pipelineLLO.js b/src/store/modules/create_pipelineLLO.js
index 66c5e98..b8b65c8 100644
--- a/src/store/modules/create_pipelineLLO.js
+++ b/src/store/modules/create_pipelineLLO.js
@@ -598,6 +598,37 @@ export default {
return R;
}
}
+ },
+ async getservicesinfocustom({commit,rootGetters}, value) {
+ //console.log('value '+JSON.stringify(value))
+ try {
+ var token = value.token
+ var params = {
+ instance: value
+ }
+ var options = {
+ params: params,
+ headers: { 'content-type': 'application/x-www-form-urlencoded',Authorization: `Bearer ${token}` },
+ };
+ var sock_server_l = ApiConfig.url_80+'/getservicesinfocustom'
+ var p = await axios.get(sock_server_l,options);
+ //var p = await axios.get('https://localhost:3000/getservicesinfo',options);
+ return p
+ //console.log(JSON.stringify(p))
+ //console.log(value.token)
+ //console.log(value.swarmlabname)
+ } catch (e) {
+ if(e.message == "Request failed with status code 401" || /401/i.test(e.message)){
+ //console.log('error '+JSON.stringify(e))
+ window.location.href = 'https://api-login.swarmlab.io:8089';
+ }else{
+ var R = {
+ ERROR_str: e,
+ ERROR: 'yes'
+ }
+ return R;
+ }
+ }
},
async get_stats_imagescontainers({commit,rootGetters}, value) {
//console.log('value '+JSON.stringify(value))
@@ -724,7 +755,7 @@ export default {
}
},
async chowncustom({commit,rootGetters}, value) {
- console.log('value '+JSON.stringify(value))
+ //console.log('value '+JSON.stringify(value))
try {
var token = value.token
var params = {