From fcecf24253b2fc96e855d5f05f7f989f67486f79 Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Thu, 13 Oct 2022 03:56:35 -0300 Subject: [PATCH 1/3] UI: Fix Volume Snapshot from user VM as admin (#6824) --- ui/src/views/compute/CreateSnapshotWizard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/compute/CreateSnapshotWizard.vue b/ui/src/views/compute/CreateSnapshotWizard.vue index 03450be42453..bcd7d0f4dbe1 100644 --- a/ui/src/views/compute/CreateSnapshotWizard.vue +++ b/ui/src/views/compute/CreateSnapshotWizard.vue @@ -119,7 +119,7 @@ export default { fetchData () { this.loading = true - api('listVolumes', { virtualMachineId: this.resource.id }) + api('listVolumes', { virtualMachineId: this.resource.id, listall: true }) .then(json => { this.listVolumes = json.listvolumesresponse.volume || [] }) From c54710873401376a63ea680167a42d192e53b796 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 20 Oct 2022 11:05:38 +0200 Subject: [PATCH 2/3] update persistent networks without any services to 'Implemented' --- .../resources/META-INF/db/schema-41710to41800.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql index 89e1cb41a588..00b260463b64 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql @@ -586,3 +586,14 @@ UPDATE cloud.configuration SET description = "Use SSL method used to encrypt copy traffic between zones. Also ensures that the certificate assigned to the zone is used when generating links for external access." WHERE name = 'secstorage.encrypt.copy'; + +-- allow isolated networks without services to be used as is. +UPDATE networks ntwk + SET ntwk.state = 'Implemented' + WHERE ntwk.network_offering_id in + (SELECT id FROM network_offerings ntwkoff + WHERE (SELECT count(*) FROM ntwk_offering_service_map ntwksrvcmp WHERE ntwksrvcmp.network_offering_id = ntwkoff.id) = 0 + AND ntwkoff.is_persistent = TRUE) AND + ntwk.state = 'Setup' AND + ntwk.removed is NULL AND + ntwk.guest_type = 'Isolated'; From a0e0e83b5474453ccd75586a93b9afc45be3e2cc Mon Sep 17 00:00:00 2001 From: dahn Date: Thu, 20 Oct 2022 14:42:13 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Wei Zhou --- .../main/resources/META-INF/db/schema-41710to41800.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql index 00b260463b64..8be5cb31b399 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41710to41800.sql @@ -588,12 +588,12 @@ generating links for external access." WHERE name = 'secstorage.encrypt.copy'; -- allow isolated networks without services to be used as is. -UPDATE networks ntwk +UPDATE `cloud`.`networks` ntwk SET ntwk.state = 'Implemented' WHERE ntwk.network_offering_id in - (SELECT id FROM network_offerings ntwkoff - WHERE (SELECT count(*) FROM ntwk_offering_service_map ntwksrvcmp WHERE ntwksrvcmp.network_offering_id = ntwkoff.id) = 0 - AND ntwkoff.is_persistent = TRUE) AND + (SELECT id FROM `cloud`.`network_offerings` ntwkoff + WHERE (SELECT count(*) FROM `cloud`.`ntwk_offering_service_map` ntwksrvcmp WHERE ntwksrvcmp.network_offering_id = ntwkoff.id) = 0 + AND ntwkoff.is_persistent = 1) AND ntwk.state = 'Setup' AND ntwk.removed is NULL AND ntwk.guest_type = 'Isolated';