From fd46e61032f15c3bdc906b445a7f2ee607488240 Mon Sep 17 00:00:00 2001
From: Harikrishna <harikrishna.patnala@gmail.com>
Date: Tue, 2 Sep 2025 18:02:30 +0530
Subject: [PATCH 01/15] Added events for snapshots, vmsnapshots, internalLB
 operations (#11230)

* Added events for snapshots, vmsnapshots, internalLB operations

* Update server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

* small fix

* Unit test - ArgumentMatchers change

Co-authored-by: dahn <daan.hoogland@gmail.com>

* Unit test - ArgumentMatchers change

Co-authored-by: dahn <daan.hoogland@gmail.com>

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Co-authored-by: dahn <daan.hoogland@gmail.com>
---
 .../CreateSnapshotFromVMSnapshotCmd.java         |  5 +++++
 .../lb/InternalLoadBalancerVMManagerImpl.java    |  4 ++++
 .../internallbvmmgr/InternalLBVMServiceTest.java | 16 ++++++++++++++--
 .../com/cloud/resource/ResourceManagerImpl.java  |  7 ++++++-
 .../storage/snapshot/SnapshotManagerImpl.java    |  2 ++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
index 7b89e87202d..d33a3ba224c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
@@ -210,4 +210,9 @@ public class CreateSnapshotFromVMSnapshotCmd extends BaseAsyncCreateCmd {
         }
         return null;
     }
+
+    @Override
+    public Long getApiResourceId() {
+        return getEntityId();
+    }
 }
diff --git a/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
index a53f27188aa..70c29a64c1c 100644
--- a/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
+++ b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -26,6 +26,8 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -540,6 +542,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_INTERNAL_LB_VM_STOP, eventDescription = "stopping internal LB VM", async = true)
     public VirtualRouter stopInternalLbVm(final long vmId, final boolean forced, final Account caller, final long callerUserId) throws ConcurrentOperationException, ResourceUnavailableException {
         final DomainRouterVO internalLbVm = _internalLbVmDao.findById(vmId);
         if (internalLbVm == null || internalLbVm.getRole() != Role.INTERNAL_LB_VM) {
@@ -928,6 +931,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_INTERNAL_LB_VM_START, eventDescription = "starting internal LB VM", async = true)
     public VirtualRouter startInternalLbVm(final long internalLbVmId, final Account caller, final long callerUserId) throws StorageUnavailableException, InsufficientCapacityException,
     ConcurrentOperationException, ResourceUnavailableException {
 
diff --git a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
index 9141190df1f..fd44dcd981c 100644
--- a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
+++ b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.internallbvmmgr;
 
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
 
 import java.lang.reflect.Field;
@@ -24,13 +27,15 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import com.cloud.event.ActionEventUtils;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.BDDMockito;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -82,6 +87,8 @@ public class InternalLBVMServiceTest extends TestCase {
     @Inject
     AccountDao _accountDao;
 
+    private MockedStatic<ActionEventUtils> actionEventUtilsMocked;
+
     long validVmId = 1L;
     long nonExistingVmId = 2L;
     long nonInternalLbVmId = 3L;
@@ -105,7 +112,7 @@ public class InternalLBVMServiceTest extends TestCase {
 
         Mockito.when(_accountMgr.getSystemUser()).thenReturn(new UserVO(1));
         Mockito.when(_accountMgr.getSystemAccount()).thenReturn(new AccountVO(2));
-        Mockito.when(_accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(new AccountVO(2));
+        Mockito.when(_accountDao.findByIdIncludingRemoved(anyLong())).thenReturn(new AccountVO(2));
         CallContext.register(_accountMgr.getSystemUser(), _accountMgr.getSystemAccount());
 
         final DomainRouterVO validVm =
@@ -120,11 +127,16 @@ public class InternalLBVMServiceTest extends TestCase {
         Mockito.when(_domainRouterDao.findById(validVmId)).thenReturn(validVm);
         Mockito.when(_domainRouterDao.findById(nonExistingVmId)).thenReturn(null);
         Mockito.when(_domainRouterDao.findById(nonInternalLbVmId)).thenReturn(nonInternalLbVm);
+
+        actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
+        BDDMockito.given(ActionEventUtils.onStartedActionEvent(anyLong(), anyLong(), anyString(), anyString(), anyLong(), anyString(), anyBoolean(), anyLong()))
+                .willReturn(1L);
     }
 
     @Override
     @After
     public void tearDown() {
+        actionEventUtilsMocked.close();
         CallContext.unregister();
     }
 
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index e0cefc7b4bf..96fe734ed89 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -1251,6 +1251,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     }
 
     @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_MAINTENANCE_CANCEL, eventDescription = "cancel maintenance for host", async = true)
     public Host cancelMaintenance(final CancelMaintenanceCmd cmd) {
         final Long hostId = cmd.getId();
 
@@ -1274,6 +1276,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     }
 
     @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_HOST_RECONNECT, eventDescription = "reconnecting host", async = true)
     public Host reconnectHost(ReconnectHostCmd cmd) throws AgentUnavailableException {
         Long hostId = cmd.getId();
 
@@ -1344,7 +1348,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             throw new CloudRuntimeException(err + e.getMessage());
         }
 
-        ActionEventUtils.onStartedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), EventTypes.EVENT_MAINTENANCE_PREPARE, "starting maintenance for host " + hostId, hostId, null, true, 0);
         _agentMgr.pullAgentToMaintenance(hostId);
 
         /* TODO: move below to listener */
