From 120a43648b8d765fbbfdf04ba66edfb9050a8f36 Mon Sep 17 00:00:00 2001 From: dahn Date: Thu, 5 Mar 2026 19:52:28 +0100 Subject: [PATCH 01/10] set width of dropdown select items for Network Offering during add tier dialog (#11899) --- ui/src/views/network/VpcTiersTab.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index 4f6aaef4445d..4a689f13c34d 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -193,8 +193,14 @@ optionFilterProp="label" :filterOption="(input, option) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }" > - + }" + > + {{ item.displaytext || item.name || item.description }} From 58916eb608036669c3fabe0239b339745b8475cf Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 6 Mar 2026 00:48:58 +0530 Subject: [PATCH 02/10] Use lateral join (introduced in MySQL 8.0.14) with subquery on user_statistics table in account_view for netstats (#12631) --- .../db/schema-42200to42210-cleanup.sql | 2 ++ .../db/views/cloud.account_netstats_view.sql | 31 ------------------- .../META-INF/db/views/cloud.account_view.sql | 15 ++++++--- 3 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql index 54baf226ac43..505c8ef5715d 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql @@ -18,3 +18,5 @@ --; -- Schema upgrade cleanup from 4.22.0.0 to 4.22.1.0 --; + +DROP VIEW IF EXISTS `cloud`.`account_netstats_view`; diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql deleted file mode 100644 index 11193c465fd7..000000000000 --- a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql +++ /dev/null @@ -1,31 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. - --- cloud.account_netstats_view source - - -DROP VIEW IF EXISTS `cloud`.`account_netstats_view`; - -CREATE VIEW `cloud`.`account_netstats_view` AS -select - `user_statistics`.`account_id` AS `account_id`, - (sum(`user_statistics`.`net_bytes_received`) + sum(`user_statistics`.`current_bytes_received`)) AS `bytesReceived`, - (sum(`user_statistics`.`net_bytes_sent`) + sum(`user_statistics`.`current_bytes_sent`)) AS `bytesSent` -from - `user_statistics` -group by - `user_statistics`.`account_id`; diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql index edc164c40cbd..327c6c627e22 100644 --- a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql +++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql @@ -39,8 +39,8 @@ select `data_center`.`id` AS `data_center_id`, `data_center`.`uuid` AS `data_center_uuid`, `data_center`.`name` AS `data_center_name`, - `account_netstats_view`.`bytesReceived` AS `bytesReceived`, - `account_netstats_view`.`bytesSent` AS `bytesSent`, + `account_netstats`.`bytesReceived` AS `bytesReceived`, + `account_netstats`.`bytesSent` AS `bytesSent`, `vmlimit`.`max` AS `vmLimit`, `vmcount`.`count` AS `vmTotal`, `runningvm`.`vmcount` AS `runningVms`, @@ -89,8 +89,15 @@ from `cloud`.`domain` ON account.domain_id = domain.id left join `cloud`.`data_center` ON account.default_zone_id = data_center.id - left join - `cloud`.`account_netstats_view` ON account.id = account_netstats_view.account_id + left join lateral ( + select + coalesce(sum(`user_statistics`.`net_bytes_received` + `user_statistics`.`current_bytes_received`), 0) AS `bytesReceived`, + coalesce(sum(`user_statistics`.`net_bytes_sent` + `user_statistics`.`current_bytes_sent`), 0) AS `bytesSent` + from + `cloud`.`user_statistics` + where + `user_statistics`.`account_id` = `account`.`id` + ) AS `account_netstats` ON TRUE left join `cloud`.`resource_limit` vmlimit ON account.id = vmlimit.account_id and vmlimit.type = 'user_vm' and vmlimit.tag IS NULL From c3d6a8cff72c47412670a914e3f4d30ad06bc46f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 9 Mar 2026 14:20:28 +0530 Subject: [PATCH 03/10] server: fix templatetype during iso upload (#12151) --- .../src/main/java/com/cloud/template/TemplateManagerImpl.java | 3 +++ server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 3ddd6a0fd9a8..ff810ef92312 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -2381,6 +2381,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) { @Override public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, HypervisorType hypervisorType) { + if (cmd instanceof GetUploadParamsForIsoCmd) { + return TemplateType.USER; + } if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd) && !(cmd instanceof GetUploadParamsForTemplateCmd)) { return null; } diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index f36c851e5bb3..49761905f004 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -4408,7 +4408,7 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri } } - if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) { + if (TemplateType.SYSTEM.equals(template.getTemplateType()) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) { throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template)); } From db836229564f3a86f39d9d0d0d44530526bf3d92 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 9 Mar 2026 18:56:19 +0530 Subject: [PATCH 04/10] ui: fix create network from global create menu (#12677) Signed-off-by: Abhishek Kumar --- ui/src/views/network/CreateNetwork.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue index 05fd7cbd5a6c..46ed9d2e039f 100644 --- a/ui/src/views/network/CreateNetwork.vue +++ b/ui/src/views/network/CreateNetwork.vue @@ -106,7 +106,7 @@ export default { fetchActionZoneData () { this.loading = true const params = {} - if (this.resource.zoneid && (this.$route.name === 'deployVirtualMachine' || this.$route.path.startsWith('/backup'))) { + if (this.resource?.zoneid && (this.$route.name === 'deployVirtualMachine' || this.$route.path.startsWith('/backup'))) { params.id = this.resource.zoneid } this.actionZoneLoading = true From 7aa0558c5b9127ef1633e151baf60ce7172ceaff Mon Sep 17 00:00:00 2001 From: Dheeraj Bansal Date: Mon, 9 Mar 2026 18:59:12 +0530 Subject: [PATCH 05/10] ui: avoid 404 after deleting template zones (#12681) --- ui/src/views/image/TemplateZones.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue index e517aad5167d..31b65e556a4b 100644 --- a/ui/src/views/image/TemplateZones.vue +++ b/ui/src/views/image/TemplateZones.vue @@ -91,7 +91,7 @@ :rowKey="record => record.datastoreId">