@@ -1472,6 +1475,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     }
 
     @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_MAINTENANCE_PREPARE, eventDescription = "prepare maintenance for host", async = true)
     public Host maintain(final PrepareForMaintenanceCmd cmd) {
         final Long hostId = cmd.getId();
         final HostVO host = _hostDao.findById(hostId);
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index eed220836a4..4ae34517357 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -492,6 +492,8 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
     }
 
     @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_SNAPSHOT_CREATE, eventDescription = "creating snapshot from VM snapshot", async = true)
     public Snapshot backupSnapshotFromVmSnapshot(Long snapshotId, Long vmId, Long volumeId, Long vmSnapshotId) {
         VMInstanceVO vm = _vmDao.findById(vmId);
         if (vm == null) {

From f24b1757a0b920d88470033bdf4bd658717a8d20 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 3 Sep 2025 15:16:10 +0530
Subject: [PATCH 02/15] ui: donot filter edge zones while registering
 directdownload iso (#10865)

Fixes #10766

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/views/image/RegisterOrUploadIso.vue | 45 +++++++++++++++-------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/ui/src/views/image/RegisterOrUploadIso.vue b/ui/src/views/image/RegisterOrUploadIso.vue
index 871a8482e99..37ae369727f 100644
--- a/ui/src/views/image/RegisterOrUploadIso.vue
+++ b/ui/src/views/image/RegisterOrUploadIso.vue
@@ -85,7 +85,7 @@
           <template #label>
             <tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
           </template>
-          <a-switch v-model:checked="form.directdownload"/>
+          <a-switch v-model:checked="form.directdownload" @change="handleDirectDownloadChange"/>
         </a-form-item>
 
         <a-form-item ref="checksum" name="checksum">
@@ -110,7 +110,7 @@
             }"
             :loading="zoneLoading"
             :placeholder="apiParams.zoneid.description">
-            <a-select-option :value="opt.id" v-for="opt in zones" :key="opt.id" :label="opt.name || opt.description">
+            <a-select-option :value="opt.id" v-for="opt in zoneList" :key="opt.id" :label="opt.name || opt.description">
               <span>
                 <resource-icon v-if="opt.icon" :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
                 <global-outlined v-else style="margin-right: 5px" />
@@ -361,17 +361,18 @@ export default {
   },
   created () {
     this.initForm()
-    this.zones = []
-    if (this.$store.getters.userInfo.roletype === 'Admin' && this.currentForm === 'Create') {
-      this.zones = [
-        {
-          id: '-1',
-          name: this.$t('label.all.zone')
-        }
-      ]
-    }
+    this.initZones()
     this.fetchData()
   },
+  computed: {
+    zoneList () {
+      let filteredZones = this.zones
+      if (!this.form.directdownload) {
+        filteredZones = this.zones.filter(zone => zone.type !== 'Edge')
+      }
+      return filteredZones
+    }
+  },
   methods: {
     initForm () {
       this.formRef = ref()
@@ -390,6 +391,17 @@ export default {
         ostypeid: [{ required: true, message: this.$t('message.error.select') }]
       })
     },
+    initZones () {
+      this.zones = []
+      if (this.$store.getters.userInfo.roletype === 'Admin' && this.currentForm === 'Create') {
+        this.zones = [
+          {
+            id: '-1',
+            name: this.$t('label.all.zone')
+          }
+        ]
+      }
+    },
     fetchData () {
       this.fetchZoneData()
       this.fetchOsType()
@@ -412,11 +424,10 @@ export default {
         const listZones = json.listzonesresponse.zone
         if (listZones) {
           this.zones = this.zones.concat(listZones)
-          this.zones = this.zones.filter(zone => zone.type !== 'Edge')
         }
       }).finally(() => {
         this.zoneLoading = false
-        this.form.zoneid = (this.zones[0].id ? this.zones[0].id : '')
+        this.form.zoneid = this.zoneList?.[0]?.id || ''
       })
     },
     fetchOsType () {
@@ -467,6 +478,12 @@ export default {
       this.fileList = newFileList
       this.form.file = undefined
     },
+    handleDirectDownloadChange () {
+      if (this.form.zoneid && this.zoneList.find(entry => entry.id === this.form.zoneid)) {
+        return
+      }
+      this.form.zoneid = this.zoneList?.[0]?.id || ''
+    },
     beforeUpload (file) {
       this.fileList = [file]
       this.form.file = file
@@ -531,7 +548,7 @@ export default {
           }
           switch (key) {
             case 'zoneid':
-              var zone = this.zones.filter(zone => zone.id === input)
+              var zone = this.zoneList.filter(zone => zone.id === input)
               params[key] = zone[0].id
               break
             case 'ostypeid':

From a4cf47a9b80e4ea96d0b702730b6e3363709d321 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 3 Sep 2025 16:30:26 +0530
Subject: [PATCH 03/15] server: remove extra chars when template status is
 error string (#11329)

Fixes #11324

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index 26a18818dbf..d23e2f6260f 100644
--- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@ -180,10 +180,10 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
                 }
             } else if (template.getDownloadState() == Status.BYPASSED) {
                 templateStatus = "Bypassed Secondary Storage";
-            }else if (template.getErrorString()==null){
+            } else if (template.getErrorString() == null) {
                 templateStatus = template.getTemplateState().toString();
-            }else {
-                templateStatus = template.getErrorString();
+            } else {
+                templateStatus = template.getErrorString().trim();
             }
         } else if (template.getDownloadState() == Status.DOWNLOADED) {
             templateStatus = "Download Complete";

From 25f1d203403fcc85023244896c9c98b95d40fb01 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 3 Sep 2025 18:35:06 +0530
Subject: [PATCH 04/15] ui: show multiple domains as links in list view
 (#11536)

* ui: show multiple domains as links in list view

Currently, when resources are linked to multiple domains and they are
shown in the list view, they are not clickable. This PR fixes it.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

---------

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/components/view/ListView.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index eca99dc0346..0109784047a 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -365,7 +365,14 @@
         <resource-label :resourceType="record.resourcetype" :resourceId="record.resourceid" :resourceName="record.resourcename" />
       </template>
       <template v-if="column.key === 'domain'">
-        <router-link v-if="record.domainid && !record.domainid.toString().includes(',') && $store.getters.userInfo.roletype !== 'User'" :to="{ path: '/domain/' + record.domainid, query: { tab: 'details' } }">{{ text }}</router-link>
+        <span v-if="record.domainid && $store.getters.userInfo.roletype !== 'User'">
+          <template v-for="(id, idx) in record.domainid.split(',')" :key="id">
+            <router-link :to="{ path: '/domain/' + id, query: { tab: 'details' } }">
+              {{ record.domain.split(',')[idx] || id }}
+            </router-link>
+            <span v-if="idx < record.domainid.split(',').length - 1">, </span>
+          </template>
+        </span>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'domainpath'">

From db5b6a54a1e52ac1716e87c9f0fa0ae46310ba3e Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Wed, 3 Sep 2025 15:44:51 +0200
Subject: [PATCH 05/15] systemvm template: update URLs of debian ISOs (#11543)

---
 .../systemvmtemplate/template-base_aarch64-target_aarch64.json  | 2 +-
 .../systemvmtemplate/template-base_x86_64-target_aarch64.json   | 2 +-
 .../systemvmtemplate/template-base_x86_64-target_x86_64.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json b/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json
index a3507c3a091..e87c37be61e 100644
--- a/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json
+++ b/tools/appliance/systemvmtemplate/template-base_aarch64-target_aarch64.json
@@ -33,7 +33,7 @@
       "headless": true,
       "http_directory": "http",
       "iso_checksum": "sha512:892cf1185a214d16ff62a18c6b89cdcd58719647c99916f6214bfca6f9915275d727b666c0b8fbf022c425ef18647e9759974abf7fc440431c39b50c296a98d3",
-      "iso_url": "https://cdimage.debian.org/mirror/cdimage/release/12.11.0/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso",
+      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.11.0/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso",
       "net_device": "virtio-net",
       "output_directory": "../dist",
       "qemu_binary": "qemu-system-aarch64",
diff --git a/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json b/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json
index 0ee62f1fd4b..4d803b25890 100644
--- a/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json
+++ b/tools/appliance/systemvmtemplate/template-base_x86_64-target_aarch64.json
@@ -32,7 +32,7 @@
       "headless": true,
       "http_directory": "http",
       "iso_checksum": "sha512:892cf1185a214d16ff62a18c6b89cdcd58719647c99916f6214bfca6f9915275d727b666c0b8fbf022c425ef18647e9759974abf7fc440431c39b50c296a98d3",
-      "iso_url": "https://cdimage.debian.org/mirror/cdimage/release/12.11.0/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso",
+      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.11.0/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso",
       "net_device": "virtio-net",
       "output_directory": "../dist",
       "qemu_binary": "qemu-system-aarch64",
diff --git a/tools/appliance/systemvmtemplate/template-base_x86_64-target_x86_64.json b/tools/appliance/systemvmtemplate/template-base_x86_64-target_x86_64.json
index 94d2f5172f7..e825e98e5f1 100644
--- a/tools/appliance/systemvmtemplate/template-base_x86_64-target_x86_64.json
+++ b/tools/appliance/systemvmtemplate/template-base_x86_64-target_x86_64.json
@@ -28,7 +28,7 @@
       "headless": true,
       "http_directory": "http",
       "iso_checksum": "sha512:0921d8b297c63ac458d8a06f87cd4c353f751eb5fe30fd0d839ca09c0833d1d9934b02ee14bbd0c0ec4f8917dde793957801ae1af3c8122cdf28dde8f3c3e0da",
-      "iso_url": "https://cdimage.debian.org/mirror/cdimage/release/12.11.0/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso",
+      "iso_url": "https://cdimage.debian.org/mirror/cdimage/archive/12.11.0/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso",
       "net_device": "virtio-net",
       "output_directory": "../dist",
       "qemuargs": [

From adec5f439dff7fe970fb5aa33bd06260a231c8d5 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Sat, 6 Sep 2025 17:04:23 +0530
Subject: [PATCH 06/15] kvm: add ssvm storage nic null uri check during plug
 (#11557)

* kvm: add ssvm storage nic null uri check during plug

Fixes #11552

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* refactor

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

---------

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../kvm/resource/BridgeVifDriver.java         | 27 +++++----
 .../kvm/resource/BridgeVifDriverTest.java     | 58 ++++++++++++++++---
 2 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index 0602fd6322f..3b66529ccaf 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -184,6 +184,21 @@ public class BridgeVifDriver extends VifDriverBase {
         return vNetId != null && protocol != null && !vNetId.equalsIgnoreCase("untagged");
     }
 
+    protected String createStorageVnetBridgeIfNeeded(NicTO nic, String trafficLabel,
+                 String storageBrName) throws InternalErrorException {
+        if (!Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) || nic.getBroadcastUri() == null) {
+            return storageBrName;
+        }
+        String vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
+        String protocol = Networks.BroadcastDomainType.Vlan.scheme();
+        if (!isValidProtocolAndVnetId(vNetId, protocol))  {
+            return storageBrName;
+        }
+        logger.debug(String.format("creating a vNet dev and bridge for %s traffic per traffic label %s",
+                Networks.TrafficType.Storage.name(), trafficLabel));
+        return createVnetBr(vNetId, storageBrName, protocol);
+    }
+
     @Override
     public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicAdapter, Map<String, String> extraConfig) throws InternalErrorException, LibvirtException {
 
@@ -250,15 +265,7 @@ public class BridgeVifDriver extends VifDriverBase {
             intf.defBridgeNet(_bridges.get("private"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
         } else if (nic.getType() == Networks.TrafficType.Storage) {
             String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();
-            if (nic.getBroadcastType() == Networks.BroadcastDomainType.Storage) {
-                vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
-                protocol = Networks.BroadcastDomainType.Vlan.scheme();
-            }
-            if (isValidProtocolAndVnetId(vNetId, protocol))  {
-                logger.debug(String.format("creating a vNet dev and bridge for %s traffic per traffic label %s",
-                        Networks.TrafficType.Storage.name(), trafficLabel));
-                storageBrName = createVnetBr(vNetId, storageBrName, protocol);
-            }
+            storageBrName = createStorageVnetBridgeIfNeeded(nic, trafficLabel, storageBrName);
             intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
         }
         if (nic.getPxeDisable()) {
@@ -291,7 +298,7 @@ public class BridgeVifDriver extends VifDriverBase {
         return "brvx-" + vnetId;
     }
 
-    private String createVnetBr(String vNetId, String pifKey, String protocol) throws InternalErrorException {
+    protected String createVnetBr(String vNetId, String pifKey, String protocol) throws InternalErrorException {
         String nic = _pifs.get(pifKey);
         if (nic == null || protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
             // if not found in bridge map, maybe traffic label refers to pif already?
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriverTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriverTest.java
index 48bba2b78ed..00364948f82 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriverTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriverTest.java
@@ -16,24 +16,29 @@
 // under the License.
 package com.cloud.hypervisor.kvm.resource;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.agent.api.to.NicTO;
+import com.cloud.exception.InternalErrorException;
 import com.cloud.network.Networks;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BridgeVifDriverTest {
 
-    private BridgeVifDriver driver;
+    private static final String BRIDGE_NAME = "cloudbr1";
 
-    @Before
-    public void setUp() throws Exception {
-        driver = new BridgeVifDriver();
-    }
+    @Spy
+    @InjectMocks
+    private BridgeVifDriver driver = new BridgeVifDriver();
 
     @Test
     public void isBroadcastTypeVlanOrVxlan() {
@@ -58,4 +63,41 @@ public class BridgeVifDriverTest {
         Assert.assertTrue(driver.isValidProtocolAndVnetId("123", "vlan"));
         Assert.assertTrue(driver.isValidProtocolAndVnetId("456", "vxlan"));
     }
+
+    @Test
+    public void createStorageVnetBridgeIfNeededReturnsStorageBrNameWhenBroadcastTypeIsNotStorageButValidValues() throws InternalErrorException {
+        NicTO nic = new NicTO();
+        nic.setBroadcastType(Networks.BroadcastDomainType.Storage);
+        int vlan = 123;
+        String newBridge = "br-" + vlan;
+        nic.setBroadcastUri(Networks.BroadcastDomainType.Storage.toUri(vlan));
+        Mockito.doReturn(newBridge).when(driver).createVnetBr(Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        String result = driver.createStorageVnetBridgeIfNeeded(nic, "trafficLabel", BRIDGE_NAME);
+        Assert.assertEquals(newBridge, result);
+    }
+
+    @Test
+    public void createStorageVnetBridgeIfNeededReturnsStorageBrNameWhenBroadcastTypeIsNotStorage() throws InternalErrorException {
+        NicTO nic = new NicTO();
+        nic.setBroadcastType(Networks.BroadcastDomainType.Vlan);
+        String result = driver.createStorageVnetBridgeIfNeeded(nic, "trafficLabel", BRIDGE_NAME);
+        Assert.assertEquals(BRIDGE_NAME, result);
+    }
+
+    @Test
+    public void createStorageVnetBridgeIfNeededReturnsStorageBrNameWhenBroadcastUriIsNull() throws InternalErrorException {
+        NicTO nic = new NicTO();
+        nic.setBroadcastType(Networks.BroadcastDomainType.Storage);
+        String result = driver.createStorageVnetBridgeIfNeeded(nic,  "trafficLabel", BRIDGE_NAME);
+        Assert.assertEquals(BRIDGE_NAME, result);
+    }
+
+    @Test
+    public void createStorageVnetBridgeIfNeededCreatesVnetBridgeWhenUntaggedVlan() throws InternalErrorException, URISyntaxException {
+        NicTO nic = new NicTO();
+        nic.setBroadcastType(Networks.BroadcastDomainType.Storage);
+        nic.setBroadcastUri(new URI(Networks.BroadcastDomainType.Storage.scheme() + "://untagged"));
+        String result = driver.createStorageVnetBridgeIfNeeded(nic, "trafficLabel", BRIDGE_NAME);
+        Assert.assertEquals(BRIDGE_NAME, result);
+    }
 }

From f4802f30ed609a0b89b7ba003cdf82f40bc7a040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?=
 <bernardomg2004@gmail.com>
Date: Mon, 8 Sep 2025 04:23:19 -0300
Subject: [PATCH 07/15] UI: fix display of disk size and IOPS fields in the
 scale VM form (#11553)

---
 ui/src/views/compute/ScaleVM.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/compute/ScaleVM.vue b/ui/src/views/compute/ScaleVM.vue
index 4ae02e7a80b..7113e3f2c09 100644
--- a/ui/src/views/compute/ScaleVM.vue
+++ b/ui/src/views/compute/ScaleVM.vue
@@ -226,8 +226,8 @@ export default {
         api('listDiskOfferings', {
           id: this.selectedOffering.diskofferingid
         }).then(response => {
-          const diskOfferings = response.listdiskofferingsresponse.diskoffering || []
-          if (this.diskOfferings) {
+          const diskOfferings = response?.listdiskofferingsresponse?.diskoffering || []
+          if (diskOfferings?.length > 0) {
             this.selectedDiskOffering = diskOfferings[0]
           }
         }).catch(error => {

From af2a911f1b7f9d7b8f7b5a7b7bc720dc29aa7068 Mon Sep 17 00:00:00 2001
From: AndrewHaZG <andrew.ha@zettagrid.com>
Date: Mon, 8 Sep 2025 15:24:33 +0800
Subject: [PATCH 08/15] UI: Make logout function more robust to prevent session
 issues (#11361)

Improve cookie cleanup during logout by removing cookies across
multiple paths and domains to ensure complete session termination.

Fixes #11078
---
 ui/src/store/modules/user.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index 6113f3ed940..5c9dff69f96 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -472,9 +472,17 @@ const user = {
         }).catch(() => {
           resolve()
         }).finally(() => {
+          const paths = ['/', '/client']
+          const hostname = window.location.hostname
+          const domains = [undefined, hostname, `.${hostname}`]
           Object.keys(Cookies.get()).forEach(cookieName => {
-            Cookies.remove(cookieName)
-            Cookies.remove(cookieName, { path: '/client' })
+            paths.forEach(path => {
+              domains.forEach(domain => {
+                const options = { path }
+                if (domain) options.domain = domain
+                Cookies.remove(cookieName, options)
+              })
+            })
           })
         })
       })

From 90681df1b5b90f31a8aa3b21c0e2fe9b5693c363 Mon Sep 17 00:00:00 2001
From: shrikantjoshi-hpe <sjoshi@hpe.com>
Date: Mon, 8 Sep 2025 13:14:33 +0530
Subject: [PATCH 09/15] Primera: Delete session after key expiration (#11487)

---
 .../adapter/primera/PrimeraAdapter.java       | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/PrimeraAdapter.java b/plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/PrimeraAdapter.java
index 445799f0c04..19c4b53222b 100644
--- a/plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/PrimeraAdapter.java
+++ b/plugins/storage/volume/primera/src/main/java/org/apache/cloudstack/storage/datastore/adapter/primera/PrimeraAdapter.java
@@ -121,6 +121,10 @@ public class PrimeraAdapter implements ProviderAdapter {
     public void disconnect() {
         logger.info("PrimeraAdapter:disconnect(): closing session");
         try {
+            //Delete session safely without triggering refreshSession
+            if (key != null && _client != null) {
+                logout();
+            }
             _client.close();
         } catch (IOException e) {
             logger.warn("PrimeraAdapter:refreshSession(): Error closing client connection", e);
@@ -130,6 +134,40 @@ public class PrimeraAdapter implements ProviderAdapter {
         }
         return;
     }
+    /**
+     * Delete session directly without going through refreshSession to avoid infinite recursion
+     */
+    private void logout() {
+        CloseableHttpResponse response = null;
+        try {
+            logger.debug("PrimeraAdapter:logout(): Delete session directly");
+            HttpDelete request = new HttpDelete(url + "/credentials/" + key);
+            request.addHeader("Content-Type", "application/json");
+            request.addHeader("Accept", "application/json");
+            request.addHeader("X-HP3PAR-WSAPI-SessionKey", key);
+
+            response = (CloseableHttpResponse) _client.execute(request);
+            final int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode == 200 || statusCode == 404) {
+                logger.debug("PrimeraAdapter:logout(): Session deleted successfully or was already expired");
+            } else if (statusCode == 401 || statusCode == 403) {
+                logger.warn("PrimeraAdapter:logout(): Session already invalid or expired during deletion");
+            } else {
+                logger.warn("PrimeraAdapter:logout(): Unexpected response when deleting session: {}", statusCode);
+            }
+        } catch (IOException e) {
+            logger.warn("PrimeraAdapter:logout(): Error deleting session: {}", e.getMessage());
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    logger.debug("PrimeraAdapter:logout(): Error closing response from session deletion", e);
+                }
+            }
+        }
+    }
 
     @Override
     public ProviderVolume create(ProviderAdapterContext context, ProviderAdapterDataObject dataIn,

From 6868f052de49fb8342bfb074cab3a30da1b83165 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 8 Sep 2025 14:36:22 +0530
Subject: [PATCH 10/15] 2fa: log error on totp mismatch (#10734)

Addresses #9515

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../cloudstack/auth/TotpUserTwoFactorAuthenticator.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/user-two-factor-authenticators/totp/src/main/java/org/apache/cloudstack/auth/TotpUserTwoFactorAuthenticator.java b/plugins/user-two-factor-authenticators/totp/src/main/java/org/apache/cloudstack/auth/TotpUserTwoFactorAuthenticator.java
index c7c4997f189..b722bd14393 100644
--- a/plugins/user-two-factor-authenticators/totp/src/main/java/org/apache/cloudstack/auth/TotpUserTwoFactorAuthenticator.java
+++ b/plugins/user-two-factor-authenticators/totp/src/main/java/org/apache/cloudstack/auth/TotpUserTwoFactorAuthenticator.java
@@ -54,7 +54,9 @@ public class TotpUserTwoFactorAuthenticator extends AdapterBase implements UserT
             logger.info("2FA matches user's input");
             return;
         }
-        throw new CloudTwoFactorAuthenticationException("two-factor authentication code provided is invalid");
+        String msg = "two-factor authentication code provided is invalid";
+        logger.error(msg);
+        throw new CloudTwoFactorAuthenticationException(msg);
     }
 
     private String get2FAKey(UserAccount userAccount) {

From 9349b69b7e6e2c6ba240f9c93ec7d2d61a791186 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 8 Sep 2025 20:21:57 +0530
Subject: [PATCH 11/15] server,kvm: detect boot options for vm import (#11218)

* server,kvm: detect boot options for vm import

Fixes #11184

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* tests and changes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

---------

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../kvm/resource/LibvirtDomainXMLParser.java  | 34 +++++++
 .../hypervisor/kvm/resource/LibvirtVMDef.java |  4 +-
 ...rtGetUnmanagedInstancesCommandWrapper.java |  6 ++
 .../resource/LibvirtDomainXMLParserTest.java  | 90 +++++++++++++++++++
 4 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
index c4d5ac48f6f..8b26bc94e21 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
@@ -48,6 +48,7 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.RngDef.RngBackendModel;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef.WatchDogAction;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef.WatchDogModel;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.GuestDef;
 
 public class LibvirtDomainXMLParser {
     protected Logger logger = LogManager.getLogger(getClass());
@@ -63,6 +64,8 @@ public class LibvirtDomainXMLParser {
     private LibvirtVMDef.CpuTuneDef cpuTuneDef;
     private LibvirtVMDef.CpuModeDef cpuModeDef;
     private String name;
+    private GuestDef.BootType bootType;
+    private GuestDef.BootMode bootMode;
 
     public boolean parseDomainXML(String domXML) {
         DocumentBuilder builder;
@@ -388,6 +391,7 @@ public class LibvirtDomainXMLParser {
             }
             extractCpuTuneDef(rootElement);
             extractCpuModeDef(rootElement);
+            extractBootDef(rootElement);
             return true;
         } catch (ParserConfigurationException e) {
             logger.debug(e.toString());
@@ -516,6 +520,14 @@ public class LibvirtDomainXMLParser {
         return cpuModeDef;
     }
 
+    public GuestDef.BootType getBootType() {
+        return bootType;
+    }
+
+    public GuestDef.BootMode getBootMode() {
+        return bootMode;
+    }
+
     private void extractCpuTuneDef(final Element rootElement) {
         NodeList cpuTunesList = rootElement.getElementsByTagName("cputune");
         if (cpuTunesList.getLength() > 0) {
@@ -569,4 +581,26 @@ public class LibvirtDomainXMLParser {
             }
         }
     }
+
+    protected void extractBootDef(final Element rootElement) {
+        bootType = GuestDef.BootType.BIOS;
+        bootMode = GuestDef.BootMode.LEGACY;
+        Element osElement = (Element) rootElement.getElementsByTagName("os").item(0);
+        if (osElement == null) {
+            return;
+        }
+        NodeList loaderList = osElement.getElementsByTagName("loader");
+        if (loaderList.getLength() == 0) {
+            return;
+        }
+        Element loader = (Element) loaderList.item(0);
+        String type = loader.getAttribute("type");
+        String secure = loader.getAttribute("secure");
+        if ("pflash".equalsIgnoreCase(type) || loader.getTextContent().toLowerCase().contains("uefi")) {
+            bootType = GuestDef.BootType.UEFI;
+        }
+        if ("yes".equalsIgnoreCase(secure)) {
+            bootMode = GuestDef.BootMode.SECURE;
+        }
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 1383190933d..a38e7a02357 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -65,7 +65,7 @@ public class LibvirtVMDef {
             }
         }
 
-        enum BootType {
+        public enum BootType {
             UEFI("UEFI"), BIOS("BIOS");
 
             String _type;
@@ -80,7 +80,7 @@ public class LibvirtVMDef {
             }
         }
 
-        enum BootMode {
+        public enum BootMode {
             LEGACY("LEGACY"), SECURE("SECURE");
 
             String _mode;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java
index 70b1715cc20..e807bf3c821 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java
@@ -135,6 +135,12 @@ public final class LibvirtGetUnmanagedInstancesCommandWrapper extends CommandWra
             instance.setNics(getUnmanagedInstanceNics(parser.getInterfaces()));
             instance.setDisks(getUnmanagedInstanceDisks(parser.getDisks(),libvirtComputingResource, conn, domain.getName()));
             instance.setVncPassword(getFormattedVncPassword(parser.getVncPasswd()));
+            if (parser.getBootType() != null) {
+                instance.setBootType(parser.getBootType().toString());
+            }
+            if (parser.getBootMode() != null) {
+                instance.setBootMode(parser.getBootMode().toString());
+            }
 
             return instance;
         } catch (Exception e) {
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java
index 921bbf0c9a8..de50cf34202 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParserTest.java
@@ -20,8 +20,13 @@
 package com.cloud.hypervisor.kvm.resource;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.List;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ChannelDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
@@ -31,10 +36,15 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef;
 
 import junit.framework.TestCase;
 import org.apache.cloudstack.utils.qemu.QemuObject;
+import org.apache.cloudstack.utils.security.ParserUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LibvirtDomainXMLParserTest extends TestCase {
@@ -386,4 +396,84 @@ public class LibvirtDomainXMLParserTest extends TestCase {
         Assert.assertEquals("CPU cores count is parsed", 4, libvirtDomainXMLParser.getCpuModeDef().getCoresPerSocket());
         Assert.assertEquals("CPU threads count is parsed", 2, libvirtDomainXMLParser.getCpuModeDef().getThreadsPerCore());
     }
+
+    private LibvirtDomainXMLParser parseElementFromXML(String xml) {
+        LibvirtDomainXMLParser parser = new LibvirtDomainXMLParser();
+        DocumentBuilder builder;
+        try {
+            builder = ParserUtils.getSaferDocumentBuilderFactory().newDocumentBuilder();
+            InputSource is = new InputSource();
+            is.setCharacterStream(new StringReader(xml));
+            Document doc = builder.parse(is);
+            Element element = doc.getDocumentElement();
+            parser.extractBootDef(element);
+        } catch (ParserConfigurationException | IOException | SAXException e) {
+            Assert.fail("Failed to parse XML: " + e.getMessage());
+        }
+        return parser;
+    }
+
+    @Test
+    public void extractBootDefParsesUEFISecureBootCorrectly() {
+        String xml = "<domain type='kvm'>" +
+                     "<os>" +
+                     "<loader type='pflash' secure='yes'>/path/to/uefi/loader</loader>" +
+                     "</os>" +
+                     "</domain>";
+
+        LibvirtDomainXMLParser parser = parseElementFromXML(xml);
+
+        assertEquals(LibvirtVMDef.GuestDef.BootType.UEFI, parser.getBootType());
+        assertEquals(LibvirtVMDef.GuestDef.BootMode.SECURE, parser.getBootMode());
+    }
+
+    @Test
+    public void extractBootDefParsesUEFILegacyBootCorrectly() {
+        String xml = "<domain type='kvm'>" +
+                     "<os>" +
+                     "<loader type='pflash' secure='no'>/path/to/uefi/loader</loader>" +
+                     "</os>" +
+                     "</domain>";
+
+        LibvirtDomainXMLParser parser = parseElementFromXML(xml);
+
+        assertEquals(LibvirtVMDef.GuestDef.BootType.UEFI, parser.getBootType());
+        assertEquals(LibvirtVMDef.GuestDef.BootMode.LEGACY, parser.getBootMode());
+    }
+
+    @Test
+    public void extractBootDefDefaultsToBIOSLegacyWhenNoLoaderPresent() {
+        String xml = "<domain type='kvm'>" +
+                     "<os>" +
+                     "<type arch='x86_64'>hvm</type>" +
+                     "</os>" +
+                     "</domain>";
+
+        LibvirtDomainXMLParser parser = parseElementFromXML(xml);
+
+        assertEquals(LibvirtVMDef.GuestDef.BootType.BIOS, parser.getBootType());
+        assertEquals(LibvirtVMDef.GuestDef.BootMode.LEGACY, parser.getBootMode());
+    }
+
+    @Test
+    public void extractBootDefHandlesEmptyOSSection() {
+        String xml = "<domain type='kvm'>" +
+                     "<os></os>" +
+                     "</domain>";
+
+        LibvirtDomainXMLParser parser = parseElementFromXML(xml);
+
+        assertEquals(LibvirtVMDef.GuestDef.BootType.BIOS, parser.getBootType());
+        assertEquals(LibvirtVMDef.GuestDef.BootMode.LEGACY, parser.getBootMode());
+    }
+
+    @Test
+    public void extractBootDefHandlesMissingOSSection() {
+        String xml = "<domain type='kvm'></domain>";
+
+        LibvirtDomainXMLParser parser = parseElementFromXML(xml);
+
+        assertEquals(LibvirtVMDef.GuestDef.BootType.BIOS, parser.getBootType());
+        assertEquals(LibvirtVMDef.GuestDef.BootMode.LEGACY, parser.getBootMode());
+    }
 }

From fe120b64e70caa3c31725028f4ea792a76b5f7d6 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 9 Sep 2025 15:04:28 +0530
Subject: [PATCH 12/15] server: prevent vm schedule update failure for time
 when not changed (#11314)

Fixes #11175

Behaviour introduced in #7397 always validates start-end times during
update even when they are not changed which leads to failure to
enable/disable schedule if the start time has passed.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../vm/schedule/VMScheduleManagerImpl.java    | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
index 0bb2f94ba7f..4d1fc4049c9 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
@@ -18,6 +18,30 @@
  */
 package org.apache.cloudstack.vm.schedule;
 
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.TimeZone;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.VMScheduleResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.scheduling.support.CronExpression;
+
 import com.cloud.api.query.MutualExclusiveIdsManagerBase;
 import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
@@ -32,27 +56,6 @@ import com.cloud.utils.db.TransactionCallback;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.VirtualMachine;
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
-import org.springframework.scheduling.support.CronExpression;
-
-import javax.inject.Inject;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.TimeZone;
 
 public class VMScheduleManagerImpl extends MutualExclusiveIdsManagerBase implements VMScheduleManager, PluggableService {
 
@@ -208,6 +211,9 @@ public class VMScheduleManagerImpl extends MutualExclusiveIdsManagerBase impleme
         Date cmdStartDate = cmd.getStartDate();
         Date cmdEndDate = cmd.getEndDate();
         Boolean enabled = cmd.getEnabled();
+        final String originalTimeZone = vmSchedule.getTimeZone();
+        final Date originalStartDate = vmSchedule.getStartDate();
+        final Date originalEndDate = vmSchedule.getEndDate();
 
         TimeZone timeZone;
         String timeZoneId;
@@ -234,7 +240,13 @@ public class VMScheduleManagerImpl extends MutualExclusiveIdsManagerBase impleme
             startDate = Date.from(DateUtil.getZoneDateTime(cmdStartDate, timeZone.toZoneId()).toInstant());
         }
 
-        validateStartDateEndDate(Objects.requireNonNullElse(startDate, DateUtils.addMinutes(new Date(), 1)), endDate, timeZone);
+        if (ObjectUtils.anyNotNull(cmdStartDate, cmdEndDate, cmdTimeZone) &&
+                (!Objects.equals(originalTimeZone, timeZoneId) ||
+                        !Objects.equals(originalStartDate, startDate) ||
+                        !Objects.equals(originalEndDate, endDate))) {
+            validateStartDateEndDate(Objects.requireNonNullElse(startDate, DateUtils.addMinutes(new Date(), 1)),
+                    endDate, timeZone);
+        }
 
         if (enabled != null) {
             vmSchedule.setEnabled(enabled);

From 3ffd4442946c9ddcaa6d38697ea366297b585f29 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 9 Sep 2025 16:12:29 +0530
Subject: [PATCH 13/15] ui: donot remove account, domain from query on public
 ip filter change (#11575)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/views/AutogenView.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index e2d99096b15..6b57e0f6ea0 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -1723,10 +1723,12 @@ export default {
       const query = Object.assign({}, this.$route.query)
       delete query.templatefilter
       delete query.isofilter
-      delete query.account
-      delete query.domainid
       delete query.state
       delete query.annotationfilter
+      if (!['publicip'].includes(this.$route.name)) {
+        delete query.account
+        delete query.domainid
+      }
       if (this.$route.name === 'template') {
         query.templatefilter = filter
       } else if (this.$route.name === 'iso') {

From 4f5f7d46d28fd17e5acbf929e1356a517a52335f Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 9 Sep 2025 06:53:09 -0400
Subject: [PATCH 14/15] CKS: Validate network offering from network if provided
 rather than global setting (#11528)

* CKS: Validate network offering from network if provided rather than global setting

* update warning message
---
 .../cluster/KubernetesClusterManagerImpl.java | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
index d1babb547f8..9b3e487680d 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -367,18 +367,33 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
         logTransitStateAndThrow(logLevel, message, null, null, ex);
     }
 
-    private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone) {
+    private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone, Long networkId) {
         // Check network offering
         String networkOfferingName = KubernetesClusterNetworkOffering.value();
-        if (networkOfferingName == null || networkOfferingName.isEmpty()) {
-            logger.warn(String.format("Global setting %s is empty. Admin has not yet specified the network offering to be used for provisioning isolated network for the cluster", KubernetesClusterNetworkOffering.key()));
+        if (StringUtils.isEmpty(networkOfferingName) && networkId == null) {
+            logger.warn("Global setting: {} is empty. Admin has not yet specified the network offering to be used for provisioning isolated network for the cluster nor has a pre-created network been passed", KubernetesClusterNetworkOffering.key());
             return false;
         }
-        NetworkOfferingVO networkOffering = networkOfferingDao.findByUniqueName(networkOfferingName);
-        if (networkOffering == null) {
-            logger.warn(String.format("Unable to find the network offering %s to be used for provisioning Kubernetes cluster", networkOfferingName));
-            return false;
+        NetworkOfferingVO networkOffering = null;
+        if (networkId != null) {
+            NetworkVO network = networkDao.findById(networkId);
+            if (network == null) {
+                logger.warn("Unable to find the network with ID: {} passed for the Kubernetes cluster", networkId);
+                return false;
+            }
+            networkOffering = networkOfferingDao.findById(network.getNetworkOfferingId());
+            if (networkOffering == null) {
+                logger.warn("Unable to find the network offering of the network: {} ({}) to be used for provisioning Kubernetes cluster", network.getName(), network.getUuid());
+                return false;
+            }
+        } else if (StringUtils.isNotEmpty(networkOfferingName)) {
+            networkOffering = networkOfferingDao.findByUniqueName(networkOfferingName);
+            if (networkOffering == null) {
+                logger.warn("Unable to find the network offering: {} to be used for provisioning Kubernetes cluster", networkOfferingName);
+                return false;
+            }
         }
+
         if (networkOffering.getState() == NetworkOffering.State.Disabled) {
             logger.warn("Network offering: {} is not enabled", networkOffering);
             return false;
@@ -413,8 +428,8 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
         return true;
     }
 
-    private boolean isKubernetesServiceConfigured(DataCenter zone) {
-        if (!isKubernetesServiceNetworkOfferingConfigured(zone)) {
+    private boolean isKubernetesServiceConfigured(DataCenter zone, Long networkId) {
+        if (!isKubernetesServiceNetworkOfferingConfigured(zone, networkId)) {
             return false;
         }
         return true;
@@ -852,7 +867,7 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
 
         DataCenter zone = validateAndGetZoneForKubernetesCreateParameters(zoneId, networkId);
 
-        if (!isKubernetesServiceConfigured(zone)) {
+        if (!isKubernetesServiceConfigured(zone, networkId)) {
             throw new CloudRuntimeException("Kubernetes service has not been configured properly to provision Kubernetes clusters");
         }
 

From f26f8cce178f66ddd5e99e652bd4eef41983b806 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 9 Sep 2025 18:21:39 +0530
Subject: [PATCH 15/15] server: allow adding non-overlapping ipv6 ranges in
 same vlan (#11556)

Fixes #11527

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Co-authored-by: Wei Zhou <weizhou@apache.org>
---
 .../com/cloud/configuration/ConfigurationManagerImpl.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index f0e485a2f46..83c3cd68502 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -5173,10 +5173,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                                 vlan.getVlanTag()));
                     }
                 }
-                if (NetUtils.isSameIsolationId(vlanId, vlan.getVlanTag()) && !vlanIp6Gateway.equals(vlan.getIp6Gateway())) {
-                    throw new InvalidParameterValueException(String.format("The IP range with tag: %s has already been added with gateway %s. Please specify a different tag.",
-                            vlan.getVlanTag(), vlan.getIp6Gateway()));
-                }
             }
         }