From ed7bd5e5804c2d834b061f64bfd2d711e1ae5715 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Thu, 3 Jul 2025 19:00:42 +0530
Subject: [PATCH 01/94] ui: fix handler for deploy button menu (#11116)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/views/compute/DeployVM.vue             |  4 +-
 ui/src/views/compute/DeployVnfAppliance.vue   |  4 +-
 ui/src/views/compute/wizard/DeployButtons.vue | 47 +++++++++----------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 73ea3fcc59d..d61c9e08ea9 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -845,7 +845,7 @@
                 :deployButtonMenuOptions="deployMenuOptions"
                 @handle-cancel="() => $router.back()"
                 @handle-deploy="handleSubmit"
-                @handle-deploy-menu="handleSubmitAndStay" />
+                @handle-deploy-menu="(index, e) => handleSubmitAndStay(e)" />
             </div>
           </a-form>
         </a-card>
@@ -860,7 +860,7 @@
                 :deployButtonMenuOptions="deployMenuOptions"
                 @handle-cancel="() => $router.back()"
                 @handle-deploy="handleSubmit"
-                @handle-deploy-menu="handleSubmitAndStay" />
+                @handle-deploy-menu="(index, e) => handleSubmitAndStay(e)" />
             </template>
           </info-card>
         </a-affix>
diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue
index 49a2a9ef8f3..b7e797ee57c 100644
--- a/ui/src/views/compute/DeployVnfAppliance.vue
+++ b/ui/src/views/compute/DeployVnfAppliance.vue
@@ -825,7 +825,7 @@
                 :deployButtonMenuOptions="deployMenuOptions"
                 @handle-cancel="() => $router.back()"
                 @handle-deploy="handleSubmit"
-                @handle-deploy-menu="handleSubmitAndStay" />
+                @handle-deploy-menu="(index, e) => handleSubmitAndStay(e)" />
             </div>
           </a-form>
         </a-card>
@@ -840,7 +840,7 @@
                 :deployButtonMenuOptions="deployMenuOptions"
                 @handle-cancel="() => $router.back()"
                 @handle-deploy="handleSubmit"
-                @handle-deploy-menu="handleSubmitAndStay" />
+                @handle-deploy-menu="(index, e) => handleSubmitAndStay(e)" />
             </template>
           </info-card>
         </a-affix>
diff --git a/ui/src/views/compute/wizard/DeployButtons.vue b/ui/src/views/compute/wizard/DeployButtons.vue
index 2bd2408e4ed..6fc9aee096d 100644
--- a/ui/src/views/compute/wizard/DeployButtons.vue
+++ b/ui/src/views/compute/wizard/DeployButtons.vue
@@ -86,7 +86,7 @@ export default {
       this.$emit('handle-deploy', e)
     },
     handleMenu (e) {
-      this.$emit('handle-deploy-menu', e.key - 1)
+      this.$emit('handle-deploy-menu', e.key - 1, e)
     }
   }
 }
@@ -94,37 +94,36 @@ export default {
 
 <style lang="less" scoped>
 
-.button-container {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  justify-content: flex-start;
-}
-
-.equal-size-button {
-  flex-grow: 1; /* Make each button grow equally */
-  min-width: 120px; /* Set a minimum width so that the buttons don't shrink too much */
-}
-
-@media (max-width: 600px) {
   .button-container {
-    flex-direction: column;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    justify-content: flex-start;
   }
 
-}
+  .equal-size-button {
+    flex-grow: 1; /* Make each button grow equally */
+    min-width: 120px; /* Set a minimum width so that the buttons don't shrink too much */
+  }
 
-.btn-stay-on-page {
-  &.ant-dropdown-menu-dark {
-    .ant-dropdown-menu-item:hover {
-      background: transparent !important;
+  @media (max-width: 600px) {
+    .button-container {
+      flex-direction: column;
     }
   }
-}
 </style>
 
 <style lang="less">
 
-.ant-btn-group > .ant-btn:first-child:not(:last-child) {
-  flex-grow: 1; /* Make each button grow equally */
-}
+  .btn-stay-on-page {
+    &.ant-dropdown-menu-dark {
+      .ant-dropdown-menu-item:hover {
+        background: transparent !important;
+      }
+    }
+  }
+
+  .ant-btn-group > .ant-btn:first-child:not(:last-child) {
+    flex-grow: 1; /* Make each button grow equally */
+  }
 </style>

From 80f46ad55d63bea88da0d1d38b00b045499aa105 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Fri, 4 Jul 2025 13:54:54 +0530
Subject: [PATCH 02/94] [VMware to KVM Migration] Fix for converted instance
 npe issue when source vmware instance ovf is exported from management server
 (#11003)

---
 .../com/cloud/storage/VolumeApiService.java   |   7 +
 .../agent/api/ConvertInstanceAnswer.java      |  16 --
 .../agent/api/ConvertInstanceCommand.java     |  11 +-
 .../LibvirtConvertInstanceCommandWrapper.java | 205 +-----------------
 ...virtConvertInstanceCommandWrapperTest.java |  70 ------
 .../vm/UnmanagedVMsManagerImpl.java           |  59 +----
 .../vm/UnmanagedVMsManagerImplTest.java       |   2 -
 7 files changed, 20 insertions(+), 350 deletions(-)

diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java
index bb69b5b6650..4182728c204 100644
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@ -171,6 +171,13 @@ public interface VolumeApiService {
      *   </table>
      */
     boolean doesStoragePoolSupportDiskOffering(StoragePool destPool, DiskOffering diskOffering);
+
+    /**
+     * Checks if the storage pool supports the required disk offering tags
+     * destPool the storage pool to check the disk offering tags
+     * diskOfferingTags the tags that should be supported
+     * return whether the tags are supported in the storage pool
+     */
     boolean doesStoragePoolSupportDiskOfferingTags(StoragePool destPool, String diskOfferingTags);
 
     Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge);
diff --git a/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java b/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java
index 174348f4f18..8092ab9b43f 100644
--- a/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.agent.api;
 
-import org.apache.cloudstack.vm.UnmanagedInstanceTO;
-
 public class ConvertInstanceAnswer extends Answer {
 
     private String temporaryConvertUuid;
@@ -25,16 +23,6 @@ public class ConvertInstanceAnswer extends Answer {
     public ConvertInstanceAnswer() {
         super();
     }
-    private UnmanagedInstanceTO convertedInstance;
-
-    public ConvertInstanceAnswer(Command command, boolean success, String details) {
-        super(command, success, details);
-    }
-
-    public ConvertInstanceAnswer(Command command, UnmanagedInstanceTO convertedInstance) {
-        super(command, true, "");
-        this.convertedInstance = convertedInstance;
-    }
 
     public ConvertInstanceAnswer(Command command, String temporaryConvertUuid) {
         super(command, true, "");
@@ -44,8 +32,4 @@ public class ConvertInstanceAnswer extends Answer {
     public String getTemporaryConvertUuid() {
         return temporaryConvertUuid;
     }
-
-    public UnmanagedInstanceTO getConvertedInstance() {
-        return convertedInstance;
-    }
 }
diff --git a/core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java b/core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java
index b8250903f85..f938d0ac55d 100644
--- a/core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java
@@ -20,13 +20,10 @@ import com.cloud.agent.api.to.DataStoreTO;
 import com.cloud.agent.api.to.RemoteInstanceTO;
 import com.cloud.hypervisor.Hypervisor;
 
-import java.util.List;
-
 public class ConvertInstanceCommand extends Command {
 
     private RemoteInstanceTO sourceInstance;
     private Hypervisor.HypervisorType destinationHypervisorType;
-    private List<String> destinationStoragePools;
     private DataStoreTO conversionTemporaryLocation;
     private String templateDirOnConversionLocation;
     private boolean checkConversionSupport;
@@ -36,12 +33,10 @@ public class ConvertInstanceCommand extends Command {
     public ConvertInstanceCommand() {
     }
 
-    public ConvertInstanceCommand(RemoteInstanceTO sourceInstance, Hypervisor.HypervisorType destinationHypervisorType,
-                                  List<String> destinationStoragePools, DataStoreTO conversionTemporaryLocation,
+    public ConvertInstanceCommand(RemoteInstanceTO sourceInstance, Hypervisor.HypervisorType destinationHypervisorType, DataStoreTO conversionTemporaryLocation,
                                   String templateDirOnConversionLocation, boolean checkConversionSupport, boolean exportOvfToConversionLocation) {
         this.sourceInstance = sourceInstance;
         this.destinationHypervisorType = destinationHypervisorType;
-        this.destinationStoragePools = destinationStoragePools;
         this.conversionTemporaryLocation = conversionTemporaryLocation;
         this.templateDirOnConversionLocation = templateDirOnConversionLocation;
         this.checkConversionSupport = checkConversionSupport;
@@ -56,10 +51,6 @@ public class ConvertInstanceCommand extends Command {
         return destinationHypervisorType;
     }
 
-    public List<String> getDestinationStoragePools() {
-        return destinationStoragePools;
-    }
-
     public DataStoreTO getConversionTemporaryLocation() {
         return conversionTemporaryLocation;
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
index a11730a1240..e79a8da9dda 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -18,22 +18,12 @@
 //
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import org.apache.cloudstack.vm.UnmanagedInstanceTO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.agent.api.Answer;
@@ -44,17 +34,12 @@ import com.cloud.agent.api.to.NfsTO;
 import com.cloud.agent.api.to.RemoteInstanceTO;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.resource.LibvirtDomainXMLParser;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
-import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
-import com.cloud.storage.Storage;
 import com.cloud.utils.FileUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
 
@@ -77,7 +62,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
             String msg = String.format("Cannot convert the instance %s from VMware as the virt-v2v binary is not found. " +
                     "Please install virt-v2v%s on the host before attempting the instance conversion.", sourceInstanceName, serverResource.isUbuntuHost()? ", nbdkit" : "");
             logger.info(msg);
-            return new ConvertInstanceAnswer(cmd, false, msg);
+            return new Answer(cmd, false, msg);
         }
 
         if (!areSourceAndDestinationHypervisorsSupported(sourceHypervisorType, destinationHypervisorType)) {
@@ -85,7 +70,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
                     String.format("The destination hypervisor type is %s, KVM was expected, cannot handle it", destinationHypervisorType) :
                     String.format("The source hypervisor type %s is not supported for KVM conversion", sourceHypervisorType);
             logger.error(err);
-            return new ConvertInstanceAnswer(cmd, false, err);
+            return new Answer(cmd, false, err);
         }
 
         final KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
@@ -103,7 +88,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
             if (StringUtils.isBlank(exportInstanceOVAUrl)) {
                 String err = String.format("Couldn't export OVA for the VM %s, due to empty url", sourceInstanceName);
                 logger.error(err);
-                return new ConvertInstanceAnswer(cmd, false, err);
+                return new Answer(cmd, false, err);
             }
 
             int noOfThreads = cmd.getThreadsCountToExportOvf();
@@ -117,7 +102,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
             if (!ovfExported) {
                 String err = String.format("Export OVA for the VM %s failed", sourceInstanceName);
                 logger.error(err);
-                return new ConvertInstanceAnswer(cmd, false, err);
+                return new Answer(cmd, false, err);
             }
             sourceOVFDirPath = String.format("%s%s/", sourceOVFDirPath, sourceInstanceName);
         } else {
@@ -140,7 +125,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
                                 "has a different virt-v2v version.",
                         ovfTemplateDirOnConversionLocation);
                 logger.error(err);
-                return new ConvertInstanceAnswer(cmd, false, err);
+                return new Answer(cmd, false, err);
             }
             return new ConvertInstanceAnswer(cmd, temporaryConvertUuid);
         } catch (Exception e) {
@@ -148,7 +133,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
                     sourceInstanceName, sourceHypervisorType, e.getMessage());
             logger.error(error, e);
             cleanupSecondaryStorage = true;
-            return new ConvertInstanceAnswer(cmd, false, error);
+            return new Answer(cmd, false, error);
         } finally {
             if (ovfExported && StringUtils.isNotBlank(ovfTemplateDirOnConversionLocation)) {
                 String sourceOVFDir = String.format("%s/%s", temporaryConvertPath, ovfTemplateDirOnConversionLocation);
@@ -205,55 +190,6 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
                 encodedUsername, encodedPassword, vcenter, datacenter, vm);
     }
 
-    protected List<KVMPhysicalDisk> getTemporaryDisksFromParsedXml(KVMStoragePool pool, LibvirtDomainXMLParser xmlParser, String convertedBasePath) {
-        List<LibvirtVMDef.DiskDef> disksDefs = xmlParser.getDisks();
-        disksDefs = disksDefs.stream().filter(x -> x.getDiskType() == LibvirtVMDef.DiskDef.DiskType.FILE &&
-                x.getDeviceType() == LibvirtVMDef.DiskDef.DeviceType.DISK).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(disksDefs)) {
-            String err = String.format("Cannot find any disk defined on the converted XML domain %s.xml", convertedBasePath);
-            logger.error(err);
-            throw new CloudRuntimeException(err);
-        }
-        sanitizeDisksPath(disksDefs);
-        return getPhysicalDisksFromDefPaths(disksDefs, pool);
-    }
-
-    private List<KVMPhysicalDisk> getPhysicalDisksFromDefPaths(List<LibvirtVMDef.DiskDef> disksDefs, KVMStoragePool pool) {
-        List<KVMPhysicalDisk> disks = new ArrayList<>();
-        for (LibvirtVMDef.DiskDef diskDef : disksDefs) {
-            KVMPhysicalDisk physicalDisk = pool.getPhysicalDisk(diskDef.getDiskPath());
-            disks.add(physicalDisk);
-        }
-        return disks;
-    }
-
-    protected List<KVMPhysicalDisk> getTemporaryDisksWithPrefixFromTemporaryPool(KVMStoragePool pool, String path, String prefix) {
-        String msg = String.format("Could not parse correctly the converted XML domain, checking for disks on %s with prefix %s", path, prefix);
-        logger.info(msg);
-        pool.refresh();
-        List<KVMPhysicalDisk> disksWithPrefix = pool.listPhysicalDisks()
-                .stream()
-                .filter(x -> x.getName().startsWith(prefix) && !x.getName().endsWith(".xml"))
-                .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(disksWithPrefix)) {
-            msg = String.format("Could not find any converted disk with prefix %s on temporary location %s", prefix, path);
-            logger.error(msg);
-            throw new CloudRuntimeException(msg);
-        }
-        return disksWithPrefix;
-    }
-
-    private void cleanupDisksAndDomainFromTemporaryLocation(List<KVMPhysicalDisk> disks,
-                                                            KVMStoragePool temporaryStoragePool,
-                                                            String temporaryConvertUuid) {
-        for (KVMPhysicalDisk disk : disks) {
-            logger.info(String.format("Cleaning up temporary disk %s after conversion from temporary location", disk.getName()));
-            temporaryStoragePool.deletePhysicalDisk(disk.getName(), Storage.ImageFormat.QCOW2);
-        }
-        logger.info(String.format("Cleaning up temporary domain %s after conversion from temporary location", temporaryConvertUuid));
-        FileUtil.deleteFiles(temporaryStoragePool.getLocalPath(), temporaryConvertUuid, ".xml");
-    }
-
     protected void sanitizeDisksPath(List<LibvirtVMDef.DiskDef> disks) {
         for (LibvirtVMDef.DiskDef disk : disks) {
             String[] diskPathParts = disk.getDiskPath().split("/");
@@ -262,114 +198,6 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
         }
     }
 
-    protected List<KVMPhysicalDisk> moveTemporaryDisksToDestination(List<KVMPhysicalDisk> temporaryDisks,
-                                                                  List<String> destinationStoragePools,
-                                                                  KVMStoragePoolManager storagePoolMgr) {
-        List<KVMPhysicalDisk> targetDisks = new ArrayList<>();
-        if (temporaryDisks.size() != destinationStoragePools.size()) {
-            String warn = String.format("Discrepancy between the converted instance disks (%s) " +
-                    "and the expected number of disks (%s)", temporaryDisks.size(), destinationStoragePools.size());
-            logger.warn(warn);
-        }
-        for (int i = 0; i < temporaryDisks.size(); i++) {
-            String poolPath = destinationStoragePools.get(i);
-            KVMStoragePool destinationPool = storagePoolMgr.getStoragePool(Storage.StoragePoolType.NetworkFilesystem, poolPath);
-            if (destinationPool == null) {
-                String err = String.format("Could not find a storage pool by URI: %s", poolPath);
-                logger.error(err);
-                continue;
-            }
-            if (destinationPool.getType() != Storage.StoragePoolType.NetworkFilesystem) {
-                String err = String.format("Storage pool by URI: %s is not an NFS storage", poolPath);
-                logger.error(err);
-                continue;
-            }
-            KVMPhysicalDisk sourceDisk = temporaryDisks.get(i);
-            if (logger.isDebugEnabled()) {
-                String msg = String.format("Trying to copy converted instance disk number %s from the temporary location %s" +
-                        " to destination storage pool %s", i, sourceDisk.getPool().getLocalPath(), destinationPool.getUuid());
-                logger.debug(msg);
-            }
-
-            String destinationName = UUID.randomUUID().toString();
-
-            KVMPhysicalDisk destinationDisk = storagePoolMgr.copyPhysicalDisk(sourceDisk, destinationName, destinationPool, 7200 * 1000);
-            targetDisks.add(destinationDisk);
-        }
-        return targetDisks;
-    }
-
-    private UnmanagedInstanceTO getConvertedUnmanagedInstance(String baseName,
-                                                              List<KVMPhysicalDisk> vmDisks,
-                                                              LibvirtDomainXMLParser xmlParser) {
-        UnmanagedInstanceTO instanceTO = new UnmanagedInstanceTO();
-        instanceTO.setName(baseName);
-        instanceTO.setDisks(getUnmanagedInstanceDisks(vmDisks, xmlParser));
-        instanceTO.setNics(getUnmanagedInstanceNics(xmlParser));
-        return instanceTO;
-    }
-
-    private List<UnmanagedInstanceTO.Nic> getUnmanagedInstanceNics(LibvirtDomainXMLParser xmlParser) {
-        List<UnmanagedInstanceTO.Nic> nics = new ArrayList<>();
-        if (xmlParser != null) {
-            List<LibvirtVMDef.InterfaceDef> interfaces = xmlParser.getInterfaces();
-            for (LibvirtVMDef.InterfaceDef interfaceDef : interfaces) {
-                UnmanagedInstanceTO.Nic nic = new UnmanagedInstanceTO.Nic();
-                nic.setMacAddress(interfaceDef.getMacAddress());
-                nic.setNicId(interfaceDef.getBrName());
-                nic.setAdapterType(interfaceDef.getModel().toString());
-                nics.add(nic);
-            }
-        }
-        return nics;
-    }
-
-    protected List<UnmanagedInstanceTO.Disk> getUnmanagedInstanceDisks(List<KVMPhysicalDisk> vmDisks, LibvirtDomainXMLParser xmlParser) {
-        List<UnmanagedInstanceTO.Disk> instanceDisks = new ArrayList<>();
-        List<LibvirtVMDef.DiskDef> diskDefs = xmlParser != null ? xmlParser.getDisks() : null;
-        for (int i = 0; i< vmDisks.size(); i++) {
-            KVMPhysicalDisk physicalDisk = vmDisks.get(i);
-            KVMStoragePool storagePool = physicalDisk.getPool();
-            UnmanagedInstanceTO.Disk disk = new UnmanagedInstanceTO.Disk();
-            disk.setPosition(i);
-            Pair<String, String> storagePoolHostAndPath = getNfsStoragePoolHostAndPath(storagePool);
-            disk.setDatastoreHost(storagePoolHostAndPath.first());
-            disk.setDatastorePath(storagePoolHostAndPath.second());
-            disk.setDatastoreName(storagePool.getUuid());
-            disk.setDatastoreType(storagePool.getType().name());
-            disk.setCapacity(physicalDisk.getVirtualSize());
-            disk.setFileBaseName(physicalDisk.getName());
-            if (CollectionUtils.isNotEmpty(diskDefs)) {
-                LibvirtVMDef.DiskDef diskDef = diskDefs.get(i);
-                disk.setController(diskDef.getBusType() != null ? diskDef.getBusType().toString() : LibvirtVMDef.DiskDef.DiskBus.VIRTIO.toString());
-            } else {
-                // If the job is finished but we cannot parse the XML, the guest VM can use the virtio driver
-                disk.setController(LibvirtVMDef.DiskDef.DiskBus.VIRTIO.toString());
-            }
-            instanceDisks.add(disk);
-        }
-        return instanceDisks;
-    }
-
-    protected Pair<String, String> getNfsStoragePoolHostAndPath(KVMStoragePool storagePool) {
-        String sourceHostIp = null;
-        String sourcePath = null;
-        List<String[]> commands = new ArrayList<>();
-        commands.add(new String[]{Script.getExecutableAbsolutePath("mount")});
-        commands.add(new String[]{Script.getExecutableAbsolutePath("grep"), storagePool.getLocalPath()});
-        String storagePoolMountPoint = Script.executePipedCommands(commands, 0).second();
-        logger.debug(String.format("NFS Storage pool: %s - local path: %s, mount point: %s", storagePool.getUuid(), storagePool.getLocalPath(), storagePoolMountPoint));
-        if (StringUtils.isNotEmpty(storagePoolMountPoint)) {
-            String[] res = storagePoolMountPoint.strip().split(" ");
-            res = res[0].split(":");
-            if (res.length > 1) {
-                sourceHostIp = res[0].strip();
-                sourcePath = res[1].strip();
-            }
-        }
-        return new Pair<>(sourceHostIp, sourcePath);
-    }
-
     private boolean exportOVAFromVMOnVcenter(String vmExportUrl,
                                              String targetOvfDir,
                                              int noOfThreads,
@@ -412,27 +240,6 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
         return exitValue == 0;
     }
 
-    protected LibvirtDomainXMLParser parseMigratedVMXmlDomain(String installPath) throws IOException {
-        String xmlPath = String.format("%s.xml", installPath);
-        if (!new File(xmlPath).exists()) {
-            String err = String.format("Conversion failed. Unable to find the converted XML domain, expected %s", xmlPath);
-            logger.error(err);
-            throw new CloudRuntimeException(err);
-        }
-        InputStream is = new BufferedInputStream(new FileInputStream(xmlPath));
-        String xml = IOUtils.toString(is, Charset.defaultCharset());
-        final LibvirtDomainXMLParser parser = new LibvirtDomainXMLParser();
-        try {
-            parser.parseDomainXML(xml);
-            return parser;
-        } catch (RuntimeException e) {
-            String err = String.format("Error parsing the converted instance XML domain at %s: %s", xmlPath, e.getMessage());
-            logger.error(err, e);
-            logger.debug(xml);
-            return null;
-        }
-    }
-
     protected String encodeUsername(String username) {
         return URLEncoder.encode(username, Charset.defaultCharset());
     }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
index 9537469145f..b369cf25f3d 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import org.apache.cloudstack.vm.UnmanagedInstanceTO;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,13 +39,10 @@ import com.cloud.agent.api.to.NfsTO;
 import com.cloud.agent.api.to.RemoteInstanceTO;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.resource.LibvirtDomainXMLParser;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
 import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
-import com.cloud.storage.Storage;
-import com.cloud.utils.Pair;
 import com.cloud.utils.script.Script;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -118,72 +114,6 @@ public class LibvirtConvertInstanceCommandWrapperTest {
         Assert.assertEquals(relativePath, diskDef.getDiskPath());
     }
 
-    @Test
-    public void testMoveTemporaryDisksToDestination() {
-        KVMPhysicalDisk sourceDisk = Mockito.mock(KVMPhysicalDisk.class);
-        List<KVMPhysicalDisk> disks = List.of(sourceDisk);
-        String destinationPoolUuid = UUID.randomUUID().toString();
-        List<String> destinationPools = List.of(destinationPoolUuid);
-
-        KVMPhysicalDisk destDisk = Mockito.mock(KVMPhysicalDisk.class);
-        Mockito.when(destDisk.getPath()).thenReturn("xyz");
-        Mockito.when(storagePoolManager.getStoragePool(Storage.StoragePoolType.NetworkFilesystem, destinationPoolUuid))
-                .thenReturn(destinationPool);
-        Mockito.when(destinationPool.getType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
-        Mockito.when(storagePoolManager.copyPhysicalDisk(Mockito.eq(sourceDisk), Mockito.anyString(), Mockito.eq(destinationPool), Mockito.anyInt()))
-                .thenReturn(destDisk);
-
-        List<KVMPhysicalDisk> movedDisks = convertInstanceCommandWrapper.moveTemporaryDisksToDestination(disks, destinationPools, storagePoolManager);
-        Assert.assertEquals(1, movedDisks.size());
-        Assert.assertEquals("xyz", movedDisks.get(0).getPath());
-    }
-
-    @Test
-    public void testGetUnmanagedInstanceDisks() {
-        try (MockedStatic<Script> ignored = Mockito.mockStatic(Script.class)) {
-            String relativePath = UUID.randomUUID().toString();
-            LibvirtVMDef.DiskDef diskDef = new LibvirtVMDef.DiskDef();
-            LibvirtVMDef.DiskDef.DiskBus bus = LibvirtVMDef.DiskDef.DiskBus.IDE;
-            LibvirtVMDef.DiskDef.DiskFmtType type = LibvirtVMDef.DiskDef.DiskFmtType.QCOW2;
-            diskDef.defFileBasedDisk(relativePath, relativePath, bus, type);
-
-            KVMPhysicalDisk sourceDisk = Mockito.mock(KVMPhysicalDisk.class);
-            Mockito.when(sourceDisk.getName()).thenReturn(UUID.randomUUID().toString());
-            Mockito.when(sourceDisk.getPool()).thenReturn(destinationPool);
-            Mockito.when(destinationPool.getType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
-            List<KVMPhysicalDisk> disks = List.of(sourceDisk);
-
-            LibvirtDomainXMLParser parser = Mockito.mock(LibvirtDomainXMLParser.class);
-            Mockito.when(parser.getDisks()).thenReturn(List.of(diskDef));
-            Mockito.doReturn(new Pair<String, String>(null, null)).when(convertInstanceCommandWrapper).getNfsStoragePoolHostAndPath(destinationPool);
-
-            Mockito.when(Script.executePipedCommands(Mockito.anyList(), Mockito.anyLong()))
-                    .thenReturn(new Pair<>(0, null));
-
-            List<UnmanagedInstanceTO.Disk> unmanagedInstanceDisks = convertInstanceCommandWrapper.getUnmanagedInstanceDisks(disks, parser);
-            Assert.assertEquals(1, unmanagedInstanceDisks.size());
-            UnmanagedInstanceTO.Disk disk = unmanagedInstanceDisks.get(0);
-            Assert.assertEquals(LibvirtVMDef.DiskDef.DiskBus.IDE.toString(), disk.getController());
-        }
-    }
-
-    @Test
-    public void testGetNfsStoragePoolHostAndPath() {
-        try (MockedStatic<Script> ignored = Mockito.mockStatic(Script.class)) {
-            String localMountPoint = "/mnt/xyz";
-            String host = "192.168.1.2";
-            String path = "/secondary";
-            String mountOutput = String.format("%s:%s on %s type nfs (...)", host, path, localMountPoint);
-            Mockito.when(temporaryPool.getLocalPath()).thenReturn(localMountPoint);
-            Mockito.when(Script.executePipedCommands(Mockito.anyList(), Mockito.anyLong()))
-                    .thenReturn(new Pair<>(0, mountOutput));
-
-            Pair<String, String> pair = convertInstanceCommandWrapper.getNfsStoragePoolHostAndPath(temporaryPool);
-            Assert.assertEquals(host, pair.first());
-            Assert.assertEquals(path, pair.second());
-        }
-    }
-
     private RemoteInstanceTO getRemoteInstanceTO(Hypervisor.HypervisorType hypervisorType) {
         RemoteInstanceTO remoteInstanceTO = Mockito.mock(RemoteInstanceTO.class);
         Mockito.when(remoteInstanceTO.getHypervisorType()).thenReturn(hypervisorType);
diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index 8d5387b3ffd..03c0ad06dc9 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -1962,27 +1962,12 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
         RemoteInstanceTO remoteInstanceTO = new RemoteInstanceTO(sourceVM);
         List<String> destinationStoragePools = selectInstanceConversionStoragePools(convertStoragePools, sourceVMwareInstance.getDisks(), serviceOffering, dataDiskOfferingMap);
         ConvertInstanceCommand cmd = new ConvertInstanceCommand(remoteInstanceTO,
-                Hypervisor.HypervisorType.KVM, destinationStoragePools, temporaryConvertLocation, ovfTemplateDirConvertLocation, false, false);
+                Hypervisor.HypervisorType.KVM, temporaryConvertLocation, ovfTemplateDirConvertLocation, false, false);
         int timeoutSeconds = UnmanagedVMsManager.ConvertVmwareInstanceToKvmTimeout.value() * 60 * 60;
         cmd.setWait(timeoutSeconds);
 
-        Answer convertAnswer;
-        try {
-             convertAnswer = agentManager.send(convertHost.getId(), cmd);
-        } catch (AgentUnavailableException | OperationTimedoutException e) {
-            String err = String.format("Could not send the convert instance command to host %s due to: %s",
-                    convertHost, e.getMessage());
-            logger.error(err, e);
-            throw new CloudRuntimeException(err);
-        }
-
-        if (!convertAnswer.getResult()) {
-            String err = String.format("The convert process failed for instance %s from VMware to KVM on host %s: %s",
-                    sourceVM, convertHost, convertAnswer.getDetails());
-            logger.error(err);
-            throw new CloudRuntimeException(err);
-        }
-        return ((ConvertInstanceAnswer) convertAnswer).getConvertedInstance();
+        return convertAndImportToKVM(cmd, convertHost, importHost, sourceVM,
+                remoteInstanceTO, destinationStoragePools, temporaryConvertLocation);
     }
 
     private UnmanagedInstanceTO convertVmwareInstanceToKVMAfterExportingOVFToConvertLocation(
@@ -1997,7 +1982,7 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
         RemoteInstanceTO remoteInstanceTO = new RemoteInstanceTO(sourceVMwareInstance.getName(), sourceVMwareInstance.getPath(), vcenterHost, vcenterUsername, vcenterPassword, datacenterName);
         List<String> destinationStoragePools = selectInstanceConversionStoragePools(convertStoragePools, sourceVMwareInstance.getDisks(), serviceOffering, dataDiskOfferingMap);
         ConvertInstanceCommand cmd = new ConvertInstanceCommand(remoteInstanceTO,
-                Hypervisor.HypervisorType.KVM, destinationStoragePools, temporaryConvertLocation, null, false, true);
+                Hypervisor.HypervisorType.KVM, temporaryConvertLocation, null, false, true);
         int timeoutSeconds = UnmanagedVMsManager.ConvertVmwareInstanceToKvmTimeout.value() * 60 * 60;
         cmd.setWait(timeoutSeconds);
         int noOfThreads = UnmanagedVMsManager.ThreadsOnKVMHostToImportVMwareVMFiles.value();
@@ -2065,7 +2050,6 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
         List<StoragePoolVO> pools = new ArrayList<>();
         pools.addAll(primaryDataStoreDao.findClusterWideStoragePoolsByHypervisorAndPoolType(destinationCluster.getId(), Hypervisor.HypervisorType.KVM, Storage.StoragePoolType.NetworkFilesystem));
         pools.addAll(primaryDataStoreDao.findZoneWideStoragePoolsByHypervisorAndPoolType(destinationCluster.getDataCenterId(), Hypervisor.HypervisorType.KVM, Storage.StoragePoolType.NetworkFilesystem));
-        List<String> diskOfferingTags = new ArrayList<>();
         if (pools.isEmpty()) {
             String msg = String.format("Cannot find suitable storage pools in the cluster %s for the conversion", destinationCluster.getName());
             logger.error(msg);
@@ -2092,39 +2076,8 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
                 logger.error(msg);
                 throw new CloudRuntimeException(msg);
             }
-            diskOfferingTags.add(diskOffering.getTags());
-        }
-        if (serviceOffering.getDiskOfferingId() != null) {
-            DiskOfferingVO diskOffering = diskOfferingDao.findById(serviceOffering.getDiskOfferingId());
-            if (diskOffering != null) {
-                diskOfferingTags.add(diskOffering.getTags());
-            }
-        }
-
-        pools = getPoolsWithMatchingTags(pools, diskOfferingTags);
-        if (pools.isEmpty()) {
-            String msg = String.format("Cannot find suitable storage pools in cluster %s for the conversion", destinationCluster);
-            logger.error(msg);
-            throw new CloudRuntimeException(msg);
-        }
-        return pools;
-    }
-
-    private List<StoragePoolVO> getPoolsWithMatchingTags(List<StoragePoolVO> pools, List<String> diskOfferingTags) {
-        if (diskOfferingTags.isEmpty()) {
-            return pools;
-        }
-        List<StoragePoolVO> poolsSupportingTags = new ArrayList<>(pools);
-        for (String tags : diskOfferingTags) {
-            boolean tagsMatched = false;
-            for (StoragePoolVO pool : pools) {
-                if (volumeApiService.doesStoragePoolSupportDiskOfferingTags(pool, tags)) {
-                    poolsSupportingTags.add(pool);
-                    tagsMatched = true;
-                }
-            }
-            if (!tagsMatched) {
-                String msg = String.format("Cannot find suitable storage pools for the conversion with disk offering tags %s", tags);
+            if (getStoragePoolWithTags(pools, diskOffering.getTags()) == null) {
+                String msg = String.format("Cannot find suitable storage pool for disk offering %s", diskOffering.getName());
                 logger.error(msg);
                 throw new CloudRuntimeException(msg);
             }
diff --git a/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
index 8cfae6b9a6e..4ea6af7c6f4 100644
--- a/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
@@ -700,11 +700,9 @@ public class UnmanagedVMsManagerImplTest {
         }
 
         when(volumeApiService.doesStoragePoolSupportDiskOffering(any(StoragePool.class), any(DiskOffering.class))).thenReturn(true);
-        when(volumeApiService.doesStoragePoolSupportDiskOfferingTags(any(StoragePool.class), any())).thenReturn(true);
 
         ConvertInstanceAnswer convertInstanceAnswer = mock(ConvertInstanceAnswer.class);
         ImportConvertedInstanceAnswer convertImportedInstanceAnswer = mock(ImportConvertedInstanceAnswer.class);
-        when(convertInstanceAnswer.getConvertedInstance()).thenReturn(instance);
         when(convertInstanceAnswer.getResult()).thenReturn(vcenterParameter != VcenterParameter.CONVERT_FAILURE);
         Mockito.lenient().when(convertImportedInstanceAnswer.getConvertedInstance()).thenReturn(instance);
         Mockito.lenient().when(convertImportedInstanceAnswer.getResult()).thenReturn(vcenterParameter != VcenterParameter.CONVERT_FAILURE);

From 39c8c4dbae98ec5695465d39c9ca1b6afba72354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?=
 <bernardomg2004@gmail.com>
Date: Sat, 5 Jul 2025 10:20:08 -0300
Subject: [PATCH 03/94] Normalize naming of Kubernetes clusters (#10778)

---
 ...esClusterResourceModifierActionWorker.java |  38 +++--
 ...usterResourceModifierActionWorkerTest.java | 138 ++++++++++++++++++
 .../java/com/cloud/utils/net/NetUtils.java    |  22 ++-
 3 files changed, 182 insertions(+), 16 deletions(-)
 create mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java

diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
index 60cd9a2dff4..667bc00605b 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -153,6 +153,8 @@ public class KubernetesClusterResourceModifierActionWorker extends KubernetesClu
 
     protected String kubernetesClusterNodeNamePrefix;
 
+    private static final int MAX_CLUSTER_PREFIX_LENGTH = 43;
+
     protected KubernetesClusterResourceModifierActionWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
         super(kubernetesCluster, clusterManager);
     }
@@ -772,19 +774,35 @@ public class KubernetesClusterResourceModifierActionWorker extends KubernetesClu
         }
     }
 
+    /**
+     * Generates a valid name prefix for Kubernetes cluster nodes.
+     *
+     * <p>The prefix must comply with Kubernetes naming constraints:
+     * <ul>
+     *   <li>Maximum 63 characters total</li>
+     *   <li>Only lowercase alphanumeric characters and hyphens</li>
+     *   <li>Must start with a letter</li>
+     *   <li>Must end with an alphanumeric character</li>
+     * </ul>
+     *
+     * <p>The generated prefix is limited to 43 characters to accommodate the full node naming pattern:
+     * <pre>{'prefix'}-{'control' | 'node'}-{'11-digit-hash'}</pre>
+     *
+     * @return A valid node name prefix, truncated if necessary
+     * @see <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/names/">Kubernetes "Object Names and IDs" documentation</a>
+     */
     protected String getKubernetesClusterNodeNamePrefix() {
-        String prefix = kubernetesCluster.getName();
-        if (!NetUtils.verifyDomainNameLabel(prefix, true)) {
-            prefix = prefix.replaceAll("[^a-zA-Z0-9-]", "");
-            if (prefix.length() == 0) {
-                prefix = kubernetesCluster.getUuid();
-            }
-            prefix = "k8s-" + prefix;
+        String prefix = kubernetesCluster.getName().toLowerCase();
+
+        if (NetUtils.verifyDomainNameLabel(prefix, true)) {
+            return StringUtils.truncate(prefix, MAX_CLUSTER_PREFIX_LENGTH);
         }
-        if (prefix.length() > 40) {
-            prefix = prefix.substring(0, 40);
+
+        prefix = prefix.replaceAll("[^a-z0-9-]", "");
+        if (prefix.isEmpty()) {
+            prefix = kubernetesCluster.getUuid();
         }
-        return prefix;
+        return StringUtils.truncate("k8s-" + prefix, MAX_CLUSTER_PREFIX_LENGTH);
     }
 
     protected KubernetesClusterVO updateKubernetesClusterEntry(final Long cores, final Long memory, final Long size,
diff --git a/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java b/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java
new file mode 100644
index 00000000000..c220a3468af
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java
@@ -0,0 +1,138 @@
+// 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.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDetailsDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterVmMapDao;
+import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class KubernetesClusterResourceModifierActionWorkerTest {
+    @Mock
+    private KubernetesClusterDao kubernetesClusterDaoMock;
+
+    @Mock
+    private KubernetesClusterDetailsDao kubernetesClusterDetailsDaoMock;
+
+    @Mock
+    private KubernetesClusterVmMapDao kubernetesClusterVmMapDaoMock;
+
+    @Mock
+    private KubernetesSupportedVersionDao kubernetesSupportedVersionDaoMock;
+
+    @Mock
+    private KubernetesClusterManagerImpl kubernetesClusterManagerMock;
+
+    @Mock
+    private KubernetesCluster kubernetesClusterMock;
+
+    private KubernetesClusterResourceModifierActionWorker kubernetesClusterResourceModifierActionWorker;
+
+    @Before
+    public void setUp() {
+        kubernetesClusterManagerMock.kubernetesClusterDao = kubernetesClusterDaoMock;
+        kubernetesClusterManagerMock.kubernetesSupportedVersionDao = kubernetesSupportedVersionDaoMock;
+        kubernetesClusterManagerMock.kubernetesClusterDetailsDao = kubernetesClusterDetailsDaoMock;
+        kubernetesClusterManagerMock.kubernetesClusterVmMapDao = kubernetesClusterVmMapDaoMock;
+
+        kubernetesClusterResourceModifierActionWorker = new KubernetesClusterResourceModifierActionWorker(kubernetesClusterMock, kubernetesClusterManagerMock);
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestReturnOriginalPrefixWhenNamingAllRequirementsAreMet() {
+        String originalPrefix = "k8s-cluster-01";
+        String expectedPrefix = "k8s-cluster-01";
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        Assert.assertEquals(expectedPrefix, kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldOnlyContainLowerCaseCharacters() {
+        String originalPrefix = "k8s-CLUSTER-01";
+        String expectedPrefix = "k8s-cluster-01";
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        Assert.assertEquals(expectedPrefix, kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldBeTruncatedWhenRequired() {
+        int maxPrefixLength = 43;
+
+        String originalPrefix = "c".repeat(maxPrefixLength + 1);
+        String expectedPrefix = "c".repeat(maxPrefixLength);
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        String normalizedPrefix = kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix();
+        Assert.assertEquals(expectedPrefix, normalizedPrefix);
+        Assert.assertEquals(maxPrefixLength, normalizedPrefix.length());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldBeTruncatedWhenRequiredAndWhenOriginalPrefixIsInvalid() {
+        int maxPrefixLength = 43;
+
+        String originalPrefix = "1!" + "c".repeat(maxPrefixLength);
+        String expectedPrefix = "k8s-1" + "c".repeat(maxPrefixLength - 5);
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        String normalizedPrefix = kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix();
+        Assert.assertEquals(expectedPrefix, normalizedPrefix);
+        Assert.assertEquals(maxPrefixLength, normalizedPrefix.length());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldOnlyIncludeAlphanumericCharactersAndHyphen() {
+        String originalPrefix = "Cluster!@#$%^&*()_+?.-01|<>";
+        String expectedPrefix = "k8s-cluster-01";
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        Assert.assertEquals(expectedPrefix, kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldContainClusterUuidWhenAllCharactersAreInvalid() {
+        String clusterUuid = "2699b547-cb56-4a59-a2c6-331cfb21d2e4";
+        String originalPrefix = "!@#$%^&*()_+?.|<>";
+        String expectedPrefix = "k8s-" + clusterUuid;
+
+        Mockito.when(kubernetesClusterMock.getUuid()).thenReturn(clusterUuid);
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        Assert.assertEquals(expectedPrefix, kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix());
+    }
+
+    @Test
+    public void getKubernetesClusterNodeNamePrefixTestNormalizedPrefixShouldNotStartWithADigit() {
+        String originalPrefix = "1 cluster";
+        String expectedPrefix = "k8s-1cluster";
+
+        Mockito.when(kubernetesClusterMock.getName()).thenReturn(originalPrefix);
+        Assert.assertEquals(expectedPrefix, kubernetesClusterResourceModifierActionWorker.getKubernetesClusterNodeNamePrefix());
+    }
+}
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
index 47c35eaada1..802b84f6a1c 100644
--- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -1055,13 +1055,23 @@ public class NetUtils {
         return Integer.toString(portRange[0]) + ":" + Integer.toString(portRange[1]);
     }
 
+    /**
+     * Validates a domain name.
+     *
+     * <p>Domain names must satisfy the following constraints:
+     * <ul>
+     *   <li>Length between 1 and 63 characters</li>
+     *   <li>Contain only ASCII letters 'a' through 'z' (case-insensitive)</li>
+     *   <li>Can include digits '0' through '9' and hyphens (-)</li>
+     *   <li>Must not start or end with a hyphen</li>
+     *   <li>If used as hostname, must not start with a digit</li>
+     * </ul>
+     *
+     * @param hostName The domain name to validate
+     * @param isHostName If true, verifies whether the domain name starts with a digit
+     * @return true if the domain name is valid, false otherwise
+     */
     public static boolean verifyDomainNameLabel(final String hostName, final boolean isHostName) {
-        // must be between 1 and 63 characters long and may contain only the ASCII letters 'a' through 'z' (in a
-        // case-insensitive manner),
-        // the digits '0' through '9', and the hyphen ('-').
-        // Can not start with a hyphen and digit, and must not end with a hyphen
-        // If it's a host name, don't allow to start with digit
-
         if (hostName.length() > 63 || hostName.length() < 1) {
             s_logger.warn("Domain name label must be between 1 and 63 characters long");
             return false;

From e47b78b2bbb4842625f7bf311a045815ed0badaa Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Mon, 7 Jul 2025 13:36:16 +0200
Subject: [PATCH 04/94] directdownload: fix keytool importcert (#11113)

* directdownload: fix keytool importcert

```
$ /usr/bin/keytool -importcert file /etc/cloudstack/agent/CSCERTIFICATE-full -keystore /etc/cloudstack/agent/cloud.jks -alias full -storepass DAWsfkJeeGrmhta6
Illegal option:  file
keytool -importcert [OPTION]...

Imports a certificate or a certificate chain

Options:

 -noprompt               do not prompt
 -trustcacerts           trust certificates from cacerts
 -protected              password through protected mechanism
 -alias <alias>          alias name of the entry to process
 -file <file>            input file name
 -keypass <arg>          key password
 -keystore <keystore>    keystore name
 -cacerts                access the cacerts keystore
 -storepass <arg>        keystore password
 -storetype <type>       keystore type
 -providername <name>    provider name
 -addprovider <name>     add security provider by name (e.g. SunPKCS11)
   [-providerarg <arg>]    configure argument for -addprovider
 -providerclass <class>  add security provider by fully-qualified class name
   [-providerarg <arg>]    configure argument for -providerclass
 -providerpath <list>    provider classpath
 -v                      verbose output

Use "keytool -?, -h, or --help" for this help message
```

* DirectDownload: drop HttpsMultiTrustManager
---
 .../HttpsDirectTemplateDownloader.java        |  11 +-
 .../download/HttpsMultiTrustManager.java      | 102 ------------------
 ...rectDownloadCertificateCommandWrapper.java |   2 +-
 3 files changed, 6 insertions(+), 109 deletions(-)
 delete mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java

diff --git a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java b/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
index 3a48ade4cd8..e3c74213d74 100644
--- a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
+++ b/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
@@ -39,9 +39,7 @@ import java.util.Map;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
 
-import org.apache.cloudstack.utils.security.SSLUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.io.IOUtils;
@@ -55,6 +53,7 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 
 import com.cloud.utils.Pair;
@@ -120,10 +119,10 @@ public class HttpsDirectTemplateDownloader extends DirectTemplateDownloaderImpl
                 String password = "changeit";
                 defaultKeystore.load(is, password.toCharArray());
             }
-            TrustManager[] tm = HttpsMultiTrustManager.getTrustManagersFromKeyStores(customKeystore, defaultKeystore);
-            SSLContext sslContext = SSLUtils.getSSLContext();
-            sslContext.init(null, tm, null);
-            return sslContext;
+            return SSLContexts.custom()
+                    .loadTrustMaterial(customKeystore, null)
+                    .loadTrustMaterial(defaultKeystore, null)
+                    .build();
         } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException | KeyManagementException e) {
             s_logger.error(String.format("Failure getting SSL context for HTTPS downloader, using default SSL context: %s", e.getMessage()), e);
             try {
diff --git a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java b/core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java
deleted file mode 100644
index fe47847c36c..00000000000
--- a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java
+++ /dev/null
@@ -1,102 +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.
-package org.apache.cloudstack.direct.download;
-
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-
-public class HttpsMultiTrustManager implements X509TrustManager {
-
-    private final List<X509TrustManager> trustManagers;
-
-    public HttpsMultiTrustManager(KeyStore... keystores) {
-        List<X509TrustManager> trustManagers = new ArrayList<>();
-        trustManagers.add(getTrustManager(null));
-        for (KeyStore keystore : keystores) {
-            trustManagers.add(getTrustManager(keystore));
-        }
-        this.trustManagers = ImmutableList.copyOf(trustManagers);
-    }
-
-    public static TrustManager[] getTrustManagersFromKeyStores(KeyStore... keyStore) {
-        return new TrustManager[] { new HttpsMultiTrustManager(keyStore) };
-
-    }
-
-    @Override
-    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-        for (X509TrustManager trustManager : trustManagers) {
-            try {
-                trustManager.checkClientTrusted(chain, authType);
-                return;
-            } catch (CertificateException ignored) {}
-        }
-        throw new CertificateException("None of the TrustManagers trust this certificate chain");
-    }
-
-    @Override
-    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-        for (X509TrustManager trustManager : trustManagers) {
-            try {
-                trustManager.checkServerTrusted(chain, authType);
-                return;
-            } catch (CertificateException ignored) {}
-        }
-        throw new CertificateException("None of the TrustManagers trust this certificate chain");
-    }
-
-    @Override
-    public X509Certificate[] getAcceptedIssuers() {
-        ImmutableList.Builder<X509Certificate> certificates = ImmutableList.builder();
-        for (X509TrustManager trustManager : trustManagers) {
-            for (X509Certificate cert : trustManager.getAcceptedIssuers()) {
-                certificates.add(cert);
-            }
-        }
-        return Iterables.toArray(certificates.build(), X509Certificate.class);
-    }
-
-    public X509TrustManager getTrustManager(KeyStore keystore) {
-        return getTrustManager(TrustManagerFactory.getDefaultAlgorithm(), keystore);
-    }
-
-    public X509TrustManager getTrustManager(String algorithm, KeyStore keystore) {
-        TrustManagerFactory factory;
-        try {
-            factory = TrustManagerFactory.getInstance(algorithm);
-            factory.init(keystore);
-            return Iterables.getFirst(Iterables.filter(
-                    Arrays.asList(factory.getTrustManagers()), X509TrustManager.class), null);
-        } catch (NoSuchAlgorithmException | KeyStoreException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetupDirectDownloadCertificateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetupDirectDownloadCertificateCommandWrapper.java
index d2b69412a72..1a8de7a8c5b 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetupDirectDownloadCertificateCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSetupDirectDownloadCertificateCommandWrapper.java
@@ -86,7 +86,7 @@ public class LibvirtSetupDirectDownloadCertificateCommandWrapper extends Command
     private void importCertificate(String tempCerFilePath, String keyStoreFile, String certificateName, String privatePassword) {
         s_logger.debug("Importing certificate from temporary file to keystore");
         String keyToolPath = Script.getExecutableAbsolutePath("keytool");
-        int result = Script.executeCommandForExitValue(keyToolPath, "-importcert", "file", tempCerFilePath,
+        int result = Script.executeCommandForExitValue(keyToolPath, "-importcert", "-file", tempCerFilePath,
                 "-keystore", keyStoreFile, "-alias", sanitizeBashCommandArgument(certificateName), "-storepass",
                 privatePassword, "-noprompt");
         if (result != 0) {

From c782835f01241be8ffdca4d6afa9896990e994e6 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Wed, 9 Jul 2025 04:41:34 -0300
Subject: [PATCH 05/94] [Vmware to KVM Migration] Fix issue with vCenter
 Standalone hosts for VM listing (#11091)

---
 .../cloud/hypervisor/vmware/mo/BaseMO.java    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java
index 0d380bd7ff7..3f27f6c80fe 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java
@@ -251,8 +251,9 @@ public class BaseMO {
                 hostClusterPair = hostClusterNamesMap.get(hostMorValue);
             } else {
                 HostMO hostMO = new HostMO(_context, hostMor);
-                ClusterMO clusterMO = new ClusterMO(_context, hostMO.getHyperHostCluster());
-                hostClusterPair = new Pair<>(hostMO.getHostName(), clusterMO.getName());
+                String hostName = hostMO.getHostName();
+                String clusterName = getClusterNameFromHostIncludingStandaloneHosts(hostMO, hostName);
+                hostClusterPair = new Pair<>(hostName, clusterName);
                 hostClusterNamesMap.put(hostMorValue, hostClusterPair);
             }
             vm.setHostName(hostClusterPair.first());
@@ -260,4 +261,20 @@ public class BaseMO {
         }
     }
 
+    /**
+     * Return the cluster name of the host on the vCenter
+     * @return null in case the host is standalone (doesn't belong to a cluster), cluster name otherwise
+     */
+    private String getClusterNameFromHostIncludingStandaloneHosts(HostMO hostMO, String hostName) {
+        try {
+            ClusterMO clusterMO = new ClusterMO(_context, hostMO.getHyperHostCluster());
+            return clusterMO.getName();
+        } catch (Exception e) {
+            String msg = String.format("Cannot find a cluster for host %s, assuming standalone host, " +
+                    "setting its cluster name as empty", hostName);
+            s_logger.info(msg);
+            return null;
+        }
+    }
+
 }

From 1cbf1cd2cd848baf12a92b814c3297d2b4cc97d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?=
 <bernardomg2004@gmail.com>
Date: Wed, 9 Jul 2025 09:31:18 -0300
Subject: [PATCH 06/94] fix volumes search filter (#11168)

---
 ui/src/components/view/SearchView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue
index 57e941a5844..fb66d24221b 100644
--- a/ui/src/components/view/SearchView.vue
+++ b/ui/src/components/view/SearchView.vue
@@ -978,7 +978,7 @@ export default {
     },
     fetchVolumes (searchKeyword) {
       return new Promise((resolve, reject) => {
-        api('listvolumes', { listAll: true, isencrypted: searchKeyword }).then(json => {
+        api('listVolumes', { listAll: true, isencrypted: searchKeyword }).then(json => {
           const volumes = json.listvolumesresponse.volume
           resolve({
             type: 'isencrypted',

From 67a1ea35f4e40f8f81acdc99a6624f0c8590b564 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Thu, 10 Jul 2025 03:44:46 +0200
Subject: [PATCH 07/94] .github: restrict codecov in UI build to
 apache/cloudstack repo (#11158)

---
 .github/workflows/ui.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index 476526aff32..1c2d2c07fc0 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -56,6 +56,7 @@ jobs:
           npm run test:unit
 
       - uses: codecov/codecov-action@v4
+        if: github.repository == 'apache/cloudstack'
         with:
           working-directory: ui
           files: ./coverage/lcov.info

From 7715b3dc29876e6a414b9269a0255fb3c3ceff1f Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:09:13 +0530
Subject: [PATCH 08/94] Improve the error throws when a template to owned by a
 non root-admin is registered for all zones. (#11170)

---
 .../src/main/java/com/cloud/template/TemplateAdapterBase.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
index 74347d1c057..905f4f6124d 100644
--- a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
@@ -192,7 +192,8 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
 
         if (!isAdmin && zoneIdList == null && !isRegionStore ) {
             // domain admin and user should also be able to register template on a region store
-            throw new InvalidParameterValueException("Please specify a valid zone Id. Only admins can create templates in all zones.");
+            throw new InvalidParameterValueException("Template registered for 'All zones' can only be owned a Root Admin account. " +
+                    "Please select specific zone(s).");
         }
 
         // check for the url format only when url is not null. url can be null incase of form based upload

From 51126a7c1054a27d65c1db764a2ecd5e7a8a4edc Mon Sep 17 00:00:00 2001
From: Ashutosh Kr Singh <ashutoshsingh@kgpian.iitkgp.ac.in>
Date: Fri, 11 Jul 2025 18:48:43 +0530
Subject: [PATCH 09/94] iteration optimized (#10576)

---
 .../direct/download/HttpsDirectTemplateDownloader.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java b/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
index b8a25a11b5c..dd0b068f566 100644
--- a/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
+++ b/core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
@@ -98,8 +98,8 @@ public class HttpsDirectTemplateDownloader extends DirectTemplateDownloaderImpl
         req = new HttpGet(downloadUrl);
         setFollowRedirects(this.isFollowRedirects());
         if (MapUtils.isNotEmpty(headers)) {
-            for (String headerKey: headers.keySet()) {
-                req.setHeader(headerKey, headers.get(headerKey));
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                req.setHeader(entry.getKey(), entry.getValue());
             }
         }
     }

From f9588960d43051ff2f921ace07c17ce0d711e963 Mon Sep 17 00:00:00 2001
From: roopsai <38998304+sroopsai@users.noreply.github.com>
Date: Fri, 11 Jul 2025 18:50:28 +0530
Subject: [PATCH 10/94] Refactor: Replace sleep() with wait() (#10504)

---
 .../agent/manager/DirectAgentAttache.java     |  3 +-
 .../main/java/com/cloud/utils/ThreadUtil.java | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 utils/src/main/java/com/cloud/utils/ThreadUtil.java

diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java
index 81148c5db30..ed18d1e82b7 100644
--- a/engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/DirectAgentAttache.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.cloud.utils.ThreadUtil;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
@@ -166,7 +167,7 @@ public class DirectAgentAttache extends AgentAttache {
                     PingCommand cmd = resource.getCurrentStatus(_id);
                     int retried = 0;
                     while (cmd == null && ++retried <= _HostPingRetryCount.value()) {
-                        Thread.sleep(1000*_HostPingRetryTimer.value());
+                        ThreadUtil.wait(this, 1000L *_HostPingRetryTimer.value(), _id, _uuid, _name);
                         cmd = resource.getCurrentStatus(_id);
                     }
 
diff --git a/utils/src/main/java/com/cloud/utils/ThreadUtil.java b/utils/src/main/java/com/cloud/utils/ThreadUtil.java
new file mode 100644
index 00000000000..5421a1fce4d
--- /dev/null
+++ b/utils/src/main/java/com/cloud/utils/ThreadUtil.java
@@ -0,0 +1,40 @@
+//
+// 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.
+//
+
+package com.cloud.utils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ThreadUtil {
+
+    protected static Logger LOGGER = LogManager.getLogger(AutoCloseableUtil.class);
+
+    public static void wait(Object object, long timeoutInMillis, long id, String uuid, String name) {
+        synchronized (object) {
+            try {
+                object.wait(timeoutInMillis);
+            } catch (InterruptedException e) {
+                LOGGER.warn("PingTask interrupted while waiting to retry ping [id: {}, uuid: {}, name: {}]", id, uuid, name, e);
+                Thread.currentThread().interrupt(); // Restore interrupted status
+            }
+        }
+
+    }
+}

From 49c6fbdfaf3d0fe1ec03064cae9c42c1fd150a15 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 14 Jul 2025 10:10:23 +0530
Subject: [PATCH 11/94] schema: fix missing columns index (#11171)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java
index d442dc89904..0c0a9f070ba 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42000to42010.java
@@ -100,8 +100,6 @@ public class Upgrade42000to42010 extends DbUpgradeAbstractImpl implements DbUpgr
 
         DbUpgradeUtils.addIndexIfNeeded(conn, "network_offering_details", "name");
 
-        DbUpgradeUtils.addIndexIfNeeded(conn, "network_offering_details", "resource_id", "resource_type");
-
         DbUpgradeUtils.addIndexIfNeeded(conn, "service_offering", "cpu");
         DbUpgradeUtils.addIndexIfNeeded(conn, "service_offering", "speed");
         DbUpgradeUtils.addIndexIfNeeded(conn, "service_offering", "ram_size");

From 4d46bece4a7f2c8e08fa5282ab96f91513670082 Mon Sep 17 00:00:00 2001
From: shrikantjoshi-hpe <sjoshi@hpe.com>
Date: Mon, 14 Jul 2025 11:20:58 +0530
Subject: [PATCH 12/94] fix priority for volume copy operation (#11109)

---
 .../storage/datastore/adapter/primera/PrimeraAdapter.java        | 1 +
 1 file changed, 1 insertion(+)

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..036144103b1 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
@@ -311,6 +311,7 @@ public class PrimeraAdapter implements ProviderAdapter {
 
         parms.setDestVolume(targetVolumeInfo.getExternalName());
         parms.setOnline(false);
+        parms.setPriority(1);
         request.setParameters(parms);
 
         PrimeraTaskReference taskref = POST("/volumes/" + sourceVolumeInfo.getExternalName(), request, new TypeReference<PrimeraTaskReference>() {});

From 54b44cc316e470557c9880b78aafcefa92b72a69 Mon Sep 17 00:00:00 2001
From: slavkap <51903378+slavkap@users.noreply.github.com>
Date: Mon, 14 Jul 2025 12:40:45 +0300
Subject: [PATCH 13/94] KVM: Option to deploy a VM with existing
 volume/snapshot (#10503)

* Option to deploy a VM with existing volume/snapshot

* smoke test changes

check if the hypervisor is KVM
check if the primary storage's scope is ZONE wide

* skip all tests if the storage isn't Zone-Wide and the hypervisor isn't KVM

* support StorPool tags

add StorPool tags to a volume created from snapshot or to a volume which
will be attached as a ROOT to a new VM

* Add StorPool tags on the new ROOT volume

* Add the StorPool's tags when volume is created from a snapshot or a
volume is attached as a ROOT to a VM

* Addressed review
---
 .../main/java/com/cloud/vm/UserVmService.java |   8 +-
 .../api/command/user/vm/DeployVMCmd.java      |  29 +-
 .../com/cloud/vm/VirtualMachineManager.java   |   8 +-
 .../service/VolumeOrchestrationService.java   |   2 +-
 .../service/api/OrchestrationService.java     |  16 +-
 .../cloud/vm/VirtualMachineManagerImpl.java   |  17 +-
 .../orchestration/CloudOrchestrator.java      |  21 +-
 .../orchestration/VolumeOrchestrator.java     |  59 +++-
 ...esClusterResourceModifierActionWorker.java |   4 +-
 .../KubernetesClusterStartWorker.java         |  12 +-
 .../network/lb/LoadBalanceRuleHandler.java    |   2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java |   2 +-
 ...InternalLoadBalancerVMManagerImplTest.java |  10 +-
 .../management/ServiceManagerImpl.java        |   2 +-
 .../network/vm/NetScalerVMManagerImpl.java    |   2 +-
 .../lifecycle/StorageVmSharedFSLifeCycle.java |  52 ++-
 .../StorageVmSharedFSLifeCycleTest.java       |  67 ++--
 .../StorPoolPrimaryDataStoreDriver.java       |  79 +++--
 .../consoleproxy/ConsoleProxyManagerImpl.java |   2 +-
 .../network/as/AutoScaleManagerImpl.java      |   6 +-
 .../network/router/NetworkHelperImpl.java     |   2 +-
 .../network/router/VpcNetworkHelperImpl.java  |   2 +-
 .../java/com/cloud/vm/UserVmManagerImpl.java  | 150 +++++++--
 .../network/as/AutoScaleManagerImplTest.java  |  12 +-
 .../com/cloud/vm/UserVmManagerImplTest.java   | 106 +++++-
 .../SecondaryStorageManagerImpl.java          |   2 +-
 .../plugins/storpool/test_storpool_tiers.py   |  99 +++++-
 ...st_vm_lifecycle_with_snapshot_or_volume.py | 318 ++++++++++++++++++
 tools/marvin/marvin/lib/base.py               |  29 +-
 29 files changed, 930 insertions(+), 190 deletions(-)
 create mode 100644 test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

diff --git a/api/src/main/java/com/cloud/vm/UserVmService.java b/api/src/main/java/com/cloud/vm/UserVmService.java
index 5c1c2f9a2e5..a8ed62fb6b9 100644
--- a/api/src/main/java/com/cloud/vm/UserVmService.java
+++ b/api/src/main/java/com/cloud/vm/UserVmService.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.vm;
 
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.Volume;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -222,7 +224,7 @@ public interface UserVmService {
                                                   String userData, Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard,
                                                   List<Long> affinityGroupIdList, Map<String, String> customParameter, String customId, Map<String, Map<Integer, String>> dhcpOptionMap,
                                                   Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                                  Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId) throws InsufficientCapacityException,
+                                                  Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException,
         ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
 
     /**
@@ -298,7 +300,7 @@ public interface UserVmService {
                                                      List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
                                                      HTTPMethod httpmethod, String userData, Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
                                                      List<Long> affinityGroupIdList, Map<String, String> customParameters, String customId, Map<String, Map<Integer, String>> dhcpOptionMap,
-                                                     Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, String vmType) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+                                                     Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, String vmType, Volume volume, Snapshot snapshot) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
 
     /**
      * Creates a User VM in Advanced Zone (Security Group feature is disabled)
@@ -370,7 +372,7 @@ public interface UserVmService {
                                         String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
                                         Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
                                         Map<String, String> customParameters, String customId, Map<String, Map<Integer, String>> dhcpOptionMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                        Map<String, String> templateOvfPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId)
+                                        Map<String, String> templateOvfPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId, Volume volume, Snapshot snapshot)
 
         throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index bf6e41e6d59..ef3eb900970 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -30,10 +30,14 @@ import com.cloud.network.Network.IpAddresses;
 import com.cloud.offering.DiskOffering;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.uservm.UserVm;
+import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Dhcp;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VmDetailConstants;
+
+import java.util.Objects;
+import java.util.stream.Stream;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.api.ACL;
@@ -55,9 +59,11 @@ import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.SecurityGroupResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.SnapshotResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.UserDataResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VolumeResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
@@ -95,7 +101,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
     private Long serviceOfferingId;
 
     @ACL
-    @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the template for the virtual machine")
+    @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "the ID of the template for the virtual machine")
     private Long templateId;
 
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "host name for the virtual machine", validations = {ApiArgValidator.RFCComplianceDomainName})
@@ -286,6 +292,11 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
             description = "Lease expiry action, valid values are STOP and DESTROY")
     private String leaseExpiryAction;
 
+    @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.UUID, entityType = VolumeResponse.class, since = "4.21")
+    private Long volumeId;
+
+    @Parameter(name = ApiConstants.SNAPSHOT_ID, type = CommandType.UUID, entityType = SnapshotResponse.class, since = "4.21")
+    private Long snapshotId;
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -744,6 +755,18 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
         }
         return null;
     }
+
+    public Long getVolumeId() {
+        return volumeId;
+    }
+
+    public Long getSnapshotId() {
+        return snapshotId;
+    }
+
+    public boolean isVolumeOrSnapshotProvided() {
+        return volumeId != null || snapshotId != null;
+    }
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -840,6 +863,10 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
 
     @Override
     public void create() throws ResourceAllocationException {
+        if (Stream.of(templateId, snapshotId, volumeId).filter(Objects::nonNull).count() != 1) {
+            throw new CloudRuntimeException("Please provide only one of the following parameters - template ID, volume ID or snapshot ID");
+        }
+
         try {
             UserVm vm = _userVmService.createVirtualMachine(this);
 
diff --git a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
index 238a78e89af..7841eba524a 100644
--- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.vm;
 
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.Volume;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -129,11 +131,11 @@ public interface VirtualMachineManager extends Manager {
      * @throws InsufficientCapacityException If there are insufficient capacity to deploy this vm.
      */
     void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, DiskOfferingInfo rootDiskOfferingInfo,
-        List<DiskOfferingInfo> dataDiskOfferings, LinkedHashMap<? extends Network, List<? extends NicProfile>> auxiliaryNetworks, DeploymentPlan plan,
-        HypervisorType hyperType, Map<String, Map<Integer, String>> extraDhcpOptions, Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap) throws InsufficientCapacityException;
+                  List<DiskOfferingInfo> dataDiskOfferings, LinkedHashMap<? extends Network, List<? extends NicProfile>> auxiliaryNetworks, DeploymentPlan plan,
+                  HypervisorType hyperType, Map<String, Map<Integer, String>> extraDhcpOptions, Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap, Volume volume, Snapshot snapshot) throws InsufficientCapacityException;
 
     void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering,
-        LinkedHashMap<? extends Network, List<? extends NicProfile>> networkProfiles, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException;
+        LinkedHashMap<? extends Network, List<? extends NicProfile>> networkProfiles, DeploymentPlan plan, HypervisorType hyperType, Volume volume, Snapshot snapshot) throws InsufficientCapacityException;
 
     void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params);
 
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index afc33eb5190..ccb5bba1c0a 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -149,7 +149,7 @@ public interface VolumeOrchestrationService {
      * Allocate a volume or multiple volumes in case of template is registered with the 'deploy-as-is' option, allowing multiple disks
      */
     List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,
-                                               Account owner);
+                                               Account owner, Volume volume, Snapshot snapshot);
 
     String getVmNameFromVolumeId(long volumeId);
 
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java
index 3ffa496b544..ffe85818fc4 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java
@@ -18,6 +18,8 @@
  */
 package org.apache.cloudstack.engine.service.api;
 
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.Volume;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ -62,12 +64,12 @@ public interface OrchestrationService {
     @POST
     @Path("/createvm")
     VirtualMachineEntity createVirtualMachine(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("template-id") String templateId,
-        @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor,
-        @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
-        @QueryParam("compute-tags") List<String> computeTags, @QueryParam("root-disk-tags") List<String> rootDiskTags,
-        @QueryParam("network-nic-map") Map<String, List<NicProfile>> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan,
-        @QueryParam("root-disk-size") Long rootDiskSize, @QueryParam("extra-dhcp-option-map") Map<String, Map<Integer, String>> extraDhcpOptionMap,
-        @QueryParam("datadisktemplate-diskoffering-map") Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap, @QueryParam("disk-offering-id") Long diskOfferingId, @QueryParam("root-disk-offering-id") Long rootDiskOfferingId) throws InsufficientCapacityException;
+                                              @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor,
+                                              @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
+                                              @QueryParam("compute-tags") List<String> computeTags, @QueryParam("root-disk-tags") List<String> rootDiskTags,
+                                              @QueryParam("network-nic-map") Map<String, List<NicProfile>> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan,
+                                              @QueryParam("root-disk-size") Long rootDiskSize, @QueryParam("extra-dhcp-option-map") Map<String, Map<Integer, String>> extraDhcpOptionMap,
+                                              @QueryParam("datadisktemplate-diskoffering-map") Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap, @QueryParam("disk-offering-id") Long diskOfferingId, @QueryParam("root-disk-offering-id") Long rootDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException;
 
     @POST
     VirtualMachineEntity createVirtualMachineFromScratch(@QueryParam("id") String id, @QueryParam("owner") String owner, @QueryParam("iso-id") String isoId,
@@ -75,7 +77,7 @@ public interface OrchestrationService {
         @QueryParam("os") String os, @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize,
         @QueryParam("compute-tags") List<String> computeTags, @QueryParam("root-disk-tags") List<String> rootDiskTags,
         @QueryParam("network-nic-map") Map<String, List<NicProfile>> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan,
-        @QueryParam("extra-dhcp-option-map") Map<String,  Map<Integer, String>> extraDhcpOptionMap, @QueryParam("disk-offering-id") Long diskOfferingId) throws InsufficientCapacityException;
+        @QueryParam("extra-dhcp-option-map") Map<String,  Map<Integer, String>> extraDhcpOptionMap, @QueryParam("disk-offering-id") Long diskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException;
 
     @POST
     NetworkEntity createNetwork(String id, String name, String domainName, String cidr, String gateway);
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 13475579f77..e439872dfb5 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -49,6 +49,7 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
 
+
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -230,6 +231,7 @@ import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.ScopeType;
+import com.cloud.storage.Snapshot;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.StorageManager;
@@ -291,6 +293,7 @@ import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 import com.google.gson.Gson;
 
+
 public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMachineManager, VmWorkJobHandler, Listener, Configurable {
 
     public static final String VM_WORK_JOB_HANDLER = VirtualMachineManagerImpl.class.getSimpleName();
@@ -503,8 +506,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Override
     @DB
     public void allocate(final String vmInstanceName, final VirtualMachineTemplate template, final ServiceOffering serviceOffering,
-            final DiskOfferingInfo rootDiskOfferingInfo, final List<DiskOfferingInfo> dataDiskOfferings,
-            final LinkedHashMap<? extends Network, List<? extends NicProfile>> auxiliaryNetworks, final DeploymentPlan plan, final HypervisorType hyperType, final Map<String, Map<Integer, String>> extraDhcpOptions, final Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap)
+                         final DiskOfferingInfo rootDiskOfferingInfo, final List<DiskOfferingInfo> dataDiskOfferings,
+                         final LinkedHashMap<? extends Network, List<? extends NicProfile>> auxiliaryNetworks, final DeploymentPlan plan, final HypervisorType hyperType, final Map<String, Map<Integer, String>> extraDhcpOptions, final Map<Long, DiskOffering> datadiskTemplateToDiskOfferingMap, Volume volume, Snapshot snapshot)
                     throws InsufficientCapacityException {
 
         logger.info("allocating virtual machine from template: {} with hostname: {} and {} networks", template, vmInstanceName, auxiliaryNetworks.size());
@@ -542,7 +545,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
             logger.debug("Allocating disks for {}",  persistedVm);
 
-            allocateRootVolume(persistedVm, template, rootDiskOfferingInfo, owner, rootDiskSizeFinal);
+            allocateRootVolume(persistedVm, template, rootDiskOfferingInfo, owner, rootDiskSizeFinal, volume, snapshot);
 
             // Create new Volume context and inject event resource type, id and details to generate VOLUME.CREATE event for the ROOT disk.
             CallContext volumeContext = CallContext.register(CallContext.current(), ApiCommandResourceType.Volume);
@@ -583,7 +586,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         }
     }
 
-    private void allocateRootVolume(VMInstanceVO vm, VirtualMachineTemplate template, DiskOfferingInfo rootDiskOfferingInfo, Account owner, Long rootDiskSizeFinal) {
+    private void allocateRootVolume(VMInstanceVO vm, VirtualMachineTemplate template, DiskOfferingInfo rootDiskOfferingInfo, Account owner, Long rootDiskSizeFinal, Volume volume, Snapshot snapshot) {
         // Create new Volume context and inject event resource type, id and details to generate VOLUME.CREATE event for the ROOT disk.
         CallContext volumeContext = CallContext.register(CallContext.current(), ApiCommandResourceType.Volume);
         try {
@@ -595,7 +598,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 logger.debug("%s has format [{}]. Skipping ROOT volume [{}] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName);
             } else {
                 volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
-                        rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vm, owner);
+                        rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vm, owner, volume, snapshot);
             }
         } finally {
             // Remove volumeContext and pop vmContext back
@@ -605,9 +608,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
     @Override
     public void allocate(final String vmInstanceName, final VirtualMachineTemplate template, final ServiceOffering serviceOffering,
-            final LinkedHashMap<? extends Network, List<? extends NicProfile>> networks, final DeploymentPlan plan, final HypervisorType hyperType) throws InsufficientCapacityException {
+            final LinkedHashMap<? extends Network, List<? extends NicProfile>> networks, final DeploymentPlan plan, final HypervisorType hyperType, Volume volume, Snapshot snapshot) throws InsufficientCapacityException {
         DiskOffering diskOffering = _diskOfferingDao.findById(serviceOffering.getDiskOfferingId());
-        allocate(vmInstanceName, template, serviceOffering, new DiskOfferingInfo(diskOffering), new ArrayList<>(), networks, plan, hyperType, null, null);
+        allocate(vmInstanceName, template, serviceOffering, new DiskOfferingInfo(diskOffering), new ArrayList<>(), networks, plan, hyperType, null, null, volume, snapshot);
     }
 
     VirtualMachineGuru getVmGuru(final VirtualMachine vm) {
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index 6763a13aed6..dab06ae995b 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -18,6 +18,9 @@
  */
 package org.apache.cloudstack.engine.orchestration;
 
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.Volume;
+import com.cloud.template.VirtualMachineTemplate;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -158,8 +161,8 @@ public class CloudOrchestrator implements OrchestrationService {
 
     @Override
     public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu,
-        int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, List<NicProfile>> networkNicMap, DeploymentPlan plan,
-        Long rootDiskSize, Map<String, Map<Integer, String>> extraDhcpOptionMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Long dataDiskOfferingId, Long rootDiskOfferingId) throws InsufficientCapacityException {
+                                                     int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, List<NicProfile>> networkNicMap, DeploymentPlan plan,
+                                                     Long rootDiskSize, Map<String, Map<Integer, String>> extraDhcpOptionMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Long dataDiskOfferingId, Long rootDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException {
 
         // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks,
         // vmEntityManager);
@@ -254,9 +257,13 @@ public class CloudOrchestrator implements OrchestrationService {
                 }
             }
         }
-
-        _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(templateId)), computeOffering, rootDiskOfferingInfo, dataDiskOfferings, networkIpMap, plan,
-            hypervisorType, extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap);
+        VirtualMachineTemplate template = null;
+        if (volume != null || snapshot != null) {
+            template = _templateDao.findByIdIncludingRemoved(new Long(templateId));
+        } else
+            template = _templateDao.findById(new Long(templateId));
+        _itMgr.allocate(vm.getInstanceName(), template, computeOffering, rootDiskOfferingInfo, dataDiskOfferings, networkIpMap, plan,
+            hypervisorType, extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap, volume, snapshot);
 
         return vmEntity;
     }
@@ -264,7 +271,7 @@ public class CloudOrchestrator implements OrchestrationService {
     @Override
     public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os,
         int cpu, int speed, long memory, Long diskSize, List<String> computeTags, List<String> rootDiskTags, Map<String, List<NicProfile>> networkNicMap, DeploymentPlan plan,
-        Map<String, Map<Integer, String>> extraDhcpOptionMap, Long diskOfferingId)
+        Map<String, Map<Integer, String>> extraDhcpOptionMap, Long diskOfferingId, Volume volume, Snapshot snapshot)
         throws InsufficientCapacityException {
 
         // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager);
@@ -321,7 +328,7 @@ public class CloudOrchestrator implements OrchestrationService {
 
         HypervisorType hypervisorType = HypervisorType.valueOf(hypervisor);
 
-        _itMgr.allocate(vm.getInstanceName(), _templateDao.findById(new Long(isoId)), computeOffering, rootDiskOfferingInfo, new ArrayList<DiskOfferingInfo>(), networkIpMap, plan, hypervisorType, extraDhcpOptionMap, null);
+        _itMgr.allocate(vm.getInstanceName(), _templateDao.findByIdIncludingRemoved(new Long(isoId)), computeOffering, rootDiskOfferingInfo, new ArrayList<DiskOfferingInfo>(), networkIpMap, plan, hypervisorType, extraDhcpOptionMap, null, volume, snapshot);
 
         return vmEntity;
     }
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index e0075888caf..9592711d1ee 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -57,6 +57,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
@@ -272,6 +274,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
     @Inject
     protected SnapshotHelper snapshotHelper;
 
+    @Inject
+    private DataStoreProviderManager dataStoreProviderMgr;
+
     private final StateMachine2<Volume.State, Volume.Event, Volume> _volStateMachine;
     protected List<StoragePoolAllocator> _storagePoolAllocators;
 
@@ -898,10 +903,20 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
     }
 
     private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,
-                                                Account owner, long deviceId, String configurationId) {
+                                                Account owner, long deviceId, String configurationId, Volume volume, Snapshot snapshot) {
         assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template.";
 
-        Long size = _tmpltMgr.getTemplateSize(template, vm.getDataCenterId());
+        if (volume != null) {
+            volume = attachExistingVolumeToVm(vm, deviceId, volume, type);
+            provideVmInfoToTheStorageVolume(vm, volume);
+            return toDiskProfile(volume, offering);
+        }
+        Long size;
+        if (snapshot != null) {
+            size = _volsDao.findByIdIncludingRemoved(snapshot.getVolumeId()).getSize();
+        } else {
+            size = _tmpltMgr.getTemplateSize(template, vm.getDataCenterId());
+        }
         if (rootDisksize != null) {
             if (template.isDeployAsIs()) {
                 // Volume size specified from template deploy-as-is
@@ -961,9 +976,45 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
 
             _resourceLimitMgr.incrementVolumeResourceCount(vm.getAccountId(), vol.isDisplayVolume(), vol.getSize(), offering);
         }
+        if (snapshot != null) {
+            UserVmVO userVmVO = _userVmDao.findById(vm.getId());
+            try {
+                VolumeInfo volumeInfo = createVolumeFromSnapshot(vol, snapshot, userVmVO);
+                return toDiskProfile(volumeInfo, offering);
+            } catch (StorageUnavailableException ex) {
+                throw new CloudRuntimeException("Could not create volume from a snapshot", ex);
+            }
+        }
         return toDiskProfile(vol, offering);
     }
 
+    private void provideVmInfoToTheStorageVolume(VirtualMachine vm, Volume volume) {
+
+        StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
+        if (pool != null) {
+            DataStoreProvider storeProvider = dataStoreProviderMgr
+                    .getDataStoreProvider(pool.getStorageProviderName());
+            DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
+            if (storeDriver != null && storeDriver instanceof PrimaryDataStoreDriver && ((PrimaryDataStoreDriver) storeDriver).isVmInfoNeeded()) {
+                ((PrimaryDataStoreDriver) storeDriver).provideVmInfo(vm.getId(), volume.getId());
+            }
+        }
+    }
+
+    private Volume attachExistingVolumeToVm(VirtualMachine vm, long deviceId, Volume volume, Type type) {
+        VolumeVO volumeVO = _volumeDao.findById(volume.getId());
+        if (volumeVO == null) {
+            throw new CloudRuntimeException(String.format("Could not find the volume %s in the DB", volume));
+        }
+        volumeVO.setDeviceId(deviceId);
+        volumeVO.setVolumeType(type);
+        if (vm != null) {
+            volumeVO.setInstanceId(vm.getId());
+        }
+        _volumeDao.update(volumeVO.getId(), volumeVO);
+        return volumeVO;
+    }
+
     @Override
     public void saveVolumeDetails(Long diskOfferingId, Long volumeId) {
         List<VolumeDetailVO> volumeDetailsVO = new ArrayList<>();
@@ -993,7 +1044,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
     @ActionEvent(eventType = EventTypes.EVENT_VOLUME_CREATE, eventDescription = "creating ROOT volume", create = true)
     @Override
     public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm,
-                                                      Account owner) {
+                                                      Account owner, Volume volume, Snapshot snapshot) {
         String templateToString = getReflectOnlySelectedFields(template);
 
         int volumesNumber = 1;
@@ -1040,7 +1091,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
             }
             logger.info("Adding disk object [{}] to VM [{}]", volumeName, vm);
             DiskProfile diskProfile = allocateTemplatedVolume(type, volumeName, offering, volumeSize, minIops, maxIops,
-                    template, vm, owner, deviceId, configurationId);
+                    template, vm, owner, deviceId, configurationId, volume, snapshot);
             profiles.add(diskProfile);
         }
 
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
index f6cafa93543..5546b38a060 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -424,13 +424,13 @@ public class KubernetesClusterResourceModifierActionWorker extends KubernetesClu
                     hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,base64UserData, null, null, keypairs,
                     null, addrs, null, null, Objects.nonNull(affinityGroupId) ?
                             Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null,
-                    null, true, null, UserVmManager.CKS_NODE);
+                    null, true, null, UserVmManager.CKS_NODE, null, null);
         } else {
             nodeVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, workerNodeTemplate, networkIds, owner,
                     hostName, hostName, null, null, null,
                     Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, null, null, keypairs,
                     null, addrs, null, null, Objects.nonNull(affinityGroupId) ?
-                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null);
+                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null, null, null);
         }
         if (logger.isInfoEnabled()) {
             logger.info("Created node VM : {}, {} in the Kubernetes cluster : {}", hostName, nodeVm, kubernetesCluster.getName());
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
index 68bec58d462..21db2ebb8f7 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
@@ -279,13 +279,13 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
             hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,base64UserData, userDataId, userDataDetails, keypairs,
                     requestedIps, addrs, null, null, Objects.nonNull(affinityGroupId) ?
                             Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null,
-                    null, true, null, UserVmManager.CKS_NODE);
+                    null, true, null, UserVmManager.CKS_NODE, null, null);
         } else {
             controlVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, controlNodeTemplate, networkIds, owner,
                     hostName, hostName, null, null, null,
                     Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, userDataId, userDataDetails, keypairs,
                     requestedIps, addrs, null, null, Objects.nonNull(affinityGroupId) ?
-                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null);
+                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null, null, null);
         }
         if (logger.isInfoEnabled()) {
             logger.info("Created control VM: {}, {} in the Kubernetes cluster: {}", controlVm, hostName, kubernetesCluster);
@@ -447,13 +447,13 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
                     hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,base64UserData, null, null, keypairs,
                     null, addrs, null, null, Objects.nonNull(affinityGroupId) ?
                             Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null,
-                    null, true, null, UserVmManager.CKS_NODE);
+                    null, true, null, UserVmManager.CKS_NODE, null, null);
         } else {
             additionalControlVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, controlNodeTemplate, networkIds, owner,
                     hostName, hostName, null, null, null,
                     Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, null, null, keypairs,
                     null, addrs, null, null, Objects.nonNull(affinityGroupId) ?
-                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null);
+                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null, null, null);
         }
 
         if (logger.isInfoEnabled()) {
@@ -491,13 +491,13 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
                     hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,base64UserData, null, null, keypairs,
                     Map.of(kubernetesCluster.getNetworkId(), requestedIps.get(etcdNodeIndex)), addrs, null, null, Objects.nonNull(affinityGroupId) ?
                             Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null,
-                    null, true, null, null);
+                    null, true, null, null, null, null);
         } else {
             etcdNode = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, etcdTemplate, networkIds, owner,
                     hostName, hostName, null, null, null,
                     Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, null, null, keypairs,
                     Map.of(kubernetesCluster.getNetworkId(), requestedIps.get(etcdNodeIndex)), addrs, null, null, Objects.nonNull(affinityGroupId) ?
-                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null);
+                            Collections.singletonList(affinityGroupId) : null, customParameterMap, null, null, null, null, true, UserVmManager.CKS_NODE, null, null, null);
         }
 
         if (logger.isInfoEnabled()) {
diff --git a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java
index 4e331891485..8f3d4b5b064 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/LoadBalanceRuleHandler.java
@@ -297,7 +297,7 @@ public class LoadBalanceRuleHandler {
                         elasticLbVmOffering.isOfferHA(), false, null);
                 elbVm.setRole(Role.LB);
                 elbVm = _routerDao.persist(elbVm);
-                _itMgr.allocate(elbVm.getInstanceName(), template, elasticLbVmOffering, networks, plan, null);
+                _itMgr.allocate(elbVm.getInstanceName(), template, elasticLbVmOffering, networks, plan, null, null, null);
                 elbVm = _routerDao.findById(elbVm.getId());
                 //TODO: create usage stats
             }
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 89ff5087682..02dfb2a179e 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
@@ -780,7 +780,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
             try {
                 internalLbVm = createOrUpdateInternalLb(internalLbVm, id, internalLbProviderId, owner, userId, vpcId,
                         routerOffering, template);
-                _itMgr.allocate(internalLbVm.getInstanceName(), template, routerOffering, networks, plan, null);
+                _itMgr.allocate(internalLbVm.getInstanceName(), template, routerOffering, networks, plan, null, null, null);
                 internalLbVm = _internalLbVmDao.findById(internalLbVm.getId());
                 if (templatesIterator.hasNext()) {
                     _itMgr.checkDeploymentPlan(internalLbVm, template, routerOffering, owner, plan);
diff --git a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java
index 65aa6a6f53c..681886e1427 100644
--- a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java
+++ b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java
@@ -134,7 +134,7 @@ public class InternalLoadBalancerVMManagerImplTest {
         when(internalLbVmDao.findById(anyLong())).thenReturn(mock(DomainRouterVO.class));
         DomainRouterVO result = service.deployInternalLbVmWithTemplates(null, id, plan, internalLbProviderId, account, userId, vpcId, serviceOffering, networks, templates);
         assertNotNull(result);
-        verify(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull());
+        verify(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull(), isNull(), isNull());
     }
 
     @Test
@@ -149,11 +149,11 @@ public class InternalLoadBalancerVMManagerImplTest {
         when(internalLbVmDao.persist(any(DomainRouterVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
         when(internalLbVmDao.findById(anyLong())).thenReturn(mock(DomainRouterVO.class));
         doThrow(new InsufficientServerCapacityException("Not enough capacity", id))
-                .when(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull());
+                .when(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull(), isNull(), isNull());
         DomainRouterVO result = service.deployInternalLbVmWithTemplates(null, id, plan, internalLbProviderId, account, userId, vpcId, serviceOffering, networks, templates);
         assertNotNull(result);
-        verify(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull());
-        verify(virtualMachineManager).allocate(anyString(), eq(template2), eq(serviceOffering), eq(networks), eq(plan), isNull());
+        verify(virtualMachineManager).allocate(anyString(), eq(template1), eq(serviceOffering), eq(networks), eq(plan), isNull(), isNull(), isNull());
+        verify(virtualMachineManager).allocate(anyString(), eq(template2), eq(serviceOffering), eq(networks), eq(plan), isNull(), isNull(), isNull());
     }
 
     @Test(expected = InsufficientCapacityException.class)
@@ -166,7 +166,7 @@ public class InternalLoadBalancerVMManagerImplTest {
         LinkedHashMap<Network, List<? extends NicProfile>> networks = new LinkedHashMap<>();
         when(internalLbVmDao.persist(any(DomainRouterVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
         doThrow(new InsufficientServerCapacityException("Insufficient capacity", id))
-                .when(virtualMachineManager).allocate(anyString(), any(VMTemplateVO.class), eq(serviceOffering), eq(networks), eq(plan), isNull());
+                .when(virtualMachineManager).allocate(anyString(), any(VMTemplateVO.class), eq(serviceOffering), eq(networks), eq(plan), isNull(), isNull(), isNull());
         service.deployInternalLbVmWithTemplates(null, id, plan, internalLbProviderId, account, userId, vpcId, serviceOffering, networks, templates);
     }
 }
diff --git a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
index 08941c56e3c..ce30b228118 100644
--- a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
@@ -130,7 +130,7 @@ public class ServiceManagerImpl implements ServiceManager {
         svm.setUserData(userData);
 
         try {
-            _vmManager.allocate(instanceName, template, serviceOffering, networks, plan, template.getHypervisorType());
+            _vmManager.allocate(instanceName, template, serviceOffering, networks, plan, template.getHypervisorType(), null, null);
         } catch (InsufficientCapacityException ex) {
             throw new CloudRuntimeException("Insufficient capacity", ex);
         }
diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java
index c3d4cf4b24e..b47fc3aaf6b 100644
--- a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java
+++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/vm/NetScalerVMManagerImpl.java
@@ -356,7 +356,7 @@ public class NetScalerVMManagerImpl extends ManagerBase implements NetScalerVMMa
         nsVpx = _routerDao.persist(nsVpx);
 
         VMInstanceVO vmVO= _vmDao.findVMByHostName(nxVpxName);
-        _itMgr.allocate(nxVpxName, template, vpxOffering, networks, plan, template.getHypervisorType());
+        _itMgr.allocate(nxVpxName, template, vpxOffering, networks, plan, template.getHypervisorType(), null, null);
         Map<Param, Object> params = new HashMap<VirtualMachineProfile.Param, Object>(1);
         try {
             if (vmVO != null) {
diff --git a/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java b/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
index a78164f603d..ef3d98354a0 100644
--- a/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
+++ b/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
@@ -17,29 +17,41 @@
 
 package org.apache.cloudstack.storage.sharedfs.lifecycle;
 
-import static org.apache.cloudstack.storage.sharedfs.SharedFS.SharedFSPath;
-import static org.apache.cloudstack.storage.sharedfs.SharedFS.SharedFSVmNamePrefix;
-import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_CPU_COUNT;
-import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_RAM_SIZE;
-
+import com.cloud.dc.DataCenter;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ManagementServerException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.Network;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.LaunchPermissionVO;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.LaunchPermissionDao;
+import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.FileUtil;
 import com.cloud.utils.Pair;
-
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.UserVmService;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.UserVmDao;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,17 +59,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import javax.inject.Inject;
-
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.UserVmService;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.UserVmDao;
-
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.context.CallContext;
@@ -67,17 +69,11 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.cloud.dc.DataCenter;
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.network.Network;
-import com.cloud.resource.ResourceManager;
-import com.cloud.service.dao.ServiceOfferingDao;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.dao.VMTemplateDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.VirtualMachineManager;
+
+import static org.apache.cloudstack.storage.sharedfs.SharedFS.SharedFSPath;
+import static org.apache.cloudstack.storage.sharedfs.SharedFS.SharedFSVmNamePrefix;
+import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_CPU_COUNT;
+import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_RAM_SIZE;
 
 public class StorageVmSharedFSLifeCycle implements SharedFSLifeCycle {
     protected Logger logger = LogManager.getLogger(getClass());
@@ -197,7 +193,7 @@ public class StorageVmSharedFSLifeCycle implements SharedFSLifeCycle {
                         diskOfferingId, size, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData,
                         null, null, keypairs, null, addrs, null, null, null,
                         customParameterMap, null, null, null, null,
-                        true, UserVmManager.SHAREDFSVM, null);
+                        true, UserVmManager.SHAREDFSVM, null, null, null);
                 vmContext.setEventResourceId(vm.getId());
                 userVmService.startVirtualMachine(vm, null);
             } catch (InsufficientCapacityException ex) {
diff --git a/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java b/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
index 4393b0565f8..813d8978697 100644
--- a/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
+++ b/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
@@ -17,39 +17,6 @@
 
 package org.apache.cloudstack.storage.sharedfs.lifecycle;
 
-import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_CPU_COUNT;
-import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_RAM_SIZE;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.storage.sharedfs.SharedFS;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
@@ -85,6 +52,38 @@ import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.storage.sharedfs.SharedFS;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+
+import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_CPU_COUNT;
+import static org.apache.cloudstack.storage.sharedfs.provider.StorageVmSharedFSProvider.SHAREDFSVM_MIN_RAM_SIZE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class StorageVmSharedFSLifeCycleTest {
@@ -258,7 +257,7 @@ public class StorageVmSharedFSLifeCycleTest {
                 anyString(), anyLong(), anyLong(), isNull(), any(Hypervisor.HypervisorType.class), any(BaseCmd.HTTPMethod.class), anyString(),
                 isNull(), isNull(), anyList(), isNull(), any(Network.IpAddresses.class), isNull(), isNull(), isNull(),
                 anyMap(), isNull(), isNull(), isNull(), isNull(),
-                anyBoolean(), anyString(), isNull())).thenReturn(vm);
+                anyBoolean(), anyString(), isNull(), isNull(), isNull())).thenReturn(vm);
 
         VolumeVO volume = mock(VolumeVO.class);
         when(volume.getId()).thenReturn(s_volumeId);
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
index d8aa9d48e7d..d93990ee071 100644
--- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -171,6 +172,8 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
     private ServiceOfferingDetailsDao serviceOfferingDetailDao;
     @Inject
     private ServiceOfferingDao serviceOfferingDao;
+    @Inject
+    private VolumeDataFactory volumeDataFactory;
 
     private SnapshotDataStoreVO getSnapshotImageStoreRef(long snapshotId, long zoneId) {
         List<SnapshotDataStoreVO> snaps = snapshotDataStoreDao.listReadyBySnapshot(snapshotId, DataStoreRole.Image);
@@ -626,8 +629,11 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
                 VolumeInfo vinfo = (VolumeInfo)dstData;
                 final String volumeName = vinfo.getUuid();
                 final Long size = vinfo.getSize();
+
                 SpConnectionDesc conn = StorPoolUtil.getSpConnection(vinfo.getDataStore().getUuid(), vinfo.getDataStore().getId(), storagePoolDetailsDao, primaryStoreDao);
-                SpApiResponse resp = StorPoolUtil.volumeCreate(volumeName, snapshotName, size, null, null, "volume", sinfo.getBaseVolume().getMaxIops(), conn);
+
+                StorPoolVolumeDef spVolume = createVolumeWithTags(sinfo, snapshotName, vinfo, volumeName, size, conn);
+                SpApiResponse resp = StorPoolUtil.volumeCreate(spVolume, conn);
                 if (resp.getError() == null) {
                     updateStoragePool(dstData.getDataStore().getId(), size);
 
@@ -643,9 +649,10 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
                     SnapshotDataStoreVO snap = getSnapshotImageStoreRef(sinfo.getId(), vinfo.getDataCenterId());
                     SnapshotDetailsVO snapshotDetail = snapshotDetailsDao.findDetail(sinfo.getId(), StorPoolUtil.SP_DELAY_DELETE);
                     if (snapshotDetail != null) {
-                        err = String.format("Could not create volume from snapshot due to: %s. The snapshot was created with the delayDelete option.", resp.getError());
+                        answer = new Answer(cmd, false, String.format("Could not create volume from snapshot due to: %s. The snapshot was created with the delayDelete option.", resp.getError()));
                     } else if (snap != null && StorPoolStorageAdaptor.getVolumeNameFromPath(snap.getInstallPath(), false) == null) {
-                        SpApiResponse emptyVolumeCreateResp = StorPoolUtil.volumeCreate(volumeName, null, size, null, null, "volume", null, conn);
+                        spVolume.setParent(null);
+                        SpApiResponse emptyVolumeCreateResp = StorPoolUtil.volumeCreate(spVolume, conn);
                         if (emptyVolumeCreateResp.getError() == null) {
                             answer = createVolumeFromSnapshot(srcData, dstData, size, emptyVolumeCreateResp);
                         } else {
@@ -655,7 +662,7 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
                         answer = new Answer(cmd, false, String.format("The snapshot %s does not exists neither on primary, neither on secondary storage. Cannot create volume from snapshot", snapshotName));
                     }
                 } else {
-                    err = String.format("Could not create Storpool volume %s from snapshot %s. Error: %s", volumeName, snapshotName, resp.getError());
+                    answer = new Answer(cmd, false, String.format("Could not create Storpool volume %s from snapshot %s. Error: %s", volumeName, snapshotName, resp.getError()));
                 }
             } else if (srcType == DataObjectType.SNAPSHOT && dstType == DataObjectType.SNAPSHOT) {
                 SnapshotInfo sinfo = (SnapshotInfo)srcData;
@@ -982,6 +989,27 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
         callback.complete(res);
     }
 
+    private StorPoolVolumeDef createVolumeWithTags(SnapshotInfo sinfo, String snapshotName, VolumeInfo vinfo, String volumeName, Long size, SpConnectionDesc conn) {
+        Pair<String, String> templateAndTier = getTemplateAndTier(vinfo, conn);
+        Map<String, String> tags = StorPoolHelper.addStorPoolTags(volumeName, getVMInstanceUUID(vinfo.getInstanceId()), "volume", getVcPolicyTag(vinfo.getInstanceId()), templateAndTier.first());
+        return new StorPoolVolumeDef(null, size, tags, snapshotName, sinfo.getBaseVolume().getMaxIops(), templateAndTier.second(), null, null, null);
+    }
+
+    private Pair<String, String> getTemplateAndTier(VolumeInfo vinfo, SpConnectionDesc conn) {
+        String tier = null;
+        String template = null;
+        if (vinfo.getDiskOfferingId() != null) {
+            tier = getTierFromOfferingDetail(vinfo.getDiskOfferingId());
+            if (tier == null) {
+                template = getTemplateFromOfferingDetail(vinfo.getDiskOfferingId());
+            }
+        }
+
+        if (template == null) {
+            template = conn.getTemplateName();
+        }
+        return new Pair<>(tier, template);
+    }
     private Answer createVolumeSnapshot(StorageSubSystemCommand cmd, Long size, SpConnectionDesc conn,
             String volName, TemplateObjectTO dstTO) {
         Answer answer;
@@ -1302,24 +1330,33 @@ public class StorPoolPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
             return;
         }
         StoragePoolVO poolVO = primaryStoreDao.findById(volume.getPoolId());
-        if (poolVO != null) {
-            try {
-                SpConnectionDesc conn = StorPoolUtil.getSpConnection(poolVO.getUuid(), poolVO.getId(), storagePoolDetailsDao, primaryStoreDao);
-                String volName = StorPoolStorageAdaptor.getVolumeNameFromPath(volume.getPath(), true);
-                VMInstanceVO userVM = vmInstanceDao.findById(vmId);
-                Map<String, String> tags = StorPoolHelper.addStorPoolTags(null, userVM.getUuid(), null, getVcPolicyTag(vmId), null);
-                if (volume.getDeviceId() != null) {
-                    tags.put("disk", volume.getDeviceId().toString());
-                }
-                StorPoolVolumeDef spVolume = new StorPoolVolumeDef(volName, null, tags, null, null, null, null, null, null);
-
-                SpApiResponse resp = StorPoolUtil.volumeUpdate(spVolume, conn);
-                if (resp.getError() != null) {
-                    logger.warn(String.format("Could not update VC policy tags of a volume with id [%s]", volume.getUuid()));
-                }
-            } catch (Exception e) {
-                logger.warn(String.format("Could not update Virtual machine tags due to %s", e.getMessage()));
+        if (poolVO != null && StoragePoolType.StorPool.equals(poolVO.getPoolType())) {
+            VolumeInfo vInfo = volumeDataFactory.getVolume(volumeId);
+            if (vInfo == null) {
+                StorPoolUtil.spLog("Could not find volume with volume ID [%s] to set tags", volumeId);
+                return;
             }
+            updateVolumeWithTags(poolVO, vInfo);
+        }
+    }
+
+    private void updateVolumeWithTags(StoragePoolVO poolVO, VolumeInfo vInfo) {
+        try {
+            SpConnectionDesc conn = StorPoolUtil.getSpConnection(poolVO.getUuid(), poolVO.getId(), storagePoolDetailsDao, primaryStoreDao);
+            String volName = StorPoolStorageAdaptor.getVolumeNameFromPath(vInfo.getPath(), true);
+            Pair<String, String> templateAndTier = getTemplateAndTier(vInfo, conn);
+            Map<String, String> tags = StorPoolHelper.addStorPoolTags(volName, getVMInstanceUUID(vInfo.getInstanceId()), "volume", getVcPolicyTag(vInfo.getInstanceId()), templateAndTier.first());
+            if (vInfo.getDeviceId() != null) {
+                tags.put("disk", vInfo.getDeviceId().toString());
+            }
+            StorPoolVolumeDef spVolume = new StorPoolVolumeDef(volName, null, tags, null, null, templateAndTier.second(), null, null, null);
+            StorPoolUtil.spLog("Updating volume's tags [%s] with template [%s]", tags, templateAndTier.second());
+            SpApiResponse resp = StorPoolUtil.volumeUpdate(spVolume, conn);
+            if (resp.getError() != null) {
+                logger.warn(String.format("Could not update VC policy tags of a volume with id [%s]", vInfo.getUuid()));
+            }
+        } catch (Exception e) {
+            logger.warn(String.format("Could not update Virtual machine tags due to %s", e.getMessage()));
         }
     }
 
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 5baed2643c9..4331cc494c4 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -725,7 +725,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
             proxy = createOrUpdateConsoleProxy(proxy, dataCenterId, id, name, serviceOffering, template, systemAcct);
             try {
                 virtualMachineManager.allocate(name, template, serviceOffering, networks, plan,
-                        template.getHypervisorType());
+                        template.getHypervisorType(), null, null);
                 proxy = consoleProxyDao.findById(proxy.getId());
                 virtualMachineManager.checkDeploymentPlan(proxy, template, serviceOffering, systemAcct, plan);
                 break;
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index bda84f09fe6..9d001080400 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1810,7 +1810,7 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
                         vmHostName, diskOfferingId, dataDiskSize, null,
                         hypervisorType, HTTPMethod.GET, userData, userDataId, userDataDetails, sshKeyPairs,
                         null, null, true, null, affinityGroupIdList, customParameters, null, null, null,
-                        null, true, overrideDiskOfferingId);
+                        null, true, overrideDiskOfferingId, null, null);
             } else {
                 if (networkModel.checkSecurityGroupSupportForNetwork(owner, zone, networkIds,
                         Collections.emptyList())) {
@@ -1818,13 +1818,13 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
                             owner, vmHostName,vmHostName, diskOfferingId, dataDiskSize, null,
                             hypervisorType, HTTPMethod.GET, userData, userDataId, userDataDetails, sshKeyPairs,
                             null, null, true, null, affinityGroupIdList, customParameters, null, null, null,
-                            null, true, overrideDiskOfferingId, null);
+                            null, true, overrideDiskOfferingId, null, null, null);
                 } else {
                     vm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner, vmHostName, vmHostName,
                             diskOfferingId, dataDiskSize, null,
                             hypervisorType, HTTPMethod.GET, userData, userDataId, userDataDetails, sshKeyPairs,
                             null, addrs, true, null, affinityGroupIdList, customParameters, null, null, null,
-                            null, true, null, overrideDiskOfferingId);
+                            null, true, null, overrideDiskOfferingId, null, null);
                 }
             }
 
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
index eb1c5cfd856..ee2081adc73 100644
--- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -889,7 +889,7 @@ public class NetworkHelperImpl implements NetworkHelper {
 
         final LinkedHashMap<Network, List<? extends NicProfile>> networks = configureDefaultNics(routerDeploymentDefinition);
 
-        _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, routerDeploymentDefinition.getPlan(), hType);
+        _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, routerDeploymentDefinition.getPlan(), hType, null, null);
     }
 
     public static void setSystemAccount(final Account systemAccount) {
diff --git a/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java
index 13e118349b0..d02fff1ee9e 100644
--- a/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java
@@ -169,7 +169,7 @@ public class VpcNetworkHelperImpl extends NetworkHelperImpl {
             }
         }
 
-        _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, vpcRouterDeploymentDefinition.getPlan(), hType);
+        _itMgr.allocate(router.getInstanceName(), template, routerOffering, networks, vpcRouterDeploymentDefinition.getPlan(), hType, null, null);
     }
 
     @Override
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index d08c8655458..af6b0f260cf 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -397,6 +397,10 @@ import com.cloud.vm.snapshot.VMSnapshotManager;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+
+
 public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, Configurable {
 
     /**
@@ -617,6 +621,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     @Inject
     NetworkService networkService;
 
+    @Inject
+    SnapshotDataFactory snapshotDataFactory;
 
     private ScheduledExecutorService _executor = null;
     private ScheduledExecutorService _vmIpFetchExecutor = null;
@@ -3705,7 +3711,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                                          Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod,
                                                          String userData, Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
                                                          Map<String, String> customParametes, String customId, Map<String, Map<Integer, String>> dhcpOptionMap,
-                                                         Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
+                                                         Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
     StorageUnavailableException, ResourceAllocationException {
 
         Account caller = CallContext.current().getCallingAccount();
@@ -3754,7 +3760,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
         return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod,
                 userData, userDataId, userDataDetails, sshKeyPairs, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, customParametes, customId, dhcpOptionMap,
-                dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, null, overrideDiskOfferingId);
+                dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, null, overrideDiskOfferingId, volume, snapshot);
 
     }
 
@@ -3764,7 +3770,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                                             List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
                                                             HTTPMethod httpmethod, String userData, Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
                                                             List<Long> affinityGroupIdList, Map<String, String> customParameters, String customId, Map<String, Map<Integer, String>> dhcpOptionMap,
-                                                            Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, String vmType) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException {
+                                                            Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap, Map<String, String> userVmOVFProperties, boolean dynamicScalingEnabled, Long overrideDiskOfferingId, String vmType, Volume volume, Snapshot snapshot) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException {
 
         Account caller = CallContext.current().getCallingAccount();
         List<NetworkVO> networkList = new ArrayList<NetworkVO>();
@@ -3867,7 +3873,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
         return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod,
                 userData, userDataId, userDataDetails, sshKeyPairs, hypervisor, caller, requestedIps, defaultIps, displayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, dataDiskTemplateToDiskOfferingMap,
-                userVmOVFProperties, dynamicScalingEnabled, vmType, overrideDiskOfferingId);
+                userVmOVFProperties, dynamicScalingEnabled, vmType, overrideDiskOfferingId, volume, snapshot);
     }
 
     @Override
@@ -3876,7 +3882,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                                String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
                                                Long userDataId, String userDataDetails, List<String> sshKeyPairs, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayvm, String keyboard, List<Long> affinityGroupIdList,
                                                Map<String, String> customParametrs, String customId, Map<String, Map<Integer, String>> dhcpOptionsMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                               Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
+                                               Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
     StorageUnavailableException, ResourceAllocationException {
 
         Account caller = CallContext.current().getCallingAccount();
@@ -3929,7 +3935,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         verifyExtraDhcpOptionsNetwork(dhcpOptionsMap, networkList);
         return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, null, group, httpmethod, userData,
                 userDataId, userDataDetails, sshKeyPairs, hypervisor, caller, requestedIps, defaultIps, displayvm, keyboard, affinityGroupIdList, customParametrs, customId, dhcpOptionsMap,
-                dataDiskTemplateToDiskOfferingMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, overrideDiskOfferingId);
+                dataDiskTemplateToDiskOfferingMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, overrideDiskOfferingId, volume, snapshot);
     }
 
     @Override
@@ -4061,7 +4067,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                         Long userDataId, String userDataDetails, List<String> sshKeyPairs, HypervisorType hypervisor, Account caller, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean isDisplayVm, String keyboard,
                                         List<Long> affinityGroupIdList, Map<String, String> customParameters, String customId, Map<String, Map<Integer, String>> dhcpOptionMap,
                                         Map<Long, DiskOffering> datadiskTemplateToDiskOfferringMap,
-                                        Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId) throws InsufficientCapacityException, ResourceUnavailableException,
+                                        Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, Long overrideDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException, ResourceUnavailableException,
     ConcurrentOperationException, StorageUnavailableException, ResourceAllocationException {
 
         _accountMgr.checkAccess(caller, null, true, owner);
@@ -4069,7 +4075,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (owner.getState() == Account.State.DISABLED) {
             throw new PermissionDeniedException("The owner of vm to deploy is disabled: " + owner);
         }
-        VMTemplateVO template = _templateDao.findById(tmplt.getId());
+        VMTemplateVO template = _templateDao.findByIdIncludingRemoved(tmplt.getId());
         if (template != null) {
             _templateDao.loadDetails(template);
         }
@@ -4141,10 +4147,18 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             rootDiskOfferingId = overrideDiskOfferingId;
         }
 
-        DiskOfferingVO rootdiskOffering = _diskOfferingDao.findById(rootDiskOfferingId);
-        long volumesSize = configureCustomRootDiskSize(customParameters, template, hypervisorType, rootdiskOffering);
+        DiskOfferingVO rootDiskOffering = _diskOfferingDao.findById(rootDiskOfferingId);
+        long volumesSize = 0;
+        if (volume != null) {
+            volumesSize = volume.getSize();
+        } else if (snapshot != null) {
+            VolumeVO volumeVO = _volsDao.findById(snapshot.getVolumeId());
+            volumesSize = volumeVO != null ? volumeVO.getSize() : 0;
+        } else {
+            volumesSize = configureCustomRootDiskSize(customParameters, template, hypervisorType, rootDiskOffering);
+        }
 
-        if (rootdiskOffering.getEncrypt() && hypervisorType != HypervisorType.KVM) {
+        if (rootDiskOffering.getEncrypt() && hypervisorType != HypervisorType.KVM) {
             throw new InvalidParameterValueException("Root volume encryption is not supported for hypervisor type " + hypervisorType);
         }
 
@@ -4153,7 +4167,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             DiskOfferingVO diskOffering = _diskOfferingDao.findById(diskOfferingId);
             additionalDiskSize = verifyAndGetDiskSize(diskOffering, diskSize);
         }
-        UserVm vm = getCheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize);
+        UserVm vm = getCheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize, volume, snapshot);
 
         _securityGroupMgr.addInstanceToGroups(vm, securityGroupIdList);
 
@@ -4173,14 +4187,14 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         Map<String, Map<Integer, String>> dhcpOptionMap, Map<Long, DiskOffering> datadiskTemplateToDiskOfferringMap,
         Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, VMTemplateVO template,
         HypervisorType hypervisorType, long accountId, ServiceOfferingVO offering, boolean isIso,
-        Long rootDiskOfferingId, long volumesSize, long additionalDiskSize) throws ResourceAllocationException {
+        Long rootDiskOfferingId, long volumesSize, long additionalDiskSize, Volume volume, Snapshot snapshot) throws ResourceAllocationException {
         if (!VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
             List<String> resourceLimitHostTags = resourceLimitService.getResourceLimitHostTags(offering, template);
             try (CheckedReservation vmReservation = new CheckedReservation(owner, ResourceType.user_vm, resourceLimitHostTags, 1l, reservationDao, resourceLimitService);
                  CheckedReservation cpuReservation = new CheckedReservation(owner, ResourceType.cpu, resourceLimitHostTags, Long.valueOf(offering.getCpu()), reservationDao, resourceLimitService);
                  CheckedReservation memReservation = new CheckedReservation(owner, ResourceType.memory, resourceLimitHostTags, Long.valueOf(offering.getRamSize()), reservationDao, resourceLimitService);
             ) {
-                return getUncheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize);
+                return getUncheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize, volume, snapshot);
             } catch (ResourceAllocationException | CloudRuntimeException  e) {
                 throw e;
             } catch (Exception e) {
@@ -4189,7 +4203,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
 
         } else {
-            return getUncheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize);
+            return getUncheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize, volume, snapshot);
         }
     }
 
@@ -4206,7 +4220,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         Map<String, Map<Integer, String>> dhcpOptionMap, Map<Long, DiskOffering> datadiskTemplateToDiskOfferringMap,
         Map<String, String> userVmOVFPropertiesMap, boolean dynamicScalingEnabled, String vmType, VMTemplateVO template,
         HypervisorType hypervisorType, long accountId, ServiceOfferingVO offering, boolean isIso,
-        Long rootDiskOfferingId, long volumesSize, long additionalDiskSize) throws ResourceAllocationException
+        Long rootDiskOfferingId, long volumesSize, long additionalDiskSize, Volume volume, Snapshot snapshot) throws ResourceAllocationException
     {
         List<String> rootResourceLimitStorageTags = getResourceLimitStorageTags(rootDiskOfferingId != null ? rootDiskOfferingId : offering.getDiskOfferingId());
         List<String> additionalResourceLimitStorageTags = diskOfferingId != null ? getResourceLimitStorageTags(diskOfferingId) : null;
@@ -4304,9 +4318,21 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
                 throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
             }
-            List<VMTemplateZoneVO> listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
-            if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
-                throw new InvalidParameterValueException(String.format("The template %s is not available for use", template));
+
+            if (volume != null) {
+                if (zone.getId() != volume.getDataCenterId()) {
+                    throw new InvalidParameterValueException(String.format("The volume's zone [%s] is not the same as the provided zone [%s]", volume.getDataCenterId(), zone.getId()));
+                }
+            } else if (snapshot != null) {
+                List<SnapshotInfo> snapshotsOnZone = snapshotDataFactory.getSnapshots(snapshot.getId(), zone.getId());
+                if (CollectionUtils.isEmpty(snapshotsOnZone)) {
+                    throw new InvalidParameterValueException("The snapshot does not exist on zone " + zone.getId());
+                }
+            } else {
+                List<VMTemplateZoneVO> listZoneTemplate = _templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
+                if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+                    throw new InvalidParameterValueException("The template " + template.getId() + " is not available for use");
+                }
             }
 
             if (isIso && !template.isBootable()) {
@@ -4485,7 +4511,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
             UserVmVO vm = commitUserVm(zone, template, hostName, displayName, owner, diskOfferingId, diskSize, userData, userDataId, userDataDetails, caller, isDisplayVm, keyboard, accountId, userId, offering,
                     isIso, sshPublicKeys, networkNicMap, id, instanceName, uuidName, hypervisorType, customParameters, dhcpOptionMap,
-                    datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, rootDiskOfferingId, keypairnames);
+                    datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, rootDiskOfferingId, keypairnames, volume, snapshot);
 
             assignInstanceToGroup(group, id);
             return vm;
@@ -4626,7 +4652,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                   final long accountId, final long userId, final ServiceOffering offering, final boolean isIso, final String sshPublicKeys, final LinkedHashMap<String, List<NicProfile>> networkNicMap,
                                   final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map<String, String> customParameters,
                                   final Map<String, Map<Integer, String>> extraDhcpOptionMap, final Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                  final Map<String, String> userVmOVFPropertiesMap, final VirtualMachine.PowerState powerState, final boolean dynamicScalingEnabled, String vmType, final Long rootDiskOfferingId, String sshkeypairs) throws InsufficientCapacityException {
+                                  final Map<String, String> userVmOVFPropertiesMap, final VirtualMachine.PowerState powerState, final boolean dynamicScalingEnabled, String vmType, final Long rootDiskOfferingId, String sshkeypairs, Volume volume, Snapshot snapshot) throws InsufficientCapacityException {
         UserVmVO vm = new UserVmVO(id, instanceName, displayName, template.getId(), hypervisorType, template.getGuestOSId(), offering.isOfferHA(),
                 offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(), userId, offering.getId(), userData, userDataId, userDataDetails, hostName);
         vm.setUuid(uuidName);
@@ -4744,7 +4770,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
             orchestrateVirtualMachineCreate(vm, guestOSCategory, computeTags, rootDiskTags, plan, rootDiskSize, template, hostName, displayName, owner,
                     diskOfferingId, diskSize, offering, isIso,networkNicMap, hypervisorType, extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap,
-                    rootDiskOfferingId);
+                    rootDiskOfferingId, volume, snapshot);
 
         }
         CallContext.current().setEventDetails("Vm Id: " + vm.getUuid());
@@ -4777,16 +4803,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                         ServiceOffering offering, boolean isIso, LinkedHashMap<String, List<NicProfile>> networkNicMap,
                                         HypervisorType hypervisorType,
                                         Map<String, Map<Integer, String>> extraDhcpOptionMap, Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                        Long rootDiskOfferingId) throws InsufficientCapacityException{
+                                        Long rootDiskOfferingId, Volume volume, Snapshot snapshot) throws InsufficientCapacityException{
         try {
             if (isIso) {
                 _orchSrvc.createVirtualMachineFromScratch(vm.getUuid(), Long.toString(owner.getAccountId()), vm.getIsoId().toString(), hostName, displayName,
                         hypervisorType.name(), guestOSCategory.getName(), offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags,
-                        networkNicMap, plan, extraDhcpOptionMap, rootDiskOfferingId);
+                        networkNicMap, plan, extraDhcpOptionMap, rootDiskOfferingId, volume, snapshot);
             } else {
                 _orchSrvc.createVirtualMachine(vm.getUuid(), Long.toString(owner.getAccountId()), Long.toString(template.getId()), hostName, displayName, hypervisorType.name(),
                         offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan, rootDiskSize, extraDhcpOptionMap,
-                        dataDiskTemplateToDiskOfferingMap, diskOfferingId, rootDiskOfferingId);
+                        dataDiskTemplateToDiskOfferingMap, diskOfferingId, rootDiskOfferingId, volume, snapshot);
             }
 
             if (logger.isDebugEnabled()) {
@@ -4908,13 +4934,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                                   final long accountId, final long userId, final ServiceOfferingVO offering, final boolean isIso, final String sshPublicKeys, final LinkedHashMap<String, List<NicProfile>> networkNicMap,
                                   final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final Map<String,
             Map<Integer, String>> extraDhcpOptionMap, final Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
-                                  Map<String, String> userVmOVFPropertiesMap, final boolean dynamicScalingEnabled, String vmType, final Long rootDiskOfferingId, String sshkeypairs) throws InsufficientCapacityException {
+                                  Map<String, String> userVmOVFPropertiesMap, final boolean dynamicScalingEnabled, String vmType, final Long rootDiskOfferingId, String sshkeypairs, Volume volume, Snapshot snapshot) throws InsufficientCapacityException {
         return commitUserVm(false, zone, null, null, template, hostName, displayName, owner,
                 diskOfferingId, diskSize, userData, userDataId, userDataDetails, isDisplayVm, keyboard,
                 accountId, userId, offering, isIso, sshPublicKeys, networkNicMap,
                 id, instanceName, uuidName, hypervisorType, customParameters,
                 extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap,
-                userVmOVFPropertiesMap, null, dynamicScalingEnabled, vmType, rootDiskOfferingId, sshkeypairs);
+                userVmOVFPropertiesMap, null, dynamicScalingEnabled, vmType, rootDiskOfferingId, sshkeypairs, volume, snapshot);
     }
 
     public void validateRootDiskResize(final HypervisorType hypervisorType, Long rootDiskSize, VMTemplateVO templateVO, UserVmVO vm, final Map<String, String> customParameters) throws InvalidParameterValueException
@@ -6134,11 +6160,40 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
         }
 
+        Account caller = CallContext.current().getCallingAccount();
+        Long callerId = caller.getId();
+
         Long templateId = cmd.getTemplateId();
+        VolumeInfo volume = null;
+        SnapshotVO snapshot = null;
+
+        if (cmd.getVolumeId() != null) {
+            volume = getVolume(cmd.getVolumeId(), templateId, false);
+            if (volume == null) {
+                throw new InvalidParameterValueException("Could not find volume with id=" + cmd.getVolumeId());
+            }
+            _accountMgr.checkAccess(caller, null, true, volume);
+            templateId = volume.getTemplateId();
+            overrideDiskOfferingId = volume.getDiskOfferingId();
+        } else if (cmd.getSnapshotId() != null) {
+            snapshot = _snapshotDao.findById(cmd.getSnapshotId());
+            if (snapshot == null) {
+                throw new InvalidParameterValueException("Could not find snapshot with id=" + cmd.getSnapshotId());
+            }
+            _accountMgr.checkAccess(caller, null, true, snapshot);
+            VolumeInfo volumeOfSnapshot = getVolume(snapshot.getVolumeId(), templateId, true);
+            templateId = volumeOfSnapshot.getTemplateId();
+            overrideDiskOfferingId = volumeOfSnapshot.getDiskOfferingId();
+        }
 
         boolean dynamicScalingEnabled = cmd.isDynamicScalingEnabled();
 
-        VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, templateId);
+        VirtualMachineTemplate template = null;
+        if (volume != null || snapshot != null) {
+            template = _entityMgr.findByIdIncludingRemoved(VirtualMachineTemplate.class, templateId);
+        } else {
+            template = _entityMgr.findById(VirtualMachineTemplate.class, templateId);
+        }
         // Make sure a valid template ID was specified
         if (template == null) {
             throw new InvalidParameterValueException("Unable to use template " + templateId);
@@ -6149,6 +6204,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             throw new InvalidParameterValueException("Can't deploy VNF appliance from a non-VNF template");
         }
 
+        if (cmd.isVolumeOrSnapshotProvided() &&
+                (!(HypervisorType.KVM.equals(template.getHypervisorType()) || HypervisorType.KVM.equals(cmd.getHypervisor())))) {
+            throw new InvalidParameterValueException("Deploying a virtual machine with existing volume/snapshot is supported only from KVM hypervisors");
+        }
         ServiceOfferingJoinVO svcOffering = serviceOfferingJoinDao.findById(serviceOfferingId);
 
         if (template.isDeployAsIs()) {
@@ -6208,9 +6267,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         userData = finalizeUserData(userData, userDataId, template);
         userData = userDataManager.validateUserData(userData, cmd.getHttpMethod());
 
-        Account caller = CallContext.current().getCallingAccount();
-        Long callerId = caller.getId();
-
         boolean isRootAdmin = _accountService.isRootAdmin(callerId);
 
         Long hostId = cmd.getHostId();
@@ -6237,7 +6293,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 vm = createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(cmd, zone, template, owner), owner, name, displayName, diskOfferingId,
                         size , group , cmd.getHypervisor(), cmd.getHttpMethod(), userData, userDataId, userDataDetails, sshKeyPairNames, cmd.getIpToNetworkMap(), addrs, displayVm , keyboard , cmd.getAffinityGroupIdList(),
                         cmd.getDetails(), cmd.getCustomId(), cmd.getDhcpOptionsMap(),
-                        dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, overrideDiskOfferingId);
+                        dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, overrideDiskOfferingId, volume, snapshot);
             }
         } else {
             if (_networkModel.checkSecurityGroupSupportForNetwork(owner, zone, networkIds,
@@ -6245,7 +6301,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 vm = createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, networkIds, getSecurityGroupIdList(cmd, zone, template, owner), owner, name,
                         displayName, diskOfferingId, size, group, cmd.getHypervisor(), cmd.getHttpMethod(), userData, userDataId, userDataDetails, sshKeyPairNames, cmd.getIpToNetworkMap(), addrs, displayVm, keyboard,
                         cmd.getAffinityGroupIdList(), cmd.getDetails(), cmd.getCustomId(), cmd.getDhcpOptionsMap(),
-                        dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, overrideDiskOfferingId, null);
+                        dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, overrideDiskOfferingId, null, volume, snapshot);
 
             } else {
                 if (cmd.getSecurityGroupIdList() != null && !cmd.getSecurityGroupIdList().isEmpty()) {
@@ -6253,7 +6309,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 }
                 vm = createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner, name, displayName, diskOfferingId, size, group,
                         cmd.getHypervisor(), cmd.getHttpMethod(), userData, userDataId, userDataDetails, sshKeyPairNames, cmd.getIpToNetworkMap(), addrs, displayVm, keyboard, cmd.getAffinityGroupIdList(), cmd.getDetails(),
-                        cmd.getCustomId(), cmd.getDhcpOptionsMap(), dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, null, overrideDiskOfferingId);
+                        cmd.getCustomId(), cmd.getDhcpOptionsMap(), dataDiskTemplateToDiskOfferingMap, userVmOVFProperties, dynamicScalingEnabled, null, overrideDiskOfferingId, volume, snapshot);
                 if (cmd instanceof DeployVnfApplianceCmd) {
                     vnfTemplateManager.createIsolatedNetworkRulesForVnfAppliance(zone, template, owner, vm, (DeployVnfApplianceCmd) cmd);
                 }
@@ -6402,6 +6458,30 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         logger.debug("Instance lease for instanceId: {} is configured to expire on: {} with action: {}", vm.getUuid(), formattedLeaseExpiryDate, leaseExpiryAction);
     }
 
+    private VolumeInfo getVolume(long id, Long templateId, boolean isSnapshot) {
+        VolumeInfo volume = volFactory.getVolume(id);
+        if (volume != null) {
+            if (volume.getDataStore() == null || !ScopeType.ZONE.equals(volume.getDataStore().getScope().getScopeType())) {
+                throw new InvalidParameterValueException("Deployment of virtual machine is supported only for Zone-wide storage pools");
+            }
+            checkIfVolumeTemplateIsTheSameAsTheProvided(volume, templateId);
+            if (volume.getInstanceId() != null && !isSnapshot) {
+                throw new InvalidParameterValueException(String.format("The volume %s is already attached to a VM %s", volume, volume.getInstanceId()));
+            }
+        }
+        return volume;
+    }
+
+    private void checkIfVolumeTemplateIsTheSameAsTheProvided(VolumeInfo volume, Long templateId) {
+        if (volume.getTemplateId() != null) {
+            if (templateId != null && !volume.getTemplateId().equals(templateId)) {
+                throw new InvalidParameterValueException(String.format("The volume's template %s is not the same as the provided one %s", volume.getTemplateId(), templateId));
+            }
+        } else {
+            throw new InvalidParameterValueException("The provided volume/snapshot doesn't have a template to deploy a VM");
+        }
+    }
+
     /**
      * Persist extra configuration data in the user_vm_details table as key/value pair
      * @param decodedUrl String consisting of the extra config data to appended onto the vmx file for VMware instances
@@ -9193,7 +9273,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 null, null, userData, null, null, isDisplayVm, keyboard,
                 accountId, userId, serviceOffering, template.getFormat().equals(ImageFormat.ISO), sshPublicKeys, networkNicMap,
                 id, instanceName, uuidName, hypervisorType, customParameters,
-                null, null, null, powerState, dynamicScalingEnabled, null, serviceOffering.getDiskOfferingId(), null);
+                null, null, null, powerState, dynamicScalingEnabled, null, serviceOffering.getDiskOfferingId(), null, null, null);
     }
 
     @Override
diff --git a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
index 7d2b35361bc..6b169a89267 100644
--- a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
@@ -1273,7 +1273,7 @@ public class AutoScaleManagerImplTest {
         when(zoneMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Basic);
         when(userVmService.createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), eq(true), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any())).thenReturn(userVmMock);
+                any(), any(), any(), any(), eq(true), any(), any(), any())).thenReturn(userVmMock);
 
         UserVm result = autoScaleManagerImplSpy.createNewVM(asVmGroupMock);
 
@@ -1284,7 +1284,7 @@ public class AutoScaleManagerImplTest {
         Mockito.verify(userVmService).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(),
                 matches(vmHostNamePattern), matches(vmHostNamePattern),
                 any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), eq(true), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any());
+                any(), any(), any(), any(), eq(true), any(), any(), any());
         Mockito.verify(asVmGroupMock).setNextVmSeq(nextVmSeq + 1);
     }
 
@@ -1320,7 +1320,7 @@ public class AutoScaleManagerImplTest {
         when(zoneMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Advanced);
         when(userVmService.createAdvancedSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), any(), any(), any(),
-                any(), any(), any(), any(), any(), eq(true), any(), any())).thenReturn(userVmMock);
+                any(), any(), any(), any(), any(), eq(true), any(), any(), any(), any())).thenReturn(userVmMock);
         when(networkModel.checkSecurityGroupSupportForNetwork(account, zoneMock,
                 List.of(networkId), Collections.emptyList())).thenReturn(true);
 
@@ -1333,7 +1333,7 @@ public class AutoScaleManagerImplTest {
         Mockito.verify(userVmService).createAdvancedSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(),
                 matches(vmHostNamePattern), matches(vmHostNamePattern),
                 any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), any(), any(), any(),
-                any(), any(), any(), any(), any(), eq(true), any(), any());
+                any(), any(), any(), any(), any(), eq(true), any(), any(), any(), any());
         Mockito.verify(asVmGroupMock).setNextVmSeq(nextVmSeq + 2);
     }
 
@@ -1369,7 +1369,7 @@ public class AutoScaleManagerImplTest {
         when(zoneMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Advanced);
         when(userVmService.createAdvancedVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), eq(true), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any(), any())).thenReturn(userVmMock);
+                any(), any(), any(), any(), eq(true), any(), any(), any(), any())).thenReturn(userVmMock);
         when(networkModel.checkSecurityGroupSupportForNetwork(account, zoneMock,
                 List.of(networkId), Collections.emptyList())).thenReturn(false);
 
@@ -1382,7 +1382,7 @@ public class AutoScaleManagerImplTest {
         Mockito.verify(userVmService).createAdvancedVirtualMachine(any(), any(), any(), any(), any(),
                 matches(vmHostNamePattern), matches(vmHostNamePattern),
                 any(), any(), any(), any(), any(), eq(userData), eq(userDataId), eq(userDataDetails.toString()), any(), any(), any(), eq(true), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any(), any());
+                any(), any(), any(), any(), eq(true), any(), any(), any(), any());
         Mockito.verify(asVmGroupMock).setNextVmSeq(nextVmSeq + 3);
     }
 
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
index cce30e9efcf..b65b4513325 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
@@ -54,6 +54,8 @@ import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
 import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.template.VnfTemplateManager;
@@ -156,7 +158,9 @@ import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.UserVmDetailsDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
+
 import org.mockito.MockedStatic;
 
 import java.text.SimpleDateFormat;
@@ -174,6 +178,9 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.verify;
 
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+
 @RunWith(MockitoJUnitRunner.class)
 public class UserVmManagerImplTest {
 
@@ -382,11 +389,28 @@ public class UserVmManagerImplTest {
     @Mock
     StorageManager storageManager;
 
+    @Mock
+    private VolumeDataFactory volumeDataFactory;
+
+    @Mock
+    private VolumeInfo volumeInfo;
+
+    @Mock
+    private SnapshotVO snapshotMock;
+
+    @Mock
+    private PrimaryDataStore primaryDataStore;
+
+    @Mock
+    private Scope scopeMock;
+
     private static final long vmId = 1l;
     private static final long zoneId = 2L;
     private static final long accountId = 3L;
     private static final long serviceOfferingId = 10L;
     private static final long templateId = 11L;
+    private static final long volumeId = 1L;
+    private static final long snashotId = 1L;
 
     private static final long GiB_TO_BYTES = 1024 * 1024 * 1024;
 
@@ -1100,14 +1124,14 @@ public class UserVmManagerImplTest {
         when(_dcMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Basic);
         Mockito.doReturn(userVmVoMock).when(userVmManagerImpl).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), nullable(Boolean.class), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any());
+                any(), any(), any(), any(), eq(true), any(), any(), any());
 
         UserVm result = userVmManagerImpl.createVirtualMachine(deployVMCmd);
         assertEquals(userVmVoMock, result);
         Mockito.verify(vnfTemplateManager).validateVnfApplianceNics(templateMock, null);
         Mockito.verify(userVmManagerImpl).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), nullable(Boolean.class), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any());
+                any(), any(), any(), any(), eq(true), any(), any(), any());
     }
 
     private List<VolumeVO> mockVolumesForIsAnyVmVolumeUsingLocalStorageTest(int localVolumes, int nonLocalVolumes) {
@@ -1360,7 +1384,7 @@ public class UserVmManagerImplTest {
 
         Mockito.doThrow(cre).when(userVmManagerImpl).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
                 any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), nullable(Boolean.class), any(), any(), any(),
-                any(), any(), any(), any(), eq(true), any());
+                any(), any(), any(), any(), eq(true), any(), any(), any());
 
         CloudRuntimeException creThrown = assertThrows(CloudRuntimeException.class, () -> userVmManagerImpl.createVirtualMachine(deployVMCmd));
         ArrayList<ExceptionProxyObject> proxyIdList = creThrown.getIdProxyList();
@@ -3210,6 +3234,7 @@ public class UserVmManagerImplTest {
 
     @Test
     public void validateNullStorageAccessGroupsOnSrcHost() {
+
         Host srcHost = Mockito.mock(Host.class);
         Host destHost = Mockito.mock(Host.class);
 
@@ -3390,9 +3415,84 @@ public class UserVmManagerImplTest {
     }
 
     Map<String, String> getLeaseDetails(int leaseDuration, String leaseExecution) {
+
         Map<String, String> leaseDetails = new HashMap<>();
         leaseDetails.put(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE, getLeaseExpiryDate(leaseDuration));
         leaseDetails.put(VmDetailConstants.INSTANCE_LEASE_EXECUTION, leaseExecution);
         return leaseDetails;
     }
+
+    @Test
+    public void createVirtualMachineWithExistingVolume() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
+        DeployVMCmd deployVMCmd = new DeployVMCmd();
+        ReflectionTestUtils.setField(deployVMCmd, "zoneId", zoneId);
+        ReflectionTestUtils.setField(deployVMCmd, "serviceOfferingId", serviceOfferingId);
+        ReflectionTestUtils.setField(deployVMCmd, "volumeId", volumeId);
+        deployVMCmd._accountService = accountService;
+
+        when(accountService.finalyzeAccountId(nullable(String.class), nullable(Long.class), nullable(Long.class), eq(true))).thenReturn(accountId);
+        when(accountService.getActiveAccountById(accountId)).thenReturn(account);
+        when(entityManager.findById(DataCenter.class, zoneId)).thenReturn(_dcMock);
+        when(entityManager.findById(ServiceOffering.class, serviceOfferingId)).thenReturn(serviceOffering);
+        when(entityManager.findById(DiskOffering.class, serviceOffering.getId())).thenReturn(smallerDisdkOffering);
+        when(entityManager.findByIdIncludingRemoved(VirtualMachineTemplate.class, templateId)).thenReturn(templateMock);
+        when(volumeDataFactory.getVolume(volumeId)).thenReturn(volumeInfo);
+        when(volumeInfo.getTemplateId()).thenReturn(templateId);
+        when(volumeInfo.getInstanceId()).thenReturn(null);
+        when(volumeInfo.getDataStore()).thenReturn(primaryDataStore);
+        when(primaryDataStore.getScope()).thenReturn(scopeMock);
+        when(primaryDataStore.getScope().getScopeType()).thenReturn(ScopeType.ZONE);
+        when(templateMock.getTemplateType()).thenReturn(Storage.TemplateType.VNF);
+        when(templateMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        when(templateMock.isDeployAsIs()).thenReturn(false);
+        when(templateMock.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
+        when(templateMock.getUserDataId()).thenReturn(null);
+        Mockito.doNothing().when(vnfTemplateManager).validateVnfApplianceNics(any(), nullable(List.class));
+        when(_dcMock.isLocalStorageEnabled()).thenReturn(false);
+        when(_dcMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Basic);
+        Mockito.doReturn(userVmVoMock).when(userVmManagerImpl).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
+                any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), nullable(Boolean.class), any(), any(), any(),
+                any(), any(), any(), any(), eq(true), any(), any(), any());
+
+
+        userVmManagerImpl.createVirtualMachine(deployVMCmd);
+    }
+
+    @Test
+    public void createVirtualMachineWithExistingSnapshot() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
+        DeployVMCmd deployVMCmd = new DeployVMCmd();
+        ReflectionTestUtils.setField(deployVMCmd, "zoneId", zoneId);
+        ReflectionTestUtils.setField(deployVMCmd, "serviceOfferingId", serviceOfferingId);
+        ReflectionTestUtils.setField(deployVMCmd, "snapshotId", snashotId);
+        deployVMCmd._accountService = accountService;
+
+        when(accountService.finalyzeAccountId(nullable(String.class), nullable(Long.class), nullable(Long.class), eq(true))).thenReturn(accountId);
+        when(accountService.getActiveAccountById(accountId)).thenReturn(account);
+        when(entityManager.findById(DataCenter.class, zoneId)).thenReturn(_dcMock);
+        when(entityManager.findById(ServiceOffering.class, serviceOfferingId)).thenReturn(serviceOffering);
+        when(entityManager.findById(DiskOffering.class, serviceOffering.getId())).thenReturn(smallerDisdkOffering);
+        when(snapshotDaoMock.findById(snashotId)).thenReturn(snapshotMock);
+        when(entityManager.findByIdIncludingRemoved(VirtualMachineTemplate.class, templateId)).thenReturn(templateMock);
+        when(volumeDataFactory.getVolume(volumeId)).thenReturn(volumeInfo);
+        when(snapshotMock.getVolumeId()).thenReturn(volumeId);
+        when(volumeInfo.getTemplateId()).thenReturn(templateId);
+        when(volumeInfo.getInstanceId()).thenReturn(null);
+        when(volumeInfo.getDataStore()).thenReturn(primaryDataStore);
+        when(primaryDataStore.getScope()).thenReturn(scopeMock);
+        when(primaryDataStore.getScope().getScopeType()).thenReturn(ScopeType.ZONE);
+        when(templateMock.getTemplateType()).thenReturn(Storage.TemplateType.VNF);
+        when(templateMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        when(templateMock.isDeployAsIs()).thenReturn(false);
+        when(templateMock.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
+        when(templateMock.getUserDataId()).thenReturn(null);
+        Mockito.doNothing().when(vnfTemplateManager).validateVnfApplianceNics(any(), nullable(List.class));
+        when(_dcMock.isLocalStorageEnabled()).thenReturn(false);
+        when(_dcMock.getNetworkType()).thenReturn(DataCenter.NetworkType.Basic);
+        Mockito.doReturn(userVmVoMock).when(userVmManagerImpl).createBasicSecurityGroupVirtualMachine(any(), any(), any(), any(), any(), any(), any(),
+                any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), nullable(Boolean.class), any(), any(), any(),
+                any(), any(), any(), any(), eq(true), any(), any(), any());
+
+
+        userVmManagerImpl.createVirtualMachine(deployVMCmd);
+    }
 }
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 25d43388b65..3ac24d3985a 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -693,7 +693,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
             secStorageVm = createOrUpdateSecondaryStorageVm(secStorageVm, dataCenterId, id, name, serviceOffering,
                     template, systemAcct, role);
             try {
-                _itMgr.allocate(name, template, serviceOffering, networks, plan, template.getHypervisorType());
+                _itMgr.allocate(name, template, serviceOffering, networks, plan, template.getHypervisorType(), null, null);
                 secStorageVm = _secStorageVmDao.findById(secStorageVm.getId());
                 _itMgr.checkDeploymentPlan(secStorageVm, template, serviceOffering, systemAcct, plan);
                 break;
diff --git a/test/integration/plugins/storpool/test_storpool_tiers.py b/test/integration/plugins/storpool/test_storpool_tiers.py
index 71758c24bed..f41059e9206 100644
--- a/test/integration/plugins/storpool/test_storpool_tiers.py
+++ b/test/integration/plugins/storpool/test_storpool_tiers.py
@@ -26,7 +26,9 @@ from marvin.lib.base import (DiskOffering,
                              StoragePool,
                              VirtualMachine,
                              SecurityGroup,
-                             ResourceDetails
+                             ResourceDetails,
+                             Snapshot,
+                             Volume,
                              )
 from marvin.lib.common import (get_domain,
                                get_template,
@@ -167,6 +169,29 @@ class TestStorPoolTiers(cloudstackTestCase):
         cls.random_data_0 = random_gen(size=100)
         cls.test_dir = "/tmp"
         cls.random_data = "random.data"
+        cls.virtual_machine = VirtualMachine.create(
+            cls.apiclient,
+            {"name": "StorPool-%s" % uuid.uuid4()},
+            zoneid=cls.zone.id,
+            templateid=cls.template.id,
+            accountid=cls.account.name,
+            domainid=cls.account.domainid,
+            serviceofferingid=cls.service_offering.id,
+            overridediskofferingid=cls.disk_offerings_tier1_tags.id,
+            hypervisor=cls.hypervisor,
+            rootdisksize=10
+        )
+
+        volume = list_volumes(
+            cls.apiclient,
+            virtualmachineid=cls.virtual_machine.id,
+            type='ROOT',
+            listall=True
+        )[0]
+        cls.snapshot = Snapshot.create(
+            cls.apiclient,
+            volume.id,
+        )
         return
 
     @classmethod
@@ -200,6 +225,7 @@ class TestStorPoolTiers(cloudstackTestCase):
     def test_01_check_tags_on_deployed_vm_and_datadisk(self):
         virtual_machine_tier1_tag = self.deploy_vm_and_check_tier_tag()
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_02_change_offering_on_attached_root_disk(self):
@@ -213,6 +239,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     def test_03_change_offering_on_attached_data_disk(self):
         virtual_machine_tier1_tag = self.deploy_vm_and_check_tier_tag()
@@ -225,6 +252,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_04_check_templates_on_deployed_vm_and_datadisk(self):
@@ -246,6 +274,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         for v in volumes:
             self.check_storpool_template(v, self.disk_offerings_tier1_template.id, self.spTemplate)
         virtual_machine_template_tier1.stop(self.apiclient, forced=True)
+        virtual_machine_template_tier1.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_05_check_templates_on_deployed_vm_and_datadisk_tier2(self):
@@ -267,6 +296,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         for v in volumes:
             self.check_storpool_template(v, self.disk_offerings_tier2_template.id, self.spTemplate)
         virtual_machine_template_tier2.stop(self.apiclient, forced=True)
+        virtual_machine_template_tier2.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_06_change_offerings_with_tags_detached_volume(self):
@@ -300,6 +330,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.changeOfferingForVolume(volumes[0].id, self.disk_offerings_tier1_tags.id, volumes[0].size)
         self.vc_policy_tags(volumes=volumes, vm=virtual_machine_tier2_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier1_tags.id, attached=True)
+        virtual_machine_tier2_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_07_change_offerings_with_template_detached_volume(self):
@@ -332,6 +363,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.changeOfferingForVolume(volumes[0].id, self.disk_offerings_tier1_template.id, volumes[0].size)
         self.check_storpool_template(volume=volumes[0], disk_offering_id=self.disk_offerings_tier1_template.id,
                                      qos_or_template=self.spTemplate)
+        virtual_machine_tier2_template.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_08_deploy_vm_with_tags_and_template_in_offerings(self):
@@ -370,6 +402,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.changeOfferingForVolume(volumes[0].id, self.disk_offerings_tier1_tags.id, volumes[0].size)
         self.vc_policy_tags(volumes=volumes, vm=virtual_machine_tier2_template, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier1_tags.id, attached=True)
+        virtual_machine_tier2_template.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_09_resize_root_volume(self):
@@ -386,6 +419,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_10_shrink_root_volume(self):
@@ -403,6 +437,7 @@ class TestStorPoolTiers(cloudstackTestCase):
                                    listall=True)
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_11_resize_data_volume(self):
@@ -419,6 +454,7 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
 
     @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
     def test_12_shrink_data_volume(self):
@@ -436,6 +472,25 @@ class TestStorPoolTiers(cloudstackTestCase):
         self.vc_policy_tags(volumes=root_volume, vm=virtual_machine_tier1_tag, qos_or_template=self.qos,
                             disk_offering_id=self.disk_offerings_tier2_tags.id, attached=True)
         virtual_machine_tier1_tag.stop(self.apiclient, forced=True)
+        virtual_machine_tier1_tag.delete(self.apiclient, expunge=True)
+
+    @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+    def test_13_deploy_vm_from_volume_check_tags(self):
+        vm = self.deploy_vm_from_snapshot_or_template(snapshotid=self.snapshot.id, is_snapshot=False)
+        root_volume = list_volumes(self.apiclient, virtualmachineid=vm.id, type="ROOT",
+                               listall=True)
+        self.vc_policy_tags(volumes=root_volume, vm=vm, qos_or_template=self.qos,
+                            disk_offering_id=self.disk_offerings_tier1_tags.id, attached=True)
+        vm.delete(self.apiclient, expunge=True)
+
+    @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="true")
+    def test_14_deploy_vm_from_snapshot_check_tags(self):
+        vm = self.deploy_vm_from_snapshot_or_template(snapshotid=self.snapshot.id, is_snapshot=True)
+        root_volume = list_volumes(self.apiclient, virtualmachineid=vm.id, type="ROOT",
+                                   listall=True)
+        self.vc_policy_tags(volumes=root_volume, vm=vm, qos_or_template=self.qos,
+                            disk_offering_id=self.disk_offerings_tier1_tags.id, attached=True)
+        vm.delete(self.apiclient, expunge=True)
 
     def deploy_vm_and_check_tier_tag(self):
         virtual_machine_tier1_tag = VirtualMachine.create(
@@ -542,3 +597,45 @@ class TestStorPoolTiers(cloudstackTestCase):
         change_offering_for_volume_cmd.shrinkok = shrinkok
 
         return self.apiclient.changeOfferingForVolume(change_offering_for_volume_cmd)
+
+    def deploy_vm_from_snapshot_or_template(self, snapshotid, is_snapshot=False):
+        if is_snapshot:
+            virtual_machine = VirtualMachine.create(self.apiclient,
+                                                    {"name": "StorPool-%s" % uuid.uuid4()},
+                                                    zoneid=self.zone.id,
+                                                    accountid=self.account.name,
+                                                    domainid=self.account.domainid,
+                                                    serviceofferingid=self.service_offering.id,
+                                                    snapshotid=snapshotid,
+                                                    )
+            try:
+                ssh_client = virtual_machine.get_ssh_client()
+            except Exception as e:
+                self.fail("SSH failed for virtual machine: %s - %s" %
+                          (virtual_machine.ipaddress, e))
+
+            return virtual_machine
+        volume = Volume.create_from_snapshot(
+            self.apiclient,
+            snapshot_id=snapshotid,
+            services=self.services,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            disk_offering=self.disk_offerings_tier1_tags.id,
+            zoneid=self.zone.id,
+            size=10
+        )
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "StorPool-%s" % uuid.uuid4()},
+                                                zoneid=self.zone.id,
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                serviceofferingid=self.service_offering.id,
+                                                volumeid=volume.id,
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
+        return virtual_machine
diff --git a/test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py b/test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py
new file mode 100644
index 00000000000..871cf25a402
--- /dev/null
+++ b/test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py
@@ -0,0 +1,318 @@
+# 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.
+""" BVT tests for Virtual Machine Life Cycle
+"""
+# Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase
+
+from marvin.lib.utils import *
+
+from marvin.lib.base import (Account,
+                             Role,
+                             ServiceOffering,
+                             VirtualMachine,
+                             Host,
+                             StoragePool,
+                             Volume,
+                             DiskOffering,
+                             Snapshot,
+                             Template)
+from marvin.lib.common import (get_domain,
+                               get_zone,
+                               get_template,
+                               list_hosts,
+                               list_volumes,
+                               list_storage_pools)
+from marvin.codes import FAILED, PASS
+from nose.plugins.attrib import attr
+
+import uuid
+import unittest
+
+class TestDeployVMFromSnapshotOrVolume(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestDeployVMFromSnapshotOrVolume, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.apiclient)
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+        cls.services['mode'] = cls.zone.networktype
+        cls.hypervisor = testClient.getHypervisorInfo()
+
+        if cls.hypervisor.lower() != "kvm":
+            raise unittest.SkipTest("Only KVM hypervisor is supported for deployment of a VM with volume/snapshot")
+
+        cls.template = get_template(
+            cls.apiclient,
+            cls.zone.id,
+            account="system"
+        )
+        if cls.template == FAILED:
+            assert False, "get_template failed to return template with description [system]"
+
+        cls.services["small"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+
+        cls.account = Account.create(
+            cls.apiclient,
+            cls.services["account"],
+            domainid=cls.domain.id
+        )
+        cls._cleanup.append(cls.account)
+        cls.debug(cls.account.id)
+
+        storage_pools_response = list_storage_pools(cls.apiclient,
+                                                    zoneid=cls.zone.id,
+                                                    scope="ZONE")
+
+        if storage_pools_response:
+            cls.zone_wide_storage = storage_pools_response[0]
+
+            cls.debug(
+                "zone wide storage id is %s" %
+                cls.zone_wide_storage.id)
+            update1 = StoragePool.update(cls.apiclient,
+                                         id=cls.zone_wide_storage.id,
+                                         tags="test-vm"
+                                         )
+            cls.debug(
+                "Storage %s pool tag%s" %
+                (cls.zone_wide_storage.id, update1.tags))
+            cls.service_offering = ServiceOffering.create(
+                cls.apiclient,
+                cls.services["service_offerings"]["small"],
+                tags="test-vm"
+            )
+            cls._cleanup.append(cls.service_offering)
+
+            do = {
+                "name": "do-tags",
+                "displaytext": "Disk offering with tags",
+                "disksize":8,
+                "tags": "test-vm"
+            }
+            cls.disk_offering = DiskOffering.create(
+                cls.apiclient,
+                do,
+            )
+            cls._cleanup.append(cls.disk_offering)
+        else:
+            raise unittest.SkipTest("No zone wide storage found. Skipping tests")
+
+
+        cls.virtual_machine = VirtualMachine.create(
+            cls.apiclient,
+            cls.services["small"],
+            accountid=cls.account.name,
+            domainid=cls.account.domainid,
+            templateid=cls.template.id,
+            serviceofferingid=cls.service_offering.id,
+            mode=cls.services['mode']
+        )
+        volume = list_volumes(
+            cls.apiclient,
+            virtualmachineid=cls.virtual_machine.id,
+            type='ROOT',
+            listall=True
+        )[0]
+        cls.snapshot = Snapshot.create(
+            cls.apiclient,
+            volume.id,
+        )
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestDeployVMFromSnapshotOrVolume, cls).tearDownClass()
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+
+    def tearDown(self):
+        super(TestDeployVMFromSnapshotOrVolume, self).tearDown()
+
+    @attr(tags=["advanced"], required_hardware="false")
+    def test_01_deploy_vm_with_existing_volume(self):
+        '''
+            Deploy a Virtual machine with existing volume
+        '''
+        self.create_volume_from_snapshot_deploy_vm(self.snapshot.id)
+
+    @attr(tags=["advanced"], required_hardware="false")
+    def test_02_deploy_vm_with_existing_snapshot(self):
+        '''
+            Deploy a Virtual machine with existing snapshot
+        '''
+
+        self.deploy_vm_from_snapshot(self.snapshot)
+
+    @attr(tags=["advanced"], required_hardware="false")
+    def test_03_deploy_vm_with_existing_volume_deleted_template(self):
+        '''
+            Deploy a Virtual machine with existing ROOT volume created from a templated which was deleted
+        '''
+        services = {"displaytext": "Template-1", "name": "Template-1-name", "ostypeid": self.template.ostypeid,
+                    "ispublic": "true"}
+
+        template = Template.create_from_snapshot(self.apiclient, self.snapshot, services)
+        self._cleanup.append(template)
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "Test-%s" % uuid.uuid4()},
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                zoneid=self.zone.id,
+                                                serviceofferingid=self.service_offering.id,
+                                                templateid=template.id,
+                                                mode="basic",
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
+
+        root_volume = list_volumes(
+            self.apiclient,
+            virtualmachineid=virtual_machine.id,
+            type='ROOT',
+            listall=True
+        )[0]
+        snapshot = Snapshot.create(
+            self.apiclient,
+            root_volume.id,
+        )
+        VirtualMachine.delete(virtual_machine, self.apiclient, expunge=True)
+        self.create_volume_from_snapshot_deploy_vm(snapshot.id)
+
+    @attr(tags=["advanced"], required_hardware="false")
+    def test_04_deploy_vm_with_existing_snapshot_deleted_template(self):
+        '''
+            Deploy a Virtual machine with existing snapshot of a ROOT volume created from a templated which was deleted
+        '''
+        services = {"displaytext": "Template-1", "name": "Template-1-name", "ostypeid": self.template.ostypeid,
+                    "ispublic": "true"}
+
+        template = Template.create_from_snapshot(self.apiclient, self.snapshot, services)
+        self._cleanup.append(template)
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "Test-%s" % uuid.uuid4()},
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                zoneid=self.zone.id,
+                                                serviceofferingid=self.service_offering.id,
+                                                templateid=template.id,
+                                                mode="basic",
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
+
+        root_volume = list_volumes(
+            self.apiclient,
+            virtualmachineid=virtual_machine.id,
+            type='ROOT',
+            listall=True
+        )[0]
+        snapshot = Snapshot.create(
+            self.apiclient,
+            root_volume.id,
+        )
+        VirtualMachine.delete(virtual_machine, self.apiclient, expunge=True)
+        self.deploy_vm_from_snapshot(snapshot)
+
+    @attr(tags=["advanced"], required_hardware="false")
+    def test_05_deploy_vm_with_existing_snapshot_deleted_volume(self):
+        '''
+            Deploy a Virtual machine with existing snapshot of a ROOT volume which was deleted
+        '''
+
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "Test-%s" % uuid.uuid4()},
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                zoneid=self.zone.id,
+                                                serviceofferingid=self.service_offering.id,
+                                                templateid=self.template.id,
+                                                mode="basic",
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
+
+        root_volume = list_volumes(
+            self.apiclient,
+            virtualmachineid=virtual_machine.id,
+            type='ROOT',
+            listall=True
+        )[0]
+        snapshot = Snapshot.create(
+            self.apiclient,
+            root_volume.id,
+        )
+        VirtualMachine.delete(virtual_machine, self.apiclient, expunge=True)
+        self.deploy_vm_from_snapshot(snapshot)
+
+    def deploy_vm_from_snapshot(self, snapshot):
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "Test-%s" % uuid.uuid4()},
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                zoneid=self.zone.id,
+                                                serviceofferingid=self.service_offering.id,
+                                                snapshotid=snapshot.id,
+                                                mode="basic",
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
+
+    def create_volume_from_snapshot_deploy_vm(self, snapshotid):
+        volume = Volume.create_from_snapshot(
+            self.apiclient,
+            snapshot_id=snapshotid,
+            services=self.services,
+            disk_offering=self.disk_offering.id,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            zoneid=self.zone.id,
+        )
+        virtual_machine = VirtualMachine.create(self.apiclient,
+                                                {"name": "Test-%s" % uuid.uuid4()},
+                                                accountid=self.account.name,
+                                                domainid=self.account.domainid,
+                                                zoneid=self.zone.id,
+                                                serviceofferingid=self.service_offering.id,
+                                                volumeid=volume.id,
+                                                mode="basic",
+                                                )
+        try:
+            ssh_client = virtual_machine.get_ssh_client()
+        except Exception as e:
+            self.fail("SSH failed for virtual machine: %s - %s" %
+                      (virtual_machine.ipaddress, e))
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index ea0ba00545c..acd6a1450ed 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -528,7 +528,8 @@ class VirtualMachine:
                rootdiskcontroller=None, vpcid=None, macaddress=None, datadisktemplate_diskoffering_list={},
                properties=None, nicnetworklist=None, bootmode=None, boottype=None, dynamicscalingenabled=None,
                userdataid=None, userdatadetails=None, extraconfig=None, size=None, overridediskofferingid=None,
-               leaseduration=None, leaseexpiryaction=None):
+               leaseduration=None, leaseexpiryaction=None, volumeid=None, snapshotid=None):
+
         """Create the instance"""
 
         cmd = deployVirtualMachine.deployVirtualMachineCmd()
@@ -698,6 +699,12 @@ class VirtualMachine:
         if leaseexpiryaction:
             cmd.leaseexpiryaction = leaseexpiryaction
 
+        if volumeid:
+            cmd.volumeid = volumeid
+
+        if snapshotid:
+            cmd.snapshotid = snapshotid
+
         virtual_machine = apiclient.deployVirtualMachine(cmd, method=method)
 
         if 'password' in list(virtual_machine.__dict__.keys()):
@@ -1215,12 +1222,15 @@ class Volume:
 
     @classmethod
     def create_from_snapshot(cls, apiclient, snapshot_id, services,
-                             account=None, domainid=None, projectid=None):
+                             account=None, domainid=None, projectid=None, zoneid=None, disk_offering=None, size=None):
         """Create Volume from snapshot"""
         cmd = createVolume.createVolumeCmd()
         cmd.name = "-".join([services["diskname"], random_gen()])
         cmd.snapshotid = snapshot_id
-        cmd.zoneid = services["zoneid"]
+        if zoneid:
+            cmd.zoneid = zoneid
+        elif "zoneid" in services:
+            cmd.zoneid = services["zoneid"]
         if "size" in services:
             cmd.size = services["size"]
         if "ispublic" in services:
@@ -1239,6 +1249,12 @@ class Volume:
         if projectid:
             cmd.projectid = projectid
 
+        if disk_offering:
+            cmd.diskofferingid = disk_offering
+
+        if size:
+            cmd.size = size
+
         return Volume(apiclient.createVolume(cmd).__dict__)
 
     @classmethod
@@ -2736,10 +2752,13 @@ class DiskOffering:
         self.__dict__.update(items)
 
     @classmethod
-    def create(cls, apiclient, services, tags=None, custom=False, domainid=None, cacheMode=None, **kwargs):
+    def create(cls, apiclient, services, tags=None, custom=False, domainid=None, cacheMode=None, displaytext=None, **kwargs):
         """Create Disk offering"""
         cmd = createDiskOffering.createDiskOfferingCmd()
-        cmd.displaytext = services["displaytext"]
+        if displaytext:
+            cmd.displaytext = displaytext
+        else:
+            cmd.displaytext = services["displaytext"]
         cmd.name = services["name"]
         if custom:
             cmd.customized = True

From 06c80cdbe9149abdf86a20df27b620b379e5e1b4 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Mon, 14 Jul 2025 15:36:30 +0530
Subject: [PATCH 14/94] Remove unfinished usage job entries of the host
 (#10848)

---
 .../java/com/cloud/usage/dao/UsageJobDao.java |  2 +
 .../com/cloud/usage/dao/UsageJobDaoImpl.java  | 37 ++++++++++++++++++-
 .../com/cloud/usage/UsageManagerImpl.java     | 23 +++++-------
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java
index f22a906054d..d4038d4ceeb 100644
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java
@@ -37,4 +37,6 @@ public interface UsageJobDao extends GenericDao<UsageJobVO, Long> {
     UsageJobVO isOwner(String hostname, int pid);
 
     void updateJobSuccess(Long jobId, long startMillis, long endMillis, long execTime, boolean success);
+
+    void removeLastOpenJobsOwned(String hostname, int pid);
 }
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java
index 065dc309ebe..4c58062413d 100644
--- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -116,7 +117,7 @@ public class UsageJobDaoImpl extends GenericDaoBase<UsageJobVO, Long> implements
     public UsageJobVO isOwner(String hostname, int pid) {
         TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
         try {
-            if ((hostname == null) || (pid <= 0)) {
+            if (hostname == null || pid <= 0) {
                 return null;
             }
 
@@ -176,7 +177,7 @@ public class UsageJobDaoImpl extends GenericDaoBase<UsageJobVO, Long> implements
         SearchCriteria<UsageJobVO> sc = createSearchCriteria();
         sc.addAnd("endMillis", SearchCriteria.Op.EQ, Long.valueOf(0));
         sc.addAnd("jobType", SearchCriteria.Op.EQ, Integer.valueOf(UsageJobVO.JOB_TYPE_SINGLE));
-        sc.addAnd("scheduled", SearchCriteria.Op.EQ, Integer.valueOf(0));
+        sc.addAnd("scheduled", SearchCriteria.Op.EQ, Integer.valueOf(UsageJobVO.JOB_NOT_SCHEDULED));
         List<UsageJobVO> jobs = search(sc, filter);
 
         if ((jobs == null) || jobs.isEmpty()) {
@@ -196,4 +197,36 @@ public class UsageJobDaoImpl extends GenericDaoBase<UsageJobVO, Long> implements
         }
         return jobs.get(0).getHeartbeat();
     }
+
+    private List<UsageJobVO> getLastOpenJobsOwned(String hostname, int pid) {
+        SearchCriteria<UsageJobVO> sc = createSearchCriteria();
+        sc.addAnd("endMillis", SearchCriteria.Op.EQ, Long.valueOf(0));
+        sc.addAnd("host", SearchCriteria.Op.EQ, hostname);
+        if (pid > 0) {
+            sc.addAnd("pid", SearchCriteria.Op.EQ, Integer.valueOf(pid));
+        }
+        return listBy(sc);
+    }
+
+    @Override
+    public void removeLastOpenJobsOwned(String hostname, int pid) {
+        if (hostname == null) {
+            return;
+        }
+
+        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
+        try {
+            List<UsageJobVO> jobs = getLastOpenJobsOwned(hostname, pid);
+            if (CollectionUtils.isNotEmpty(jobs)) {
+                s_logger.info(String.format("Found %s opens job, to remove", jobs.size()));
+                for (UsageJobVO job : jobs) {
+                    s_logger.debug(String.format("Removing job - id: %d, pid: %d, job type: %d, scheduled: %d, heartbeat: %s",
+                            job.getId(), job.getPid(), job.getJobType(), job.getScheduled(), job.getHeartbeat()));
+                    remove(job.getId());
+                }
+            }
+        } finally {
+            txn.close();
+        }
+    }
 }
diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
index cc129a9ec5e..95475452164 100644
--- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -319,6 +319,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
             s_logger.info("Starting Usage Manager");
         }
 
+        _usageJobDao.removeLastOpenJobsOwned(_hostname, 0);
+        Runtime.getRuntime().addShutdownHook(new AbandonJob());
+
         // use the configured exec time and aggregation duration for scheduling the job
         _scheduledFuture =
                 _executor.scheduleAtFixedRate(this, _jobExecTime.getTimeInMillis() - System.currentTimeMillis(), _aggregationDuration * 60 * 1000, TimeUnit.MILLISECONDS);
@@ -331,7 +334,6 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
             _sanity = _sanityExecutor.scheduleAtFixedRate(new SanityCheck(), 1, _sanityCheckInterval, TimeUnit.DAYS);
         }
 
-        Runtime.getRuntime().addShutdownHook(new AbandonJob());
         TransactionLegacy usageTxn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
         try {
             if (_heartbeatLock.lock(3)) { // 3 second timeout
@@ -2255,17 +2257,17 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
                         // the aggregation range away from executing the next job
                         long now = System.currentTimeMillis();
                         long timeToJob = _jobExecTime.getTimeInMillis() - now;
-                        long timeSinceJob = 0;
+                        long timeSinceLastSuccessJob = 0;
                         long aggregationDurationMillis = _aggregationDuration * 60L * 1000L;
                         long lastSuccess = _usageJobDao.getLastJobSuccessDateMillis();
                         if (lastSuccess > 0) {
-                            timeSinceJob = now - lastSuccess;
+                            timeSinceLastSuccessJob = now - lastSuccess;
                         }
 
-                        if ((timeSinceJob > 0) && (timeSinceJob > (aggregationDurationMillis - 100))) {
+                        if ((timeSinceLastSuccessJob > 0) && (timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {
                             if (timeToJob > (aggregationDurationMillis / 2)) {
                                 if (s_logger.isDebugEnabled()) {
-                                    s_logger.debug("it's been " + timeSinceJob + " ms since last usage job and " + timeToJob +
+                                    s_logger.debug("it's been " + timeSinceLastSuccessJob + " ms since last usage job and " + timeToJob +
                                             " ms until next job, scheduling an immediate job to catch up (aggregation duration is " + _aggregationDuration + " minutes)");
                                 }
                                 scheduleParse();
@@ -2352,17 +2354,12 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
             }
         }
     }
+
     private class AbandonJob extends Thread {
         @Override
         public void run() {
-            s_logger.info("exitting Usage Manager");
-            deleteOpenjob();
-        }
-        private void deleteOpenjob() {
-            UsageJobVO job = _usageJobDao.isOwner(_hostname, _pid);
-            if (job != null) {
-                _usageJobDao.remove(job.getId());
-            }
+            s_logger.info("exiting Usage Manager");
+            _usageJobDao.removeLastOpenJobsOwned(_hostname, _pid);
         }
     }
 }

From 6059724189759470208a8e135744314119323534 Mon Sep 17 00:00:00 2001
From: Gabriel Pordeus Santos <gabriel.santos@scclouds.com.br>
Date: Mon, 14 Jul 2025 07:55:09 -0300
Subject: [PATCH 15/94] Hide CloudStack version from XML response when
 unauthenticated (#10575)

---
 .../cloud/api/response/ApiResponseSerializer.java  | 14 ++++++++++++--
 .../com/cloud/server/ManagementServerImpl.java     |  9 +++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
index c72c275c212..f40bbdf06ac 100644
--- a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
@@ -20,6 +20,7 @@ import com.cloud.api.ApiDBUtils;
 import com.cloud.api.ApiResponseGsonHelper;
 import com.cloud.api.ApiServer;
 import com.cloud.serializer.Param;
+import com.cloud.server.ManagementServerImpl;
 import com.cloud.user.Account;
 import com.cloud.utils.HttpUtils;
 import com.cloud.utils.encoding.URLEncoder;
@@ -171,9 +172,18 @@ public class ApiResponseSerializer {
         if (result != null && log != null) {
             StringBuilder sb = new StringBuilder();
             sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            sb.append("<").append(result.getResponseName()).append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\">");
             log.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            log.append("<").append(result.getResponseName()).append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\">");
+
+            sb.append("<").append(result.getResponseName());
+            log.append("<").append(result.getResponseName());
+
+            boolean authenticated = CallContext.current().getCallingAccount().getId() != Account.ACCOUNT_ID_SYSTEM;
+            if (ManagementServerImpl.exposeCloudStackVersionInApiXmlResponse.value() && authenticated) {
+                sb.append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\"");
+                log.append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\"");
+            }
+            sb.append(">");
+            log.append(">");
 
             if (result instanceof ListResponse) {
                 Integer count = ((ListResponse)result).getCount();
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 9ac4599f30e..e385c472779 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -870,6 +870,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     static final ConfigKey<Integer> sshKeyLength = new ConfigKey<>("Advanced", Integer.class, "ssh.key.length", "2048", "Specifies custom SSH key length (bit)", true, ConfigKey.Scope.Global);
     static final ConfigKey<Boolean> humanReadableSizes = new ConfigKey<>("Advanced", Boolean.class, "display.human.readable.sizes", "true", "Enables outputting human readable byte sizes to logs and usage records.", false, ConfigKey.Scope.Global);
     public static final ConfigKey<String> customCsIdentifier = new ConfigKey<>("Advanced", String.class, "custom.cs.identifier", UUID.randomUUID().toString().split("-")[0].substring(4), "Custom identifier for the cloudstack installation", true, ConfigKey.Scope.Global);
+    public static final ConfigKey<Boolean> exposeCloudStackVersionInApiXmlResponse = new ConfigKey<Boolean>("Advanced", Boolean.class, "expose.cloudstack.version.api.xml.response", "true", "Indicates whether ACS version should appear in the root element of an API XML response.", true, ConfigKey.Scope.Global);
+    public static final ConfigKey<Boolean> exposeCloudStackVersionInApiListCapabilities = new ConfigKey<Boolean>("Advanced", Boolean.class, "expose.cloudstack.version.api.list.capabilities", "true", "Indicates whether ACS version should show in the listCapabilities API.", true, ConfigKey.Scope.Global);
+
     private static final VirtualMachine.Type []systemVmTypes = { VirtualMachine.Type.SecondaryStorageVm, VirtualMachine.Type.ConsoleProxy};
     private static final List<HypervisorType> LIVE_MIGRATION_SUPPORTING_HYPERVISORS = List.of(HypervisorType.Hyperv, HypervisorType.KVM,
             HypervisorType.LXC, HypervisorType.Ovm, HypervisorType.Ovm3, HypervisorType.Simulator, HypervisorType.VMware, HypervisorType.XenServer);
@@ -4227,7 +4230,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {vmPasswordLength, sshKeyLength, humanReadableSizes, customCsIdentifier};
+        return new ConfigKey<?>[] {exposeCloudStackVersionInApiXmlResponse, exposeCloudStackVersionInApiListCapabilities, vmPasswordLength, sshKeyLength, humanReadableSizes, customCsIdentifier};
     }
 
     protected class EventPurgeTask extends ManagedContextRunnable {
@@ -4665,10 +4668,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
 
         final Integer fsVmMinCpu = Integer.parseInt(_configDao.getValue("sharedfsvm.min.cpu.count"));
         final Integer fsVmMinRam = Integer.parseInt(_configDao.getValue("sharedfsvm.min.ram.size"));
+        if (exposeCloudStackVersionInApiListCapabilities.value()) {
+            capabilities.put("cloudStackVersion", getVersion());
+        }
 
         capabilities.put("securityGroupsEnabled", securityGroupsEnabled);
         capabilities.put("userPublicTemplateEnabled", userPublicTemplateEnabled);
-        capabilities.put("cloudStackVersion", getVersion());
         capabilities.put("supportELB", supportELB);
         capabilities.put("projectInviteRequired", _projectMgr.projectInviteRequired());
         capabilities.put("allowusercreateprojects", _projectMgr.allowUserToCreateProject());

From fb6adacc512847778879af5ce3aa3b27c6f25394 Mon Sep 17 00:00:00 2001
From: Bryan Lima <42067040+BryanMLima@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:59:09 +0200
Subject: [PATCH 16/94] GUI whitelabel runtime system (#8942)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add first version

* Add guithemedetails join

* Update since and remove extra line

* Limit information on API response for non admin users

* Add base files for preset themes

* Add miising license

* Revert cookie check

* Fix imports

* Fix pre-commit

* Address log4j2 string to format review and add license to css files

* Fix infinite loading

* Move event details to service implementation

* Move view to a specific view file

* Refactoring gui theme classes

* Normalize package name

* Address Henrique review

* Fix create table SQL

* Add interface for Dao classes

* Remove extra tabs

* Address unauthorized call when 2FA is enabled

* Remove trailing whitespaces

* Apply suggestions from code review

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

---------

Co-authored-by: Henrique Sato <henriquesato2003@gmail.com>
Co-authored-by: Bernardo De Marco Gonçalves <bernardomg2004@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../main/java/com/cloud/event/EventTypes.java |   10 +
 .../apache/cloudstack/api/ApiConstants.java   |   16 +
 .../cloudstack/api/ResponseGenerator.java     |    4 +
 .../user/gui/theme/CreateGuiThemeCmd.java     |  129 ++
 .../user/gui/theme/ListGuiThemesCmd.java      |  110 ++
 .../user/gui/theme/RemoveGuiThemeCmd.java     |   60 +
 .../user/gui/theme/UpdateGuiThemeCmd.java     |  136 ++
 .../api/response/GuiThemeResponse.java        |  179 ++
 .../apache/cloudstack/gui/theme/GuiTheme.java |   61 +
 .../cloudstack/gui/theme/GuiThemeDetails.java |   36 +
 .../cloudstack/gui/theme/GuiThemeJoin.java    |   47 +
 .../cloudstack/gui/theme/GuiThemeService.java |   35 +
 .../gui/theme/GuiThemeDetailsVO.java          |   91 +
 .../cloudstack/gui/theme/GuiThemeJoinVO.java  |  141 ++
 .../cloudstack/gui/theme/GuiThemeVO.java      |  189 ++
 .../cloudstack/gui/theme/dao/GuiThemeDao.java |   24 +
 .../gui/theme/dao/GuiThemeDaoImpl.java        |   25 +
 .../gui/theme/dao/GuiThemeDetailsDao.java     |   30 +
 .../gui/theme/dao/GuiThemeDetailsDaoImpl.java |  126 ++
 .../gui/theme/dao/GuiThemeJoinDao.java        |   31 +
 .../gui/theme/dao/GuiThemeJoinDaoImpl.java    |  139 ++
 ...spring-engine-schema-core-daos-context.xml |    3 +
 .../META-INF/db/schema-42010to42100.sql       |   24 +
 .../db/views/cloud.gui_themes_view.sql        |   38 +
 .../java/com/cloud/utils/db/SearchBase.java   |    8 +
 .../com/cloud/utils/db/SearchCriteria.java    |    6 +-
 .../java/com/cloud/api/ApiResponseHelper.java |   29 +-
 .../main/java/com/cloud/api/ApiServer.java    |    4 +
 .../main/java/com/cloud/api/ApiServlet.java   |   17 +
 .../cloud/server/ManagementServerImpl.java    |    8 +
 .../gui/theme/GuiThemeServiceImpl.java        |  445 +++++
 .../spring-server-core-managers-context.xml   |    1 +
 .../gui/theme/GuiThemeServiceImplTest.java    |  215 +++
 tools/apidoc/gen_toc.py                       |    6 +-
 ui/public/assets/asf-logo.svg                 |  116 ++
 ui/public/assets/feather.svg                  |   89 +
 ui/public/config.json                         |    1 +
 ui/public/css/apache-theme.css                | 1169 ++++++++++++
 ui/public/css/dark-theme.css                  | 1592 +++++++++++++++++
 ui/public/index.html                          |    8 -
 ui/src/api/index.js                           |   11 +-
 ui/src/components/header/UserMenu.vue         |    6 +-
 ui/src/main.js                                |   18 +-
 ui/src/store/modules/user.js                  |    6 +-
 ui/src/utils/guiTheme.js                      |  100 ++
 45 files changed, 5519 insertions(+), 20 deletions(-)
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/CreateGuiThemeCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/ListGuiThemesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/RemoveGuiThemeCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/UpdateGuiThemeCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiTheme.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetails.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoin.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeService.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetailsVO.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoinVO.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeVO.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java
 create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java
 create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.gui_themes_view.sql
 create mode 100644 server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImplTest.java
 create mode 100644 ui/public/assets/asf-logo.svg
 create mode 100644 ui/public/assets/feather.svg
 create mode 100644 ui/public/css/apache-theme.css
 create mode 100644 ui/public/css/dark-theme.css
 create mode 100644 ui/src/utils/guiTheme.js

diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index c8694e076b8..27f507d3a75 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -809,6 +809,11 @@ public class EventTypes {
     public static final String VM_LEASE_CANCELLED = "VM.LEASE.CANCELLED";
     public static final String VM_LEASE_EXPIRING = "VM.LEASE.EXPIRING";
 
+    // GUI Theme
+    public static final String EVENT_GUI_THEME_CREATE = "GUI.THEME.CREATE";
+    public static final String EVENT_GUI_THEME_REMOVE = "GUI.THEME.REMOVE";
+    public static final String EVENT_GUI_THEME_UPDATE = "GUI.THEME.UPDATE";
+
     static {
 
         // TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@ -1312,6 +1317,11 @@ public class EventTypes {
         entityEventDetails.put(VM_LEASE_EXPIRING, VirtualMachine.class);
         entityEventDetails.put(VM_LEASE_DISABLED, VirtualMachine.class);
         entityEventDetails.put(VM_LEASE_CANCELLED, VirtualMachine.class);
+
+        // GUI theme
+        entityEventDetails.put(EVENT_GUI_THEME_CREATE, "GuiTheme");
+        entityEventDetails.put(EVENT_GUI_THEME_REMOVE, "GuiTheme");
+        entityEventDetails.put(EVENT_GUI_THEME_UPDATE, "GuiTheme");
     }
 
     public static boolean isNetworkEvent(String eventType) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 22e7e807502..882634ec6c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -1256,6 +1256,22 @@ public class ApiConstants {
 
     public static final String VMWARE_DC = "vmwaredc";
 
+    public static final String CSS = "css";
+
+    public static final String JSON_CONFIGURATION = "jsonconfiguration";
+
+    public static final String COMMON_NAMES = "commonnames";
+
+    public static final String COMMON_NAME = "commonname";
+
+    public static final String DOMAIN_IDS = "domainids";
+
+    public static final String SHOW_PUBLIC = "showpublic";
+
+    public static final String LIST_ONLY_DEFAULT_THEME = "listonlydefaulttheme";
+
+    public static final String RECURSIVE_DOMAINS = "recursivedomains";
+
     /**
      * This enum specifies IO Drivers, each option controls specific policies on I/O.
      * Qemu guests support "threads" and "native" options Since 0.8.8 ; "io_uring" is supported Since 6.3.0 (QEMU 5.0).
diff --git a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
index 3288eb58d75..d0683299e73 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
@@ -64,6 +64,7 @@ import org.apache.cloudstack.api.response.GuestOSResponse;
 import org.apache.cloudstack.api.response.GuestOsMappingResponse;
 import org.apache.cloudstack.api.response.GuestVlanRangeResponse;
 import org.apache.cloudstack.api.response.GuestVlanResponse;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
 import org.apache.cloudstack.api.response.HostForMigrationResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
@@ -150,6 +151,7 @@ import org.apache.cloudstack.config.ConfigurationGroup;
 import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
 import org.apache.cloudstack.direct.download.DirectDownloadCertificateHostMap;
 import org.apache.cloudstack.direct.download.DirectDownloadManager;
+import org.apache.cloudstack.gui.theme.GuiThemeJoin;
 import org.apache.cloudstack.management.ManagementServerHost;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
 import org.apache.cloudstack.region.PortableIp;
@@ -579,4 +581,6 @@ public interface ResponseGenerator {
     SharedFSResponse createSharedFSResponse(ResponseView view, SharedFS sharedFS);
 
     void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses, ResourceTag.ResourceObjectType type);
+
+    GuiThemeResponse createGuiThemeResponse(GuiThemeJoin guiThemeJoin);
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/CreateGuiThemeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/CreateGuiThemeCmd.java
new file mode 100644
index 00000000000..8566b413cc1
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/CreateGuiThemeCmd.java
@@ -0,0 +1,129 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gui.theme;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gui.theme.GuiTheme;
+import org.apache.cloudstack.gui.theme.GuiThemeJoin;
+import org.apache.cloudstack.gui.theme.GuiThemeService;
+
+import javax.inject.Inject;
+
+@APICommand(name = "createGuiTheme", description = "Creates a customized GUI theme for a set of Common Names (fixed or wildcard), a set of domain UUIDs, and/or a set of " +
+        "account UUIDs.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0.0", authorized = {RoleType.Admin})
+public class CreateGuiThemeCmd extends BaseCmd {
+
+    @Inject
+    GuiThemeService guiThemeService;
+
+    @Parameter(name = ApiConstants.NAME, required = true, type = CommandType.STRING, length = 2048, description = "A name to identify the theme.")
+    private String name;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, length = 4096, description = "A description for the theme.")
+    private String description;
+
+    @Parameter(name = ApiConstants.CSS, type = CommandType.STRING, length = 65535, description = "The CSS to be retrieved and imported into the GUI " +
+            "when matching the theme access configurations.")
+    private String css;
+
+    @Parameter(name = ApiConstants.JSON_CONFIGURATION, type = CommandType.STRING, length = 65535, description = "The JSON with the configurations to be " +
+            "retrieved and imported into the GUI when matching the theme access configurations.")
+    private String jsonConfiguration;
+
+    @Parameter(name = ApiConstants.COMMON_NAMES, type = CommandType.STRING, length = 65535, description = "A set of Common Names (CN) (fixed or " +
+            "wildcard) separated by comma that can retrieve the theme; e.g.: *acme.com,acme2.com")
+    private String commonNames;
+
+    @Parameter(name = ApiConstants.DOMAIN_IDS, type = CommandType.STRING, length = 65535, description = "A set of domain UUIDs (also known as ID for " +
+            "the end-user) separated by comma that can retrieve the theme.")
+    private String domainIds;
+
+    @Parameter(name = ApiConstants.ACCOUNT_IDS, type = CommandType.STRING, length = 65535, description = "A set of account UUIDs (also known as ID for" +
+            " the end-user) separated by comma that can retrieve the theme.")
+    private String accountIds;
+
+    @Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN, description = "Defines whether a theme can be retrieved by anyone when only " +
+            "the `commonNames` is informed. If the `domainIds` or `accountIds` is informed, it is considered as `false`.")
+    private Boolean isPublic = true;
+
+    @Parameter(name = ApiConstants.RECURSIVE_DOMAINS, type = CommandType.BOOLEAN, description = "Defines whether the subdomains of the informed domains are considered. Default " +
+            "value is false.")
+    private Boolean recursiveDomains = false;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getCss() {
+        return css;
+    }
+
+    public String getJsonConfiguration() {
+        return jsonConfiguration;
+    }
+
+    public String getCommonNames() {
+        return commonNames;
+    }
+
+    public String getDomainIds() {
+        return domainIds;
+    }
+
+    public String getAccountIds() {
+        return accountIds;
+    }
+
+    public Boolean getPublic() {
+        return isPublic;
+    }
+
+    public Boolean getRecursiveDomains() {
+        return recursiveDomains;
+    }
+
+    @Override
+    public void execute() {
+        GuiThemeJoin guiThemeJoin = guiThemeService.createGuiTheme(this);
+
+        if (guiThemeJoin == null) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create the GUI theme.");
+        }
+
+        GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiThemeJoin);
+        response.setResponseName(getCommandName());
+        this.setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/ListGuiThemesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/ListGuiThemesCmd.java
new file mode 100644
index 00000000000..35a0a749aa9
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/ListGuiThemesCmd.java
@@ -0,0 +1,110 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gui.theme;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.gui.theme.GuiTheme;
+import org.apache.cloudstack.gui.theme.GuiThemeService;
+
+import javax.inject.Inject;
+
+@APICommand(name = "listGuiThemes", description = "Lists GUI themes.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
+        since = "4.21.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.User, RoleType.DomainAdmin,
+        RoleType.ResourceAdmin})
+public class ListGuiThemesCmd extends BaseListCmd {
+
+    @Inject
+    GuiThemeService guiThemeService;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "The theme ID.", entityType = GuiThemeResponse.class)
+    private Long id;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "The name of the theme.")
+    private String name;
+
+    @Parameter(name = ApiConstants.COMMON_NAME, type = CommandType.STRING, description = "The internet Common Name (CN) to be filtered.")
+    private String commonName;
+
+    @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "The ID of the domain to be filtered.")
+    private Long domainId;
+
+    @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "The ID of the account to be filtered.")
+    private Long accountId;
+
+    @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "Whether to list all themes.")
+    private boolean listAll = false;
+
+    @Parameter(name = ApiConstants.SHOW_REMOVED, type = CommandType.BOOLEAN, description = "Whether to list removed themes.")
+    private boolean showRemoved = false;
+
+    @Parameter(name = ApiConstants.SHOW_PUBLIC, type = CommandType.BOOLEAN, description = "Whether to list public themes.")
+    private Boolean showPublic;
+
+    @Parameter(name = ApiConstants.LIST_ONLY_DEFAULT_THEME, type = CommandType.BOOLEAN, description = "Whether to only list the default theme.")
+    private boolean listOnlyDefaultTheme = false;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getCommonName() {
+        return commonName;
+    }
+
+    public Long getDomainId() {
+        return domainId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public boolean getListAll() {
+        return listAll;
+    }
+
+    public boolean getShowRemoved() {
+        return showRemoved;
+    }
+
+    public Boolean getShowPublic() {
+        return showPublic;
+    }
+
+    public boolean getListOnlyDefaultTheme() {
+        return listOnlyDefaultTheme;
+    }
+
+    @Override
+    public void execute() {
+        ListResponse<GuiThemeResponse> response = guiThemeService.listGuiThemes(this);
+        response.setResponseName(getCommandName());
+        this.setResponseObject(response);
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/RemoveGuiThemeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/RemoveGuiThemeCmd.java
new file mode 100644
index 00000000000..64164838eba
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/RemoveGuiThemeCmd.java
@@ -0,0 +1,60 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gui.theme;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gui.theme.GuiTheme;
+import org.apache.cloudstack.gui.theme.GuiThemeService;
+
+import javax.inject.Inject;
+
+@APICommand(name = "removeGuiTheme", description = "Removes an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
+        since = "4.21.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
+public class RemoveGuiThemeCmd extends BaseCmd {
+
+    @Inject
+    GuiThemeService guiThemeService;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GuiThemeResponse.class, required = true,
+            description = "The unique identifier of the GUI theme to be removed.")
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void execute() {
+        guiThemeService.removeGuiTheme(this);
+        final SuccessResponse response = new SuccessResponse();
+        response.setResponseName(getCommandName());
+        response.setSuccess(true);
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/UpdateGuiThemeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/UpdateGuiThemeCmd.java
new file mode 100644
index 00000000000..daef2235ce8
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/UpdateGuiThemeCmd.java
@@ -0,0 +1,136 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gui.theme;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gui.theme.GuiTheme;
+import org.apache.cloudstack.gui.theme.GuiThemeJoin;
+import org.apache.cloudstack.gui.theme.GuiThemeService;
+
+import javax.inject.Inject;
+
+
+@APICommand(name = "updateGuiTheme", description = "Updates an existing GUI theme.", responseObject = GuiThemeResponse.class, entityType = {GuiTheme.class},
+        since = "4.21.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
+public class UpdateGuiThemeCmd extends BaseCmd {
+
+    @Inject
+    GuiThemeService guiThemeService;
+
+    @Parameter(name = ApiConstants.ID, required = true, type = CommandType.UUID, entityType = GuiThemeResponse.class, description = "The ID of the theme to be updated.")
+    private Long id;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, length = 2048, description = "A name to identify the theme.")
+    private String name;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, length = 4096, description = "A description for the theme.")
+    private String description;
+
+    @Parameter(name = ApiConstants.CSS, type = CommandType.STRING, length = 65535, description = "The CSS to be retrieved and imported into the GUI " +
+            "when matching the theme access configurations.")
+    private String css;
+
+    @Parameter(name = ApiConstants.JSON_CONFIGURATION, type = CommandType.STRING, length = 65535, description = "The JSON with the configurations to be " +
+            "retrieved and imported into the GUI when matching the theme access configurations.")
+    private String jsonConfiguration;
+
+    @Parameter(name = ApiConstants.COMMON_NAMES, type = CommandType.STRING, length = 65535, description = "A set of Common Names (CN) (fixed or " +
+            "wildcard) separated by comma that can retrieve the theme; e.g.: *acme.com,acme2.com")
+    private String commonNames;
+
+    @Parameter(name = ApiConstants.DOMAIN_IDS, type = CommandType.STRING, length = 65535, description = "A set of domain UUIDs (also known as ID for " +
+            "the end-user) separated by comma that can retrieve the theme.")
+    private String domainIds;
+
+    @Parameter(name = ApiConstants.RECURSIVE_DOMAINS, type = CommandType.BOOLEAN, description = "Defines whether the subdomains of the informed domains are considered. Default " +
+            "value is false.")
+    private Boolean recursiveDomains = false;
+
+    @Parameter(name = ApiConstants.ACCOUNT_IDS, type = CommandType.STRING, length = 65535, description = "A set of account UUIDs (also known as ID for" +
+            " the end-user) separated by comma that can retrieve the theme.")
+    private String accountIds;
+
+    @Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN, description = "Defines whether a theme can be retrieved by anyone when only " +
+            "the `commonNames` is informed. If the `domainIds` or `accountIds` is informed, it is considered as `false`.")
+    private Boolean isPublic = true;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getCss() {
+        return css;
+    }
+
+    public String getJsonConfiguration() {
+        return jsonConfiguration;
+    }
+
+    public String getCommonNames() {
+        return commonNames;
+    }
+
+    public String getDomainIds() {
+        return domainIds;
+    }
+
+    public String getAccountIds() {
+        return accountIds;
+    }
+
+    public Boolean getRecursiveDomains() {
+        return recursiveDomains;
+    }
+
+    public Boolean getIsPublic() {
+        return isPublic;
+    }
+
+    @Override
+    public void execute() {
+        GuiThemeJoin guiThemeJoin = guiThemeService.updateGuiTheme(this);
+
+        if (guiThemeJoin == null) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update the GUI theme.");
+        }
+
+        GuiThemeResponse response = _responseGenerator.createGuiThemeResponse(guiThemeJoin);
+        response.setResponseName(getCommandName());
+        this.setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java
new file mode 100644
index 00000000000..fe8a85b4176
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java
@@ -0,0 +1,179 @@
+//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.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.gui.theme.GuiThemeJoin;
+
+import java.util.Date;
+
+@EntityReference(value = {GuiThemeJoin.class})
+public class GuiThemeResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the custom GUI theme.")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the GUI theme.")
+    private String name;
+
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "Description of the GUI theme.")
+    private String description;
+
+    @SerializedName(ApiConstants.CSS)
+    @Param(description = "The CSS to be retrieved and imported into the GUI when matching the theme access configurations.")
+    private String css;
+
+    @SerializedName(ApiConstants.JSON_CONFIGURATION)
+    @Param(description = "The JSON with the configurations to be retrieved and imported into the GUI when matching the theme access configurations.")
+    private String jsonConfiguration;
+
+    @SerializedName(ApiConstants.COMMON_NAMES)
+    @Param(description = "A set of Common Names (CN) (fixed or wildcard) separated by comma that can retrieve the theme; e.g.: *acme.com,acme2.com")
+    private String commonNames;
+
+    @SerializedName(ApiConstants.DOMAIN_IDS)
+    @Param(description = "A set of domain UUIDs (also known as ID for the end-user) separated by comma that can retrieve the theme.")
+    private String domainIds;
+
+    @SerializedName(ApiConstants.RECURSIVE_DOMAINS)
+    @Param(description = "Whether to consider the subdomains of the informed domain IDs.")
+    private Boolean recursiveDomains;
+
+    @SerializedName(ApiConstants.ACCOUNT_IDS)
+    @Param(description = "A set of account UUIDs (also known as ID for the end-user) separated by comma that can retrieve the theme.")
+    private String accountIds;
+
+    @SerializedName(ApiConstants.IS_PUBLIC)
+    @Param(description = "Defines whether a theme can be retrieved by anyone when only the `commonNames` is informed. If the `domainIds` or `accountIds` is informed, it is " +
+            "considered as `false`.")
+    private Boolean isPublic;
+
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "When the GUI theme was created.")
+    private Date created;
+
+    @SerializedName(ApiConstants.REMOVED)
+    @Param(description = "When the GUI theme was removed.")
+    private Date removed;
+
+    public GuiThemeResponse() {
+        super("guiThemes");
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCss() {
+        return css;
+    }
+
+    public void setCss(String css) {
+        this.css = css;
+    }
+
+    public String getJsonConfiguration() {
+        return jsonConfiguration;
+    }
+
+    public void setJsonConfiguration(String jsonConfiguration) {
+        this.jsonConfiguration = jsonConfiguration;
+    }
+
+    public String getCommonNames() {
+        return commonNames;
+    }
+
+    public void setCommonNames(String commonNames) {
+        this.commonNames = commonNames;
+    }
+
+    public String getDomainIds() {
+        return domainIds;
+    }
+
+    public void setDomainIds(String domainIds) {
+        this.domainIds = domainIds;
+    }
+
+    public String getAccountIds() {
+        return accountIds;
+    }
+
+    public void setAccountIds(String accountIds) {
+        this.accountIds = accountIds;
+    }
+
+    public Boolean getPublic() {
+        return isPublic;
+    }
+
+    public void setPublic(Boolean aPublic) {
+        isPublic = aPublic;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public Boolean getRecursiveDomains() {
+        return recursiveDomains;
+    }
+
+    public void setRecursiveDomains(Boolean recursiveDomains) {
+        this.recursiveDomains = recursiveDomains;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gui/theme/GuiTheme.java b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiTheme.java
new file mode 100644
index 00000000000..0cca8bc2d7d
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiTheme.java
@@ -0,0 +1,61 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import java.util.Date;
+
+public interface GuiTheme extends InternalIdentity, Identity {
+
+    String getName();
+
+    String getDescription();
+
+    String getCss();
+
+    String getJsonConfiguration();
+
+    Date getCreated();
+
+    Date getRemoved();
+
+    boolean getIsPublic();
+
+    void setId(Long id);
+
+    void setUuid(String uuid);
+
+    void setName(String name);
+
+    void setDescription(String description);
+
+    void setCss(String css);
+
+    void setJsonConfiguration(String jsonConfiguration);
+
+    void setCreated(Date created);
+
+    void setRemoved(Date removed);
+
+    void setIsPublic(boolean isPublic);
+
+    boolean isRecursiveDomains();
+
+    void setRecursiveDomains(boolean recursiveDomains);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetails.java b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetails.java
new file mode 100644
index 00000000000..164535033d9
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetails.java
@@ -0,0 +1,36 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface GuiThemeDetails extends InternalIdentity {
+
+    void setId(Long id);
+
+    Long getGuiThemeId();
+
+    void setGuiThemeId(Long guiThemeId);
+
+    String getType();
+
+    void setType(String type);
+
+    String getValue();
+
+    void setValue(String value);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoin.java b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoin.java
new file mode 100644
index 00000000000..e54d53138ef
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoin.java
@@ -0,0 +1,47 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import java.util.Date;
+
+public interface GuiThemeJoin extends InternalIdentity, Identity {
+
+    String getName();
+
+    String getDescription();
+
+    String getCss();
+
+    String getJsonConfiguration();
+
+    String getCommonNames();
+
+    String getDomains();
+
+    String getAccounts();
+
+    boolean isRecursiveDomains();
+
+    boolean getIsPublic();
+
+    Date getCreated();
+
+    Date getRemoved();
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeService.java b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeService.java
new file mode 100644
index 00000000000..8a066d3ffec
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeService.java
@@ -0,0 +1,35 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import org.apache.cloudstack.api.command.user.gui.theme.CreateGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.RemoveGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.UpdateGuiThemeCmd;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+
+public interface GuiThemeService {
+
+    ListResponse<GuiThemeResponse> listGuiThemes(ListGuiThemesCmd cmd);
+
+    GuiThemeJoin createGuiTheme(CreateGuiThemeCmd cmd);
+
+    GuiThemeJoin updateGuiTheme(UpdateGuiThemeCmd cmd);
+
+    void removeGuiTheme(RemoveGuiThemeCmd cmd);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetailsVO.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetailsVO.java
new file mode 100644
index 00000000000..046a19c59fa
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetailsVO.java
@@ -0,0 +1,91 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "gui_themes_details")
+public class GuiThemeDetailsVO implements GuiThemeDetails {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "gui_theme_id", nullable = false)
+    private Long guiThemeId;
+
+    @Column(name = "type", nullable = false, length = 100)
+    private String type;
+
+    @Column(name = "value", nullable = false, length = 65535)
+    private String value;
+
+    public GuiThemeDetailsVO() {
+    }
+
+    public GuiThemeDetailsVO(Long guiThemeId, String type, String value) {
+        this.guiThemeId = guiThemeId;
+        this.type = type;
+        this.value = value;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public Long getGuiThemeId() {
+        return guiThemeId;
+    }
+
+    @Override
+    public void setGuiThemeId(Long guiThemeId) {
+        this.guiThemeId = guiThemeId;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoinVO.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoinVO.java
new file mode 100644
index 00000000000..2df23b3d106
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoinVO.java
@@ -0,0 +1,141 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import com.cloud.utils.db.GenericDao;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+
+@Entity
+@Table(name = "gui_themes_view")
+public class GuiThemeJoinVO implements GuiThemeJoin {
+    @Id
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "uuid", nullable = false)
+    private String uuid;
+
+    @Column(name = "name", nullable = false, length = 2048)
+    private String name;
+
+    @Column(name = "description", length = 4096)
+    private String description;
+
+    @Column(name = "css", nullable = false, length = 65535)
+    private String css;
+
+    @Column(name = "json_configuration", nullable = false, length = 65535)
+    private String jsonConfiguration;
+
+    @Column(name = "common_names", length = 65535)
+    private String commonNames;
+
+    @Column(name = "domains", length = 65535)
+    private String domains;
+
+    @Column(name = "accounts", length = 65535)
+    private String accounts;
+
+    @Column(name = "recursive_domains")
+    private boolean recursiveDomains;
+
+    @Column(name = "is_public")
+    private boolean isPublic;
+
+    @Column(name = GenericDao.CREATED_COLUMN, nullable = false)
+    @Temporal(value = TemporalType.TIMESTAMP)
+    private Date created;
+
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    @Temporal(value = TemporalType.TIMESTAMP)
+    private Date removed = null;
+
+    public GuiThemeJoinVO() {
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public String getCss() {
+        return css;
+    }
+
+    @Override
+    public String getJsonConfiguration() {
+        return jsonConfiguration;
+    }
+
+    @Override
+    public String getCommonNames() {
+        return commonNames;
+    }
+
+    @Override
+    public String getDomains() {
+        return domains;
+    }
+
+    @Override
+    public String getAccounts() {
+        return accounts;
+    }
+
+    @Override
+    public boolean isRecursiveDomains() {
+        return recursiveDomains;
+    }
+
+    @Override
+    public boolean getIsPublic() {
+        return isPublic;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    @Override
+    public Date getRemoved() {
+        return removed;
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeVO.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeVO.java
new file mode 100644
index 00000000000..887e3886f6c
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeVO.java
@@ -0,0 +1,189 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+import java.util.UUID;
+
+@Entity
+@Table(name = "gui_themes")
+public class GuiThemeVO implements GuiTheme {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "uuid", nullable = false)
+    private String uuid = UUID.randomUUID().toString();
+
+    @Column(name = "name", nullable = false, length = 2048)
+    private String name;
+
+    @Column(name = "description", length = 4096)
+    private String description;
+
+    @Column(name = "css", length = 65535)
+    private String css;
+
+    @Column(name = "json_configuration", length = 65535)
+    private String jsonConfiguration;
+
+    @Column(name = "is_public")
+    private boolean isPublic;
+
+    @Column(name = "recursive_domains")
+    private boolean recursiveDomains = false;
+
+    @Column(name = GenericDao.CREATED_COLUMN, nullable = false)
+    @Temporal(value = TemporalType.TIMESTAMP)
+    private Date created;
+
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    @Temporal(value = TemporalType.TIMESTAMP)
+    private Date removed = null;
+
+    public GuiThemeVO() {
+
+    }
+
+    public GuiThemeVO(String name, String description, String css, String jsonConfiguration, boolean recursiveDomains, boolean isPublic, Date created, Date removed) {
+        this.name = name;
+        this.description = description;
+        this.css = css;
+        this.jsonConfiguration = jsonConfiguration;
+        this.recursiveDomains = recursiveDomains;
+        this.isPublic = isPublic;
+        this.created = created;
+        this.removed = removed;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public String getCss() {
+        return css;
+    }
+
+    @Override
+    public String getJsonConfiguration() {
+        return jsonConfiguration;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    @Override
+    public Date getRemoved() {
+        return removed;
+    }
+
+    @Override
+    public boolean getIsPublic() {
+        return isPublic;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public void setCss(String css) {
+        this.css = css;
+    }
+
+    @Override
+    public void setJsonConfiguration(String jsonConfiguration) {
+        this.jsonConfiguration = jsonConfiguration;
+    }
+
+    @Override
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    @Override
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    @Override
+    public void setIsPublic(boolean isPublic) {
+        this.isPublic = isPublic;
+    }
+
+    @Override
+    public boolean isRecursiveDomains() {
+        return recursiveDomains;
+    }
+
+    @Override
+    public void setRecursiveDomains(boolean recursiveDomains) {
+        this.recursiveDomains = recursiveDomains;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "uuid", "name", "description", "isPublic", "recursiveDomains");
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java
new file mode 100644
index 00000000000..c00aedcc786
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java
@@ -0,0 +1,24 @@
+// 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
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeVO;
+
+public interface GuiThemeDao extends GenericDao<GuiThemeVO, Long> {
+
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java
new file mode 100644
index 00000000000..bc58c5f80f3
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java
@@ -0,0 +1,25 @@
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.db.GenericDaoBase;
+import org.apache.cloudstack.gui.theme.GuiThemeVO;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GuiThemeDaoImpl extends GenericDaoBase<GuiThemeVO, Long> implements GuiThemeDao {
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java
new file mode 100644
index 00000000000..af243b1ffa4
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java
@@ -0,0 +1,30 @@
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeDetailsVO;
+
+import java.util.List;
+
+public interface GuiThemeDetailsDao extends GenericDao<GuiThemeDetailsVO, Long> {
+    List<Long> listGuiThemeIdsByCommonName(String commonName);
+
+    List<Long> listGuiThemeIdsByDomainUuids(String domainUuid);
+
+    void expungeByGuiThemeId(long guiThemeId);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java
new file mode 100644
index 00000000000..b0969833eb0
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java
@@ -0,0 +1,126 @@
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.gui.theme.GuiThemeDetailsVO;
+import org.apache.cloudstack.gui.theme.GuiThemeVO;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class GuiThemeDetailsDaoImpl extends GenericDaoBase<GuiThemeDetailsVO, Long> implements GuiThemeDetailsDao {
+
+    @Inject
+    DomainDao domainDao;
+
+    @Inject
+    GuiThemeDao guiThemeDao;
+
+    public List<Long> listGuiThemeIdsByCommonName(String commonName) {
+        GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsDaoSearchBuilder = createSearchBuilder(Long.class);
+        detailsDaoSearchBuilder.selectFields(detailsDaoSearchBuilder.entity().getGuiThemeId());
+        detailsDaoSearchBuilder.and("commonNameType", detailsDaoSearchBuilder.entity().getType(), SearchCriteria.Op.EQ);
+        detailsDaoSearchBuilder.and().op("firstReplace", detailsDaoSearchBuilder.entity().getValue(), SearchCriteria.Op.LIKE_REPLACE);
+        detailsDaoSearchBuilder.or("secondReplace", detailsDaoSearchBuilder.entity().getValue(), SearchCriteria.Op.LIKE_REPLACE).cp();
+        detailsDaoSearchBuilder.done();
+
+        SearchCriteria<Long> searchCriteria = detailsDaoSearchBuilder.create();
+        searchCriteria.setParameters("commonNameType", "commonName");
+        searchCriteria.setParameters("firstReplace", commonName, "*", "%");
+        searchCriteria.setParameters("secondReplace", commonName, "*.", "%");
+
+        return customSearch(searchCriteria, null);
+    }
+
+    public List<Long> listGuiThemeIdsByDomainUuids(String domainUuid) {
+        List<Long> guiThemeIds = new ArrayList<>();
+        String requestedDomainPath = domainDao.findByUuid(domainUuid).getPath();
+
+        SearchBuilder<DomainVO> domainSearchBuilderPathLike = domainDao.createSearchBuilder();
+        domainSearchBuilderPathLike.and("pathLike", domainSearchBuilderPathLike.entity().getPath(), SearchCriteria.Op.LIKE_CONCAT);
+
+        SearchBuilder<DomainVO> domainSearchBuilderPathEq = domainDao.createSearchBuilder();
+        domainSearchBuilderPathEq.and("pathEq", domainSearchBuilderPathEq.entity().getPath(), SearchCriteria.Op.EQ);
+
+        GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsSearchBuilderPathLike = createDetailsSearchBuilder(domainSearchBuilderPathLike);
+        SearchCriteria<Long> searchCriteriaDomainPathLike = setParametersDomainPathLike(detailsSearchBuilderPathLike, requestedDomainPath);
+
+        GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsSearchBuilderPathEq = createDetailsSearchBuilder(domainSearchBuilderPathEq);
+        SearchCriteria<Long> searchCriteriaDomainPathEq = setParametersDomainPathEq(detailsSearchBuilderPathEq, requestedDomainPath);
+
+        guiThemeIds.addAll(customSearch(searchCriteriaDomainPathLike, null));
+        guiThemeIds.addAll(customSearch(searchCriteriaDomainPathEq, null));
+        return guiThemeIds;
+    }
+
+    private SearchCriteria<Long> setParametersDomainPathLike(GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsSearchBuilderPathLike, String requestedDomainPath) {
+        SearchCriteria<Long> searchCriteria = detailsSearchBuilderPathLike.create();
+        searchCriteria.setParameters("domainUuidType", "domain");
+        searchCriteria.setJoinParameters("domainJoin", "pathLike", requestedDomainPath, "%");
+        searchCriteria.setJoinParameters("guiThemesJoin", "recursiveDomains", true);
+
+        return searchCriteria;
+    }
+
+    private SearchCriteria<Long> setParametersDomainPathEq(GenericSearchBuilder<GuiThemeDetailsVO, Long> detailsSearchBuilderPathEq, String requestedDomainPath) {
+        SearchCriteria<Long> searchCriteria = detailsSearchBuilderPathEq.create();
+        searchCriteria.setParameters("domainUuidType", "domain");
+        searchCriteria.setJoinParameters("domainJoin", "pathEq", requestedDomainPath);
+        searchCriteria.setJoinParameters("guiThemesJoin", "recursiveDomains", false);
+
+        return searchCriteria;
+    }
+
+    private GenericSearchBuilder<GuiThemeDetailsVO, Long> createDetailsSearchBuilder(SearchBuilder<DomainVO> domainSearchBuilder) {
+        SearchBuilder<GuiThemeVO> guiThemeDaoSearchBuilder = guiThemeDao.createSearchBuilder();
+        guiThemeDaoSearchBuilder.and("recursiveDomains", guiThemeDaoSearchBuilder.entity().isRecursiveDomains(), SearchCriteria.Op.EQ);
+
+        GenericSearchBuilder<GuiThemeDetailsVO, Long> guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder = createSearchBuilder(Long.class);
+        guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.selectFields(guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.entity().getGuiThemeId());
+        guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.and("domainUuidType", guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.entity().getType(), SearchCriteria.Op.EQ);
+        guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.join("domainJoin", domainSearchBuilder, domainSearchBuilder.entity().getUuid(),
+                guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.entity().getValue(), JoinBuilder.JoinType.INNER);
+        guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.join("guiThemesJoin", guiThemeDaoSearchBuilder, guiThemeDaoSearchBuilder.entity().getId(),
+                guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.entity().getGuiThemeId(), JoinBuilder.JoinType.INNER);
+
+        domainSearchBuilder.done();
+        guiThemeDaoSearchBuilder.done();
+        guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder.done();
+
+        return guiThemesDetailsJoinDomainJoinGuiThemesSearchBuilder;
+    }
+
+    public void expungeByGuiThemeId(long guiThemeId) {
+        SearchBuilder<GuiThemeDetailsVO> searchBuilder = createSearchBuilder();
+        searchBuilder.and("guiThemeId", searchBuilder.entity().getGuiThemeId(), SearchCriteria.Op.EQ);
+        searchBuilder.done();
+
+        SearchCriteria<GuiThemeDetailsVO> searchCriteria = searchBuilder.create();
+        searchCriteria.setParameters("guiThemeId", guiThemeId);
+        expunge(searchCriteria);
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java
new file mode 100644
index 00000000000..740199cfca7
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java
@@ -0,0 +1,31 @@
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gui.theme.GuiThemeJoinVO;
+
+import java.util.List;
+
+public interface GuiThemeJoinDao extends GenericDao<GuiThemeJoinVO, Long> {
+    GuiThemeJoinVO findDefaultTheme();
+
+    Pair<List<GuiThemeJoinVO>, Integer> listGuiThemesWithNoAuthentication(String commonName);
+
+    Pair<List<GuiThemeJoinVO>, Integer> listGuiThemes(Long id, String name, String commonName, String domainUuid, String accountUuid, boolean listAll, boolean showRemoved, Boolean showPublic);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java
new file mode 100644
index 00000000000..ce6f7055812
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java
@@ -0,0 +1,139 @@
+// 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.
+package org.apache.cloudstack.gui.theme.dao;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.gui.theme.GuiThemeJoinVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class GuiThemeJoinDaoImpl extends GenericDaoBase<GuiThemeJoinVO, Long> implements GuiThemeJoinDao {
+    @Inject
+    GuiThemeDetailsDao guiThemeDetailsDao;
+
+    public static final Long INVALID_ID = -1L;
+
+    public GuiThemeJoinVO findDefaultTheme() {
+        SearchBuilder<GuiThemeJoinVO> searchBuilder = createSearchBuilder();
+        searchBuilder.and("commonNames", searchBuilder.entity().getCommonNames(), SearchCriteria.Op.NULL);
+        searchBuilder.and("domainUuids", searchBuilder.entity().getDomains(), SearchCriteria.Op.NULL);
+        searchBuilder.and("accountUuids", searchBuilder.entity().getAccounts(), SearchCriteria.Op.NULL);
+        searchBuilder.done();
+
+        SearchCriteria<GuiThemeJoinVO> searchCriteria = searchBuilder.create();
+
+        return findOneBy(searchCriteria);
+    }
+
+    public Pair<List<GuiThemeJoinVO>, Integer> listGuiThemesWithNoAuthentication(String commonName) {
+        SearchCriteria<GuiThemeJoinVO> searchCriteria = createGuiThemeSearchCriteria(null, null, commonName, null, null, null, false);
+        return searchOrderByCreatedDate(searchCriteria, false);
+    }
+
+    public Pair<List<GuiThemeJoinVO>, Integer> listGuiThemes(Long id, String name, String commonName, String domainUuid, String accountUuid, boolean listAll,
+                                                             boolean showRemoved, Boolean showPublic) {
+        SearchCriteria<GuiThemeJoinVO> searchCriteria = createGuiThemeSearchCriteria(id, name, commonName, domainUuid, accountUuid, showPublic, listAll);
+
+        if (listAll) {
+            showRemoved = false;
+        }
+
+        return searchOrderByCreatedDate(searchCriteria, showRemoved);
+    }
+
+    private Pair<List<GuiThemeJoinVO>, Integer> searchOrderByCreatedDate(SearchCriteria<GuiThemeJoinVO> searchCriteria, boolean showRemoved) {
+        Filter filter = new Filter(GuiThemeJoinVO.class, "created", false);
+        return searchAndCount(searchCriteria, filter, showRemoved);
+    }
+
+    private SearchCriteria<GuiThemeJoinVO> createGuiThemeSearchCriteria(Long id, String name, String commonName, String domainUuid, String accountUuid, Boolean showPublic, boolean listAll) {
+        SearchCriteria<GuiThemeJoinVO> searchCriteria = createGuiThemeJoinSearchBuilder(listAll, showPublic).create();
+        List<Long> idList = new ArrayList<>();
+
+        if (id != null) {
+            idList.add(id);
+        }
+
+        searchCriteria.setParametersIfNotNull("name", name);
+        searchCriteria.setParametersIfNotNull("isPublic", showPublic);
+
+        if (StringUtils.isNotBlank(accountUuid)) {
+            searchCriteria.setParameters("accountUuid", "%" + accountUuid + "%");
+        }
+
+        if (StringUtils.isNotBlank(commonName)) {
+            setGuiThemeIdsFilteredByType(idList, ApiConstants.COMMON_NAME, commonName);
+        }
+
+        if (StringUtils.isNotBlank(domainUuid)) {
+            setGuiThemeIdsFilteredByType(idList, ApiConstants.DOMAIN, domainUuid);
+        }
+
+        searchCriteria.setParametersIfNotNull("idIn", idList.toArray());
+
+        return searchCriteria;
+    }
+
+    /**
+     * Sets the `id IN ( )` clause of the query. If the informed value of common name or domain ID does not retrieve any GUI theme ID; then, an invalid ID (-1) is passed to the
+     * list, as not a single entity has this ID. This is necessary as to set the parameter even if it did not find any GUI theme ID; otherwise, the query would not filter the
+     * common name or domain ID passed.
+     */
+    public void setGuiThemeIdsFilteredByType(List<Long> idList, String type, String value) {
+        List<Long> guiThemeIdsFilteredByType = new ArrayList<>();
+
+        switch (type) {
+            case ApiConstants.COMMON_NAME:
+                guiThemeIdsFilteredByType = guiThemeDetailsDao.listGuiThemeIdsByCommonName(value);
+                break;
+            case ApiConstants.DOMAIN:
+                guiThemeIdsFilteredByType = guiThemeDetailsDao.listGuiThemeIdsByDomainUuids(value);
+                break;
+        }
+
+        if (CollectionUtils.isNotEmpty(guiThemeIdsFilteredByType)) {
+            idList.addAll(guiThemeIdsFilteredByType);
+            return;
+        }
+        logger.trace(String.format("No GUI theme with the specified [%s] with UUID [%s] was found, adding an invalid ID for filtering.", type, value));
+        idList.add(INVALID_ID);
+    }
+
+    private SearchBuilder<GuiThemeJoinVO> createGuiThemeJoinSearchBuilder(boolean listAll, Boolean showPublic) {
+        SearchBuilder<GuiThemeJoinVO> guiThemeJoinSearchBuilder = createSearchBuilder();
+        guiThemeJoinSearchBuilder.and("idIn", guiThemeJoinSearchBuilder.entity().getId(), SearchCriteria.Op.IN);
+        guiThemeJoinSearchBuilder.and("name", guiThemeJoinSearchBuilder.entity().getName(), SearchCriteria.Op.EQ);
+        guiThemeJoinSearchBuilder.and("accountUuid", guiThemeJoinSearchBuilder.entity().getAccounts(), SearchCriteria.Op.LIKE);
+
+        if (!listAll && showPublic != null) {
+            guiThemeJoinSearchBuilder.and("isPublic", guiThemeJoinSearchBuilder.entity().getIsPublic(), SearchCriteria.Op.EQ);
+        }
+
+        return guiThemeJoinSearchBuilder;
+    }
+}
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index d05635f4614..474569f4924 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -301,4 +301,7 @@
   <bean id="SharedFSDaoImpl" class="org.apache.cloudstack.storage.sharedfs.dao.SharedFSDaoImpl" />
   <bean id="SharedFSJoinDaoImpl" class="org.apache.cloudstack.storage.sharedfs.query.dao.SharedFSJoinDaoImpl" />
   <bean id="ReconcileCommandDaoImpl" class="org.apache.cloudstack.command.dao.ReconcileCommandDaoImpl" />
+  <bean id="guiThemeDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeDaoImpl" />
+  <bean id="guiThemeDetailsDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeDetailsDaoImpl" />
+  <bean id="guiThemeJoinDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDaoImpl" />
 </beans>
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 5a50b96d8f2..53c2bbf60cc 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -203,3 +203,27 @@ SET `sort_key` = CASE
     ELSE `sort_key`
 END;
 -- End: Changes for Guest OS category cleanup
+
+-- Whitelabel GUI
+CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes` (
+    `id` bigint(20) unsigned NOT NULL auto_increment,
+    `uuid` varchar(255) UNIQUE,
+    `name` varchar(2048) NOT NULL COMMENT 'A name to identify the theme.',
+    `description` varchar(4096) DEFAULT NULL COMMENT 'A description for the theme.',
+    `css` text DEFAULT NULL COMMENT 'The CSS to be retrieved and imported into the GUI when matching the theme access configurations.',
+    `json_configuration` text DEFAULT NULL COMMENT 'The JSON with the configurations to be retrieved and imported into the GUI when matching the theme access configurations.',
+    `recursive_domains` tinyint(1) DEFAULT 0 COMMENT 'Defines whether the subdomains of the informed domains are considered. Default value is false.',
+    `is_public` tinyint(1) default 1 COMMENT 'Defines whether a theme can be retrieved by anyone when only the `internet_domains_names` is informed. If the `domain_uuids` or `account_uuids` is informed, it is considered as `false`.',
+    `created` datetime NOT NULL,
+    `removed` datetime DEFAULT NULL,
+    PRIMARY KEY (`id`)
+);
+
+CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
+    `id` bigint(20) unsigned NOT NULL auto_increment,
+    `gui_theme_id` bigint(20) unsigned NOT NULL COMMENT 'Foreign key referencing the GUI theme on `gui_themes` table.',
+    `type` varchar(100) NOT NULL COMMENT 'The type of GUI theme details. Valid options are: `account`, `domain` and `commonName`',
+    `value` text NOT NULL COMMENT 'The value of the `type` details. Can be an UUID (account or domain) or internet common name.',
+    PRIMARY KEY (`id`),
+    CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
+);
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.gui_themes_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.gui_themes_view.sql
new file mode 100644
index 00000000000..3173274623e
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.gui_themes_view.sql
@@ -0,0 +1,38 @@
+-- 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.
+
+-- VIEW `cloud`.`gui_themes_view`;
+
+DROP VIEW IF EXISTS `cloud`.`gui_themes_view`;
+
+CREATE VIEW `cloud`.`gui_themes_view` AS
+SELECT
+    `cloud`.`gui_themes`.`id` AS `id`,
+    `cloud`.`gui_themes`.`uuid` AS `uuid`,
+    `cloud`.`gui_themes`.`name` AS `name`,
+    `cloud`.`gui_themes`.`description` AS `description`,
+    `cloud`.`gui_themes`.`css` AS `css`,
+    `cloud`.`gui_themes`.`json_configuration` AS `json_configuration`,
+    (SELECT group_concat(gtd.`value` separator ',') FROM `cloud`.`gui_themes_details` gtd WHERE gtd.`type` = 'commonName' AND gtd.gui_theme_id = `cloud`.`gui_themes`.`id`) common_names,
+    (SELECT group_concat(gtd.`value` separator ',') FROM `cloud`.`gui_themes_details` gtd WHERE gtd.`type` = 'domain' AND gtd.gui_theme_id = `cloud`.`gui_themes`.`id`) domains,
+    (SELECT group_concat(gtd.`value` separator ',') FROM `cloud`.`gui_themes_details` gtd WHERE gtd.`type` = 'account' AND gtd.gui_theme_id = `cloud`.`gui_themes`.`id`) accounts,
+    `cloud`.`gui_themes`.`recursive_domains` AS `recursive_domains`,
+    `cloud`.`gui_themes`.`is_public` AS `is_public`,
+    `cloud`.`gui_themes`.`created` AS `created`,
+    `cloud`.`gui_themes`.`removed` AS `removed`
+FROM `cloud`.`gui_themes` LEFT JOIN `cloud`.`gui_themes_details` ON `cloud`.`gui_themes_details`.`gui_theme_id` = `cloud`.`gui_themes`.`id`
+GROUP BY `cloud`.`gui_themes`.`id`;
diff --git a/framework/db/src/main/java/com/cloud/utils/db/SearchBase.java b/framework/db/src/main/java/com/cloud/utils/db/SearchBase.java
index b4c27746799..512941f4ee3 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/SearchBase.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/SearchBase.java
@@ -479,6 +479,14 @@ public abstract class SearchBase<J extends SearchBase<?, T, K>, T, K> {
                 sql.append(" FIND_IN_SET(?, ");
             }
 
+            if (op == Op.LIKE_REPLACE) {
+                sql.append(" ? LIKE REPLACE (");
+            }
+
+            if (op == Op.LIKE_CONCAT) {
+                sql.append(" ? LIKE CONCAT (");
+            }
+
             if (tableAlias == null) {
                 if (joinName != null) {
                     tableAlias = joinName;
diff --git a/framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java b/framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java
index 4a5349b31f4..15807eb26d4 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/SearchCriteria.java
@@ -39,7 +39,8 @@ public class SearchCriteria<K> {
                 " NOT BETWEEN ? AND ? ",
                 2), IN(" IN () ", -1), NOTIN(" NOT IN () ", -1), LIKE(" LIKE ? ", 1), NLIKE(" NOT LIKE ? ", 1), NIN(" NOT IN () ", -1), NULL(" IS NULL ", 0), NNULL(
                 " IS NOT NULL ",
-                0), SC(" () ", 1), TEXT("  () ", 1), RP("", 0), AND(" AND ", 0), OR(" OR ", 0), NOT(" NOT ", 0), FIND_IN_SET(" ) ", 1), BINARY_OR(" & ?) > 0", 1);
+                0), SC(" () ", 1), TEXT("  () ", 1), RP("", 0), AND(" AND ", 0), OR(" OR ", 0), NOT(" NOT ", 0), FIND_IN_SET(" ) ", 1), BINARY_OR(" & ?) > 0", 1),
+                LIKE_REPLACE(", ?, ?)", 3), LIKE_CONCAT(", ?)", 2);
 
         private final String op;
         int params;
@@ -60,7 +61,8 @@ public class SearchCriteria<K> {
     }
 
     public enum Func {
-        NATIVE("@", 1), MAX("MAX(@)", 1), MIN("MIN(@)", 1), FIRST("FIRST(@)", 1), LAST("LAST(@)", 1), SUM("SUM(@)", 1), COUNT("COUNT(@)", 1), DISTINCT("DISTINCT(@)", 1), DISTINCT_PAIR("DISTINCT @, @", 2);
+        NATIVE("@", 1), MAX("MAX(@)", 1), MIN("MIN(@)", 1), FIRST("FIRST(@)", 1), LAST("LAST(@)", 1), SUM("SUM(@)", 1), COUNT("COUNT(@)", 1), DISTINCT("DISTINCT(@)", 1), DISTINCT_PAIR("DISTINCT @, @", 2),
+                CONCAT("CONCAT(@,@)", 2);
 
         private String func;
         private int count;
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index ef65c4c3120..15d8c7309d4 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -97,6 +97,7 @@ import org.apache.cloudstack.api.response.GuestOSResponse;
 import org.apache.cloudstack.api.response.GuestOsMappingResponse;
 import org.apache.cloudstack.api.response.GuestVlanRangeResponse;
 import org.apache.cloudstack.api.response.GuestVlanResponse;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
 import org.apache.cloudstack.api.response.HostForMigrationResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
@@ -206,6 +207,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.gui.theme.GuiThemeJoin;
 import org.apache.cloudstack.management.ManagementServerHost;
 import org.apache.cloudstack.network.BgpPeerVO;
 import org.apache.cloudstack.network.RoutedIpv4Manager;
@@ -5515,8 +5517,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         SharedFSJoinVO sharedFSView = ApiDBUtils.newSharedFSView(sharedFS);
         return ApiDBUtils.newSharedFSResponse(view, sharedFSView);
     }
-
-    protected Map<String, ResourceIcon> getResourceIconsUsingOsCategory(List<TemplateResponse> responses) {
+protected Map<String, ResourceIcon> getResourceIconsUsingOsCategory(List<TemplateResponse> responses) {
         Set<Long> guestOsCategoryIds = responses.stream().map(TemplateResponse::getOsTypeCategoryId).collect(Collectors.toSet());
         Map<Long, ResourceIcon> guestOsCategoryIcons =
                 resourceIconManager.getByResourceTypeAndIds(ResourceTag.ResourceObjectType.GuestOsCategory,
@@ -5550,4 +5551,28 @@ public class ApiResponseHelper implements ResponseGenerator {
             response.setResourceIconResponse(iconResponse);
         }
     }
+    @Override
+    public GuiThemeResponse createGuiThemeResponse(GuiThemeJoin guiThemeJoin) {
+        GuiThemeResponse guiThemeResponse = new GuiThemeResponse();
+
+        Long callerId = CallContext.current().getCallingAccount().getAccountId();
+        if (callerId != Account.ACCOUNT_ID_SYSTEM && _accountMgr.isRootAdmin(callerId)) {
+            guiThemeResponse.setId(guiThemeJoin.getUuid());
+            guiThemeResponse.setName(guiThemeJoin.getName());
+            guiThemeResponse.setDescription(guiThemeJoin.getDescription());
+            guiThemeResponse.setCommonNames(guiThemeJoin.getCommonNames());
+            guiThemeResponse.setDomainIds(guiThemeJoin.getDomains());
+            guiThemeResponse.setRecursiveDomains(guiThemeJoin.isRecursiveDomains());
+            guiThemeResponse.setAccountIds(guiThemeJoin.getAccounts());
+            guiThemeResponse.setPublic(guiThemeJoin.getIsPublic());
+            guiThemeResponse.setCreated(guiThemeJoin.getCreated());
+            guiThemeResponse.setRemoved(guiThemeJoin.getRemoved());
+        }
+
+        guiThemeResponse.setJsonConfiguration(guiThemeJoin.getJsonConfiguration());
+        guiThemeResponse.setCss(guiThemeJoin.getCss());
+        guiThemeResponse.setResponseName("guithemes");
+
+        return guiThemeResponse;
+    }
 }
diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java
index 34752000907..e0737a6891d 100644
--- a/server/src/main/java/com/cloud/api/ApiServer.java
+++ b/server/src/main/java/com/cloud/api/ApiServer.java
@@ -87,6 +87,7 @@ import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
 import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
 import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;
 import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
 import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 import org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;
@@ -967,6 +968,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
                 final User user = ApiDBUtils.findUserById(userId);
                 return commandAvailable(remoteAddress, commandName, user);
             } else {
+                if (commandName.equalsIgnoreCase(ListGuiThemesCmd.class.getAnnotation(APICommand.class).name())) {
+                    return true;
+                }
                 // check against every available command to see if the command exists or not
                 if (!s_apiNameCmdClassMap.containsKey(commandName) && !commandName.equals("login") && !commandName.equals("logout")) {
                     final String errorMessage = "The given command " + commandName + " either does not exist, is not available" +
diff --git a/server/src/main/java/com/cloud/api/ApiServlet.java b/server/src/main/java/com/cloud/api/ApiServlet.java
index 41229670c38..21d09375812 100644
--- a/server/src/main/java/com/cloud/api/ApiServlet.java
+++ b/server/src/main/java/com/cloud/api/ApiServlet.java
@@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ApiServerService;
@@ -46,6 +47,7 @@ import org.apache.cloudstack.api.auth.APIAuthenticationManager;
 import org.apache.cloudstack.api.auth.APIAuthenticationType;
 import org.apache.cloudstack.api.auth.APIAuthenticator;
 import org.apache.cloudstack.api.command.user.consoleproxy.CreateConsoleEndpointCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.managed.context.ManagedContext;
 import org.apache.cloudstack.utils.consoleproxy.ConsoleAccessUtils;
@@ -397,6 +399,8 @@ public class ApiServlet extends HttpServlet {
                 CallContext.register(accountMgr.getSystemUser(), accountMgr.getSystemAccount());
             }
             setProjectContext(params);
+            setGuiThemeParameterIfApiCallIsUnauthenticated(userId, command, req, params);
+
             if (LOGGER.isTraceEnabled()) {
                 LOGGER.trace(String.format("verifying request for user %s from %s with %d parameters",
                         userId, remoteAddress.getHostAddress(), params.size()));
@@ -457,6 +461,19 @@ public class ApiServlet extends HttpServlet {
         }
     }
 
+    private void setGuiThemeParameterIfApiCallIsUnauthenticated(Long userId, String command, HttpServletRequest req, Map<String, Object[]> params) {
+        String listGuiThemesApiName = ListGuiThemesCmd.class.getAnnotation(APICommand.class).name();
+
+        if (userId != null || !listGuiThemesApiName.equalsIgnoreCase(command)) {
+            return;
+        }
+
+        String serverName = req.getServerName();
+        LOGGER.info("Unauthenticated call to {} API, thus, the `commonName` parameter will be inferred as {}.", listGuiThemesApiName, serverName);
+        params.put(ApiConstants.COMMON_NAME, new String[]{serverName});
+    }
+
+
     private boolean checkIfAuthenticatorIsOf2FA(String command) {
         boolean verify2FA = false;
         APIAuthenticator apiAuthenticator = authManager.getAPIAuthenticator(command);
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index e385c472779..1ae2ded5b1c 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -403,6 +403,10 @@ import org.apache.cloudstack.api.command.user.firewall.UpdateFirewallRuleCmd;
 import org.apache.cloudstack.api.command.user.firewall.UpdatePortForwardingRuleCmd;
 import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
 import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.CreateGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.RemoveGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.UpdateGuiThemeCmd;
 import org.apache.cloudstack.api.command.user.iso.AttachIsoCmd;
 import org.apache.cloudstack.api.command.user.iso.CopyIsoCmd;
 import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
@@ -4187,6 +4191,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         cmdList.add(UpdateSecondaryStorageSelectorCmd.class);
         cmdList.add(RemoveSecondaryStorageSelectorCmd.class);
         cmdList.add(ListAffectedVmsForStorageScopeChangeCmd.class);
+        cmdList.add(ListGuiThemesCmd.class);
+        cmdList.add(UpdateGuiThemeCmd.class);
+        cmdList.add(CreateGuiThemeCmd.class);
+        cmdList.add(RemoveGuiThemeCmd.class);
 
         // Out-of-band management APIs for admins
         cmdList.add(EnableOutOfBandManagementForHostCmd.class);
diff --git a/server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java b/server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java
new file mode 100644
index 00000000000..78bcb6bbc03
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java
@@ -0,0 +1,445 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import com.cloud.domain.Domain;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
+import com.cloud.user.Account;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.command.user.gui.theme.CreateGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.RemoveGuiThemeCmd;
+import org.apache.cloudstack.api.command.user.gui.theme.UpdateGuiThemeCmd;
+import org.apache.cloudstack.api.response.GuiThemeResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeDao;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeDetailsDao;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDao;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Component
+public class GuiThemeServiceImpl implements GuiThemeService {
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    private static final List<String> ALLOWED_PRIMITIVE_PROPERTIES = List.of("appTitle", "footer", "loginFooter", "logo", "minilogo", "banner");
+
+    private static final List<String> ALLOWED_ERROR_PROPERTIES = List.of("403", "404", "500");
+
+    private static final List<String> ALLOWED_PLUGIN_PROPERTIES = List.of("name", "path", "icon", "isExternalLink");
+
+    private static final String ERROR = "error";
+
+    private static final String PLUGINS = "plugins";
+
+    @Inject
+    GuiThemeDao guiThemeDao;
+
+    @Inject
+    GuiThemeDetailsDao guiThemeDetailsDao;
+
+    @Inject
+    GuiThemeJoinDao guiThemeJoinDao;
+
+    @Inject
+    ResponseGenerator responseGenerator;
+
+    @Inject
+    EntityManager entityManager;
+
+    @Inject
+    AccountDao accountDao;
+
+    @Inject
+    DomainDao domainDao;
+
+    @Override
+    public ListResponse<GuiThemeResponse> listGuiThemes(ListGuiThemesCmd cmd) {
+        ListResponse<GuiThemeResponse> response = new ListResponse<>();
+        Pair<List<GuiThemeJoinVO>, Integer> result;
+        boolean listOnlyDefaultTheme = cmd.getListOnlyDefaultTheme();
+
+        if (listOnlyDefaultTheme) {
+            result = retrieveDefaultTheme();
+        } else if (CallContext.current().getCallingAccountId() == Account.ACCOUNT_ID_SYSTEM) {
+            logger.info("Unauthenticated call to `listGuiThemes` API, ignoring all parameters, except `commonName`.");
+            result = listGuiThemesWithNoAuthentication(cmd);
+        } else {
+            result = listGuiThemesInternal(cmd);
+        }
+        List<GuiThemeResponse> guiThemeResponses = new ArrayList<>();
+
+        for (GuiThemeJoin guiThemeJoin : result.first()) {
+            GuiThemeResponse guiThemeResponse = responseGenerator.createGuiThemeResponse(guiThemeJoin);
+            guiThemeResponses.add(guiThemeResponse);
+        }
+
+        response.setResponses(guiThemeResponses);
+        return response;
+    }
+
+    private Pair<List<GuiThemeJoinVO>, Integer> retrieveDefaultTheme() {
+        GuiThemeJoinVO defaultTheme = guiThemeJoinDao.findDefaultTheme();
+        List<GuiThemeJoinVO> list = new ArrayList<>();
+
+        if (defaultTheme != null) {
+            list.add(defaultTheme);
+        }
+
+        return new Pair<>(list, list.size());
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_GUI_THEME_CREATE, eventDescription = "Creating GUI theme")
+    public GuiThemeJoin createGuiTheme(CreateGuiThemeCmd cmd) {
+        String name = cmd.getName();
+        String description = cmd.getDescription();
+        String css = cmd.getCss();
+        String jsonConfiguration = cmd.getJsonConfiguration();
+        String commonNames = cmd.getCommonNames();
+        String providedDomainIds = cmd.getDomainIds();
+        String providedAccountIds = cmd.getAccountIds();
+        boolean isPublic = cmd.getPublic();
+        Boolean recursiveDomains = cmd.getRecursiveDomains();
+
+        CallContext.current().setEventDetails(String.format("Name: %s, AccountIDs: %s, DomainIDs: %s, RecursiveDomains: %s, CommonNames: %s", name, providedAccountIds,
+                providedDomainIds, recursiveDomains, commonNames));
+
+        if (StringUtils.isAllBlank(css, jsonConfiguration)) {
+            throw new CloudRuntimeException("Either the `css` or `jsonConfiguration` parameter must be informed.");
+        }
+
+        validateParameters(jsonConfiguration, providedDomainIds, providedAccountIds, commonNames, null);
+
+        if (shouldSetGuiThemeToPrivate(providedDomainIds, providedAccountIds)) {
+            isPublic = false;
+        }
+
+        GuiThemeVO guiThemeVO = new GuiThemeVO(name, description, css, jsonConfiguration, recursiveDomains, isPublic, new Date(), null);
+        guiThemeDao.persist(guiThemeVO);
+        persistGuiThemeDetails(guiThemeVO.getId(), commonNames, providedDomainIds, providedAccountIds);
+        return guiThemeJoinDao.findById(guiThemeVO.getId());
+    }
+
+    protected void persistGuiThemeDetails(long guiThemeId, String commonNames, String providedDomainIds, String providedAccountIds) {
+        persistDetailValueIfNotNull(guiThemeId, commonNames, "commonName");
+        persistDetailValueIfNotNull(guiThemeId, providedDomainIds, "domain");
+        persistDetailValueIfNotNull(guiThemeId, providedAccountIds, "account");
+    }
+
+    protected void persistDetailValueIfNotNull(long guiThemeId, String providedParameter, String type) {
+        if (providedParameter == null) {
+            logger.trace("GUI theme provided parameter `{}` is null; therefore, it will be ignored.", type);
+            return;
+        }
+        for (String splitParameter : StringUtils.deleteWhitespace(providedParameter).split(",")) {
+            guiThemeDetailsDao.persist(new GuiThemeDetailsVO(guiThemeId, type, splitParameter));
+        }
+
+    }
+
+    protected boolean shouldSetGuiThemeToPrivate(String providedDomainIds, String providedAccountIds) {
+        if (StringUtils.isNotBlank(providedAccountIds)) {
+            logger.info("Parameter `accountIds` was informed during GUI theme creation, therefore, `isPublic` will be set to `false`.");
+            return true;
+        }
+
+        if (StringUtils.isNotBlank(providedDomainIds)) {
+            logger.info("Parameter `domainIds` was informed during GUI theme creation, therefore, `isPublic` will be set to `false`.");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * A GUI theme is only considered the default one if the parameters `commonNames`, `domainIds` and `accountIds` are all blank.
+     * @return true if all parameters are blank, false otherwise.
+     */
+    protected boolean isConsideredDefaultTheme(String commonNames, String providedDomainIds, String providedAccountIds) {
+        return StringUtils.isAllBlank(commonNames, providedDomainIds, providedAccountIds);
+    }
+
+    /**
+     * There can only be one default theme registered, therefore, a {@link CloudRuntimeException} will be thrown if:
+     * <ul>
+     *     <li>There is already a default theme registered when creating a new GUI theme.</li>
+     *     <li>Or, the GUI theme to be updated is not the default theme already registered.</li>
+     * </ul>
+     */
+    protected void checkIfDefaultThemeIsAllowed(String commonNames, String providedDomainIds, String providedAccountIds, Long idOfThemeToBeUpdated) {
+        if (!isConsideredDefaultTheme(commonNames, providedDomainIds, providedAccountIds)) {
+            logger.info("The GUI theme will not be considered as the default one, as the `commonNames`, `domainIds` and `accountIds` are not all blank.");
+            return;
+        }
+
+        GuiThemeJoinVO defaultTheme = guiThemeJoinDao.findDefaultTheme();
+
+        if (defaultTheme != null && (idOfThemeToBeUpdated == null || defaultTheme.getId() != idOfThemeToBeUpdated)) {
+            throw new CloudRuntimeException(String.format("Only one default GUI theme is allowed. Remove the current default theme %s and try again.", defaultTheme));
+        }
+
+        logger.info("The parameters `commonNames`, `domainIds` and `accountIds` were not informed. The created theme will be considered as the default theme.");
+    }
+
+    protected Pair<List<GuiThemeJoinVO>, Integer> listGuiThemesWithNoAuthentication(ListGuiThemesCmd cmd) {
+        return guiThemeJoinDao.listGuiThemesWithNoAuthentication(cmd.getCommonName());
+    }
+
+
+    protected Pair<List<GuiThemeJoinVO>, Integer> listGuiThemesInternal(ListGuiThemesCmd cmd) {
+        Long id = cmd.getId();
+        String name = cmd.getName();
+        String commonName = cmd.getCommonName();
+        String domainUuid = cmd.getDomainId() == null ? null : domainDao.findById(cmd.getDomainId()).getUuid();
+        String accountUuid = cmd.getAccountId() == null ? null : accountDao.findById(cmd.getAccountId()).getUuid();
+        boolean listAll = cmd.getListAll();
+        boolean showRemoved = cmd.getShowRemoved();
+        Boolean showPublic = cmd.getShowPublic();
+
+        return guiThemeJoinDao.listGuiThemes(id, name, commonName, domainUuid, accountUuid, listAll, showRemoved, showPublic);
+    }
+
+    protected void validateParameters(String jsonConfig, String domainIds, String accountIds, String commonNames, Long idOfThemeToBeUpdated) {
+        if (isConsideredDefaultTheme(commonNames, domainIds, accountIds)) {
+            checkIfDefaultThemeIsAllowed(commonNames, domainIds, accountIds, idOfThemeToBeUpdated);
+        }
+
+        validateObjectUuids(accountIds, Account.class);
+        validateObjectUuids(domainIds, Domain.class);
+        validateJsonConfiguration(jsonConfig);
+    }
+
+    protected void validateJsonConfiguration(String jsonConfig) {
+        if (jsonConfig == null) {
+            return;
+        }
+
+        JsonObject jsonObject = new JsonObject();
+
+        try {
+            JsonElement jsonElement = new JsonParser().parse(jsonConfig);
+            Set<Map.Entry<String, JsonElement>> entries = jsonElement.getAsJsonObject().entrySet();
+            entries.stream().forEach(entry -> validateJsonAttributes(entry, jsonObject));
+        } catch (JsonSyntaxException exception) {
+            logger.error("The following exception was thrown while parsing the JSON object: [{}].", exception.getMessage());
+            throw new CloudRuntimeException("Specified JSON configuration is not a valid JSON object.");
+        }
+    }
+
+    /**
+     * Validates the informed JSON attributes considering the allowed properties by the API, any invalid option is ignored.
+     * All valid options are added to a {@link JsonObject} that will be considered as the final JSON configuration used by the GUI theme.
+     */
+    private void validateJsonAttributes(Map.Entry<String, JsonElement> entry, JsonObject jsonObject) {
+        JsonElement entryValue = entry.getValue();
+        String entryKey = entry.getKey();
+
+        if (entryValue.isJsonPrimitive() && ALLOWED_PRIMITIVE_PROPERTIES.contains(entryKey)) {
+            logger.trace("The JSON attribute [{}] is a valid option.", entryKey);
+            jsonObject.add(entryKey, entryValue);
+        } else if (entryValue.isJsonObject() && ERROR.equals(entryKey)) {
+            validateErrorAttribute(entry, jsonObject);
+        } else if (entryValue.isJsonArray() && PLUGINS.equals(entryKey)) {
+            validatePluginsAttribute(entry, jsonObject);
+        } else {
+            warnOfInvalidJsonAttribute(entryKey);
+        }
+    }
+
+    /**
+     * Creates a {@link JsonObject} with only the valid options for the Plugins' properties specified in the {@link #ALLOWED_PLUGIN_PROPERTIES}.
+     */
+    protected void validatePluginsAttribute(Map.Entry<String, JsonElement> entry, JsonObject jsonObject) {
+        Set<Map.Entry<String, JsonElement>> entries = entry.getValue().getAsJsonArray().get(0).getAsJsonObject().entrySet();
+        JsonObject objectToBeAdded = createJsonObject(entries, ALLOWED_PLUGIN_PROPERTIES);
+        JsonArray jsonArray = new JsonArray();
+
+        if (objectToBeAdded.entrySet().isEmpty()) {
+            return;
+        }
+
+        jsonArray.add(objectToBeAdded);
+        jsonObject.add(entry.getKey(), jsonArray);
+    }
+
+    /**
+     * Creates a {@link JsonObject} with only the valid options for the Error's properties specified in the {@link #ALLOWED_ERROR_PROPERTIES}.
+     */
+    protected void validateErrorAttribute(Map.Entry<String, JsonElement> entry, JsonObject jsonObject) {
+        Set<Map.Entry<String, JsonElement>> entries = entry.getValue().getAsJsonObject().entrySet();
+        JsonObject objectToBeAdded = createJsonObject(entries, ALLOWED_ERROR_PROPERTIES);
+
+        if (objectToBeAdded.entrySet().isEmpty()) {
+            return;
+        }
+
+        jsonObject.add(entry.getKey(), objectToBeAdded);
+    }
+
+    protected JsonObject createJsonObject(Set<Map.Entry<String, JsonElement>> entries, List<String> allowedProperties) {
+        JsonObject objectToBeAdded = new JsonObject();
+
+        for (Map.Entry<String, JsonElement> recursiveEntry : entries) {
+            String entryKey = recursiveEntry.getKey();
+
+            if (!allowedProperties.contains(entryKey)) {
+                warnOfInvalidJsonAttribute(entryKey);
+                continue;
+            }
+            objectToBeAdded.add(entryKey, recursiveEntry.getValue());
+        }
+
+        return objectToBeAdded;
+    }
+
+    protected void warnOfInvalidJsonAttribute(String entryKey) {
+        logger.warn("The JSON attribute [{}] is not a valid option, therefore, it will be ignored.", entryKey);
+    }
+
+    /**
+     * Validate if the comma separated list of UUIDs of the fields {@link GuiThemeJoinVO#getAccounts()} and {@link GuiThemeJoinVO#getDomains()} are valid.
+     * @param providedIds a comma separated list of UUIDs of {@link Account} or {@link Domain}
+     * @param clazz the class to infer the DAO object. Valid options are: {@link Account} and {@link Domain}
+     */
+    protected void validateObjectUuids(String providedIds, Class clazz) {
+        if (StringUtils.isBlank(providedIds)) {
+            return;
+        }
+
+        String[] commaSeparatedIds = providedIds.split("\\s*,\\s*");
+        for (String id : commaSeparatedIds) {
+            Object objectVO = entityManager.findByUuid(clazz, id);
+
+            if (objectVO == null) {
+                throw new CloudRuntimeException(String.format("The %s ID %s does not exist. Verify the informed IDs and try again.", clazz.getSimpleName(), id));
+            }
+        }
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_GUI_THEME_UPDATE, eventDescription = "Updating GUI theme")
+    public GuiThemeJoin updateGuiTheme(UpdateGuiThemeCmd cmd) {
+        Long guiThemeId = cmd.getId();
+        GuiThemeJoinVO guiThemeJoinVO = guiThemeJoinDao.findById(guiThemeId);
+
+        String name = cmd.getName();
+        String description = cmd.getDescription();
+        String css = cmd.getCss();
+        String jsonConfiguration = cmd.getJsonConfiguration();
+        String commonNames = cmd.getCommonNames() == null ? guiThemeJoinVO.getCommonNames() : cmd.getCommonNames();
+        String providedDomainIds = cmd.getDomainIds() == null ? guiThemeJoinVO.getDomains() : cmd.getDomainIds();
+        String providedAccountIds = cmd.getAccountIds() == null ? guiThemeJoinVO.getAccounts() : cmd.getAccountIds();
+        Boolean isPublic = cmd.getIsPublic();
+        Boolean recursiveDomains = cmd.getRecursiveDomains();
+
+        CallContext.current().setEventDetails(String.format("ID: %s, Name: %s, AccountIDs: %s, DomainIDs: %s, RecursiveDomains: %s, CommonNames: %s", guiThemeId, name,
+                providedAccountIds, providedDomainIds, recursiveDomains, commonNames));
+
+        validateParameters(jsonConfiguration, providedDomainIds, providedAccountIds, commonNames, guiThemeId);
+
+        if (shouldSetGuiThemeToPrivate(providedDomainIds, providedAccountIds)) {
+            isPublic = false;
+        }
+
+        return persistGuiTheme(guiThemeId, name, description, css, jsonConfiguration, commonNames, providedDomainIds, providedAccountIds, isPublic, recursiveDomains);
+    }
+
+    protected GuiThemeJoinVO persistGuiTheme(Long guiThemeId, String name, String description, String css, String jsonConfiguration, String commonNames, String providedDomainIds,
+                                             String providedAccountIds, Boolean isPublic, Boolean recursiveDomains){
+        return Transaction.execute((TransactionCallback<GuiThemeJoinVO>) status -> {
+            GuiThemeVO guiThemeVO = guiThemeDao.findById(guiThemeId);
+
+            if (name != null) {
+                guiThemeVO.setName(ifBlankReturnNull(name));
+            }
+
+            if (description != null) {
+                guiThemeVO.setDescription(ifBlankReturnNull(description));
+            }
+
+            if (css != null) {
+                guiThemeVO.setCss(css);
+            }
+
+            if (jsonConfiguration != null) {
+                guiThemeVO.setJsonConfiguration(jsonConfiguration);
+            }
+
+            if (isPublic != null) {
+                guiThemeVO.setIsPublic(isPublic);
+            }
+
+            if (recursiveDomains != null) {
+                guiThemeVO.setRecursiveDomains(recursiveDomains);
+            }
+
+            logger.trace("Persisting GUI theme [{}] with CSS [{}] and JSON configuration [{}].", guiThemeVO, guiThemeVO.getCss(), guiThemeVO.getJsonConfiguration());
+
+            guiThemeDao.persist(guiThemeVO);
+            guiThemeDetailsDao.expungeByGuiThemeId(guiThemeId);
+            persistGuiThemeDetails(guiThemeId, commonNames, providedDomainIds, providedAccountIds);
+
+            return guiThemeJoinDao.findById(guiThemeId);
+        });
+    }
+
+    protected String ifBlankReturnNull(String value) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        return value;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_GUI_THEME_REMOVE, eventDescription = "Removing GUI theme")
+    public void removeGuiTheme(RemoveGuiThemeCmd cmd) {
+        Long guiThemeId = cmd.getId();
+        GuiThemeVO guiThemeVO = guiThemeDao.findById(guiThemeId);
+        CallContext.current().setEventDetails(String.format("ID: %s", guiThemeId));
+
+        if (guiThemeVO != null) {
+            guiThemeDao.remove(guiThemeId);
+        } else {
+            logger.error("Unable to find a GUI theme with the specified ID [{}].", guiThemeId);
+            throw new CloudRuntimeException("Unable to find a GUI theme with the specified ID.");
+        }
+    }
+}
diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index dfb38cd7d8b..d82e20dc344 100644
--- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -390,4 +390,5 @@
         <property name="asyncJobDispatcher" ref="ApiAsyncJobDispatcher" />
     </bean>
 
+    <bean id="guiThemeServiceImpl" class="org.apache.cloudstack.gui.theme.GuiThemeServiceImpl" />
 </beans>
diff --git a/server/src/test/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImplTest.java
new file mode 100644
index 00000000000..c47fdadd32c
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImplTest.java
@@ -0,0 +1,215 @@
+// 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.
+package org.apache.cloudstack.gui.theme;
+
+import com.cloud.user.Account;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.command.user.gui.theme.ListGuiThemesCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDaoImpl;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RunWith(MockitoJUnitRunner.class)
+public class GuiThemeServiceImplTest {
+
+    @Mock
+    GuiThemeJoinDaoImpl guiThemeJoinDaoMock;
+
+    @Mock
+    GuiThemeJoinVO guiThemeJoinVOMock;
+
+    @Mock
+    EntityManager entityManagerMock;
+
+    @Mock
+    Object objectMock;
+
+    @Mock
+    ListGuiThemesCmd listGuiThemesCmdMock;
+
+    @Spy
+    @InjectMocks
+    GuiThemeServiceImpl guiThemeServiceSpy = new GuiThemeServiceImpl();
+
+    private static final String COMMON_NAME = "*acme.com,acm2.com";
+
+    private static final String DOMAIN_IDS = "1,2,3";
+
+    private static final String ACCOUNT_IDS = "4,5,6";
+
+    private static final String BLANK_STRING = "";
+
+    @Test
+    public void listGuiThemesTestShouldIgnoreParametersWhenItIsCalledUnauthenticated() {
+        Pair<List<GuiThemeJoinVO>, Integer> emptyPair = new Pair<>(new ArrayList<>(), 0);
+
+        Long accountId = Account.ACCOUNT_ID_SYSTEM;
+
+        try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
+            CallContext callContextMock = Mockito.mock(CallContext.class);
+            callContextMocked.when(CallContext::current).thenReturn(callContextMock);
+            Mockito.doReturn(accountId).when(callContextMock).getCallingAccountId();
+            Mockito.doReturn(emptyPair).when(guiThemeServiceSpy).listGuiThemesWithNoAuthentication(Mockito.nullable(ListGuiThemesCmd.class));
+            Mockito.when(listGuiThemesCmdMock.getListOnlyDefaultTheme()).thenReturn(false);
+            guiThemeServiceSpy.listGuiThemes(listGuiThemesCmdMock);
+            Mockito.verify(guiThemeServiceSpy, Mockito.times(1)).listGuiThemesWithNoAuthentication(Mockito.nullable(ListGuiThemesCmd.class));
+        }
+    }
+
+    @Test
+    public void listGuiThemesTestShouldCallNormalFlowWhenAuthenticated() {
+        Pair<List<GuiThemeVO>, Integer> emptyPair = new Pair<>(new ArrayList<>(), 0);
+
+        Long accountId = 3L;
+
+        try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
+            CallContext callContextMock = Mockito.mock(CallContext.class);
+            callContextMocked.when(CallContext::current).thenReturn(callContextMock);
+            Mockito.doReturn(accountId).when(callContextMock).getCallingAccountId();
+            Mockito.doReturn(emptyPair).when(guiThemeServiceSpy).listGuiThemesInternal(Mockito.nullable(ListGuiThemesCmd.class));
+            Mockito.when(listGuiThemesCmdMock.getListOnlyDefaultTheme()).thenReturn(false);
+            guiThemeServiceSpy.listGuiThemes(listGuiThemesCmdMock);
+            Mockito.verify(guiThemeServiceSpy, Mockito.times(1)).listGuiThemesInternal(Mockito.nullable(ListGuiThemesCmd.class));
+        }
+    }
+
+    @Test
+    public void listGuiThemesTestListOnlyDefaultThemesShouldCallFindDefaultTheme() {
+        Mockito.when(listGuiThemesCmdMock.getListOnlyDefaultTheme()).thenReturn(true);
+        guiThemeServiceSpy.listGuiThemes(listGuiThemesCmdMock);
+        Mockito.verify(guiThemeJoinDaoMock, Mockito.times(1)).findDefaultTheme();
+    }
+
+    @Test
+    public void shouldSetGuiThemeToPrivateTestDomainIdsAndAccountIdsAreBlankShouldReturnFalse() {
+        boolean result = guiThemeServiceSpy.shouldSetGuiThemeToPrivate(BLANK_STRING, BLANK_STRING);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void shouldSetGuiThemeToPrivateTestDomainIdsNotBlankAndAccountIdsIsBlankShouldReturnTrue() {
+        boolean result = guiThemeServiceSpy.shouldSetGuiThemeToPrivate(DOMAIN_IDS, BLANK_STRING);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void shouldSetGuiThemeToPrivateTestDomainIdsIsBlankAndAccountIdsIsNotBlankShouldReturnTrue() {
+        boolean result = guiThemeServiceSpy.shouldSetGuiThemeToPrivate(BLANK_STRING, ACCOUNT_IDS);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void shouldSetGuiThemeToPrivateTestDomainIdsAndAccountIdsAreNotBlankShouldReturnTrue() {
+        boolean result = guiThemeServiceSpy.shouldSetGuiThemeToPrivate(DOMAIN_IDS, ACCOUNT_IDS);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void validateObjectUuidsTestProvidedUuidsIsNullShouldNotThrowCloudRuntimeException() {
+        guiThemeServiceSpy.validateObjectUuids(null, null);
+    }
+
+    @Test
+    public void validateObjectUuidsTestProvidedUuidsIsBlankShouldNotThrowCloudRuntimeException() {
+        guiThemeServiceSpy.validateObjectUuids(BLANK_STRING, null);
+    }
+
+    @Test
+    public void validateObjectUuidsTestProvidedUuidsIsBlankAndCommaSeparatedShouldNotThrowCloudRuntimeException() {
+        String blankCommaSeparatedString = ",,,";
+        guiThemeServiceSpy.validateObjectUuids(blankCommaSeparatedString, null);
+    }
+
+    @Test
+    public void validateObjectUuidsTestProvidedUuidIsValidShouldNotThrowCloudRuntimeException() {
+        String validUuid = "4";
+
+        Mockito.when(entityManagerMock.findByUuid(Mockito.any(Class.class), Mockito.anyString())).thenReturn(objectMock);
+        guiThemeServiceSpy.validateObjectUuids(validUuid, Account.class);
+    }
+
+    @Test
+    public void validateObjectUuidsTestProvidedUuidsAreValidShouldNotThrowCloudRuntimeException() {
+        Mockito.when(entityManagerMock.findByUuid(Mockito.any(Class.class), Mockito.anyString())).thenReturn(objectMock);
+        guiThemeServiceSpy.validateObjectUuids(ACCOUNT_IDS, Account.class);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void validateObjectUuidsTestProvidedUuidsAreNotValidShouldThrowCloudRuntimeException() {
+        Mockito.when(entityManagerMock.findByUuid(Mockito.any(Class.class), Mockito.anyString())).thenReturn(null);
+        guiThemeServiceSpy.validateObjectUuids(ACCOUNT_IDS, Account.class);
+    }
+
+    @Test
+    public void checkIfDefaultThemeIsAllowedTestThemeIsNotConsideredDefault() {
+        Mockito.when(guiThemeServiceSpy.isConsideredDefaultTheme(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(false);
+
+        guiThemeServiceSpy.checkIfDefaultThemeIsAllowed(COMMON_NAME, BLANK_STRING, BLANK_STRING, null);
+    }
+
+    @Test
+    public void checkIfDefaultThemeIsAllowedTestThemeIsConsideredDefaultAndThereIsNotADefaultThemeRegistered() {
+        Mockito.when(guiThemeServiceSpy.isConsideredDefaultTheme(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+        Mockito.when(guiThemeJoinDaoMock.findDefaultTheme()).thenReturn(null);
+
+        guiThemeServiceSpy.checkIfDefaultThemeIsAllowed(BLANK_STRING, BLANK_STRING, BLANK_STRING, null);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void checkIfDefaultThemeIsAllowedTestThemeIsConsideredDefaultAndThereIsADefaultThemeRegisteredShouldThrowCloudRuntimeException() {
+        Mockito.when(guiThemeServiceSpy.isConsideredDefaultTheme(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+        Mockito.when(guiThemeJoinDaoMock.findDefaultTheme()).thenReturn(guiThemeJoinVOMock);
+
+        guiThemeServiceSpy.checkIfDefaultThemeIsAllowed(BLANK_STRING, BLANK_STRING, BLANK_STRING, null);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void checkIfDefaultThemeIsAllowedTestThemeIsConsideredDefaultAndWillBeUpdatedAndIsDifferentIdShouldThrowCloudRuntimeException() {
+        Mockito.when(guiThemeServiceSpy.isConsideredDefaultTheme(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+        Mockito.when(guiThemeJoinDaoMock.findDefaultTheme()).thenReturn(guiThemeJoinVOMock);
+        Mockito.when(guiThemeJoinVOMock.getId()).thenReturn(1L);
+
+        guiThemeServiceSpy.checkIfDefaultThemeIsAllowed(BLANK_STRING, BLANK_STRING, BLANK_STRING, 2L);
+    }
+
+    @Test
+    public void checkIfDefaultThemeIsAllowedTestThemeIsConsideredDefaultAndWillBeUpdatedAndIsTheSameShouldAllowUpdate() {
+        Mockito.when(guiThemeServiceSpy.isConsideredDefaultTheme(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+        Mockito.when(guiThemeJoinDaoMock.findDefaultTheme()).thenReturn(guiThemeJoinVOMock);
+        Mockito.when(guiThemeJoinVOMock.getId()).thenReturn(1L);
+
+        guiThemeServiceSpy.checkIfDefaultThemeIsAllowed(BLANK_STRING, BLANK_STRING, BLANK_STRING, 1L);
+    }
+}
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 8fafd841be4..8d507670ba8 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -260,7 +260,11 @@ known_categories = {
     'addNodesToKubernetesCluster': 'Kubernetes Service',
     'removeNodesFromKubernetesCluster': 'Kubernetes Service',
     'configureStorageAccess': 'Storage Access Groups',
-    'listStorageAccessGroups': 'Storage Access Groups'
+    'listStorageAccessGroups': 'Storage Access Groups',
+    'listGuiThemes': 'GUI Theme',
+    'createGuiTheme': 'GUI Theme',
+    'updateGuiTheme': 'GUI Theme',
+    'removeGuiTheme': 'GUI Theme'
 }
 
 
diff --git a/ui/public/assets/asf-logo.svg b/ui/public/assets/asf-logo.svg
new file mode 100644
index 00000000000..d69e8d7ebb8
--- /dev/null
+++ b/ui/public/assets/asf-logo.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve">
+<path fill="#6D6E71" d="M7104.7,847.8c15.3,15.3,22.9,33.7,22.9,55.2c0,21.5-7.6,39.9-22.9,55.4c-15.3,15.4-33.8,23.1-55.6,23.1  c-21.8,0-40.2-7.6-55.4-22.9c-15.1-15.3-22.7-33.7-22.7-55.2c0-21.5,7.6-39.9,22.9-55.4c15.3-15.4,33.7-23.1,55.4-23.1  C7070.9,824.9,7089.4,832.5,7104.7,847.8z M7098.1,951.9c13.3-13.6,20-29.8,20-48.7s-6.6-35-19.8-48.5  c-13.2-13.4-29.4-20.1-48.6-20.1c-19.2,0-35.4,6.7-48.7,20.2c-13.3,13.5-19.9,29.7-19.9,48.7c0,19,6.6,35.2,19.7,48.6  c13.1,13.4,29.3,20.1,48.5,20.1S7084.7,965.4,7098.1,951.9z M7087.1,888.1c0,14-6.1,22.8-18.4,26.4l22.5,30.5h-18.2l-20.3-28.3  h-18.6v28.3h-14.7v-84.6h31.8c12.8,0,22,2.2,27.6,6.6C7084.4,871.4,7087.1,878.4,7087.1,888.1z M7068.2,900c3-2.4,4.4-6.5,4.4-12  c0-5.5-1.5-9.4-4.5-11.6c-3-2.2-8.4-3.2-16-3.2h-18v30.5h17.5C7059.7,903.6,7065.3,902.4,7068.2,900z"/>
+<path fill="#6D6E71" d="M1803.6,499.8v155.4h-20V499.8h-56.8v-19.2h133.9v19.2H1803.6z"/>
+<path fill="#6D6E71" d="M2082.2,655.2v-76.9h-105.2v76.9h-20V480.5h20v78.9h105.2v-78.9h20v174.7H2082.2z"/>
+<path fill="#6D6E71" d="M2241.4,499.8v57.4h88.1v19.2h-88.1v59.8h101.8v19h-121.8V480.5H2340v19.2H2241.4z"/>
+<path fill="#D22128" d="M1574.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H1574.5z M2032.6,970  l-205.1,493.2h404.7L2032.6,970z"/>
+<path fill="#D22128" d="M2596.9,1852.4V854.8H3010c171.4,0,295.1,158.8,295.1,313.3c0,163-115.2,316.1-286.6,316.1h-324.6v368.1  H2596.9z M2693.9,1397.1h318.9c118,0,193.9-108.2,193.9-229c0-125.1-92.7-226.2-202.3-226.2h-310.5V1397.1z"/>
+<path fill="#D22128" d="M3250.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H3250.5z M3708.6,970  l-205.1,493.2h404.7L3708.6,970z"/>
+<path fill="#D22128" d="M4637.3,849.1c177,0,306.3,89.9,368.1,217.8l-78.7,47.8c-63.2-132.1-186.9-177-295.1-177  c-238.9,0-369.5,213.6-369.5,414.5c0,220.6,161.6,420.1,373.7,420.1c112.4,0,244.5-56.2,307.7-185.5l81.5,42.1  c-64.6,148.9-241.7,231.8-394.8,231.8c-274,0-466.5-261.3-466.5-514.2C4163.8,1106.3,4336.6,849.1,4637.3,849.1z"/>
+<path fill="#D22128" d="M5949.1,854.8v997.6h-98.4v-466.5h-591.5v466.5h-96.9V854.8h96.9v444h591.5v-444H5949.1z"/>
+<path fill="#D22128" d="M6844.6,1765.2v87.1h-670.2V854.8H6832v87.1h-560.6v359.7h489v82.9h-489v380.8H6844.6z"/>
+<path fill="#6D6E71" d="M1667.6,2063.6c11.8,3.5,22.2,8.3,31,14.2l-10.3,22.6c-9-6-18.6-10.4-28.9-13.4c-10.2-2.9-20-4.4-29.2-4.4  c-13.6,0-24.5,2.4-32.6,7.3c-8.1,4.9-12.2,11.8-12.2,20.7c0,7.6,2.3,14,6.8,19c4.5,5,10.2,8.9,17,11.7c6.8,2.8,16.1,6,28,9.6  c14.4,4.6,26,8.9,34.7,12.9c8.8,4,16.3,9.9,22.5,17.8c6.2,7.8,9.3,18.2,9.3,31c0,11.7-3.2,21.8-9.5,30.6  c-6.3,8.7-15.3,15.5-26.8,20.3c-11.6,4.8-24.9,7.2-40,7.2c-15.1,0-29.7-2.9-43.9-8.7c-14.2-5.8-26.4-13.6-36.6-23.4l10.7-21.6  c9.6,9.4,20.7,16.7,33.3,21.9c12.6,5.2,24.8,7.8,36.8,7.8c15.3,0,27.3-3,36.1-8.9c8.8-5.9,13.2-13.9,13.2-23.9  c0-7.8-2.3-14.3-6.9-19.4c-4.6-5.1-10.3-9-17.1-11.9c-6.8-2.8-16.1-6-28-9.6c-14.2-4.2-25.7-8.3-34.6-12.2  c-8.9-3.9-16.4-9.7-22.5-17.5c-6.1-7.7-9.2-17.9-9.2-30.6c0-10.9,3-20.4,9-28.6c6-8.2,14.6-14.6,25.6-19.1  c11.1-4.5,23.8-6.8,38.2-6.8C1643.8,2058.3,1655.7,2060.1,1667.6,2063.6z"/>
+<path fill="#6D6E71" d="M1980.1,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6  c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6  c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14  C1944.8,2058.6,1963.2,2063.3,1980.1,2072.8z M1881.9,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1  c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30  c-13-7.4-27.2-11.2-42.6-11.2C1909.4,2081.5,1895.1,2085.2,1881.9,2092.7z"/>
+<path fill="#6D6E71" d="M2186.5,2082.4v74h98.4v23.2h-98.4v90.2h-24.1v-210.6h133.8v23.2H2186.5z"/>
+<path fill="#6D6E71" d="M2491.6,2082.4v187.4h-24.1v-187.4h-68.4v-23.2h161.4v23.2H2491.6z"/>
+<path fill="#6D6E71" d="M2871.8,2269.8l-56.8-177.4l-57.6,177.4h-24.5l-70.5-210.6h25.9l57.9,182.7l57.1-182.4l24.1-0.3l57.7,182.7  l57.1-182.7h25l-70.6,210.6H2871.8z"/>
+<path fill="#6D6E71" d="M3087.3,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6h-26.1l-23.5-53.2H3087.3z M3144.5,2086.6  l-46.9,106.8h94.4L3144.5,2086.6z"/>
+<path fill="#6D6E71" d="M3461.1,2202.7c-6,0.4-10.7,0.6-14.1,0.6h-56v66.5H3367v-210.6h80c26.2,0,46.6,6.2,61.2,18.5  c14.5,12.3,21.8,29.8,21.8,52.3c0,17.2-4.1,31.7-12.2,43.3c-8.1,11.6-19.8,20-35,25l49.2,71.5h-27.3L3461.1,2202.7z M3491.3,2167.6  c10.3-8.4,15.5-20.8,15.5-37c0-15.9-5.2-27.9-15.5-36c-10.3-8.1-25.1-12.2-44.3-12.2h-56v97.8h56  C3466.2,2180.2,3481,2176,3491.3,2167.6z"/>
+<path fill="#6D6E71" d="M3688.3,2082.4v69.2h106.2v23.2h-106.2v72.1h122.8v22.9h-146.9v-210.6h142.9v23.2H3688.3z"/>
+<path fill="#6D6E71" d="M4147,2082.4v74h98.4v23.2H4147v90.2h-24.1v-210.6h133.8v23.2H4147z"/>
+<path fill="#6D6E71" d="M4523.3,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6  c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6  c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14  C4488.1,2058.6,4506.5,2063.3,4523.3,2072.8z M4425.2,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1  c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30  c-13-7.4-27.2-11.2-42.6-11.2C4452.6,2081.5,4438.3,2085.2,4425.2,2092.7z"/>
+<path fill="#6D6E71" d="M4854.7,2247.7c-15.7,15.5-37.3,23.3-64.8,23.3c-27.7,0-49.4-7.8-65.1-23.3c-15.7-15.5-23.6-37-23.6-64.6  v-124h24.1v124c0,20.3,5.8,36.1,17.3,47.5c11.6,11.4,27.3,17.1,47.3,17.1c20.1,0,35.8-5.7,47.1-17c11.4-11.3,17-27.2,17-47.7v-124  h24.1v124C4878.2,2210.7,4870.4,2232.2,4854.7,2247.7z"/>
+<path fill="#6D6E71" d="M5169.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H5169.5z"/>
+<path fill="#6D6E71" d="M5478.4,2073.1c16.4,9.3,29.4,21.9,38.9,37.9c9.6,16,14.3,33.9,14.3,53.5s-4.8,37.6-14.3,53.6  c-9.5,16.1-22.6,28.7-39.3,37.9c-16.6,9.2-35.2,13.8-55.5,13.8h-84.3v-210.6h85.2C5443.7,2059.2,5462,2063.8,5478.4,2073.1z   M5362.3,2246.9h61.4c15.5,0,29.6-3.5,42.3-10.6c12.7-7.1,22.8-16.9,30.2-29.5c7.4-12.5,11.1-26.5,11.1-42  c0-15.5-3.8-29.4-11.3-41.9c-7.5-12.5-17.7-22.3-30.6-29.6c-12.8-7.2-27-10.9-42.6-10.9h-60.5V2246.9z"/>
+<path fill="#6D6E71" d="M5668.6,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6H5807l-23.5-53.2H5668.6z M5725.8,2086.6  l-46.9,106.8h94.4L5725.8,2086.6z"/>
+<path fill="#6D6E71" d="M5991,2082.4v187.4H5967v-187.4h-68.4v-23.2h161.4v23.2H5991z"/>
+<path fill="#6D6E71" d="M6175.9,2269.8v-210.6h24.1v210.6H6175.9z"/>
+<path fill="#6D6E71" d="M6493.7,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6  c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6  c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14  C6458.5,2058.6,6476.9,2063.3,6493.7,2072.8z M6395.6,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1  c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30  c-13-7.4-27.2-11.2-42.6-11.2C6423,2081.5,6408.8,2085.2,6395.6,2092.7z"/>
+<path fill="#6D6E71" d="M6826.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H6826.5z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-4516.6152" y1="-2338.7222" x2="-4108.4111" y2="-1861.3982" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0" style="stop-color:#F69923"/>
+	<stop offset="0.3123" style="stop-color:#F79A23"/>
+	<stop offset="0.8383" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M1230.1,13.7c-45.3,26.8-120.6,102.5-210.5,212.3l82.6,155.9c58-82.9,116.9-157.5,176.3-221.2  c4.6-5.1,7-7.5,7-7.5c-2.3,2.5-4.6,5-7,7.5c-19.2,21.2-77.5,89.2-165.5,224.4c84.7-4.2,214.9-21.6,321.1-39.7  c31.6-177-31-258-31-258S1323.4-41.4,1230.1,13.7z"/>
+<path fill="none" d="M1090.2,903.1c0.6-0.1,1.2-0.2,1.8-0.3l-11.9,1.3c-0.7,0.3-1.4,0.7-2.1,1  C1082.1,904.4,1086.2,903.7,1090.2,903.1z"/>
+<path fill="none" d="M1005.9,1182.3c-6.7,1.5-13.7,2.7-20.7,3.7C992.3,1185,999.2,1183.8,1005.9,1182.3z"/>
+<path fill="none" d="M432.9,1808.8c0.9-2.3,1.8-4.7,2.6-7c18.2-48,36.2-94.7,54-140.1c20-51,39.8-100.4,59.3-148.3  c20.6-50.4,40.9-99.2,60.9-146.3c21-49.4,41.7-97,62-142.8c16.5-37.3,32.8-73.4,48.9-108.3c5.4-11.7,10.7-23.2,16-34.6  c10.5-22.7,21-44.8,31.3-66.5c9.5-20,19-39.6,28.3-58.8c3.1-6.4,6.2-12.8,9.3-19.1c0.5-1,1-2,1.5-3.1l-10.2,1.1l-8-15.9  c-0.8,1.6-1.6,3.1-2.4,4.6c-14.5,28.8-28.9,57.9-43.1,87.2c-8.2,16.9-16.4,34-24.6,51c-22.6,47.4-44.8,95.2-66.6,143.3  c-22.1,48.6-43.7,97.5-64.9,146.5c-20.8,48.1-41.3,96.2-61.2,144.2c-20,48-39.5,95.7-58.5,143.2c-19.9,49.5-39.2,98.7-58,147.2  c-4.2,10.9-8.5,21.9-12.7,32.8c-15,39.2-29.7,77.8-44,116l12.7,25.1l11.4-1.2c0.4-1.1,0.8-2.3,1.3-3.4  C396.7,1905.4,414.9,1856.4,432.9,1808.8z"/>
+<path fill="none" d="M980,1186.8L980,1186.8c0.1,0,0.1,0,0.1-0.1C980.1,1186.8,980.1,1186.8,980,1186.8z"/>
+<path fill="#BE202E" d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6  C942,1325.2,947.3,1324.1,952.6,1323z"/>
+<path opacity="0.35" fill="#BE202E" d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6  C942,1325.2,947.3,1324.1,952.6,1323z"/>
+<path fill="#BE202E" d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1c1.8-0.2,3.5-0.5,5.2-0.8  c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"/>
+<path opacity="0.35" fill="#BE202E" d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1  c1.8-0.2,3.5-0.5,5.2-0.8c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-7537.7339" y1="-2391.4075" x2="-4625.4141" y2="-2391.4075" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M858.6,784.7c25.1-46.9,50.5-92.8,76.2-137.4c26.7-46.4,53.7-91.3,80.9-134.7  c1.6-2.6,3.2-5.2,4.8-7.7c27-42.7,54.2-83.7,81.6-122.9L1019.5,226c-6.2,7.6-12.5,15.3-18.8,23.2c-23.8,29.7-48.6,61.6-73.9,95.5  c-28.6,38.2-58,78.9-87.8,121.7c-27.6,39.5-55.5,80.9-83.5,123.7c-23.8,36.5-47.7,74-71.4,112.5c-0.9,1.4-1.8,2.9-2.6,4.3  l107.5,212.3C811.8,873.6,835.1,828.7,858.6,784.7z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-7186.1777" y1="-2099.3059" x2="-5450.7183" y2="-2099.3059" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0" style="stop-color:#282662"/>
+	<stop offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop offset="0.7882" style="stop-color:#9F2064"/>
+	<stop offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M369,1981c-14.2,39.1-28.5,78.9-42.9,119.6c-0.2,0.6-0.4,1.2-0.6,1.8c-2,5.7-4.1,11.5-6.1,17.2  c-9.7,27.4-18,52.1-37.3,108.2c31.7,14.5,57.1,52.5,81.1,95.6c-2.6-44.7-21-86.6-56.2-119.1c156.1,7,290.6-32.4,360.1-146.6  c6.2-10.2,11.9-20.9,17-32.2c-31.6,40.1-70.8,57.1-144.5,53c-0.2,0.1-0.3,0.1-0.5,0.2c0.2-0.1,0.3-0.1,0.5-0.2  c108.6-48.6,163.1-95.3,211.2-172.6c11.4-18.3,22.5-38.4,33.8-60.6c-94.9,97.5-205,125.3-320.9,104.2l-86.9,9.5  C374.4,1966.3,371.7,1973.6,369,1981z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2418.5454" x2="-4461.8428" y2="-2418.5454" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_4_)" d="M409.6,1786.3c18.8-48.5,38.1-97.7,58-147.2c19-47.4,38.5-95.2,58.5-143.2  c20-48,40.4-96.1,61.2-144.2c21.2-49,42.9-97.8,64.9-146.5c21.8-48.1,44-95.9,66.6-143.3c8.1-17.1,16.3-34.1,24.6-51  c14.2-29.3,28.6-58.4,43.1-87.2c0.8-1.6,1.6-3.1,2.4-4.6L681.4,706.8c-1.8,2.9-3.5,5.8-5.3,8.6c-25.1,40.9-50,82.7-74.4,125.4  c-24.7,43.1-49,87.1-72.7,131.7c-20,37.6-39.6,75.6-58.6,113.9c-3.8,7.8-7.6,15.5-11.3,23.2c-23.4,48.2-44.6,94.8-63.7,139.5  c-21.7,50.7-40.7,99.2-57.5,145.1c-11,30.2-21,59.4-30.1,87.4c-7.5,24-14.7,47.9-21.5,71.8c-16,56.3-29.9,112.4-41.2,168.3  L353,1935.1c14.3-38.1,28.9-76.8,44-116C401.1,1808.2,405.4,1797.3,409.6,1786.3z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-7161.7642" y1="-2379.1431" x2="-5631.2524" y2="-2379.1431" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0" style="stop-color:#282662"/>
+	<stop offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop offset="0.7882" style="stop-color:#9F2064"/>
+	<stop offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_5_)" d="M243.5,1729.4c-13.6,68.2-23.2,136.2-28,203.8c-0.2,2.4-0.4,4.7-0.5,7.1  c-33.7-54-124-106.8-123.8-106.2c64.6,93.7,113.7,186.7,120.9,278c-34.6,7.1-82-3.2-136.8-23.3c57.1,52.5,100,67,116.7,70.9  c-52.5,3.3-107.1,39.3-162.1,80.8c80.5-32.8,145.5-45.8,192.1-35.3C148.1,2414.2,74.1,2645,0,2890c22.7-6.7,36.2-21.9,43.9-42.6  c13.2-44.4,100.8-335.6,238-718.2c3.9-10.9,7.8-21.8,11.8-32.9c1.1-3,2.2-6.1,3.3-9.2c14.5-40.1,29.5-81.1,45.1-122.9  c3.5-9.5,7.1-19,10.7-28.6c0.1-0.2,0.1-0.4,0.2-0.6l-107.9-213.2C244.6,1724.4,244,1726.9,243.5,1729.4z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2117.1309" x2="-4461.8428" y2="-2117.1309" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_6_)" d="M805.6,937c-3.1,6.3-6.2,12.7-9.3,19.1c-9.3,19.2-18.8,38.8-28.3,58.8  c-10.3,21.7-20.7,43.9-31.3,66.5c-5.3,11.4-10.6,22.9-16,34.6c-16.1,35-32.4,71.1-48.9,108.3c-20.3,45.8-41,93.4-62,142.8  c-20,47.1-40.3,95.9-60.9,146.3c-19.5,47.9-39.3,97.3-59.3,148.3c-17.8,45.4-35.9,92.1-54,140.1c-0.9,2.3-1.8,4.7-2.6,7  c-18,47.6-36.2,96.6-54.6,146.8c-0.4,1.1-0.8,2.3-1.3,3.4l86.9-9.5c-1.7-0.3-3.5-0.5-5.2-0.9c103.9-13,242.1-90.6,331.4-186.5  c41.1-44.2,78.5-96.3,113-157.3c25.7-45.4,49.8-95.8,72.8-151.5c20.1-48.7,39.4-101.4,58-158.6c-23.9,12.6-51.2,21.8-81.4,28.2  c-5.3,1.1-10.7,2.2-16.1,3.1c-5.5,1-11,1.8-16.6,2.6l0,0l0,0c0.1,0,0.1-0.1,0.2-0.1c96.9-37.3,158-109.2,202.4-197.4  c-25.5,17.4-66.9,40.1-116.6,51.1c-6.7,1.5-13.7,2.7-20.7,3.7c-1.7,0.3-3.5,0.6-5.2,0.8l0,0l0,0c0.1,0,0.1,0,0.1-0.1  c0,0,0.1,0,0.1,0l0,0c33.6-14.1,62-29.8,86.6-48.4c5.3-4,10.4-8.1,15.3-12.3c7.5-6.5,14.7-13.3,21.5-20.5c4.4-4.6,8.6-9.3,12.7-14.2  c9.6-11.5,18.7-23.9,27.1-37.3c2.6-4.1,5.1-8.3,7.6-12.6c3.2-6.2,6.3-12.3,9.3-18.3c13.5-27.2,24.4-51.5,33-72.8  c4.3-10.6,8.1-20.5,11.3-29.7c1.3-3.7,2.5-7.2,3.7-10.6c3.4-10.2,6.2-19.3,8.4-27.3c3.3-12,5.3-21.5,6.4-28.4l0,0l0,0  c-3.3,2.6-7.1,5.2-11.3,7.7c-29.3,17.5-79.5,33.4-119.9,40.8l79.8-8.8l-79.8,8.8c-0.6,0.1-1.2,0.2-1.8,0.3c-4,0.7-8.1,1.3-12.2,2  c0.7-0.3,1.4-0.7,2.1-1l-273,29.9C806.6,935,806.1,936,805.6,937z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-7554.8232" y1="-2132.0981" x2="-4642.5034" y2="-2132.0981" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_7_)" d="M1112.9,385.1c-24.3,37.3-50.8,79.6-79.4,127.5c-1.5,2.5-3,5.1-4.5,7.6  c-24.6,41.5-50.8,87.1-78.3,137c-23.8,43.1-48.5,89.3-74.3,139c-22.4,43.3-45.6,89.2-69.4,137.8l273-29.9  c79.5-36.6,115.1-69.7,149.6-117.6c9.2-13.2,18.4-27,27.5-41.3c28-43.8,55.6-92,80.1-139.9c23.7-46.3,44.7-92.2,60.7-133.5  c10.2-26.3,18.4-50.8,24.1-72.3c5-19,8.9-36.9,11.9-54.1C1327.9,363.5,1197.6,380.9,1112.9,385.1z"/>
+<path fill="#BE202E" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<path opacity="0.35" fill="#BE202E" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2027.484" x2="-4461.8433" y2="-2027.484" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_8_)" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<path fill="#BE202E" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<path opacity="0.35" fill="#BE202E" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2037.7417" x2="-4461.8433" y2="-2037.7417" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_9_)" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<path fill="#BE202E" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7  C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+<path opacity="0.35" fill="#BE202E" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7  L980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-5738.0635" y1="-2039.799" x2="-5094.3457" y2="-2039.799" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_10_)" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7  C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+</svg>
diff --git a/ui/public/assets/feather.svg b/ui/public/assets/feather.svg
new file mode 100644
index 00000000000..95cc5b2c07a
--- /dev/null
+++ b/ui/public/assets/feather.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Feather" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 2392.5 4226.6" enable-background="new 0 0 2392.5 4226.6" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-5167.0962" y1="697.5549" x2="-4570.1162" y2="1395.619" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0" style="stop-color:#F69923"/>
+	<stop offset="0.3123" style="stop-color:#F79A23"/>
+	<stop offset="0.8383" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M1798.9,20.1C1732.6,59.2,1622.5,170,1491,330.5l120.8,228c84.8-121.3,170.9-230.4,257.8-323.6  c6.7-7.4,10.2-10.9,10.2-10.9c-3.4,3.6-6.8,7.3-10.2,10.9c-28.1,31-113.4,130.5-242.1,328.1c123.9-6.2,314.3-31.5,469.6-58.1  c46.2-258.8-45.3-377.3-45.3-377.3S1935.5-60.6,1798.9,20.1z"/>
+<path fill="none" d="M1594.4,1320.7c0.9-0.2,1.8-0.3,2.7-0.5l-17.4,1.9c-1.1,0.5-2,1-3.1,1.4  C1582.6,1322.6,1588.5,1321.6,1594.4,1320.7z"/>
+<path fill="none" d="M1471.1,1729.1c-9.9,2.2-20,3.9-30.2,5.4C1451.1,1733,1461.2,1731.2,1471.1,1729.1z"/>
+<path fill="none" d="M633.1,2645.2c1.3-3.4,2.6-6.8,3.8-10.2c26.6-70.2,52.9-138.4,79-204.9c29.3-74.6,58.2-146.8,86.8-216.8  c30.1-73.8,59.8-145.1,89.1-214c30.7-72.3,61-141.9,90.7-208.9c24.2-54.5,48-107.3,71.5-158.4c7.8-17,15.6-33.9,23.4-50.6  c15.4-33.1,30.7-65.6,45.7-97.3c13.9-29.3,27.7-57.9,41.4-86c4.5-9.4,9.1-18.6,13.6-27.9c0.7-1.5,1.5-3,2.2-4.5l-14.8,1.6  l-11.8-23.2c-1.1,2.3-2.3,4.5-3.5,6.8c-21.2,42.1-42.2,84.6-63,127.5c-12,24.8-24,49.7-35.9,74.7c-33,69.3-65.5,139.2-97.4,209.6  c-32.3,71.1-63.9,142.6-94.9,214.2c-30.5,70.3-60.3,140.7-89.6,210.9c-29.2,70.1-57.7,140-85.6,209.4  c-29.1,72.5-57.4,144.3-84.8,215.3c-6.2,16-12.4,32-18.5,48c-22,57.3-43.4,113.8-64.3,169.6l18.6,36.7l16.6-1.8  c0.6-1.7,1.2-3.4,1.8-5C580.1,2786.5,606.7,2714.9,633.1,2645.2z"/>
+<path fill="none" d="M1433.2,1735.7L1433.2,1735.7c0.1,0,0.1-0.1,0.2-0.1C1433.4,1735.6,1433.3,1735.6,1433.2,1735.7z"/>
+<path fill="#BE202E" d="M1393.2,1934.8c-15.4,2.8-31.3,5.5-47.6,8.3c-0.1,0-0.2,0.1-0.3,0.1c8.2-1.2,16.3-2.4,24.3-3.8  C1377.6,1938,1385.4,1936.5,1393.2,1934.8z"/>
+<path opacity="0.35" fill="#BE202E" d="M1393.2,1934.8c-15.4,2.8-31.3,5.5-47.6,8.3c-0.1,0-0.2,0.1-0.3,0.1  c8.2-1.2,16.3-2.4,24.3-3.8C1377.6,1938,1385.4,1936.5,1393.2,1934.8z"/>
+<path fill="#BE202E" d="M1433.6,1735.5c0,0-0.1,0-0.1,0.1c-0.1,0-0.1,0.1-0.2,0.1c2.6-0.3,5.1-0.8,7.6-1.1  c10.3-1.5,20.4-3.3,30.2-5.4C1458.8,1731.2,1446.3,1733.4,1433.6,1735.5L1433.6,1735.5L1433.6,1735.5z"/>
+<path opacity="0.35" fill="#BE202E" d="M1433.6,1735.5c0,0-0.1,0-0.1,0.1c-0.1,0-0.1,0.1-0.2,0.1c2.6-0.3,5.1-0.8,7.6-1.1  c10.3-1.5,20.4-3.3,30.2-5.4C1458.8,1731.2,1446.3,1733.4,1433.6,1735.5L1433.6,1735.5L1433.6,1735.5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-9585.3418" y1="620.5048" x2="-5326.209" y2="620.5048" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M1255.7,1147.6c36.7-68.6,73.9-135.7,111.5-201c39-67.8,78.5-133.6,118.4-197c2.3-3.7,4.7-7.5,7-11.3  c39.4-62.4,79.2-122.4,119.3-179.8l-120.8-228c-9.1,11.1-18.2,22.4-27.5,33.9c-34.8,43.4-71,90.1-108.1,139.6  c-41.8,55.8-84.8,115.4-128.5,177.9c-40.3,57.8-81.2,118.3-122.1,180.9c-34.8,53.3-69.8,108.2-104.5,164.5c-1.3,2.1-2.6,4.2-3.9,6.3  l157.2,310.5C1187.3,1277.6,1221.3,1212,1255.7,1147.6z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-9071.207" y1="1047.6898" x2="-6533.1782" y2="1047.6898" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0" style="stop-color:#282662"/>
+	<stop offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop offset="0.7882" style="stop-color:#9F2064"/>
+	<stop offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M539.7,2897.1c-20.8,57.2-41.7,115.4-62.7,174.9c-0.3,0.9-0.6,1.7-0.9,2.6c-3,8.4-5.9,16.8-8.9,25.2  c-14.1,40.1-26.4,76.2-54.5,158.3c46.3,21.1,83.5,76.7,118.7,139.8c-3.7-65.3-30.8-126.7-82.1-174.2  c228.3,10.3,425-47.4,526.7-214.3c9.1-14.9,17.4-30.5,24.9-47.2c-46.2,58.6-103.5,83.5-211.4,77.4c-0.2,0.1-0.5,0.2-0.7,0.3  c0.2-0.1,0.5-0.2,0.7-0.3c158.8-71.1,238.5-139.3,308.9-252.4c16.7-26.8,32.9-56.1,49.5-88.6C1009,2841.2,848.1,2881.8,678.6,2851  l-127.1,13.9C547.5,2875.6,543.6,2886.3,539.7,2897.1z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-9346.126" y1="580.817" x2="-5086.9941" y2="580.817" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_4_)" d="M599,2612.4c27.5-71,55.8-142.8,84.8-215.3c27.8-69.4,56.4-139.2,85.6-209.4  c29.2-70.2,59.1-140.5,89.6-210.9c31-71.6,62.7-143.1,94.9-214.2c31.9-70.3,64.4-140.3,97.4-209.6c11.9-25,23.9-49.9,35.9-74.7  c20.8-42.9,41.8-85.4,63-127.5c1.1-2.3,2.3-4.5,3.5-6.8l-157.2-310.5c-2.6,4.2-5.1,8.4-7.7,12.6c-36.6,59.8-73.1,121-108.9,183.5  c-36.2,63.1-71.7,127.4-106.4,192.6c-29.3,55-57.9,110.5-85.7,166.5c-5.6,11.4-11.1,22.6-16.6,33.9  c-34.3,70.5-65.2,138.6-93.2,204.1c-31.7,74.2-59.6,145.1-84,212.3c-16.1,44.2-30.7,86.9-44.1,127.9c-11,35-21.5,70.1-31.4,105  c-23.5,82.3-43.7,164.4-60.3,246.2L516.2,2830c20.9-55.8,42.3-112.3,64.3-169.6C586.6,2644.5,592.8,2628.4,599,2612.4z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-9035.5029" y1="638.4408" x2="-6797.2012" y2="638.4408" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0" style="stop-color:#282662"/>
+	<stop offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop offset="0.7882" style="stop-color:#9F2064"/>
+	<stop offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_5_)" d="M356.1,2529.2c-19.8,99.8-33.9,199.2-41,298c-0.2,3.5-0.6,6.9-0.8,10.4  c-49.3-79-181.3-156.1-181-155.4c94.5,137,166.2,273,176.9,406.5c-50.6,10.4-119.9-4.6-200-34.1c83.5,76.7,146.2,97.9,170.6,103.6  c-76.7,4.8-156.6,57.5-237.1,118.2c117.7-48,212.8-67,280.9-51.6C216.6,3530.6,108.3,3868.2,0,4226.6c33.2-9.8,53-32.1,64.1-62.3  c19.3-64.9,147.4-490.7,348.1-1050.4c5.7-15.9,11.5-31.9,17.3-48c1.6-4.5,3.3-9,4.9-13.4c21.2-58.7,43.2-118.6,65.9-179.7  c5.2-13.9,10.4-27.8,15.6-41.8c0.1-0.3,0.2-0.6,0.3-0.8l-157.8-311.8C357.7,2521.9,356.8,2525.5,356.1,2529.2z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-9346.126" y1="1021.6218" x2="-5086.9941" y2="1021.6218" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_6_)" d="M1178.1,1370.3c-4.5,9.2-9,18.5-13.6,27.9c-13.6,28.1-27.4,56.7-41.4,86  c-15.1,31.7-30.3,64.1-45.7,97.3c-7.8,16.7-15.5,33.5-23.4,50.6c-23.5,51.1-47.3,103.9-71.5,158.4c-29.7,67-60,136.6-90.7,208.9  c-29.3,68.9-59,140.2-89.1,214c-28.6,70-57.5,142.3-86.8,216.8c-26.1,66.5-52.4,134.7-79,204.9c-1.3,3.4-2.6,6.8-3.8,10.2  c-26.4,69.7-53,141.3-79.8,214.7c-0.6,1.7-1.2,3.4-1.8,5l127.1-13.9c-2.5-0.5-5.1-0.8-7.6-1.3c152-18.9,354-132.5,484.6-272.7  c60.2-64.6,114.8-140.8,165.3-230c37.6-66.4,72.9-140,106.5-221.5c29.4-71.2,57.6-148.3,84.8-231.9c-34.9,18.4-74.9,31.9-119,41.3  c-7.7,1.6-15.6,3.2-23.6,4.6c-8,1.4-16.1,2.7-24.3,3.8l0,0l0,0c0.1,0,0.2-0.1,0.3-0.1c141.7-54.5,231.1-159.8,296.1-288.7  c-37.3,25.4-97.9,58.7-170.5,74.7c-9.9,2.2-20,3.9-30.2,5.4c-2.6,0.4-5.1,0.8-7.6,1.1l0,0l0,0c0.1,0,0.1-0.1,0.2-0.1  c0,0,0.1,0,0.1-0.1l0,0c49.2-20.6,90.7-43.6,126.7-70.8c7.7-5.8,15.2-11.8,22.4-18.1c11-9.5,21.4-19.5,31.4-30  c6.4-6.7,12.6-13.6,18.6-20.8c14.1-16.8,27.3-34.9,39.7-54.6c3.8-6,7.5-12.1,11.2-18.4c4.7-9.1,9.2-18,13.6-26.8  c19.8-39.8,35.6-75.3,48.2-106.5c6.3-15.6,11.8-30,16.5-43.4c1.9-5.3,3.7-10.5,5.4-15.5c5-15,9.1-28.3,12.3-40  c4.8-17.5,7.7-31.4,9.3-41.5l0,0l0,0c-4.8,3.8-10.3,7.6-16.5,11.3c-42.8,25.6-116.2,48.8-175.4,59.7l116.7-12.8l-116.7,12.8  c-0.9,0.2-1.8,0.3-2.7,0.5c-5.9,1-11.9,1.9-17.9,2.9c1.1-0.5,2-1,3.1-1.4l-399.3,43.8C1179.6,1367.4,1178.9,1368.8,1178.1,1370.3z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-9610.334" y1="999.733" x2="-5351.2017" y2="999.733" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_7_)" d="M1627.6,563.1c-35.5,54.5-74.3,116.4-116,186.5c-2.2,3.6-4.4,7.4-6.6,11.1  c-36,60.7-74.3,127.3-114.5,200.3c-34.8,63-71,130.6-108.6,203.3c-32.8,63.3-66.7,130.5-101.5,201.6l399.3-43.8  c116.3-53.5,168.3-101.9,218.8-171.9c13.4-19.3,26.9-39.5,40.3-60.4c41-64,81.2-134.5,117.2-204.6c34.7-67.7,65.3-134.8,88.8-195.3  c14.9-38.5,26.9-74.3,35.2-105.7c7.3-27.7,13-54,17.4-79.1C1941.9,531.6,1751.5,557,1627.6,563.1z"/>
+<path fill="#BE202E" d="M1369.6,1939.4c-8,1.4-16.1,2.7-24.3,3.8l0,0C1353.5,1942.1,1361.6,1940.8,1369.6,1939.4z"/>
+<path opacity="0.35" fill="#BE202E" d="M1369.6,1939.4c-8,1.4-16.1,2.7-24.3,3.8l0,0C1353.5,1942.1,1361.6,1940.8,1369.6,1939.4z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="-9346.126" y1="1152.7261" x2="-5086.9941" y2="1152.7261" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_8_)" d="M1369.6,1939.4c-8,1.4-16.1,2.7-24.3,3.8l0,0C1353.5,1942.1,1361.6,1940.8,1369.6,1939.4z"/>
+<path fill="#BE202E" d="M1433.2,1735.7c2.6-0.3,5.1-0.8,7.6-1.1C1438.3,1734.9,1435.8,1735.3,1433.2,1735.7L1433.2,1735.7z"/>
+<path opacity="0.35" fill="#BE202E" d="M1433.2,1735.7c2.6-0.3,5.1-0.8,7.6-1.1C1438.3,1734.9,1435.8,1735.3,1433.2,1735.7  L1433.2,1735.7z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="-9346.126" y1="1137.7247" x2="-5086.9941" y2="1137.7247" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_9_)" d="M1433.2,1735.7c2.6-0.3,5.1-0.8,7.6-1.1C1438.3,1734.9,1435.8,1735.3,1433.2,1735.7L1433.2,1735.7z"/>
+<path fill="#BE202E" d="M1433.5,1735.6c0,0,0.1,0,0.1-0.1l0,0l0,0l0,0C1433.6,1735.5,1433.5,1735.5,1433.5,1735.6z"/>
+<path opacity="0.35" fill="#BE202E" d="M1433.5,1735.6c0,0,0.1,0,0.1-0.1l0,0l0,0l0,0C1433.6,1735.5,1433.5,1735.5,1433.5,1735.6z"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-6953.4072" y1="1134.7161" x2="-6011.9995" y2="1134.7161" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 3144.8108 -4619.2983)">
+	<stop offset="0.3233" style="stop-color:#9E2064"/>
+	<stop offset="0.6302" style="stop-color:#C92037"/>
+	<stop offset="0.7514" style="stop-color:#CD2335"/>
+	<stop offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_10_)" d="M1433.5,1735.6c0,0,0.1,0,0.1-0.1l0,0l0,0l0,0C1433.6,1735.5,1433.5,1735.5,1433.5,1735.6z"/>
+<path fill="#6D6E71" d="M2218.7,387v11.7h27.4v77.4h12.7v-77.4h27.6V387H2218.7z M2377,387l-30.6,62.2l-30.8-62.2h-15.3v89.1h11.7  v-70.7l30.3,61.3h8.1l30.3-61.3v70.7h11.7V387H2377z"/>
+</svg>
diff --git a/ui/public/config.json b/ui/public/config.json
index d56e6f03783..bea9599fa3a 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -17,6 +17,7 @@
   "logo": "assets/logo.svg",
   "minilogo": "assets/mini-logo.svg",
   "banner": "assets/banner.svg",
+  "favicon": "cloud.ico",
   "error": {
     "403": "assets/403.png",
     "404": "assets/404.png",
diff --git a/ui/public/css/apache-theme.css b/ui/public/css/apache-theme.css
new file mode 100644
index 00000000000..573c062c513
--- /dev/null
+++ b/ui/public/css/apache-theme.css
@@ -0,0 +1,1169 @@
+/*
+* 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.
+*/
+
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+
+:root {
+  --main-verde: #3E7C59;
+  --main-vermelho: #ae0000;
+  --main-normal:#327355;
+  --main-exception:#ae0000;
+  --main-primary-claro: #db4e2d22;
+  --main-primary-escuro: #db4e2d;
+  --main-secondary-claro: #E9782622;
+  --main-secondary-escuro: #E97826;
+  --main-grey-claro: #eee;
+  --main-grey-escuro: #6D6E71;
+  --main-image-menu: url("../assets/asf-logo.svg");
+  --main-image-login: url("../assets/asf-logo.svg");
+  --main-image-icon: url("../assets/feather.svg");
+  --main-linear-cora: #ddd;
+  --main-linear-corb: #ddd;
+}
+
+#app > div > form > img.user-layout-logo{
+  display:none !important;
+}
+
+#app > div > form{
+  background-image:var(--main-image-login);
+  background-repeat:no-repeat;
+  background-size:250px;
+  background-position:top center;
+  padding-top:120px;
+}
+
+.userLayout .user-layout-header{
+  min-height:100px;
+  background-image:var(--main-image-login);
+  background-repeat:no-repeat;
+  background-size:250px;
+  background-position:top center;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu > div > div{
+  height: 100px !important;
+  background-image:var(--main-image-menu);
+  background-repeat:no-repeat;
+  background-size:200px;
+  background-position:25px 25px;
+  margin-bottom:20px;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu.ant-layout-sider-collapsed > div > div{
+  height: 70px !important;
+  background-image:var(--main-image-icon);
+  background-repeat:no-repeat;
+  background-size:30px;
+  background-position:25px 20px;
+}
+
+.sider.light .ant-menu-light a,
+.sider.light .ant-menu-submenu > .ant-menu-submenu-title {
+  color:#000 !important;
+}
+
+.sider.light .ant-menu-light a path{
+
+}
+
+.ant-menu:not(.ant-menu-horizontal) span.ant-menu-title-content .custom-icon path{
+  transition:fill 1s easyin;
+}
+
+.ant-menu:not(.ant-menu-horizontal) span.ant-menu-title-content:hover .custom-icon path{
+  fill:#fff !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-active:hover a,
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-submenu .ant-menu-submenu-title:hover{
+  color:#fff !important;
+}
+
+.ant-menu-submenu ul a,
+.ant-menu-submenu ul .ant-menu-item-active.ant-menu-item-selected a span{
+  color:#fff !important;
+}
+
+.ant-menu-submenu ul .ant-menu-item-selected a span{
+  color:#000 !important;
+}
+
+*{
+  font-family: 'Poppins' , Courier !important;
+}
+
+aside,
+.ant-menu-submenu ul{
+  background: linear-gradient(var(--main-linear-cora), var(--main-linear-corb)) !important;
+}
+
+html{
+  background-color: var(--main-secondary-escuro);
+}
+
+/* HEADER */
+.layout.ant-layout .header{
+  background: linear-gradient(var(--main-linear-cora), var(--main-linear-corb)) !important;
+  box-shadow: 0px 0px 10px #00000055;
+}
+
+.layout.ant-layout .header .user-menu > span.ant-dropdown-open{
+  background-color:var(--main-primary-claro) !important;
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+}
+
+.layout.ant-layout .header .anticon-menu-unfold:hover,
+.layout.ant-layout .header .anticon-menu-fold:hover,
+.layout.ant-layout .header .user-menu > span:hover{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+.layout.ant-layout .header .user-menu > span:hover *{
+  color:#fff !important;
+}
+.layout.ant-layout .header .user-menu > span *{
+  color:#000 !important;
+}
+
+.layout.ant-layout .header .anticon-menu-unfold,
+.layout.ant-layout .header .anticon-menu-fold{
+  color:#000;
+}
+
+.header-notice-opener{
+  padding-left:15px;
+}
+
+
+.ant-table-tbody > .ant-table-row:hover td{
+  background-color:var(--main-secondary-claro) !important;
+}
+
+/* SIDE BAR */
+
+.vm-info-card .ant-card-body .ant-card-bordered{
+  border-top:2px solid var(--main-primary-escuro) !important;
+  margin-bottom:50px;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .ant-card-head,
+.vm-info-card .ant-card-body .ant-card-bordered .ant-card-grid{
+  padding:10px 0px !important;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .resource-detail-item{
+  margin-bottom:20px;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .resource-detail-item .resource-detail-item__label{
+  font-weight:900;
+}
+
+/* USER LOGIN SCREEN */
+
+.ant-tabs-tab,
+.user-layout{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:0px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-secondary-escuro) !important;
+  color: #fff;
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-nav{
+  width:100%;
+}
+
+.user-layout .ant-tabs-nav > div > div{
+  width:50%;
+}
+
+/* IMAGES LOGO */
+.userLayout .user-layout-logo{
+  display:none;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu > div > div > img{
+  display:none !important;
+}
+
+/* PROGRESS */
+.ant-progress.ant-progress-status-active .ant-progress-inner,
+.ant-progress.ant-progress-status-normal .ant-progress-inner{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-progress.ant-progress-status-active .ant-progress-inner .ant-progress-bg,
+.ant-progress.ant-progress-status-normal .ant-progress-inner .ant-progress-bg{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-progress .ant-progress-text{
+  color:var(--main-grey-escuro) !important;
+  font-weight:900;
+}
+
+.ant-progress.ant-progress-status-exception .ant-progress-inner .ant-progress-bg{
+  background-color:var(--main-exception) !important;
+}
+
+/* FORMS */
+.ant-select-selector,
+.ant-input{
+  background-color:white !important;
+}
+
+.ant-select.ant-select-focused .ant-select-arrow .anticon{
+  color:var(--main-grey-claro);
+}
+
+.ant-select-selector .ant-select-selection-placeholder,
+.ant-select,
+.ant-input::placeholder{
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-select-selector:hover, .ant-select-selector:focus,
+.ant-input:hover, .ant-input:focus{
+  box-shadow: 0px 0px 3px var(--main-primary-escuro);
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-color: var(--main-primary-escuro);
+  border-right-width: 1px !important;
+  box-shadow: 0 0 0 2px var(--main-primary-claro);
+}
+
+.ant-select-dropdown .ant-select-item.ant-select-item-option-selected,
+.ant-select-dropdown .ant-select-item:hover{
+  background-color:var(--main-primary-claro)  !important;
+}
+
+/* PAGINATION */
+.ant-pagination .ant-pagination-item.ant-pagination-item-active{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:#fff;
+}
+
+.ant-pagination .ant-pagination-item.ant-pagination-item-active a{
+  color:#fff !important;
+  font-weight:bold;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active){
+  background-color:#fff !important;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active):hover{
+  background-color:var(--main-secondary-escuro) !important;
+  border-color:#fff;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active):hover a{
+  color:#fff !important;
+  font-weight:bold;
+}
+
+.ant-pagination .ant-pagination-next span,
+.ant-pagination .ant-pagination-prev span{
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-pagination .ant-pagination-next span:hover,
+.ant-pagination .ant-pagination-prev span:hover{
+  color:var(--main-secondary-escuro) !important;
+}
+
+
+/* RADIO GROUP */
+.ant-radio-group label.ant-radio-button-wrapper-checked{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-radio-group label:not(.ant-radio-button-wrapper-checked):hover{
+  color:#000 !important;
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* TABLES */
+.ant-table{
+  font-size:16px !important;
+}
+
+.ant-table th{
+  border-bottom:5px solid var(--main-primary-claro) !important;
+}
+
+.ant-table th.ant-table-column-has-sorters:hover{
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+}
+
+.ant-table thead.ant-table-thead{
+  background-color:Red !important;
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+}
+
+.anticon.ant-table-column-sorter-up.on *,
+.anticon.ant-table-column-sorter-down.on *{
+  color: var(--main-primary-escuro) !important;
+}
+
+/* PAGE TABS LEFT */
+.ant-tabs-left-bar .ant-tabs-nav-scroll {
+  border-right:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  margin:0px;
+  padding:10px 15px;
+  border-right:3px solid transparent;
+  transform: all 1s easyin !important;
+  background-color:#fff !important;
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active,
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-right:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll  .ant-tabs-ink-bar{
+  display:none !important;
+  width:0px !important;
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* PAGE TABS TOP */
+.ant-tabs-tab-next,
+.ant-tabs-tab-prev{
+  color:var(--main-primary-escuro) !important;
+}
+
+.ant-tabs-tab-next svg,
+.ant-tabs-tab-prev svg{
+  transform: scale(1.5);
+}
+
+.ant-tabs-tab-next:not(.ant-tabs-tab-btn-disabled):hover,
+.ant-tabs-tab-prev:not(.ant-tabs-tab-btn-disabled):hover{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+.ant-tabs-tab-next.ant-tabs-tab-btn-disabled,
+.ant-tabs-tab-prev.ant-tabs-tab-btn-disabled{
+  color:var(--main-primary-claro) !important;
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll {
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  margin:0px;
+  padding:14px 30px;
+  border-bottom:3px solid transparent;
+  transform: all 1s easyin !important;
+  background-color:#fff !important;
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active,
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll  .ant-tabs-ink-bar{
+  height:0px !important;
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* LINKS */
+a{
+  color: var(--main-primary-escuro);
+}
+
+a:hover{
+  color: var(--main-secondary-escuro);
+}
+
+.ant-breadcrumb-link a:hover{
+  color: var(--main-primary-escuro) !important;;
+}
+
+.ant-breadcrumb-link .anticon{
+  margin-top:5px !important;
+}
+
+.ant-breadcrumb-link .ant-select-arrow .anticon{
+  margin-top:0px !important;
+}
+
+/* USER MENU */
+.user-menu > span{
+  border-bottom:5px solid transparent;
+}
+
+.user-menu > span:hover{
+  border-bottom:5px solid var(--main-primary-escuro);
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-dropdown .ant-dropdown-menu-item:hover{
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-dropdown .ant-dropdown-menu-item:hover *{
+  color:#000;
+}
+
+.ant-dropdown .ant-dropdown-menu-item.ant-dropdown-menu-item-selected,
+.ant-dropdown .ant-dropdown-menu-item.ant-dropdown-menu-item-selected:hover *{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+/* CHECKBOXES */
+.ant-checkbox-checked .ant-checkbox-inner {
+  background-color: var(--main-primary-escuro) !important;
+  border-color: var(--main-primary-escuro) !important;
+}
+
+.ant-checkbox .ant-checkbox-inner {
+  border-color: var(--main-primary-escuro) !important;
+}
+
+.ant-checkbox-indeterminate .ant-checkbox-inner::after{
+  background-color: var(--main-primary-escuro) !important;
+}
+
+/* SEARCH */
+/*
+.ant-input-search .ant-input-wrapper.ant-input-group{
+  display:flex;
+  justify-content: flex-end;
+  padding-right:2%;
+
+}
+
+.ant-input-search.ant-input-affix-wrapper{
+  width:300px !important;
+  transform: width 1s easyin;
+  border:0px;
+}
+
+.ant-input-search.ant-input-affix-wrapper-focused{
+  width:98% !important;
+  border:0px !important;
+  border-color:transparent !important;
+}
+*/
+
+.breadcrumb-card > .ant-card-body >.ant-row{
+  display:flex;
+  align-items: end;
+  height:90px;
+}
+
+.ant-breadcrumb > span:last-child label,
+.ant-breadcrumb-link .router-link-exact-active{
+  font-size:35px;
+  position:absolute;
+  left:10px;
+  top:-65px;
+  /*! width:100vh !important; */
+}
+
+.ant-card-head .ant-card-head-title{
+  font-size:35px;
+}
+
+.breadcrumb-card > .ant-card-body >.ant-row .ant-col:last-child{
+  padding-bottom:7px;
+}
+
+.ant-input-search .ant-input-group-addon{
+  padding:0px !important;
+  width:30px !important;
+}
+
+.ant-input-search .ant-input-group-addon button{
+  height:30px !important;
+  width:30px;
+  border-radius:7px 0px 0px 7px;
+  border:2px solid var(--main-primary-claro) !important;
+}
+
+.ant-select.project-select > .ant-select-selector,
+.ant-input-affix-wrapper,
+.ant-input-affix-wrapper input,
+.ant-input-search .ant-input-search.input-search,
+.ant-input-search .ant-input-search.input-search input{
+  background-color:white !important;
+}
+
+.ant-select.project-select.ant-select-focused > .ant-select-selector,
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused,
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused input,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused input{
+  background-color: var(--main-grey-escuro) !important;
+  color:#fff !important;
+}
+
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused .anticon{
+  background-color:red !important;
+}
+
+.user-layout .ant-input-affix-wrapper-focused .ant-input-prefix,
+.user-layout .ant-input-affix-wrapper-focused .ant-input-suffix{
+  color:#fff !important;
+}
+
+/*
+.ant-select.project-select.ant-select-focused .anticon path{
+  color:#fff !important;
+  stroke:#fff !important;
+}
+*/
+
+.ant-input-search .ant-input-search.input-search input::placeholder {
+  color: #666;
+}
+
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused input::placeholder,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused input::placeholder{
+  color:#ffffffDD !important;
+}
+
+.ant-input-search .ant-input-search.input-search{
+  border-radius:0px 7px 7px 0px;
+}
+
+.anticon-search.ant-input-search-icon{
+  background-color:var(--main-primary-escuro) !important;
+  position:absolute;
+  height:30px;
+  width:30px;
+  border-radius:0px 7px 7px 0px;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  color:#fff;
+  right:0;
+}
+
+.anticon-search.ant-input-search-icon:hover{
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+/* SWITCH E BOTAO */
+button.ant-btn:not(.ant-btn-icon-only){
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff;
+  border:0px;
+}
+
+button.ant-btn:not(.ant-btn-icon-only):hover{
+  background-color:var(--main-secondary-escuro) !important;
+  color:#fff;
+}
+
+.ant-radio .ant-radio-inner{
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-radio .ant-radio-inner:after{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-switch{
+  background-color:var(--main-primary-claro);
+  border-color:var(--main-primary-escuro) !important;
+  height:24px;
+  /*! position:absolute; */
+}
+
+.ant-switch-loading-icon, .ant-switch::after{
+  height:20px;
+}
+
+.ant-switch-checked{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-switch span{
+  color:#444;
+}
+
+.ant-switch-checked span{
+  color:#fff;
+}
+
+.ant-slider-handle,
+.ant-slider-handle .ant-tooltip-open{
+  background-color: #fff;
+  border: solid 2px var(--main-primary-escuro);
+  border-radius: 50%;
+  box-shadow: 0;
+}
+
+.ant-slider-handle.ant-tooltip-open{
+  box-shadow: 0px 0px 5px var(--main-grey-claro) !important;
+  border: solid 2px var(--main-primary-escuro);
+}
+
+.ant-slider:hover .ant-slider-handle,
+.ant-slider-handle:hover,
+.ant-slider-handle:focus{
+  background-color: var(--main-primary-escuro);
+  border: solid 2px var(--main-primary-escuro) !important;
+  border-radius: 50%;
+  box-shadow: 0;
+  box-shadow: 0px 0px 5px var(--main-grey-claro) !important;
+}
+
+.ant-slider-track{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-slider-rail{
+  background-color:var(--main-primary-claro) !important;
+}
+
+
+/* HEADER */
+.layout.ant-layout .header{
+  background-color:#fff !important;
+}
+
+/* MENU ACTIVE */
+.ant-menu-vertical .ant-menu-item::after, .ant-menu-vertical-left .ant-menu-item::after, .ant-menu-vertical-right .ant-menu-item::after, .ant-menu-inline .ant-menu-item::after {
+  border-color:var(--main-primary-escuro) !important;
+  /*! color: red !important; */
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item a,
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected a{
+  color:#000 !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item.ant-menu-item-selected {
+  background-color: var(--main-primary-claro) !important;
+}
+
+/* MENU LIGHT */
+.sider.light .ant-menu-light,
+.sider.light .ant-menu-submenu > .ant-menu{
+  background-color:var(--main-secondary-escuro);
+  background-color:transparent;
+}
+
+
+.sider.light .ant-menu-dark{
+  background-color:green;
+}
+
+.ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::before,
+.ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::after{
+  background-color: #000 !important;
+}
+
+.ant-menu-submenu-inline:hover .ant-menu-submenu-title .ant-menu-submenu-arrow::before,
+.ant-menu-submenu-inline:hover .ant-menu-submenu-title .ant-menu-submenu-arrow::after{
+  background-color: #fff !important;
+}
+
+/* MENU ITEM */
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item:hover,
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-submenu div:hover{
+  background-color: var(--main-primary-escuro) !important;
+}
+
+.ant-menu-inline-collapsed .ant-menu-submenu-title{
+  margin:0px !important;
+}
+
+
+/* CARDS DASHBOARD */
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card{
+  background-color:var(--main-vermelho) !important;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card{
+  background-color:var(--main-verde) !important;
+}
+
+.usage-dashboard-chart-card-inner h2,
+.usage-dashboard-chart-card-inner h3{
+  color:#fff !important;
+}
+
+/* CHARTS  */
+
+.ant-progress .ant-progress-status-normal path{
+  stroke:var(--main-exception) !important;
+}
+
+.ant-progress-circle.ant-progress-status-normal .ant-progress-text{
+  color:var(--main-normal) !important;
+  font-weight: bold
+}
+
+.ant-progress.ant-progress-status-normal path.ant-progress-circle-path{
+  stroke:var(--main-normal) !important;
+}
+
+.ant-progress.ant-progress-status-exception path.ant-progress-circle-path,
+.ant-progress.ant-progress-status-active path.ant-progress-circle-path{
+  stroke:var(--main-exception) !important;
+}
+
+.ant-progress path.ant-progress-circle-trail{
+  stroke:var(--main-grey-claro) !important;
+}
+
+.ant-progress-circle.ant-progress-status-exception .ant-progress-text,
+.ant-progress-circle.ant-progress-status-active .ant-progress-text{
+  color:var(--main-exception) !important;
+  font-weight: bold
+}
+
+/* LIST TABLES  */
+.ant-list .ant-list-item{
+  border-left:5px solid transparent !important;
+  padding-left:10px;
+}
+
+.ant-list .ant-list-item:hover{
+  background-color:var(--main-grey-claro) !important;
+  border-left:5px solid var(--main-primary-escuro) !important;
+}
+
+.ant-list .ant-list-item .ant-btn{
+  border-color:var(--main-grey-escuro) !important;
+  background-color:var(--main-grey-claro) !important;
+  color:var(--main-grey-escuro) !important;
+
+}
+
+.ant-list .ant-list-item:hover .ant-btn{
+  border-color:red!important;
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+.ant-list .ant-list-item:hover .ant-btn:hover{
+  border-color:var(--main-secondary-escuro) !important;
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+/* OTHERS  */
+
+.ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected{
+  background-color:var(--main-primary-claro)
+}
+
+/* MODAL */
+.ant-modal .ant-modal-header{
+  background-color:var(--main-secondary-escuro);
+}
+
+.ant-modal .ant-modal-header *{
+  color:#fff;
+}
+
+.ant-modal .ant-row.ant-form-item{
+  margin-bottom:20px !important;
+}
+
+.ant-modal .ant-row.ant-form-item .ant-form-item-label{
+  padding-bottom:0px !important;
+}
+
+.ant-row.ant-form-item{
+  margin-bottom:20px !important;
+}
+
+.ant-steps-item .ant-form.ant-form-vertical{
+  margin-top:20px !important;
+}
+
+.ant-row.ant-form-item .ant-form-item-label{
+  padding-bottom:0px !important;
+}
+
+.ant-modal .ant-modal-title{
+  font-size:20px
+}
+
+.ant-modal .ant-modal-title .anticon{
+  font-size:15px
+}
+
+.ant-modal .ant-modal-body .anticon:not(.anticon-cloud-upload){
+  position:absolute;
+  transform: scale(0.9);
+  margin-left:5px;
+}
+
+.ant-select-selector .anticon{
+  position: relative !important;
+  margin-left:0px !important;
+}
+
+.ant-modal .anticon:hover{
+  color:var(--main-primary-escuro);
+}
+
+.ant-modal .ant-modal-close{
+  color:#fff;
+  height:54px;
+  transition:all 1s easyin;
+  background-color:transparent;
+}
+
+.ant-modal .ant-modal-close:hover{
+  background-color:var(--main-primary-escuro);
+}
+
+.ant-modal .ant-modal-close-x:hover svg{
+  color:#fff;
+}
+
+.ant-modal .ant-modal-close-x svg{
+  transform: scale(1.3);
+}
+
+/* REGISTRATIONS FORMS AND ADDS */
+.ant-steps-item-tail{
+  margin-top:15px;
+}
+
+.ant-steps-item-tail:after{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-steps-item-icon{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:var(--main-primary-escuro) !important;
+  margin-top:10px
+}
+
+.ant-steps-item .ant-card-head{
+  padding:0px;
+}
+
+.ant-steps-item .ant-radio-group .ant-card-grid{
+  box-shadow: ;none;
+  border:2px solid var(--main-grey-claro)
+}
+
+.ant-steps-item .ant-card-meta-description{
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-steps-item .ant-card-body .ant-tabs-nav > div .ant-tabs-tab,
+.ant-steps-item .ant-card-contain-tabs .ant-card-body{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper{
+  width:100%;
+  border-radius:7px;
+  padding:10px;
+}
+
+.ant-steps-item .ant-radio-wrapper:hover{
+  background-color:green !important;
+}
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper:hover{
+  background-color: blue !important;
+}
+
+.ant-steps-item .ant-radio-group label:not(.ant-radio-button-wrapper-checked):hover{
+  background-color:transparent !important;
+}
+
+.ant-steps-item #zoneid .ant-card-grid .ant-radio-wrapper{
+  background-color: var(--main-grey-claro) !important;
+}
+
+.ant-steps-item #zoneid .ant-card-grid .ant-radio-wrapper:hover{
+  background-color: var(--main-primary-claro) !important;
+}
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper .anticon{
+  margin-left:0px !important;
+  width:100%;
+  margin-top:0px !important;
+}
+
+.ant-steps-item .ant-list .ant-list-item:hover{
+  background-color:var(--main-primary-claro) !important;
+  border-left:5px solid transparent !important;
+}
+
+.ant-steps-item{
+  margin-bottom:30px;
+  margin-top:0px;
+}
+
+.ant-table-body,
+.ant-list-vertical.form-item-scroll .ant-spin-container{
+  max-height:none !important;;
+}
+
+.ant-steps-item-title{
+  width:100%;
+  height:40px;
+  display: flex;
+  align-items: center;
+  border-top:2px solid var(--main-primary-claro) !important;
+  font-weight:00 !important;
+  font-size:22px !important;
+}
+
+
+.ant-menu-submenu-arrow:after{
+  /*! color:red !important; */
+}
+
+button.ant-btn.ant-btn-dangerous:not(.ant-btn-icon-only)
+{
+  background-color:var(--main-vermelho) !important;
+}
+
+.resource-detail-item{
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 20px;
+}
+
+.account-center-tags .ant-divider-horizontal{
+  display:none
+}
+
+.ant-table tr.ant-table-row-selected td{
+  background-color:var(--main-secondary-claro);
+}
+
+/* MODAL Steps */
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item-title{
+  font-size:14px !important;
+  border-top:0px !important;
+  justify-content: center;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-wait .ant-steps-item-icon{
+  background-color:#ddd !important;
+  border-color:#999 !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-wait .ant-steps-item-icon span{
+  color:#999;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-finish .ant-steps-item-icon{
+  background-color:#555 !important;
+  border-color:#555 !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-finish .ant-steps-item-icon span{
+  color:white !important;
+  right:-3px;
+  top:9px;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item-container .ant-steps-item-icon{
+  background-color:var(--main-primary-claro) !important;
+  margin-top:0px;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-active .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-wait .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-finish .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-finish .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  color:white !important;
+  left:0px !important;
+  top:0px;
+}
+
+.ant-modal-body .ant-table-body .ant-tag span{
+  position:relative !important;
+}
+
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle{
+  padding-top:15px !important;
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous{
+  background-color:var( --main-vermelho);
+  border-color:var( --main-vermelho);
+}
+
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-close-circle{
+  top:0px !important;
+  bottom:0px !important;
+  left:-10px !important;
+}
+
+.ant-modal-body .ant-form-item-control-input .ant-select-arrow{
+  right:15px
+}
+
+.ant-form-item-has-feedback .ant-form-item-control-input :not(.ant-input-group-addon) > .ant-select .ant-select-arrow{
+  right:40px
+}
+
+.ant-modal-body .ant-form-item-control-input .ant-select-clear{
+  background-color:transparent !important;
+  top:13px;
+  right:-20px !important;
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous .anticon{
+  /*! left:2px; */
+  /*! top:7px; */
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous:hover,
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle:hover{
+  background-color:var(--main-secondary-escuro);
+  border-color:var(--main-secondary-escuro);
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous .anticon,
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle:hover svg{
+  color:#fff;
+}
+
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle > span{
+  top:4px;
+  left:-1px;
+}
+
+.ant-modal-body .traffic-select-item .ant-select-arrow .anticon.anticon-down{
+  margin-left:0px !important;
+}
+
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-close-circle,
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-check-circle{
+  left:5px;
+  top:4px !important;
+}
+
+.ant-modal-body .card-waiting-launch .anticon-check-circle{
+  font-size:40px !important;
+  left:60px;
+  top:40px
+}
+
+.ant-modal-body .anticon-rocket{
+  left:1px;
+  bottom:7px;
+}
+
+.ant-modal-body .anticon-rocket:hover{
+  color:inherit !important;
+}
+
+.anticon-loading{
+  top:0px;
+}
+
+.card-launch-content .ant-steps-item-finish .anticon.anticon-check.ant-steps-finish-icon{
+  right:-6px;
+  color:#fff;
+  top:19px
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon .ant-steps-icon .anticon{
+  left:-10px
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon{
+  min-width:23px !important;
+}
+
+.card-launch-content .anticon.anticon-close-circle{
+  left:-15px !important;
+}
+
+.card-launch-content .anticon.anticon-loading{
+  top:1px
+}
+
+
+.ant-modal-body .ant-table-bordered .ant-table-body .ant-table-row-cell-break-word .ant-btn-circle.ant-btn-dangerous{
+  background-color:var(--main-vermelho) !important;
+
+  &:hover{
+    background-color:var(--main-secondary-escuro) !important;
+  }
+
+}
+
+.ant-modal-body .ant-table-bordered .ant-table-body .ant-table-row-cell-break-word .ant-btn-circle.ant-btn-dangerous span{
+  background-color: transparent;
+  margin-right:5px !important;
+}
+
+.ant-alert:not(.ant-alert-no-icon) .ant-alert-message{
+  margin-left:40px;
+}
+
+.ant-btn-dangerous.ant-btn-primary.ant-btn-dangerous{
+  background:var(--main-vermelho);
+  border-color:var(--main-vermelho);
+}
diff --git a/ui/public/css/dark-theme.css b/ui/public/css/dark-theme.css
new file mode 100644
index 00000000000..3af275b966f
--- /dev/null
+++ b/ui/public/css/dark-theme.css
@@ -0,0 +1,1592 @@
+/*
+* 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.
+*/
+
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+
+:root {
+  --main-verde: #3E7C59;
+  --main-vermelho: #ae0000;
+  --main-normal:#b2e061;
+  --main-exception:#fd7f6f;
+  --main-primary-claro: #0094F055;
+  --main-primary-text: #A1E4F0;
+  --main-primary-escuro: #B08A2A;
+  --main-secondary-claro: #B08A2A22;
+  --main-secondary-escuro: #7eb0d5;
+  --main-grey-claro: #ccc;
+  --main-grey-escuro: #444;
+  --main-image-menu: url("../assets/logo.svg");
+  --main-image-login: url("../assets/banner.svg");
+  --main-image-icon: url("../assets/mini-logo.svg");
+  --main-linear-cora: #333;
+  --main-linear-corb: #333;
+}
+
+#app{
+  background-color: var(--main-linear-cora);
+}
+
+#app > div > form.ant-form.ant-form-horizontal h1,
+#app > div > form.ant-form.ant-form-horizontal p{
+  color:#fff !important;
+}
+
+#app > div > form > img.user-layout-logo{
+  display:none !important;
+}
+
+#app > div > form{
+  background-image:var(--main-image-login);
+  background-repeat:no-repeat;
+  background-size:250px;
+  background-position:top center;
+  padding-top:120px;
+}
+
+.userLayout .user-layout-header{
+  min-height:130px;
+  background-image:var(--main-image-login);
+  background-repeat:no-repeat;
+  background-size:400px;
+  background-position:top center;
+  margin-bottom:20px;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu > div > div{
+  height: 90px;
+  background-image:var(--main-image-menu);
+  background-repeat:no-repeat;
+  background-size:150px;
+  background-position:25px 25px;
+  margin-bottom:20px;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu.ant-layout-sider-collapsed > div > div{
+  height: 80px;
+  background-image:var(--main-image-icon);
+  background-repeat:no-repeat;
+  background-size:60px;
+  background-position:10px 20px;
+}
+
+.sider.light .ant-menu-light a,
+.sider.light .ant-menu-submenu > .ant-menu-submenu-title {
+  color:#fff !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-active:hover a,
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-submenu span.ant-menu-title-content:hover{
+  color:#fff !important;
+}
+
+.ant-menu-submenu ul a,
+.ant-menu-submenu ul .ant-menu-item-selected a span{
+  color:#000 !important;
+}
+
+/* USER MENU DARK */
+*{
+  font-family: 'Poppins' , Courier !important;
+}
+
+aside,
+.ant-menu-submenu ul{
+  background: linear-gradient(var(--main-linear-cora), var(--main-linear-corb)) !important;
+}
+
+.ant-menu-submenu ul a,
+.ant-menu-submenu ul .ant-menu-item-selected a span{
+  color:#fff !important;
+}
+
+html{
+  background-color: var(--main-secondary-escuro);
+}
+
+/* HEADER */
+.layout.ant-layout .header{
+  background: linear-gradient(var(--main-linear-cora), var(--main-linear-corb)) !important;
+  box-shadow: 0px 0px 10px #00000055;
+}
+
+.layout.ant-layout .header .user-menu > span.ant-dropdown-open{
+  background-color:var(--main-primary-claro) !important;
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+}
+
+.layout.ant-layout .header .anticon-menu-unfold:hover,
+.layout.ant-layout .header .anticon-menu-fold:hover,
+.layout.ant-layout .header .user-menu > span:hover{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+.layout.ant-layout .header .user-menu > span:hover *,
+.layout.ant-layout .header .user-menu > span *{
+  color:#fff !important;
+}
+
+.layout.ant-layout .header .anticon-menu-unfold,
+.layout.ant-layout .header .anticon-menu-fold{
+  color:#fff;
+}
+
+.header-notice-opener{
+  padding-left:15px;
+}
+
+
+.ant-table-tbody > .ant-table-row:hover td{
+  background-color:var(--main-secondary-claro) !important;
+}
+
+/* SIDE BAR */
+.ant-card {
+  background-color: var(--main-linear-cora) !important;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered{
+  border-top:2px solid var(--main-primary-escuro) !important;
+  margin-bottom:50px;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .ant-card-head,
+.vm-info-card .ant-card-body .ant-card-bordered .ant-card-grid{
+  padding:10px 0px !important;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .resource-detail-item{
+  margin-bottom:20px;
+}
+
+.vm-info-card .ant-card-body .ant-card-bordered .resource-detail-item .resource-detail-item__label{
+  font-weight:900;
+}
+
+/* USER LOGIN SCREEN */
+
+.ant-tabs-tab,
+.user-layout{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:0px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-secondary-escuro) !important;
+  color: #fff;
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-nav{
+  width:100%;
+}
+
+.user-layout .ant-tabs-nav > div > div{
+  width:50%;
+}
+
+/* IMAGES LOGO */
+.userLayout .user-layout-logo{
+  display:none;
+}
+
+.ant-layout-sider.light.ant-fixed-sidemenu > div > div > img{
+  display:none !important;
+}
+
+/* PROGRESS */
+.ant-progress.ant-progress-status-active .ant-progress-inner,
+.ant-progress.ant-progress-status-normal .ant-progress-inner{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-progress.ant-progress-status-active .ant-progress-inner .ant-progress-bg,
+.ant-progress.ant-progress-status-normal .ant-progress-inner .ant-progress-bg{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-progress .ant-progress-text{
+  color:var(--main-grey-claro) !important;
+  font-weight:700;
+}
+
+.ant-progress.ant-progress-status-exception .ant-progress-inner .ant-progress-bg{
+  background-color:var(--main-exception) !important;
+}
+
+/* FORMS */
+.ant-input-number-input{
+  color:#000;
+}
+
+.ant-input-number-disabled .ant-input-number-input{
+  color:#666;
+}
+
+.ant-select-selector,
+.ant-input{
+  background-color:white !important;
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-select.ant-select-focused .ant-select-arrow .anticon{
+  color:var(--main-grey-claro);
+}
+
+.ant-select-selector .ant-select-selection-placeholder,
+.ant-select,
+.ant-input::placeholder{
+  color:var(--main-grey-escuro) !important;
+}
+
+
+.ant-select-selector:hover, .ant-select-selector:focus,
+.ant-input:hover, .ant-input:focus{
+  box-shadow: 0px 0px 3px var(--main-primary-escuro);
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-color: var(--main-primary-escuro);
+  border-right-width: 1px !important;
+  box-shadow: 0 0 0 2px var(--main-primary-claro);
+}
+
+.ant-select-dropdown .ant-select-item.ant-select-item-option-selected,
+.ant-select-dropdown .ant-select-item:hover{
+  background-color:var(--main-primary-claro)  !important;
+}
+
+/* PAGINATION */
+.ant-pagination .ant-pagination-item.ant-pagination-item-active{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:#fff;
+}
+
+.ant-pagination .ant-pagination-item.ant-pagination-item-active a{
+  color:#fff !important;
+  font-weight:bold;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active){
+  background-color:#fff !important;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active):hover{
+  background-color:var(--main-secondary-escuro) !important;
+  border-color:#666;
+}
+
+.ant-pagination .ant-pagination-item:not(.ant-pagination-item-active):hover a{
+  color:#666 !important;
+  font-weight:bold;
+}
+
+.ant-pagination .ant-pagination-next span,
+.ant-pagination .ant-pagination-prev span{
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-pagination .ant-pagination-next span:hover,
+.ant-pagination .ant-pagination-prev span:hover{
+  color:var(--main-secondary-escuro) !important;
+}
+
+
+/* RADIO GROUP */
+.ant-radio-group label.ant-radio-button-wrapper-checked{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-radio-group label:not(.ant-radio-button-wrapper-checked):hover{
+  color:#000 !important;
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* TABLES */
+.ant-table{
+  font-size:16px !important;
+  background:var(--main-linear-cora) !important;
+}
+
+.ant-table th{
+  border-bottom:5px solid #ffffff55!important;
+}
+
+.ant-table th.ant-table-column-has-sorters:hover{
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+  background-color:#ffffff22 !important;
+}
+
+.ant-table thead.ant-table-thead{
+  border-bottom:5px solid var(--main-primary-escuro) !important;
+}
+
+.anticon.ant-table-column-sorter-up.on *,
+.anticon.ant-table-column-sorter-down.on *{
+  color: var(--main-primary-escuro) !important;
+}
+
+.anticon.anticon-camera.upload-icon{
+  background:#ffffff33 !important;
+  border:0px;
+}
+
+.anticon.anticon-camera.upload-icon:hover{
+  background:var(--main-secondary-escuro) !important;
+}
+
+.anticon.anticon-camera.upload-icon{
+  background: !important;
+}
+
+/* PAGE TABS LEFT */
+.ant-tabs-left-bar .ant-tabs-nav-scroll {
+  border-right:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  margin:0px;
+  padding:10px 15px;
+  border-right:3px solid transparent;
+  transition: all 1s ease !important;
+  background-color:var(--main-linear-cora) !important;
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active,
+.ant-tabs-left-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:#ffffff33 !important;
+  color: var(--main-primary-escuro);
+  border-right:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-left-bar .ant-tabs-nav-scroll  .ant-tabs-ink-bar{
+  display:none !important;
+  width:0px !important;
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* PAGE TABS TOP */
+.ant-tabs-tab-next,
+.ant-tabs-tab-prev{
+  color:var(--main-primary-escuro) !important;
+}
+
+.ant-tabs-tab-next svg,
+.ant-tabs-tab-prev svg{
+  transform: scale(1.5);
+}
+
+.ant-tabs-tab-next:not(.ant-tabs-tab-btn-disabled):hover,
+.ant-tabs-tab-prev:not(.ant-tabs-tab-btn-disabled):hover{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+.ant-tabs-tab-next.ant-tabs-tab-btn-disabled,
+.ant-tabs-tab-prev.ant-tabs-tab-btn-disabled{
+  color:var(--main-primary-claro) !important;
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll {
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  margin:0px;
+  padding:14px 30px;
+  border-bottom:3px solid transparent;
+  transform: all 1s easyin !important;
+  background-color:#fff !important;
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active,
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-grey-claro) !important;
+  color: var(--main-primary-escuro);
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll  .ant-tabs-ink-bar{
+  height:0px !important;
+  background-color:var(--main-primary-escuro) !important;
+}
+
+/* LINKS */
+a{
+  color: var(--main-primary-escuro);
+}
+
+a:hover{
+  color: var(--main-secondary-escuro);
+}
+
+.ant-breadcrumb-link a:hover{
+  color: var(--main-primary-escuro) !important;;
+}
+
+.ant-breadcrumb-link .anticon{
+  margin-top:5px !important;
+}
+
+.ant-breadcrumb-link .ant-select-arrow .anticon{
+  margin-top:0px !important;
+}
+
+
+/* USER MENU */
+.user-menu > span{
+  border-bottom:5px solid transparent;
+}
+
+.user-menu > span:hover{
+  border-bottom:5px solid var(--main-primary-escuro);
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-dropdown .ant-dropdown-menu-item:hover{
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-dropdown .ant-dropdown-menu-item:hover *{
+  color:#000;
+}
+
+.ant-dropdown .ant-dropdown-menu-item.ant-dropdown-menu-item-selected,
+.ant-dropdown .ant-dropdown-menu-item.ant-dropdown-menu-item-selected:hover *{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+}
+
+/* CHECKBOXES */
+.ant-checkbox-checked .ant-checkbox-inner {
+  background-color: var(--main-primary-escuro) !important;
+  border-color: var(--main-primary-escuro) !important;
+}
+
+.ant-checkbox .ant-checkbox-inner {
+  border-color: var(--main-primary-escuro) !important;
+}
+
+.ant-checkbox-indeterminate .ant-checkbox-inner::after{
+  background-color: var(--main-primary-escuro) !important;
+}
+
+/* SEARCH */
+/*
+.ant-input-search .ant-input-wrapper.ant-input-group{
+  display:flex;
+  justify-content: flex-end;
+  padding-right:2%;
+
+}
+
+.ant-input-search.ant-input-affix-wrapper{
+  width:300px !important;
+  transform: width 1s easyin;
+  border:0px;
+}
+
+.ant-input-search.ant-input-affix-wrapper-focused{
+  width:98% !important;
+  border:0px !important;
+  border-color:transparent !important;
+}
+*/
+
+.breadcrumb-card > .ant-card-body >.ant-row{
+  display:flex;
+  align-items: end;
+  height:90px;
+}
+
+.ant-breadcrumb > span:last-child label,
+.ant-breadcrumb-link .router-link-exact-active{
+  font-size:35px;
+  position:absolute;
+  left:10px;
+  top:-65px;
+  /*! width:100vh !important; */
+}
+
+.ant-card-head{
+  background-color:var(--main-linear-cora);
+  color:#fff;
+}
+
+.ant-card-head .ant-card-head-title{
+  font-size:35px;
+}
+
+.breadcrumb-card > .ant-card-body >.ant-row .ant-col:last-child{
+  padding-bottom:7px;
+}
+
+.ant-input-search .ant-input-group-addon{
+  padding:0px !important;
+  width:30px !important;
+}
+
+.ant-input-search .ant-input-group-addon button{
+  height:30px !important;
+  width:30px;
+  border-radius:7px 0px 0px 7px;
+  border:2px solid var(--main-primary-escuro) !important;
+}
+
+.ant-select.project-select > .ant-select-selector,
+.ant-input-affix-wrapper,
+.ant-input-affix-wrapper input,
+.ant-input-search .ant-input-search.input-search,
+.ant-input-search .ant-input-search.input-search input{
+  background-color:white !important;
+}
+
+.ant-input-affix-wrapper{
+  border-radius: 7px;
+}
+
+.ant-select.project-select.ant-select-focused > .ant-select-selector,
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused,
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused input,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused input{
+  background-color: var(--main-grey-claro) !important;
+  color: var(--main-grey-escuro) !important;
+}
+
+.user-layout .ant-input-affix-wrapper-focused .ant-input-prefix,
+.user-layout .ant-input-affix-wrapper-focused .ant-input-suffix{
+  color:#333 !important;
+}
+
+/*
+.ant-select.project-select.ant-select-focused .anticon path{
+  color:#fff !important;
+  stroke:#fff !important;
+}
+*/
+
+.ant-input-search .ant-input-search.input-search input::placeholder {
+  color: #666;
+}
+
+.ant-input-affix-wrapper.ant-input-affix-wrapper-focused input::placeholder,
+.ant-input-search .ant-input-search.input-search.ant-input-affix-wrapper-focused input::placeholder{
+  color:var(--main-grey-escuro) !important;
+}
+
+.ant-input-search .ant-input-search.input-search{
+  border-radius:0px 7px 7px 0px;
+}
+
+.anticon-search.ant-input-search-icon{
+  background-color:var(--main-primary-escuro) !important;
+  position:absolute;
+  height:30px;
+  width:30px;
+  border-radius:0px 7px 7px 0px;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  color:#fff;
+  right:0;
+}
+
+.anticon-search.ant-input-search-icon:hover{
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+/* SWITCH E BOTAO */
+button.ant-btn{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff;
+  border:0px;
+}
+
+button.ant-btn:hover{
+  background-color:var(--main-secondary-escuro) !important;
+  color:#fff;
+}
+
+.ant-radio .ant-radio-inner{
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-radio .ant-radio-inner:after{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-tabs-tabpane .ant-radio-button-wrapper{
+  background-color:var(--main-linear-cora);
+}
+
+.ant-switch{
+  background-color:var(--main-primary-claro);
+  border-color:var(--main-primary-escuro) !important;
+  height:24px;
+  /*! position:absolute; */
+}
+
+.ant-switch-loading-icon, .ant-switch::after{
+  height:20px;
+}
+
+.ant-switch-disabled,
+.ant-switch-checked{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-switch span{
+  color:#444;
+}
+
+.ant-switch-checked span{
+  color:#fff;
+}
+
+.ant-slider-handle,
+.ant-slider-handle .ant-tooltip-open{
+  background-color: #fff;
+  border: solid 2px var(--main-primary-escuro);
+  border-radius: 50%;
+  box-shadow: 0;
+}
+
+.ant-slider-handle.ant-tooltip-open{
+  box-shadow: 0px 0px 5px var(--main-grey-claro) !important;
+  border: solid 2px var(--main-primary-escuro);
+}
+
+.ant-slider:hover .ant-slider-handle,
+.ant-slider-handle:hover,
+.ant-slider-handle:focus{
+  background-color: var(--main-primary-escuro);
+  border: solid 2px var(--main-primary-escuro) !important;
+  border-radius: 50%;
+  box-shadow: 0;
+  box-shadow: 0px 0px 5px var(--main-grey-claro) !important;
+}
+
+.ant-slider-track{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-slider-rail{
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-avatar-icon{
+  background-color:transparent;
+}
+
+
+/* HEADER */
+.layout.ant-layout .header{
+  background-color:#fff !important;
+}
+
+/* MENU ACTIVE */
+.ant-menu-vertical .ant-menu-item::after, .ant-menu-vertical-left .ant-menu-item::after, .ant-menu-vertical-right .ant-menu-item::after, .ant-menu-inline .ant-menu-item::after {
+  border-color:var(--main-primary-escuro) !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected a{
+  color:#000 !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item.ant-menu-item-selected {
+  background-color: var(--main-primary-claro) !important;
+}
+
+/* MENU LIGHT */
+.sider.light .ant-menu-light,
+.sider.light .ant-menu-submenu > .ant-menu{
+  background-color:transparent;
+}
+
+.ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::before,
+.ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::after{
+  background-color: #fff !important;
+}
+
+/* MENU ITEM */
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item:hover,
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-submenu div:hover{
+  background-color: var(--main-primary-escuro) !important;
+}
+
+.ant-menu-inline-collapsed .ant-menu-submenu-title{
+  margin:0px !important;
+}
+
+
+/* CARDS DASHBOARD */
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card{
+  background-color:var(--main-vermelho) !important;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card{
+  background-color:var(--main-verde) !important;
+}
+
+.usage-dashboard-chart-card-inner h2,
+.usage-dashboard-chart-card-inner h3{
+  color:#fff !important;
+}
+
+/* CHARTS  */
+
+.ant-progress .ant-progress-status-normal path{
+  stroke:var(--main-exception) !important;
+}
+
+.ant-progress-circle.ant-progress-status-normal .ant-progress-text{
+  color:var(--main-normal) !important;
+  font-weight: bold
+}
+
+.ant-progress.ant-progress-status-normal path.ant-progress-circle-path{
+  stroke:var(--main-normal) !important;
+}
+
+.ant-progress.ant-progress-status-exception path.ant-progress-circle-path,
+.ant-progress.ant-progress-status-active path.ant-progress-circle-path{
+  stroke:var(--main-exception) !important;
+}
+
+.ant-progress path.ant-progress-circle-trail{
+  stroke:var(--main-grey-claro) !important;
+}
+
+.ant-progress-circle.ant-progress-status-exception .ant-progress-text,
+.ant-progress-circle.ant-progress-status-active .ant-progress-text{
+  color:var(--main-exception) !important;
+  font-weight: bold
+}
+
+/* LIST TABLES  */
+.ant-list .ant-list-item{
+  border-left:5px solid transparent !important;
+  padding-left:10px;
+}
+
+.ant-list .ant-list-item:hover{
+  background-color:#ffffff33 !important;
+  border-left:5px solid var(--main-primary-escuro) !important;
+}
+
+.ant-list.ant-list-split .ant-list-item:hover{
+  background-color:transparent !important;
+
+}
+
+.ant-list .ant-list-item .ant-btn{
+  opacity:0;
+}
+
+.ant-list .ant-list-item:hover .ant-btn{
+  background-color:var(--main-primary-escuro) !important;
+  color:#fff !important;
+  opacity:1;
+}
+
+.ant-list .ant-list-item-action-split{
+  opacity:0;
+}
+
+.ant-list .ant-list-item:hover .ant-btn:hover{
+  border-color:var(--main-secondary-escuro) !important;
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+/* OTHERS  */
+
+.ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected{
+  background-color:var(--main-primary-claro)
+}
+
+/* MODAL */
+.ant-modal .ant-modal-header{
+  background-color:var(--main-primary-claro);
+}
+
+.ant-modal .ant-modal-header *{
+  color:#fff;
+}
+
+.ant-modal .ant-row.ant-form-item{
+  margin-bottom:20px !important;
+}
+
+.ant-modal .ant-row.ant-form-item .ant-form-item-label{
+  padding-bottom:0px !important;
+}
+
+.ant-row.ant-form-item{
+  margin-bottom:20px !important;
+}
+
+.ant-steps-item .ant-form.ant-form-vertical{
+  margin-top:20px !important;
+}
+
+.ant-row.ant-form-item .ant-form-item-label{
+  padding-bottom:0px !important;
+}
+
+.ant-modal .ant-modal-title{
+  font-size:20px
+}
+
+.ant-modal .ant-modal-title .anticon{
+  font-size:15px
+}
+
+.ant-modal .ant-modal-body .anticon{
+  /* position:absolute; */
+  transform: scale(0.9);
+  margin-left:5px;
+}
+
+.ant-select-selector .anticon{
+  position: relative !important;
+  margin-left:0px !important;
+}
+
+.ant-modal .anticon:hover{
+  color:var(--main-primary-escuro);
+}
+
+.ant-modal .ant-modal-close{
+  color:#fff;
+  height:54px;
+  transition:all 1s easyin;
+  background-color:transparent;
+}
+
+.ant-modal .ant-modal-close:hover{
+  background-color:var(--main-primary-escuro);
+}
+
+.ant-modal .ant-modal-close-x:hover svg{
+  color:#fff;
+}
+
+.ant-modal .ant-modal-close-x svg{
+  transform: scale(1.3);
+}
+
+/* REGISTRATIONS FORMS AND ADDS */
+.ant-steps-item-tail{
+  margin-top:15px;
+}
+
+.ant-steps-item-tail:after{
+  background-color:var(--main-grey-claro) !important;
+}
+
+.ant-steps-item-icon{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:var(--main-primary-escuro) !important;
+  margin-top:10px
+}
+
+.ant-steps-item .ant-card-head{
+  padding:0px;
+}
+
+.ant-steps-item .ant-radio-group .ant-card-grid{
+  box-shadow: ;none;
+  border:2px solid var(--main-grey-claro)
+}
+
+.ant-steps-item .ant-card-meta-description{
+  color:var(--main-grey-claro) !important;
+}
+
+.ant-steps-item .ant-card-body .ant-tabs-nav > div .ant-tabs-tab,
+.ant-steps-item .ant-card-contain-tabs .ant-card-body{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper{
+  width:100%;
+  border-radius:7px;
+  padding:10px;
+}
+
+.ant-steps-item .ant-radio-wrapper:hover{
+  background-color:green !important;
+}
+
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper:hover{
+  background-color: blue !important;
+}
+
+.ant-steps-item .ant-radio-group label:not(.ant-radio-button-wrapper-checked):hover{
+  background-color:transparent !important;
+}
+
+.ant-steps-item #zoneid .ant-card-grid .ant-radio-wrapper{
+  background-color: var(--main-grey-escuro) !important;
+}
+
+.ant-steps-item #zoneid .ant-card-grid .ant-radio-wrapper:hover{
+  background-color: var(--main-primary-claro) !important;
+}
+
+.ant-steps-item .ant-card-grid .ant-radio-wrapper .anticon{
+  margin-left:0px !important;
+  width:100%;
+  margin-top:0px !important;
+}
+
+.ant-steps-item .ant-list .ant-list-item:hover{
+  background-color:var(--main-primary-claro) !important;
+  border-left:5px solid transparent !important;
+}
+
+.ant-steps-item{
+  margin-bottom:30px;
+  margin-top:0px;
+}
+
+.ant-table-body,
+.ant-list-vertical.form-item-scroll .ant-spin-container{
+  max-height:none !important;;
+}
+
+.ant-steps-item-title{
+  width:100%;
+  height:40px;
+  display: flex;
+  align-items: center;
+  border-top:0px solid #ffffff55 !important;
+  font-weight:00 !important;
+  font-size:22px !important;
+}
+
+/* DARK HOME */
+body #userLayout{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.userLayout .user-layout-header{
+  margin-bottom:20px;
+}
+
+.userLayout .anticon-translation{
+  color:#FFF;
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active{
+  background-color:var(--main-primary-escuro) !important;
+  color: #fff;
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.user-layout .ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  background-color:var(--main-linear-cora) !important;
+  color: #fff;
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-layout-footer *{
+  color:#fff !important;
+}
+
+.ant-card{
+  border:0px !important;
+}
+
+.ant-card-body *:not(a):not(.ant-tag):not(.ant-tag *):not(input):not(.ant-select-selection-item span):not(div.ant-select *),
+.ant-table *:not(a):not(.ant-tag):not(.ant-tag *):not(input):not(.ant-select-selection-item span){
+  color:#fff;
+}
+
+.ant-input-suffix .anticon:not(.anticon-search ) *{
+  color:#000 !important;
+}
+
+.ant-alert-info *{
+  color:#000 !important;
+}
+
+.anticon.anticon-delete{
+  background-color:var(--main-vermelho);
+  padding:0px;
+  border-radius:50px;
+}
+
+.ant-popover-inner-content .anticon.anticon-delete{
+  padding:0px;
+}
+
+.anticon.anticon-delete svg path:first-child{
+  fill:transparent;
+}
+
+.anticon.anticon-delete svg path:last-child{
+  fill:#fff;
+}
+
+.ant-pagination .ant-select-item-option-content span{
+  color:#000 !important;
+}
+
+.ant-select-selection-item{
+  color:#000 !important;
+}
+
+.ant-table a{
+  color:var(--main-primary-escuro) !important;
+}
+
+
+.ant-table tr,
+.ant-table th,
+.ant-table-footer,
+.ant-card-body,
+.ant-layout,
+.ant-layout-footer{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.ant-table tr.ant-table-row-selected td{
+  background-color:var(--main-secondary-claro);
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card .ant-card-body{
+  background-color:var(--main-verde) !important;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card .ant-card-body{
+  background-color:var(--main-vermelho) !important;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col .ant-card.usage-dashboard-chart-card .ant-card-body{
+  background-color:#fff !important;
+}
+
+.usage-dashboard-chart-card-inner h2,
+.usage-dashboard-chart-card-inner h3,
+.usage-dashboard-chart-card-inner svg{
+  color:#000 !important;
+  fill:#000;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner svg,
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner svg,
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner h2,
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner h2,
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner h3,
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(1) .ant-card.usage-dashboard-chart-card .ant-card-body .usage-dashboard-chart-card-inner h3{
+  color:#fff !important;
+  fill:#fff;
+}
+
+.usage-dashboard .ant-card-body .ant-row .ant-col:nth-child(2) .ant-card.usage-dashboard-chart-card .ant-card-body{
+  background-color:var(--main-vermelho) !important;
+}
+
+.ant-table tr a,
+.ant-table th a{
+  color:var(--main-primary-text) !important;
+}
+
+.ant-pagination{
+  color:#fff;
+}
+
+.ant-tabs-tabpane .ant-table tr,
+.ant-tabs-tabpane .ant-table-footer,
+.ant-tabs-tabpane .ant-table th{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.usage-dashboard .ant-tabs-tabpane .ant-table table,
+.usage-dashboard .ant-tabs-tabpane .ant-table tr,
+.usage-dashboard .ant-tabs-tabpane .ant-table-footer,
+.usage-dashboard .ant-tabs-tabpane .ant-table th{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.ant-tabs-tabpane .ant-table tr,
+.ant-tabs-tabpane .ant-table th{
+  background-color: var(--main-linear-cora) !important;
+}
+
+.ant-tabs-tabpane .ant-pagination{
+  color:#000;
+}
+
+.ant-tabs .ant-tabs-left-content{
+  border-left: 0px !important;
+}
+
+.ant-tabs .ant-tabs-bar{
+  border-color:transparent;
+}
+
+.ant-layout-content .page-header-wrapper-grid-content-main .ant-row .ant-col-lg-16 .ant-card-body{
+  background-color:var(--main-linear-cora) !important;
+}
+
+.ant-select-selection-item,
+.ant-select-selector,
+.ant-select-selector *{
+  color:#666 !important;
+}
+
+.ant-layout-content .page-header-wrapper-grid-content-main .ant-row .ant-col-lg-16 .ant-card-body *:not(a):not(input):not(.ant-radio-button-wrapper-checked span):not(button *):not(.ant-select-selector *):not(.ant-select-item-option-content){
+  color:#fff;
+}
+
+.ant-layout-content .page-header-wrapper-grid-content-main .ant-row .ant-col-lg-16 .ant-card-body p.ant-empty-description:not(.ant-radio-button-wrapper-checked span):not(button *){
+  color:#fff !important;
+}
+
+.input-search .ant-input-group-addon{
+  border:0px;
+}
+
+.ant-select-arrow path{
+  color:#666 !important;
+}
+
+.ant-input-search,
+.ant-input-search .ant-input-search-icon{
+  border:0px !important;
+}
+
+.ant-progress.ant-progress-status-active .ant-progress-inner,
+.ant-progress.ant-progress-status-normal .ant-progress-inner{
+  background-color:#ffffff33 !important;
+}
+
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected a{
+  color:#fff !important;
+}
+
+.ant-menu span.ant-menu-title-content .custom-icon path,
+.ant-menu span.ant-menu-title-content:hover .custom-icon path{
+  fill:#fff !important;
+}
+
+.ant-menu-submenu-popup.ant-menu-light, .ant-menu-light > .ant-menu,
+.ant-menu-submenu ul,
+.ant-menu-submenu ul .ant-menu-item {
+  background:var(--main-grey-escuro) !important;
+}
+
+.ant-pagination .ant-pagination-item.ant-pagination-item-active{
+  border:0px;
+}
+
+.ant-pagination .ant-pagination-item{
+  border:0px;
+  margin-left:2px !important;
+}
+
+.ant-table-placeholder{
+  background:var(--main-linear-cora)
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab{
+  margin:0px;
+  padding:14px 30px;
+  border-bottom:3px solid transparent;
+  transform: all 1s easyin !important;
+  background-color:var(--main-linear-cora) !important;
+  font-weight: 600;
+}
+
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab.ant-tabs-tab-active,
+.ant-tabs-top-bar .ant-tabs-nav-scroll .ant-tabs-tab:hover{
+  background-color:var(--main-primary-escuro) !important;
+  color: #fff;
+  border-bottom:3px solid var(--main-primary-escuro);
+}
+
+.ant-table .ant-table-body .ant-btn{
+  background:var(--main-primary-escuro) !important;
+}
+
+.ant-table .ant-table-body .ant-btn:hover{
+  background:var(--main-primary-claro)  !important;
+}
+
+.ant-input-group-addon{
+  background-color:transparent;
+}
+
+/* FIM DARKMODE */
+
+button.ant-btn.ant-btn-dangerous:not(.ant-btn-icon-only)
+{
+  background-color:var(--main-vermelho) !important;
+}
+
+/* TREE FILES */
+.ant-tree-icon__customize,
+.ant-tree.ant-tree-show-line li span.ant-tree-switcher{
+  background-color:transparent;
+}
+
+.ant-tree .ant-tree-node-content-wrapper:hover{
+  background-color:inherit !important;
+}
+
+.ant-tree .ant-tree-node-content-wrapper:hover span{
+  color:var(--main-primary-escuro) !important;
+}
+
+
+
+
+
+
+.ant-dropdown-placement-bottomRight ul{
+  background-color:#fff;;
+}
+
+
+.ant-dropdown-placement-bottomRight li *{
+  color:#000 !important;
+}
+
+.ant-table .ant-table-row-expand-icon{
+  border-radius:50px;
+}
+
+.ant-table .ant-table-expanded-row.ant-table-expanded-row-level-1:hover td,
+.ant-table .ant-table-expanded-row.ant-table-expanded-row-level-1 td:hover{
+  background-color:transparent !important;
+}
+
+.ant-table .ant-table-row-expand-icon:after{
+  color:#000;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  height:100%;
+  width:100%;
+}
+
+.vm-info-card .resource-detail-item__details a, .vm-info-card .resource-detail-item a {
+  color: var(--main-primary-escuro);
+  cursor: default;
+  pointer-events: none;
+}
+
+/* Modal */
+.ant-modal-content{
+  background-color:var(--main-linear-cora);
+  border:1px solid #fff;
+}
+
+.ant-modal-content .ant-radio-group.ant-radio-group-solid span{
+  color:#000 !important;
+}
+
+.ant-modal-content .ant-radio-group.ant-radio-group-solid label{
+  background-color:#fff;
+}
+
+.ant-modal-content .ant-radio-group.ant-radio-group-solid .ant-radio-button-wrapper-checked span,
+.ant-modal-content .ant-radio-group.ant-radio-group-solid label:hover span{
+  color:#fff !important;
+}
+
+.ant-modal-content label{
+  color:#fff;
+}
+
+.ant-modal-content .ant-tabs-nav .ant-tabs-tab{
+  color:#fff;
+}
+
+.resource-detail-item{
+  border-bottom: 1px solid #777;
+  padding-bottom: 20px;
+}
+
+.account-center-tags .ant-divider-horizontal{
+  display:none
+}
+
+
+/* MODAL Steps */
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item-title{
+  font-size:14px !important;
+  border-top:0px !important;
+  justify-content: center;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-wait .ant-steps-item-icon{
+  background-color:#ddd !important;
+  border-color:#999 !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-wait .ant-steps-item-icon span{
+  color:#999;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-finish .ant-steps-item-icon{
+  background-color:#555 !important;
+  border-color:#555 !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-finish .ant-steps-item-icon span{
+  color:white !important;
+  right:-3px;
+  top:9px;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item-container .ant-steps-item-icon{
+  background-color:var(--main-primary-claro) !important;
+  margin-top:0px;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-active .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-primary-escuro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-wait .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-primary-claro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-finish .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  background-color:var(--main-secondary-escuro) !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-dot .ant-steps-item.ant-steps-item-finish .ant-steps-item-container .ant-steps-item-icon .ant-steps-icon-dot{
+  color:white !important;
+  left:0px !important;
+  top:0px;
+}
+
+.ant-modal-body .ant-table-body .ant-tag span{
+  position:relative !important;
+}
+
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle{
+  padding-top:15px !important;
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous{
+  background-color:var( --main-vermelho);
+  border-color:var( --main-vermelho);
+}
+
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-close-circle{
+  top:0px !important;
+  bottom:0px !important;
+  left:-10px !important;
+}
+
+.ant-modal-body .ant-form-item-control-input .ant-select-arrow{
+  right:15px
+}
+
+.ant-form-item-has-feedback .ant-form-item-control-input :not(.ant-input-group-addon) > .ant-select .ant-select-arrow{
+  right:40px
+}
+
+.ant-modal-body .ant-form-item-control-input .ant-select-clear{
+  background-color:transparent !important;
+  top:13px;
+  right:-20px !important;
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous .anticon{
+  /* left:2px;
+  top:7px; */
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous:hover,
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle:hover{
+  background-color:var(--main-secondary-escuro);
+  border-color:var(--main-secondary-escuro);
+}
+
+.ant-modal-body .ant-table-body button.ant-btn-circle.ant-btn-dangerous .anticon,
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle:hover svg{
+  color:#fff;
+}
+
+.ant-modal-body .ant-table-body .traffic-select-item > span button.ant-btn-circle > span{
+  top:4px;
+  left:-1px;
+}
+
+.ant-modal-body .traffic-select-item .ant-select-arrow .anticon.anticon-down{
+  margin-left:0px !important;
+}
+
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-close-circle,
+.ant-modal-body .ant-form-item-control-input .anticon.anticon-check-circle{
+  left:5px;
+  top:4px !important;
+}
+
+.ant-modal-body .card-waiting-launch .anticon-check-circle{
+  position: absolute;
+  font-size:40px !important;
+  left:60px;
+  top:40px
+}
+
+.ant-modal-body .anticon-rocket{
+  left:1px;
+  bottom:7px;
+}
+
+.ant-modal-body .anticon-rocket:hover{
+  color:inherit !important;
+}
+
+.card-launch-content .ant-steps-item-finish .anticon.anticon-check.ant-steps-finish-icon{
+  right:-6px;
+  color:#fff;
+  top:19px
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon .ant-steps-icon .anticon{
+  left:-10px
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon .ant-steps-icon .anticon.ant-steps-finish-icon{
+  position: absolute;
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon{
+  min-width:23px !important;
+}
+
+.card-launch-content .anticon.anticon-close-circle{
+  left:-15px !important;
+}
+
+.card-launch-content .anticon.anticon-loading{
+  top:1px
+}
+
+/* NOVAS ENTRADAS */
+.ant-spin-nested-loading .ant-table-bordered .ant-table-body .ant-table-row-cell-break-word .ant-btn-circle{
+
+}
+
+.ant-modal-body .ant-table-bordered .ant-table-body .ant-table-row-cell-break-word .ant-btn-circle.ant-btn-dangerous{
+  background-color:var(--main-vermelho) !important;
+
+  &:hover{
+    background-color:var(--main-secondary-escuro) !important;
+  }
+
+}
+
+.ant-alert .ant-alert-message{
+  margin-left:40px;
+}
+
+.ant-alert:not(.ant-alert-no-icon) .ant-alert-message{
+  margin-left:40px;
+}
+
+.ant-btn-dangerous.ant-btn-primary.ant-btn-dangerous{
+  background:var(--main-vermelho);
+  border-color:var(--main-vermelho);
+}
+
+
+/* DARK ONLY */
+.ant-modal-body .ant-table-bordered .ant-table-body .ant-table-row-cell-break-word .ant-btn-circle.ant-btn-dangerous span{
+  background-color: transparent;
+  margin-right:5px !important;
+}
+
+.ant-steps-item-content .ant-card.ant-card-bordered .ant-card-body{
+  border:1px solid var(--main-primary-escuro) !important;
+  border-radius: 0px;
+}
+
+.ant-modal-body .ant-form.ant-form-horizontal.form-content{
+  background-color:transparent !important;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item-title{
+  color:#fff;
+}
+.ant-modal-body .zone-support{
+  background:transparent !important;
+}
+
+.ant-card-bordered:not(:last-child){
+  border-bottom:1px solid rgba(255,255,255,0.5) !important;
+}
+
+.ant-steps-item-description .ant-card-bordered:not(:last-child){
+  border-bottom:0px !important;
+}
+
+.ant-card-bordered.ant-form-text{
+  background-color:var(--main-grey-escuro);
+  border-bottom:0px !important;
+  color:#fff;
+}
+
+.ant-modal-body .ant-steps.ant-steps-horizontal .ant-steps-item.ant-steps-item-finish .ant-steps-item-icon span{
+  color:white !important;
+  right:3px;
+  top:0px;
+}
+
+.ant-steps-item-icon{
+  background-color:var(--main-primary-escuro) !important;
+  border-color:var(--main-primary-escuro) !important;
+  margin-top:10px
+}
+
+.card-launch-content .ant-steps-item .ant-steps-item-icon{
+  background-color:transparent !important;
+}
+
+form.ant-form .ant-form-item-explain.ant-form-item-explain-error{
+  color:pink !important;
+}
diff --git a/ui/public/index.html b/ui/public/index.html
index b681ad6a902..7397f27d545 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -54,12 +54,4 @@
       <div class="loader"></div>
     </div>
   </body>
-  <script type="text/javascript">
-    fetch('./config.json?ts=' + Date.now())
-      .then(response => response.json())
-      .then(data => {
-        document.getElementById("favicon").setAttribute("href", data.loginFavicon);
-        document.getElementById("title").innerHTML = data.loginTitle;
-      }).catch((err) => {});
-  </script>
 </html>
diff --git a/ui/src/api/index.js b/ui/src/api/index.js
index 85c46c483b2..45938df6cab 100644
--- a/ui/src/api/index.js
+++ b/ui/src/api/index.js
@@ -88,10 +88,13 @@ export function login (arg) {
   })
 }
 
-export function logout () {
-  message.destroy()
-  notification.destroy()
-  return postAPI('logout')
+export async function logout () {
+  const result = await postAPI('logout').finally(() => {
+    sourceToken.cancel()
+    message.destroy()
+    notification.destroy()
+  })
+  return result
 }
 
 export function oauthlogin (arg) {
diff --git a/ui/src/components/header/UserMenu.vue b/ui/src/components/header/UserMenu.vue
index 34d38d8327b..a67fe06096a 100644
--- a/ui/src/components/header/UserMenu.vue
+++ b/ui/src/components/header/UserMenu.vue
@@ -80,6 +80,8 @@ import { mapActions, mapGetters } from 'vuex'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import eventBus from '@/config/eventBus'
 import { SERVER_MANAGER } from '@/store/mutation-types'
+import { sourceToken } from '@/utils/request'
+import { applyCustomGuiTheme } from '@/utils/guiTheme'
 
 export default {
   name: 'UserMenu',
@@ -178,7 +180,9 @@ export default {
       }
     },
     handleLogout () {
-      return this.Logout({}).then(() => {
+      this.Logout({}).finally(async () => {
+        sourceToken.init()
+        await applyCustomGuiTheme(null, null)
         this.$router.push('/user/login')
       }).catch(err => {
         this.$message.error({
diff --git a/ui/src/main.js b/ui/src/main.js
index d7f32ff503d..c25ab1066d4 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -43,6 +43,9 @@ import {
 } from './utils/plugins'
 import { VueAxios } from './utils/request'
 import directives from './utils/directives'
+import Cookies from 'js-cookie'
+import { api } from '@/api'
+import { applyCustomGuiTheme } from './utils/guiTheme'
 
 vueApp.use(VueAxios, router)
 vueApp.use(pollJobPlugin)
@@ -89,7 +92,7 @@ fetch('config.json?ts=' + Date.now())
     }
     return response.json()
   })
-  .then(config => {
+  .then(async config => {
     vueProps.$config = config
     let baseUrl = config.apiBase
     if (config.multipleServer) {
@@ -98,6 +101,19 @@ fetch('config.json?ts=' + Date.now())
 
     vueProps.axios.defaults.baseURL = baseUrl
 
+    const userid = Cookies.get('userid')
+    let accountid = null
+    let domainid = null
+
+    if (userid !== undefined && Cookies.get('sessionkey')) {
+      await api('listUsers', { userid: userid }).then(response => {
+        accountid = response.listusersresponse.user[0].accountid
+        domainid = response.listusersresponse.user[0].domainid
+      })
+    }
+
+    await applyCustomGuiTheme(accountid, domainid)
+
     loadLanguageAsync().then(() => {
       vueApp.use(store)
         .use(router)
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index ffa0c2b136e..0fbdc5788c0 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -47,6 +47,10 @@ import {
   LATEST_CS_VERSION
 } from '@/store/mutation-types'
 
+import {
+  applyCustomGuiTheme
+} from '@/utils/guiTheme'
+
 const user = {
   state: {
     token: '',
@@ -243,7 +247,6 @@ const user = {
           const latestVersion = vueProps.$localStorage.get(LATEST_CS_VERSION, { version: '', fetchedTs: 0 })
           commit('SET_LATEST_VERSION', latestVersion)
           notification.destroy()
-
           resolve()
         }).catch(error => {
           reject(error)
@@ -406,6 +409,7 @@ const user = {
 
         getAPI('listUsers', { id: Cookies.get('userid'), showicon: true }).then(response => {
           const result = response.listusersresponse.user[0]
+          applyCustomGuiTheme(result.accountid, result.domainid)
           commit('SET_INFO', result)
           commit('SET_NAME', result.firstname + ' ' + result.lastname)
           commit('SET_AVATAR', result.icon?.base64image || '')
diff --git a/ui/src/utils/guiTheme.js b/ui/src/utils/guiTheme.js
new file mode 100644
index 00000000000..7cc3dc0cc03
--- /dev/null
+++ b/ui/src/utils/guiTheme.js
@@ -0,0 +1,100 @@
+// 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.
+
+import { vueProps } from '@/vue-app'
+import { api } from '@/api'
+
+export async function applyCustomGuiTheme (accountid, domainid) {
+  await fetch('config.json').then(response => response.json()).then(config => {
+    vueProps.$config = config
+  })
+
+  let guiTheme
+
+  if (accountid != null) {
+    guiTheme = await fetchGuiTheme({ accountid: accountid })
+  }
+
+  if (guiTheme === undefined && domainid != null) {
+    guiTheme = await fetchGuiTheme({ domainid: domainid })
+  }
+
+  if (guiTheme === undefined) {
+    guiTheme = await fetchGuiTheme({ commonname: window.location.hostname })
+  }
+
+  if (guiTheme === undefined) {
+    guiTheme = await fetchGuiTheme({ listonlydefaulttheme: true })
+  }
+
+  await applyDynamicCustomization(guiTheme)
+}
+
+async function fetchGuiTheme (params) {
+  return await api('listGuiThemes', params).then(response => {
+    if (response.listguithemesresponse.guiThemes) {
+      return response.listguithemesresponse.guiThemes[0]
+    }
+  })
+}
+
+async function applyDynamicCustomization (response) {
+  let jsonConfig
+
+  if (response?.jsonconfiguration) {
+    jsonConfig = JSON.parse(response?.jsonconfiguration)
+  }
+
+  // Sets custom GUI fields only if is not nullish.
+  vueProps.$config.appTitle = jsonConfig?.appTitle ?? vueProps.$config.appTitle
+  vueProps.$config.footer = jsonConfig?.footer ?? vueProps.$config.footer
+  vueProps.$config.loginFooter = jsonConfig?.loginFooter ?? vueProps.$config.loginFooter
+  vueProps.$config.logo = jsonConfig?.logo ?? vueProps.$config.logo
+  vueProps.$config.minilogo = jsonConfig?.minilogo ?? vueProps.$config.minilogo
+  vueProps.$config.banner = jsonConfig?.banner ?? vueProps.$config.banner
+
+  if (jsonConfig?.error) {
+    vueProps.$config.error[403] = jsonConfig?.error[403] ?? vueProps.$config.error[403]
+    vueProps.$config.error[404] = jsonConfig?.error[404] ?? vueProps.$config.error[404]
+    vueProps.$config.error[500] = jsonConfig?.error[500] ?? vueProps.$config.error[500]
+  }
+
+  if (jsonConfig?.plugins) {
+    jsonConfig.plugins.forEach(plugin => {
+      vueProps.$config.plugins.push(plugin)
+    })
+  }
+
+  vueProps.$config.favicon = jsonConfig?.favicon ?? vueProps.$config.favicon
+  vueProps.$config.css = response?.css ?? null
+
+  await applyStaticCustomization(vueProps.$config.favicon, vueProps.$config.css)
+}
+
+async function applyStaticCustomization (favicon, css) {
+  document.getElementById('favicon').href = favicon
+
+  let style = document.getElementById('guiThemeCSS')
+  if (style != null) {
+    style.innerHTML = css
+  } else {
+    style = document.createElement('style')
+    style.setAttribute('id', 'guiThemeCSS')
+    style.innerHTML = css
+    document.body.appendChild(style)
+  }
+}

From e8ab0ae70a72e9b59479841a96e06700fb185fea Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Tue, 15 Jul 2025 16:40:53 +0530
Subject: [PATCH 17/94] CPU to Memory weight based algorithm to order cluster 
 (#10997)

* CPU to Memory weight based algorithm to order cluster
host.capacityType.to.order.clusters config will support new algorithm: COMBINED
which will work with host.capacityType.to.order.clusters.cputomemoryweight and capacity will be
computed based on CPU and memory both and using weight factor

* minor changes

* add unit tests

* update desc and add validation

* handle copilot review comments

* add log indicating chosen capacityType for ordering

---------

Co-authored-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../apache/cloudstack/api/ApiConstants.java   |   5 +
 .../configuration/ConfigurationManager.java   |   6 +
 .../com/cloud/capacity/dao/CapacityDao.java   |  10 +-
 .../cloud/capacity/dao/CapacityDaoImpl.java   |  62 ++++-
 .../META-INF/db/schema-42010to42100.sql       |   6 +
 .../capacity/dao/CapacityDaoImplTest.java     | 226 +++++++++++++++++-
 .../implicitplanner/ImplicitPlannerTest.java  |   2 +-
 .../allocator/impl/FirstFitAllocator.java     |  45 +++-
 .../java/com/cloud/configuration/Config.java  |   5 +-
 .../ConfigurationManagerImpl.java             |   3 +-
 .../com/cloud/deploy/FirstFitPlanner.java     | 125 ++++++++--
 .../allocator/impl/FirstFitAllocatorTest.java |  62 +++++
 .../com/cloud/vm/FirstFitPlannerTest.java     | 142 ++++++++++-
 13 files changed, 661 insertions(+), 38 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 882634ec6c8..f5a1636c30e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -90,9 +90,11 @@ public class ApiConstants {
     public static final String CONVERT_INSTANCE_HOST_ID = "convertinstancehostid";
     public static final String CONVERT_INSTANCE_STORAGE_POOL_ID = "convertinstancepoolid";
     public static final String ENABLED_REVOCATION_CHECK = "enabledrevocationcheck";
+    public static final String COMBINED_CAPACITY_ORDERING = "COMBINED";
     public static final String CONTROLLER = "controller";
     public static final String CONTROLLER_UNIT = "controllerunit";
     public static final String COPY_IMAGE_TAGS = "copyimagetags";
+    public static final String CPU_OVERCOMMIT_RATIO = "cpuOvercommitRatio";
     public static final String CSR = "csr";
     public static final String PRIVATE_KEY = "privatekey";
     public static final String DATASTORE_HOST = "datastorehost";
@@ -124,6 +126,7 @@ public class ApiConstants {
     public static final String CNI_CONFIG_DETAILS = "cniconfigdetails";
     public static final String CNI_CONFIG_NAME = "cniconfigname";
     public static final String COMPONENT = "component";
+    public static final String CPU = "CPU";
     public static final String CPU_CORE_PER_SOCKET = "cpucorepersocket";
     public static final String CPU_NUMBER = "cpunumber";
     public static final String CPU_SPEED = "cpuspeed";
@@ -344,6 +347,7 @@ public class ApiConstants {
     public static final String MAX_BACKUPS = "maxbackups";
     public static final String MAX_CPU_NUMBER = "maxcpunumber";
     public static final String MAX_MEMORY = "maxmemory";
+    public static final String MEMORY_OVERCOMMIT_RATIO = "memoryOvercommitRatio";
     public static final String MIN_CPU_NUMBER = "mincpunumber";
     public static final String MIN_MEMORY = "minmemory";
     public static final String MIGRATION_TYPE = "migrationtype";
@@ -441,6 +445,7 @@ public class ApiConstants {
     public static final String PUBLIC_END_PORT = "publicendport";
     public static final String PUBLIC_ZONE = "publiczone";
     public static final String PURGE_RESOURCES = "purgeresources";
+    public static final String RAM = "RAM";
     public static final String REBALANCE = "rebalance";
     public static final String RECEIVED_BYTES = "receivedbytes";
     public static final String RECONNECT = "reconnect";
diff --git a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
index 859d1176213..5655a0593c8 100644
--- a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
+++ b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
@@ -65,6 +65,12 @@ public interface ConfigurationManager {
             "allow.non.rfc1918.compliant.ips", "Advanced", "false",
             "Allows non-compliant RFC 1918 IPs for Shared, Isolated networks and VPCs", true, null);
 
+    ConfigKey<Float> HostCapacityTypeCpuMemoryWeight = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Float.class,
+            "host.capacityType.to.order.clusters.cputomemoryweight",
+            "0.5",
+            "Weight for CPU (as a value between 0 and 1) applied to compute capacity for Pods, Clusters and Hosts for COMBINED capacityType for ordering. Weight for RAM will be (1 - weight of CPU)",
+            true, ConfigKey.Scope.Global);
+
     /**
      * @param offering
      * @return
diff --git a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java
index 7a4c96c6e1f..42313efa512 100644
--- a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java
+++ b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDao.java
@@ -30,7 +30,7 @@ public interface CapacityDao extends GenericDao<CapacityVO, Long> {
 
     List<CapacityVO> listByHostIdTypes(Long hostId, List<Short> capacityTypes);
 
-    List<Long> listClustersInZoneOrPodByHostCapacities(long id, long vmId, int requiredCpu, long requiredRam, short capacityTypeForOrdering, boolean isZone);
+    List<Long> listClustersInZoneOrPodByHostCapacities(long id, long vmId, int requiredCpu, long requiredRam, boolean isZone);
 
     List<Long> listHostsWithEnoughCapacity(int requiredCpu, long requiredRam, Long clusterId, String hostType);
 
@@ -48,7 +48,7 @@ public interface CapacityDao extends GenericDao<CapacityVO, Long> {
 
     List<SummedCapacity> findFilteredCapacityBy(Integer capacityType, Long zoneId, Long podId, Long clusterId, List<Long> hostIds, List<Long> poolIds);
 
-    List<Long> listPodsByHostCapacities(long zoneId, int requiredCpu, long requiredRam, short capacityType);
+    List<Long> listPodsByHostCapacities(long zoneId, int requiredCpu, long requiredRam);
 
     Pair<List<Long>, Map<Long, Double>> orderPodsByAggregateCapacity(long zoneId, short capacityType);
 
@@ -65,4 +65,10 @@ public interface CapacityDao extends GenericDao<CapacityVO, Long> {
     float findClusterConsumption(Long clusterId, short capacityType, long computeRequested);
 
     Pair<List<Long>, Map<Long, Double>> orderHostsByFreeCapacity(Long zoneId, Long clusterId, short capacityType);
+
+    List<CapacityVO> listHostCapacityByCapacityTypes(Long zoneId, Long clusterId, List<Short> capacityTypes);
+
+    List<CapacityVO> listPodCapacityByCapacityTypes(Long zoneId, List<Short> capacityTypes);
+
+    List<CapacityVO> listClusterCapacityByCapacityTypes(Long zoneId, Long podId, List<Short> capacityTypes);
 }
diff --git a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
index 0860f14518f..d54d1632bd0 100644
--- a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -684,7 +684,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
     }
 
     @Override
-    public List<Long> listClustersInZoneOrPodByHostCapacities(long id, long vmId, int requiredCpu, long requiredRam, short capacityTypeForOrdering, boolean isZone) {
+    public List<Long> listClustersInZoneOrPodByHostCapacities(long id, long vmId, int requiredCpu, long requiredRam, boolean isZone) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         PreparedStatement pstmt = null;
         List<Long> result = new ArrayList<Long>();
@@ -1068,7 +1068,65 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
     }
 
     @Override
-    public List<Long> listPodsByHostCapacities(long zoneId, int requiredCpu, long requiredRam, short capacityType) {
+    public List<CapacityVO> listHostCapacityByCapacityTypes(Long zoneId, Long clusterId, List<Short> capacityTypes) {
+        SearchBuilder<CapacityVO> sb = createSearchBuilder();
+        sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ);
+        sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
+        sb.done();
+
+        SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
+        if (zoneId != null) {
+            sc.setParameters("zoneId", zoneId);
+        }
+        if (clusterId != null) {
+            sc.setParameters("clusterId", clusterId);
+        }
+        sc.setParameters("capacityTypes", capacityTypes.toArray());
+        return listBy(sc);
+    }
+
+    @Override
+    public List<CapacityVO> listPodCapacityByCapacityTypes(Long zoneId, List<Short> capacityTypes) {
+        SearchBuilder<CapacityVO> sb = createSearchBuilder();
+        sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
+        sb.done();
+        SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
+        if (zoneId != null) {
+            sc.setParameters("zoneId", zoneId);
+        }
+        sc.setParameters("capacityTypes", capacityTypes.toArray());
+        return listBy(sc);
+    }
+
+    @Override
+    public List<CapacityVO> listClusterCapacityByCapacityTypes(Long zoneId, Long podId, List<Short> capacityTypes) {
+        SearchBuilder<CapacityVO> sb = createSearchBuilder();
+        sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
+        sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
+        sb.done();
+
+        SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
+        if (zoneId != null) {
+            sc.setParameters("zoneId", zoneId);
+        }
+        if (podId != null) {
+            sc.setParameters("podId", podId);
+        }
+        sc.setParameters("capacityTypes", capacityTypes.toArray());
+        return listBy(sc);
+    }
+
+    @Override
+    public List<Long> listPodsByHostCapacities(long zoneId, int requiredCpu, long requiredRam) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         PreparedStatement pstmt = null;
         List<Long> result = new ArrayList<Long>();
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 53c2bbf60cc..3fd4914b2e2 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -204,6 +204,12 @@ SET `sort_key` = CASE
 END;
 -- End: Changes for Guest OS category cleanup
 
+-- Update description for configuration: host.capacityType.to.order.clusters
+UPDATE `cloud`.`configuration` SET
+    `description` = 'The host capacity type (CPU, RAM or COMBINED) is used by deployment planner to order clusters during VM resource allocation'
+WHERE `name` = 'host.capacityType.to.order.clusters'
+  AND `description` = 'The host capacity type (CPU or RAM) is used by deployment planner to order clusters during VM resource allocation';
+
 -- Whitelabel GUI
 CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes` (
     `id` bigint(20) unsigned NOT NULL auto_increment,
diff --git a/engine/schema/src/test/java/com/cloud/capacity/dao/CapacityDaoImplTest.java b/engine/schema/src/test/java/com/cloud/capacity/dao/CapacityDaoImplTest.java
index 8e9a0bd34c7..f9528d5d57f 100644
--- a/engine/schema/src/test/java/com/cloud/capacity/dao/CapacityDaoImplTest.java
+++ b/engine/schema/src/test/java/com/cloud/capacity/dao/CapacityDaoImplTest.java
@@ -51,6 +51,7 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -61,6 +62,9 @@ public class CapacityDaoImplTest {
     @InjectMocks
     CapacityDaoImpl capacityDao = new CapacityDaoImpl();
 
+    @Mock
+    private CapacityVO mockEntity;
+
     @Mock
     private TransactionLegacy txn;
     @Mock
@@ -71,6 +75,8 @@ public class CapacityDaoImplTest {
 
     private SearchBuilder<CapacityVO> searchBuilder;
     private SearchCriteria<CapacityVO> searchCriteria;
+    private List<Short> capacityTypes;
+    private List<CapacityVO> expectedCapacities;
 
     @Before
     public void setUp() {
@@ -83,6 +89,17 @@ public class CapacityDaoImplTest {
 
         mockedTransactionLegacy = Mockito.mockStatic(TransactionLegacy.class);
         mockedTransactionLegacy.when(TransactionLegacy::currentTxn).thenReturn(txn);
+
+        // Setup common test data
+        capacityTypes = Arrays.asList((short) 1, (short) 2, (short) 3);
+        expectedCapacities = Arrays.asList(mock(CapacityVO.class), mock(CapacityVO.class));
+        doReturn(expectedCapacities).when(capacityDao).listBy(searchCriteria);
+    }
+
+    private CapacityVO createMockCapacityVO(Long id) {
+        CapacityVO capacity = mock(CapacityVO.class);
+        when(capacity.getId()).thenReturn(id);
+        return capacity;
     }
 
     @After
@@ -205,11 +222,11 @@ public class CapacityDaoImplTest {
         when(pstmt.executeQuery()).thenReturn(resultSet);
         when(resultSet.next()).thenReturn(false);
 
-        List<Long> resultZone = capacityDao.listClustersInZoneOrPodByHostCapacities(1L, 123L, 2, 2048L, (short)0, true);
+        List<Long> resultZone = capacityDao.listClustersInZoneOrPodByHostCapacities(1L, 123L, 2, 2048L, true);
         assertNotNull(resultZone);
         assertTrue(resultZone.isEmpty());
 
-        List<Long> resultPod = capacityDao.listClustersInZoneOrPodByHostCapacities(1L, 123L, 2, 2048L, (short)0, false);
+        List<Long> resultPod = capacityDao.listClustersInZoneOrPodByHostCapacities(1L, 123L, 2, 2048L, false);
         assertNotNull(resultPod);
         assertTrue(resultPod.isEmpty());
     }
@@ -281,7 +298,7 @@ public class CapacityDaoImplTest {
         when(pstmt.executeQuery()).thenReturn(resultSet);
         when(resultSet.next()).thenReturn(false);
 
-        List<Long> result = capacityDao.listPodsByHostCapacities(1L, 2, 1024L, (short)0);
+        List<Long> result = capacityDao.listPodsByHostCapacities(1L, 2, 1024L);
         assertNotNull(result);
         assertTrue(result.isEmpty());
     }
@@ -330,4 +347,207 @@ public class CapacityDaoImplTest {
         assertNotNull(result);
         assertTrue(result.isEmpty());
     }
+
+    @Test
+    public void testListHostCapacityByCapacityTypes_WithAllParameters() {
+        // Given
+        Long zoneId = 100L;
+        Long clusterId = 200L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listHostCapacityByCapacityTypes(zoneId, clusterId, capacityTypes);
+
+        // Then
+        verify(searchBuilder).and("zoneId", mockEntity.getDataCenterId(), SearchCriteria.Op.EQ);
+        verify(searchBuilder).and("clusterId", mockEntity.getClusterId(), SearchCriteria.Op.EQ);
+        verify(searchBuilder).and("capacityTypes", mockEntity.getCapacityType(), SearchCriteria.Op.IN);
+        verify(searchBuilder).and("capacityState", mockEntity.getCapacityState(), SearchCriteria.Op.EQ);
+
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria).setParameters("zoneId", zoneId);
+        verify(searchCriteria).setParameters("clusterId", clusterId);
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        verify(capacityDao).listBy(searchCriteria);
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListHostCapacityByCapacityTypes_WithNullZoneId() {
+        // Given
+        Long clusterId = 200L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listHostCapacityByCapacityTypes(null, clusterId, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria, Mockito.times(0)).setParameters(eq("zoneId"), any());
+        verify(searchCriteria).setParameters("clusterId", clusterId);
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListHostCapacityByCapacityTypes_WithNullClusterId() {
+        // Given
+        Long zoneId = 100L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listHostCapacityByCapacityTypes(zoneId, null, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria).setParameters("zoneId", zoneId);
+        verify(searchCriteria, never()).setParameters(eq("clusterId"), any());
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListHostCapacityByCapacityTypes_WithEmptyCapacityTypes() {
+        // Given
+        Long zoneId = 100L;
+        Long clusterId = 200L;
+        List<Short> emptyCapacityTypes = Collections.emptyList();
+
+        // When
+        List<CapacityVO> result = capacityDao.listHostCapacityByCapacityTypes(zoneId, clusterId, emptyCapacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityTypes", emptyCapacityTypes.toArray());
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListPodCapacityByCapacityTypes_WithAllParameters() {
+        // Given
+        Long zoneId = 100L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listPodCapacityByCapacityTypes(zoneId, capacityTypes);
+
+        // Then
+        verify(searchBuilder).and("zoneId", mockEntity.getDataCenterId(), SearchCriteria.Op.EQ);
+        verify(searchBuilder).and("capacityTypes", mockEntity.getCapacityType(), SearchCriteria.Op.IN);
+        verify(searchBuilder).and("capacityState", mockEntity.getCapacityState(), SearchCriteria.Op.EQ);
+
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria).setParameters("zoneId", zoneId);
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListPodCapacityByCapacityTypes_WithNullZoneId() {
+        // When
+        List<CapacityVO> result = capacityDao.listPodCapacityByCapacityTypes(null, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria, never()).setParameters(eq("zoneId"), any());
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListClusterCapacityByCapacityTypes_WithAllParameters() {
+        // Given
+        Long zoneId = 100L;
+        Long podId = 300L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listClusterCapacityByCapacityTypes(zoneId, podId, capacityTypes);
+
+        // Then
+        verify(searchBuilder).and("zoneId", mockEntity.getDataCenterId(), SearchCriteria.Op.EQ);
+        verify(searchBuilder).and("podId", mockEntity.getPodId(), SearchCriteria.Op.EQ);
+        verify(searchBuilder).and("capacityTypes", mockEntity.getCapacityType(), SearchCriteria.Op.IN);
+        verify(searchBuilder).and("capacityState", mockEntity.getCapacityState(), SearchCriteria.Op.EQ);
+
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria).setParameters("zoneId", zoneId);
+        verify(searchCriteria).setParameters("podId", podId);
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListClusterCapacityByCapacityTypes_WithNullZoneId() {
+        // Given
+        Long podId = 300L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listClusterCapacityByCapacityTypes(null, podId, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria, never()).setParameters(eq("zoneId"), any());
+        verify(searchCriteria).setParameters("podId", podId);
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListClusterCapacityByCapacityTypes_WithNullPodId() {
+        // Given
+        Long zoneId = 100L;
+
+        // When
+        List<CapacityVO> result = capacityDao.listClusterCapacityByCapacityTypes(zoneId, null, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria).setParameters("zoneId", zoneId);
+        verify(searchCriteria, never()).setParameters(eq("podId"), any());
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testListClusterCapacityByCapacityTypes_WithBothIdsNull() {
+        // When
+        List<CapacityVO> result = capacityDao.listClusterCapacityByCapacityTypes(null, null, capacityTypes);
+
+        // Then
+        verify(searchCriteria).setParameters("capacityState", "Enabled");
+        verify(searchCriteria, never()).setParameters(eq("zoneId"), any());
+        verify(searchCriteria, never()).setParameters(eq("podId"), any());
+        verify(searchCriteria).setParameters("capacityTypes", capacityTypes.toArray());
+
+        assertEquals("Should return expected capacities", expectedCapacities, result);
+    }
+
+    @Test
+    public void testAllMethods_VerifySearchBuilderSetup() {
+        // Test that all methods properly set up the search builder
+        Long zoneId = 100L;
+        Long clusterId = 200L;
+        Long podId = 300L;
+
+        // Test host capacity method
+        capacityDao.listHostCapacityByCapacityTypes(zoneId, clusterId, capacityTypes);
+
+        // Test pod capacity method
+        capacityDao.listPodCapacityByCapacityTypes(zoneId, capacityTypes);
+
+        // Test cluster capacity method
+        capacityDao.listClusterCapacityByCapacityTypes(zoneId, podId, capacityTypes);
+
+        // Verify createSearchBuilder was called 3 times
+        verify(capacityDao, times(3)).createSearchBuilder();
+
+        // Verify done() was called 3 times
+        verify(searchBuilder, times(3)).done();
+
+        // Verify listBy was called 3 times
+        verify(capacityDao, times(3)).listBy(searchCriteria);
+    }
 }
diff --git a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
index 2d2b4c78261..a00fb49bb3f 100644
--- a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
+++ b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
@@ -359,7 +359,7 @@ public class ImplicitPlannerTest {
         clustersWithEnoughCapacity.add(3L);
         when(
             capacityDao.listClustersInZoneOrPodByHostCapacities(dataCenterId, 12L, noOfCpusInOffering * cpuSpeedInOffering, ramInOffering * 1024L * 1024L,
-                Capacity.CAPACITY_TYPE_CPU, true)).thenReturn(clustersWithEnoughCapacity);
+                    true)).thenReturn(clustersWithEnoughCapacity);
 
         Map<Long, Double> clusterCapacityMap = new HashMap<Long, Double>();
         clusterCapacityMap.put(1L, 2048D);
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 68a901a68a2..3ca47caf8af 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -30,15 +30,18 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import com.cloud.agent.manager.allocator.HostAllocator;
+import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityManager;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.configuration.Config;
+import com.cloud.configuration.ConfigurationManager;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.deploy.DeploymentClusterPlanner;
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
+import com.cloud.deploy.FirstFitPlanner;
 import com.cloud.gpu.GPU;
 import com.cloud.host.DetailVO;
 import com.cloud.host.Host;
@@ -67,6 +70,7 @@ import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 /**
@@ -295,7 +299,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
             Collections.shuffle(hosts);
         } else if (vmAllocationAlgorithm.equals("userdispersing")) {
             hosts = reorderHostsByNumberOfVms(plan, hosts, account);
-        }else if(vmAllocationAlgorithm.equals("firstfitleastconsumed")){
+        } else if(vmAllocationAlgorithm.equals("firstfitleastconsumed")){
             hosts = reorderHostsByCapacity(plan, hosts);
         }
 
@@ -372,13 +376,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
     private List<? extends Host> reorderHostsByCapacity(DeploymentPlan plan, List<? extends Host> hosts) {
         Long zoneId = plan.getDataCenterId();
         Long clusterId = plan.getClusterId();
-        //Get capacity by which we should reorder
-        String capacityTypeToOrder = _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
-        short capacityType = CapacityVO.CAPACITY_TYPE_CPU;
-        if("RAM".equalsIgnoreCase(capacityTypeToOrder)){
-            capacityType = CapacityVO.CAPACITY_TYPE_MEMORY;
-        }
-        Pair<List<Long>, Map<Long, Double>> result = _capacityDao.orderHostsByFreeCapacity(zoneId, clusterId, capacityType);
+        Pair<List<Long>, Map<Long, Double>> result = getOrderedHostsByCapacity(zoneId, clusterId);
         List<Long> hostIdsByFreeCapacity = result.first();
         Map<Long, String> sortedHostByCapacity = result.second().entrySet()
                 .stream()
@@ -407,6 +405,37 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
         return reorderedHosts;
     }
 
+    private Pair<List<Long>, Map<Long, Double>> getOrderedHostsByCapacity(Long zoneId, Long clusterId) {
+        double cpuToMemoryWeight = ConfigurationManager.HostCapacityTypeCpuMemoryWeight.value();
+        // Get capacity by which we should reorder
+        short capacityType = FirstFitPlanner.getHostCapacityTypeToOrderCluster(
+                _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+        logger.debug("CapacityType: {} is used for Host ordering", FirstFitPlanner.getCapacityTypeName(capacityType));
+        if (capacityType >= 0) { // for CPU or RAM
+            return _capacityDao.orderHostsByFreeCapacity(zoneId, clusterId, capacityType);
+        }
+        List<CapacityVO> capacities = _capacityDao.listHostCapacityByCapacityTypes(zoneId, clusterId,
+                List.of(Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY));
+        Map<Long, Double> hostByComputedCapacity = getHostByCombinedCapacities(capacities, cpuToMemoryWeight);
+        return new Pair<>(new ArrayList<>(hostByComputedCapacity.keySet()), hostByComputedCapacity);
+    }
+
+    @NotNull
+    public static Map<Long, Double> getHostByCombinedCapacities(List<CapacityVO> capacities, double cpuToMemoryWeight) {
+        Map<Long, Double> hostByComputedCapacity = new HashMap<>();
+        for (CapacityVO capacityVO : capacities) {
+            long hostId = capacityVO.getHostOrPoolId();
+            double applicableWeight = capacityVO.getCapacityType() == Capacity.CAPACITY_TYPE_CPU ? cpuToMemoryWeight : 1 - cpuToMemoryWeight;
+            double capacityMetric = applicableWeight * (capacityVO.getTotalCapacity() - (capacityVO.getUsedCapacity() + capacityVO.getReservedCapacity()))/capacityVO.getTotalCapacity();
+            hostByComputedCapacity.merge(hostId, capacityMetric, Double::sum);
+        }
+
+        return hostByComputedCapacity.entrySet()
+                .stream()
+                .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+    }
+
     private List<? extends Host> reorderHostsByNumberOfVms(DeploymentPlan plan, List<? extends Host> hosts, Account account) {
         if (account == null) {
             return hosts;
diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java
index a6efaffcb56..d35bfac501f 100644
--- a/server/src/main/java/com/cloud/configuration/Config.java
+++ b/server/src/main/java/com/cloud/configuration/Config.java
@@ -897,8 +897,9 @@ public enum Config {
             String.class,
             "host.capacityType.to.order.clusters",
             "CPU",
-            "The host capacity type (CPU or RAM) is used by deployment planner to order clusters during VM resource allocation",
-            "CPU,RAM"),
+            "The host capacity type (CPU, RAM, COMBINED) is used by deployment planner to order clusters during VM resource allocation",
+            "CPU,RAM,COMBINED"),
+
     ApplyAllocationAlgorithmToPods(
             "Advanced",
             ManagementServer.class,
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 2452ac96cfc..8cee3dba527 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -601,6 +601,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         weightBasedParametersForValidation.add(CapacityManager.SecondaryStorageCapacityThreshold.key());
         weightBasedParametersForValidation.add(ClusterDrsService.ClusterDrsImbalanceThreshold.key());
         weightBasedParametersForValidation.add(ClusterDrsService.ClusterDrsImbalanceSkipThreshold.key());
+        weightBasedParametersForValidation.add(ConfigurationManager.HostCapacityTypeCpuMemoryWeight.key());
     }
 
     protected void overProvisioningFactorsForValidation() {
@@ -8274,7 +8275,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                 BYTES_MAX_READ_LENGTH, BYTES_MAX_WRITE_LENGTH, ADD_HOST_ON_SERVICE_RESTART_KVM, SET_HOST_DOWN_TO_MAINTENANCE,
                 VM_SERVICE_OFFERING_MAX_CPU_CORES, VM_SERVICE_OFFERING_MAX_RAM_SIZE, MIGRATE_VM_ACROSS_CLUSTERS,
                 ENABLE_ACCOUNT_SETTINGS_FOR_DOMAIN, ENABLE_DOMAIN_SETTINGS_FOR_CHILD_DOMAIN,
-                ALLOW_DOMAIN_ADMINS_TO_CREATE_TAGGED_OFFERINGS, DELETE_QUERY_BATCH_SIZE, AllowNonRFC1918CompliantIPs
+                ALLOW_DOMAIN_ADMINS_TO_CREATE_TAGGED_OFFERINGS, DELETE_QUERY_BATCH_SIZE, AllowNonRFC1918CompliantIPs, HostCapacityTypeCpuMemoryWeight
         };
     }
 
diff --git a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
index abaf48400e2..d01e43622c6 100644
--- a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
@@ -20,14 +20,19 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import com.cloud.capacity.CapacityVO;
+import com.cloud.configuration.ConfigurationManager;
+import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -457,17 +462,14 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
             logger.debug("Listing clusters in order of aggregate capacity, that have (at least one host with) enough CPU and RAM capacity under this " +
                 (isZone ? "Zone: " : "Pod: ") + id);
         }
-        String capacityTypeToOrder = configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
-        short capacityType = Capacity.CAPACITY_TYPE_CPU;
-        if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) {
-            capacityType = Capacity.CAPACITY_TYPE_MEMORY;
-        }
 
-        List<Long> clusterIdswithEnoughCapacity = capacityDao.listClustersInZoneOrPodByHostCapacities(id, vmId, requiredCpu, requiredRam, capacityType, isZone);
+        List<Long> clusterIdswithEnoughCapacity = capacityDao.listClustersInZoneOrPodByHostCapacities(id, vmId, requiredCpu, requiredRam, isZone);
         if (logger.isTraceEnabled()) {
             logger.trace("ClusterId List having enough CPU and RAM capacity: " + clusterIdswithEnoughCapacity);
         }
-        Pair<List<Long>, Map<Long, Double>> result = capacityDao.orderClustersByAggregateCapacity(id, vmId, capacityType, isZone);
+
+
+        Pair<List<Long>, Map<Long, Double>> result = getOrderedClustersByCapacity(id, vmId, isZone);
         List<Long> clusterIdsOrderedByAggregateCapacity = result.first();
         //only keep the clusters that have enough capacity to host this VM
         if (logger.isTraceEnabled()) {
@@ -491,17 +493,12 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
         if (logger.isDebugEnabled()) {
             logger.debug("Listing pods in order of aggregate capacity, that have (at least one host with) enough CPU and RAM capacity under this Zone: " + zoneId);
         }
-        String capacityTypeToOrder = configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
-        short capacityType = Capacity.CAPACITY_TYPE_CPU;
-        if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) {
-            capacityType = Capacity.CAPACITY_TYPE_MEMORY;
-        }
-
-        List<Long> podIdswithEnoughCapacity = capacityDao.listPodsByHostCapacities(zoneId, requiredCpu, requiredRam, capacityType);
+        List<Long> podIdswithEnoughCapacity = capacityDao.listPodsByHostCapacities(zoneId, requiredCpu, requiredRam);
         if (logger.isTraceEnabled()) {
             logger.trace("PodId List having enough CPU and RAM capacity: " + podIdswithEnoughCapacity);
         }
-        Pair<List<Long>, Map<Long, Double>> result = capacityDao.orderPodsByAggregateCapacity(zoneId, capacityType);
+
+        Pair<List<Long>, Map<Long, Double>> result = getOrderedPodsByCapacity(zoneId);
         List<Long> podIdsOrderedByAggregateCapacity = result.first();
         //only keep the clusters that have enough capacity to host this VM
         if (logger.isTraceEnabled()) {
@@ -517,6 +514,104 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
 
     }
 
+    private Pair<List<Long>, Map<Long, Double>> getOrderedPodsByCapacity(long zoneId) {
+        double cpuToMemoryWeight = ConfigurationManager.HostCapacityTypeCpuMemoryWeight.value();
+        short capacityType = getHostCapacityTypeToOrderCluster(
+                configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+
+        logger.debug("CapacityType: {} is used for Pod ordering", getCapacityTypeName(capacityType));
+        if (capacityType >= 0) { // for capacityType other than COMBINED
+            return capacityDao.orderPodsByAggregateCapacity(zoneId, capacityType);
+        }
+        List<CapacityVO> capacities = capacityDao.listPodCapacityByCapacityTypes(zoneId, List.of(Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY));
+        Map<Long, Double> podsByCombinedCapacities = getPodByCombinedCapacities(capacities, cpuToMemoryWeight);
+        return new Pair<>(new ArrayList<>(podsByCombinedCapacities.keySet()), podsByCombinedCapacities);
+    }
+
+    // order pods by combining cpu and memory capacity considering cpuToMemoeryWeight
+    public Map<Long, Double> getPodByCombinedCapacities(List<CapacityVO> capacities, double cpuToMemoryWeight) {
+        Map<Long, Double> podByCombinedCapacity = new HashMap<>();
+        for (CapacityVO capacityVO : capacities) {
+            boolean isCPUCapacity = capacityVO.getCapacityType() == Capacity.CAPACITY_TYPE_CPU;
+            long podId = capacityVO.getPodId();
+            double applicableWeight = isCPUCapacity ? cpuToMemoryWeight : 1 - cpuToMemoryWeight;
+            String overCommitRatioParam = isCPUCapacity ? ApiConstants.CPU_OVERCOMMIT_RATIO : ApiConstants.MEMORY_OVERCOMMIT_RATIO;
+            ClusterDetailsVO overCommitRatioVO = clusterDetailsDao.findDetail(capacityVO.getClusterId(), overCommitRatioParam);
+            float overCommitRatio = Float.parseFloat(overCommitRatioVO.getValue());
+            double capacityMetric = applicableWeight *
+                    (capacityVO.getUsedCapacity() + capacityVO.getReservedCapacity())/(capacityVO.getTotalCapacity() * overCommitRatio);
+            podByCombinedCapacity.merge(podId, capacityMetric, Double::sum);
+        }
+        return podByCombinedCapacity.entrySet()
+                .stream()
+                .sorted(Map.Entry.comparingByValue())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+    }
+
+
+    private Pair<List<Long>, Map<Long, Double>> getOrderedClustersByCapacity(long id, long vmId, boolean isZone) {
+        double cpuToMemoryWeight = ConfigurationManager.HostCapacityTypeCpuMemoryWeight.value();
+        short capacityType = getHostCapacityTypeToOrderCluster(
+                configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+
+        logger.debug("CapacityType: {} is used for Cluster ordering", getCapacityTypeName(capacityType));
+        if (capacityType >= 0) { // for capacityType other than COMBINED
+            return capacityDao.orderClustersByAggregateCapacity(id, vmId, capacityType, isZone);
+        }
+
+        Long zoneId = isZone ? id : null;
+        Long podId = isZone ? null : id;
+        List<CapacityVO> capacities = capacityDao.listClusterCapacityByCapacityTypes(zoneId, podId,
+                List.of(Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY));
+
+        Map<Long, Double> clusterByCombinedCapacities = getClusterByCombinedCapacities(capacities, cpuToMemoryWeight);
+        return new Pair<>(new ArrayList<>(clusterByCombinedCapacities.keySet()), clusterByCombinedCapacities);
+    }
+
+    public static String getCapacityTypeName(short capacityType) {
+        switch (capacityType) {
+            case 0: return ApiConstants.RAM;
+            case 1: return ApiConstants.CPU;
+            case -1: return ApiConstants.COMBINED_CAPACITY_ORDERING;
+            default: return "UNKNOWN";
+        }
+    }
+
+    public Map<Long, Double> getClusterByCombinedCapacities(List<CapacityVO> capacities, double cpuToMemoryWeight) {
+        Map<Long, Double> clusterByCombinedCapacity = new HashMap<>();
+        for (CapacityVO capacityVO : capacities) {
+            boolean isCPUCapacity = capacityVO.getCapacityType() == Capacity.CAPACITY_TYPE_CPU;
+            long clusterId = capacityVO.getClusterId();
+            double applicableWeight = isCPUCapacity ? cpuToMemoryWeight : 1 - cpuToMemoryWeight;
+            String overCommitRatioParam = isCPUCapacity ? ApiConstants.CPU_OVERCOMMIT_RATIO : ApiConstants.MEMORY_OVERCOMMIT_RATIO;
+            ClusterDetailsVO overCommitRatioVO = clusterDetailsDao.findDetail(clusterId, overCommitRatioParam);
+            float overCommitRatio = Float.parseFloat(overCommitRatioVO.getValue());
+            double capacityMetric = applicableWeight *
+                    (capacityVO.getUsedCapacity() + capacityVO.getReservedCapacity())/(capacityVO.getTotalCapacity() * overCommitRatio);
+            clusterByCombinedCapacity.merge(clusterId, capacityMetric, Double::sum);
+        }
+        return clusterByCombinedCapacity.entrySet()
+                .stream()
+                .sorted(Map.Entry.comparingByValue())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+    }
+
+    public static short getHostCapacityTypeToOrderCluster(String capacityTypeToOrder, double cpuToMemoryWeight) {
+        if (ApiConstants.RAM.equalsIgnoreCase(capacityTypeToOrder)) {
+            return CapacityVO.CAPACITY_TYPE_MEMORY;
+        }
+        if (ApiConstants.COMBINED_CAPACITY_ORDERING.equalsIgnoreCase(capacityTypeToOrder)) {
+            if (cpuToMemoryWeight == 1.0) {
+                return CapacityVO.CAPACITY_TYPE_CPU;
+            }
+            if (cpuToMemoryWeight == 0.0) {
+                return CapacityVO.CAPACITY_TYPE_MEMORY;
+            }
+            return -1; // represents COMBINED
+        }
+        return CapacityVO.CAPACITY_TYPE_CPU;
+    }
+
     private void removeClustersWithoutMatchingTag(List<Long> clusterListForVmAllocation, String hostTagOnOffering) {
 
         List<Long> matchingClusters = hostDao.listClustersByHostTag(hostTagOnOffering);
diff --git a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
index 4524943db38..83498fbbe76 100644
--- a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
+++ b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
@@ -19,6 +19,7 @@
 package com.cloud.agent.manager.allocator.impl;
 
 import com.cloud.capacity.CapacityManager;
+import com.cloud.capacity.CapacityVO;
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.host.Host;
@@ -28,12 +29,14 @@ import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -47,6 +50,7 @@ import static org.mockito.Mockito.when;
 
 
 public class FirstFitAllocatorTest {
+    private static final double TOLERANCE = 0.0001;
     private FirstFitAllocator allocator;
     private CapacityManager capacityMgr;
     private ServiceOfferingDetailsDao offeringDetailsDao;
@@ -156,4 +160,62 @@ public class FirstFitAllocatorTest {
 
         assertTrue(result.isEmpty());
     }
+
+    @Test
+    public void testHostByCombinedCapacityOrder() {
+        // Test scenario 1: Default capacity usage (0.5 weight)
+        List<CapacityVO> mockCapacity = getHostCapacities();
+        Map<Long, Double> hostByCombinedCapacity = FirstFitAllocator.getHostByCombinedCapacities(mockCapacity, 0.5);
+
+        // Verify host ordering and capacity values
+        Long firstHostId = hostByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Host with ID 1 should be first in ordering", Long.valueOf(1L), firstHostId);
+        Assert.assertEquals("Host 1 combined capacity should match expected value",
+                0.9609375, hostByCombinedCapacity.get(1L), TOLERANCE);
+        Assert.assertEquals("Host 2 combined capacity should match expected value",
+                0.9296875, hostByCombinedCapacity.get(2L), TOLERANCE);
+
+        // Test scenario 2: Modified capacity usage (0.7 weight)
+        when(mockCapacity.get(0).getUsedCapacity()).thenReturn(1500L);
+        hostByCombinedCapacity = FirstFitAllocator.getHostByCombinedCapacities(mockCapacity, 0.7);
+
+        // Verify new ordering after capacity change
+        firstHostId = hostByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Host with ID 2 should be first after capacity change", Long.valueOf(2L), firstHostId);
+        Assert.assertEquals("Host 2 combined capacity should match expected value after change",
+                0.9515625, hostByCombinedCapacity.get(2L), TOLERANCE);
+        Assert.assertEquals("Host 1 combined capacity should match expected value after change",
+                0.9484375, hostByCombinedCapacity.get(1L), TOLERANCE);
+    }
+
+    List<CapacityVO> getHostCapacities() {
+        CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+        when(cpuCapacity1.getHostOrPoolId()).thenReturn(1L);
+        when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+        when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+        when(cpuCapacity2.getHostOrPoolId()).thenReturn(2L);
+        when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity2.getUsedCapacity()).thenReturn(500L);
+        when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO memCapacity1 = mock(CapacityVO.class);
+        when(memCapacity1.getHostOrPoolId()).thenReturn(1L);
+        when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+        when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+        CapacityVO memCapacity2 = mock(CapacityVO.class);
+        when(memCapacity2.getHostOrPoolId()).thenReturn(2L);
+        when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+        when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+        return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2, memCapacity2);
+    }
 }
diff --git a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
index 7df4857f4fd..517c2d2287b 100644
--- a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
+++ b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
@@ -17,6 +17,7 @@
 package com.cloud.vm;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -30,6 +31,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import com.cloud.capacity.CapacityVO;
+import com.cloud.dc.ClusterDetailsVO;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.framework.config.ConfigDepot;
@@ -42,10 +45,10 @@ import org.apache.cloudstack.framework.config.impl.ConfigDepotImpl;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.test.utils.SpringUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -138,7 +141,9 @@ public class FirstFitPlannerTest {
     ScopedConfigStorage scopedStorage;
     @Inject
     HostDao hostDao;
-
+    @Inject
+    private ClusterDetailsDao clusterDetailsDao;
+    private static final double TOLERANCE = 0.0001;
     private static long domainId = 1L;
     long dataCenterId = 1L;
     long accountId = 1L;
@@ -241,6 +246,69 @@ public class FirstFitPlannerTest {
         assertTrue("Reordered cluster list does not have clusters exceeding threshold", (clusterList.containsAll(clustersCrossingThreshold)));
     }
 
+
+    @Test
+    public void testGetClusterOrderCapacityType() {
+        Assert.assertEquals(1, FirstFitPlanner.getHostCapacityTypeToOrderCluster("CPU", 0.5));
+        Assert.assertEquals(0, FirstFitPlanner.getHostCapacityTypeToOrderCluster("RAM", 0.5));
+        String combinedOrder = "COMBINED";
+        Assert.assertEquals(1, FirstFitPlanner.getHostCapacityTypeToOrderCluster(combinedOrder, 1)); // cputomemoryweight:1 -> CPU
+        Assert.assertEquals(0, FirstFitPlanner.getHostCapacityTypeToOrderCluster(combinedOrder, 0)); // cputomemoryweight: 0 -> RAM
+        Assert.assertEquals(-1, FirstFitPlanner.getHostCapacityTypeToOrderCluster(combinedOrder, 0.5));
+    }
+
+    @Test
+    public void testGetPodByCombinedCapacities() {
+        List<CapacityVO> mockCapacity = getPodCapacities();
+        ClusterDetailsVO clusterDetailsOverCommitRatio = mock(ClusterDetailsVO.class);
+        when(clusterDetailsOverCommitRatio.getValue()).thenReturn("1.0");
+        when(clusterDetailsDao.findDetail(anyLong(), anyString())).thenReturn(clusterDetailsOverCommitRatio);
+
+        Map<Long, Double> podByCombinedCapacity = planner.getPodByCombinedCapacities(mockCapacity, 0.5);
+        Long firstPodId = podByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Pod with ID 1 should be first in ordering", Long.valueOf(1L), firstPodId);
+        Assert.assertEquals("Pod 1 combined capacity should match expected value",
+                0.0390625, podByCombinedCapacity.get(1L), TOLERANCE);
+        Assert.assertEquals("Pod 2 combined capacity should match expected value",
+                0.0703125, podByCombinedCapacity.get(2L), TOLERANCE);
+
+        // Test scenario 2: Modified capacity usage (0.7 weight)
+        when(mockCapacity.get(0).getUsedCapacity()).thenReturn(1500L);
+        podByCombinedCapacity = planner.getPodByCombinedCapacities(mockCapacity, 0.7);
+        firstPodId = podByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Pod with ID 2 should be first in ordering", Long.valueOf(2L), firstPodId);
+        Assert.assertEquals("Pod 2 combined capacity should match expected value",
+                0.04843750, podByCombinedCapacity.get(2L), TOLERANCE);
+        Assert.assertEquals("Pod 1 combined capacity should match expected value",
+                0.05156250, podByCombinedCapacity.get(1L), TOLERANCE);
+    }
+
+    @Test
+    public void testGetClusterByCombinedCapacities() {
+        List<CapacityVO> mockCapacity = getClusterCapacities();
+        ClusterDetailsVO clusterDetailsOverCommitRatio = mock(ClusterDetailsVO.class);
+        when(clusterDetailsOverCommitRatio.getValue()).thenReturn("1.0");
+        when(clusterDetailsDao.findDetail(anyLong(), anyString())).thenReturn(clusterDetailsOverCommitRatio);
+
+        Map<Long, Double> clusterByCombinedCapacity = planner.getClusterByCombinedCapacities(mockCapacity, 0.5);
+        Long firstClusterId = clusterByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Cluster with ID 1 should be first in ordering", Long.valueOf(1L), firstClusterId);
+        Assert.assertEquals("Cluster 1 combined capacity should match expected value",
+                0.046875, clusterByCombinedCapacity.get(1L), TOLERANCE);
+        Assert.assertEquals("Cluster 2 combined capacity should match expected value",
+                0.07421875, clusterByCombinedCapacity.get(2L), TOLERANCE);
+
+        // Test scenario 2: Modified capacity usage (0.7 weight)
+        when(mockCapacity.get(0).getUsedCapacity()).thenReturn(2000L);
+        clusterByCombinedCapacity = planner.getClusterByCombinedCapacities(mockCapacity, 0.7);
+        firstClusterId = clusterByCombinedCapacity.keySet().iterator().next();
+        Assert.assertEquals("Cluster with ID 2 should be first in ordering", Long.valueOf(2L), firstClusterId);
+        Assert.assertEquals("Cluster 2 combined capacity should match expected value",
+                0.05390625, clusterByCombinedCapacity.get(2L), TOLERANCE);
+        Assert.assertEquals("Cluster 1 combined capacity should match expected value",
+                0.0625, clusterByCombinedCapacity.get(1L), TOLERANCE);
+    }
+
     private List<Long> initializeForClusterThresholdDisabled() {
         when(configDepot.getConfigStringValue(DeploymentClusterPlanner.ClusterThresholdEnabled.key(),
                 ConfigKey.Scope.Global, null)).thenReturn(Boolean.FALSE.toString());
@@ -293,7 +361,7 @@ public class FirstFitPlannerTest {
 
         when(
             capacityDao.listClustersInZoneOrPodByHostCapacities(dataCenterId, 12L, noOfCpusInOffering * cpuSpeedInOffering, ramInOffering * 1024L * 1024L,
-                Capacity.CAPACITY_TYPE_CPU, true)).thenReturn(clustersWithEnoughCapacity);
+                    true)).thenReturn(clustersWithEnoughCapacity);
 
         Map<Long, Double> clusterCapacityMap = new HashMap<Long, Double>();
         clusterCapacityMap.put(1L, 2048D);
@@ -327,7 +395,7 @@ public class FirstFitPlannerTest {
         hostList6.add(new Long(15));
         String[] implicitHostTags = {"GPU"};
         int ramInBytes = ramInOffering * 1024 * 1024;
-        when(serviceOfferingDetailsDao.findDetail(ArgumentMatchers.anyLong(), anyString())).thenReturn(null);
+        when(serviceOfferingDetailsDao.findDetail(anyLong(), anyString())).thenReturn(null);
         when(hostGpuGroupsDao.listHostIds()).thenReturn(hostList0);
         when(capacityDao.listHostsWithEnoughCapacity(noOfCpusInOffering * cpuSpeedInOffering, ramInBytes, new Long(1), Host.Type.Routing.toString())).thenReturn(hostList1);
         when(capacityDao.listHostsWithEnoughCapacity(noOfCpusInOffering * cpuSpeedInOffering, ramInBytes, new Long(2), Host.Type.Routing.toString())).thenReturn(hostList2);
@@ -505,4 +573,70 @@ public class FirstFitPlannerTest {
             }
         }
     }
+
+    List<CapacityVO> getClusterCapacities() {
+        CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+        when(cpuCapacity1.getClusterId()).thenReturn(1L);
+        when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+        when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+        when(cpuCapacity2.getClusterId()).thenReturn(2L);
+        when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+        when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO memCapacity1 = mock(CapacityVO.class);
+        when(memCapacity1.getClusterId()).thenReturn(1L);
+        when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+        when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+        CapacityVO memCapacity2 = mock(CapacityVO.class);
+        when(memCapacity2.getClusterId()).thenReturn(2L);
+        when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+        when(memCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+        return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2, memCapacity2);
+    }
+
+    List<CapacityVO> getPodCapacities() {
+        CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+        when(cpuCapacity1.getPodId()).thenReturn(1L);
+        when(cpuCapacity1.getClusterId()).thenReturn(1L);
+        when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+        when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+        when(cpuCapacity2.getPodId()).thenReturn(2L);
+        when(cpuCapacity2.getClusterId()).thenReturn(1L);
+        when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+        when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(cpuCapacity2.getUsedCapacity()).thenReturn(500L);
+        when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+        CapacityVO memCapacity1 = mock(CapacityVO.class);
+        when(memCapacity1.getPodId()).thenReturn(1L);
+        when(memCapacity1.getClusterId()).thenReturn(1L);
+        when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+        when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+        CapacityVO memCapacity2 = mock(CapacityVO.class);
+        when(memCapacity2.getPodId()).thenReturn(2L);
+        when(memCapacity2.getClusterId()).thenReturn(1L);
+        when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+        when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+        when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+        when(memCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+        return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2, memCapacity2);
+    }
 }

From 9688cbb0953494346a519a661c7bb4374688cb7d Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Tue, 15 Jul 2025 20:09:41 +0800
Subject: [PATCH 18/94] systemvm: build 4.20.2 template with 'depmod -a'
 (#11128)

---
 pom.xml                                              | 2 +-
 tools/appliance/systemvmtemplate/scripts/finalize.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af0ac94a1f2..17385ab5a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.systemvm.template.location>https://download.cloudstack.org/systemvm</project.systemvm.template.location>
-        <project.systemvm.template.version>4.20.1.0</project.systemvm.template.version>
+        <project.systemvm.template.version>4.20.2.0</project.systemvm.template.version>
         <sonar.organization>apache</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
diff --git a/tools/appliance/systemvmtemplate/scripts/finalize.sh b/tools/appliance/systemvmtemplate/scripts/finalize.sh
index e5d15ecb61c..507d4a4133a 100644
--- a/tools/appliance/systemvmtemplate/scripts/finalize.sh
+++ b/tools/appliance/systemvmtemplate/scripts/finalize.sh
@@ -68,6 +68,7 @@ function zero_disk() {
 }
 
 function finalize() {
+  depmod -a
   configure_misc
   configure_rundisk_size
   configure_sudoers

From f52e05863e608f53f9e97e93fe47577b8dfe189b Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Tue, 15 Jul 2025 18:19:46 +0530
Subject: [PATCH 19/94] UI fix api in project view (#11191)

* Add project id for post requests as well in the params

* Replace leftover api calls to getAPI calls

* ui: don't remove values from request if the value is null or empty string

* Address comments

* Apply suggestions from code review

* Apply suggestions from code review

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

* fixup

* Return null if guiTheme requests fails

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 ui/src/api/index.js                           |  2 +-
 .../view/ImageDeployInstanceButton.vue        |  6 ++--
 ui/src/main.js                                |  4 +--
 ui/src/utils/guiTheme.js                      |  7 ++--
 ui/src/utils/request.js                       | 34 +++++++++++++++++--
 ui/src/views/compute/KubernetesAddNodes.vue   |  6 ++--
 .../views/compute/KubernetesRemoveNodes.vue   |  4 +--
 7 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/ui/src/api/index.js b/ui/src/api/index.js
index 45938df6cab..1f532c36336 100644
--- a/ui/src/api/index.js
+++ b/ui/src/api/index.js
@@ -47,7 +47,7 @@ export function postAPI (command, data = {}) {
   params.append('response', 'json')
   if (data) {
     Object.entries(data).forEach(([key, value]) => {
-      if (value !== undefined && value !== null && value !== '') {
+      if (value !== undefined && value !== null) {
         params.append(key, value)
       }
     })
diff --git a/ui/src/components/view/ImageDeployInstanceButton.vue b/ui/src/components/view/ImageDeployInstanceButton.vue
index 4f632cc0383..b2d4b55bc6a 100644
--- a/ui/src/components/view/ImageDeployInstanceButton.vue
+++ b/ui/src/components/view/ImageDeployInstanceButton.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { api } from '@/api'
+import { getAPI } from '@/api'
 import ResourceIcon from '@/components/view/ResourceIcon'
 
 export default {
@@ -100,7 +100,7 @@ export default {
       this.itemCount = 0
       this.fetchLoading = true
       this.zones = []
-      api(this.imageApi, params).then(json => {
+      getAPI(this.imageApi, params).then(json => {
         const imageResponse = json?.[this.imageApi.toLowerCase() + 'response']?.[this.$route.meta.name] || []
         this.zones = imageResponse.map(i => ({
           id: i.zoneid,
@@ -122,7 +122,7 @@ export default {
       }
       const zoneids = this.zones.map(z => z.id)
       this.loading = true
-      api('listZones', { showicon: true, ids: zoneids.join(',') }).then(json => {
+      getAPI('listZones', { showicon: true, ids: zoneids.join(',') }).then(json => {
         this.zones = json.listzonesresponse.zone || []
       }).finally(() => {
         this.loading = false
diff --git a/ui/src/main.js b/ui/src/main.js
index c25ab1066d4..2bd9d945e9a 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -44,7 +44,7 @@ import {
 import { VueAxios } from './utils/request'
 import directives from './utils/directives'
 import Cookies from 'js-cookie'
-import { api } from '@/api'
+import { getAPI } from '@/api'
 import { applyCustomGuiTheme } from './utils/guiTheme'
 
 vueApp.use(VueAxios, router)
@@ -106,7 +106,7 @@ fetch('config.json?ts=' + Date.now())
     let domainid = null
 
     if (userid !== undefined && Cookies.get('sessionkey')) {
-      await api('listUsers', { userid: userid }).then(response => {
+      await getAPI('listUsers', { userid: userid }).then(response => {
         accountid = response.listusersresponse.user[0].accountid
         domainid = response.listusersresponse.user[0].domainid
       })
diff --git a/ui/src/utils/guiTheme.js b/ui/src/utils/guiTheme.js
index 7cc3dc0cc03..b1a7209fd27 100644
--- a/ui/src/utils/guiTheme.js
+++ b/ui/src/utils/guiTheme.js
@@ -16,7 +16,7 @@
 // under the License.
 
 import { vueProps } from '@/vue-app'
-import { api } from '@/api'
+import { getAPI } from '@/api'
 
 export async function applyCustomGuiTheme (accountid, domainid) {
   await fetch('config.json').then(response => response.json()).then(config => {
@@ -45,10 +45,13 @@ export async function applyCustomGuiTheme (accountid, domainid) {
 }
 
 async function fetchGuiTheme (params) {
-  return await api('listGuiThemes', params).then(response => {
+  return await getAPI('listGuiThemes', params).then(response => {
     if (response.listguithemesresponse.guiThemes) {
       return response.listguithemesresponse.guiThemes[0]
     }
+  }).catch(error => {
+    console.error('Error fetching GUI theme:', error)
+    return null
   })
 }
 
diff --git a/ui/src/utils/request.js b/ui/src/utils/request.js
index 7c757691f2b..42b26c9785b 100644
--- a/ui/src/utils/request.js
+++ b/ui/src/utils/request.js
@@ -149,6 +149,15 @@ const err = (error) => {
 service.interceptors.request.use(config => {
   source = sourceToken.getSource()
   config.cancelToken = source.token
+
+  handleGetRequestParams(config)
+
+  handlePostRequestParams(config)
+
+  return config
+}, err)
+
+function handleGetRequestParams (config) {
   if (config && config.params) {
     config.params.response = 'json'
     const project = vueProps.$localStorage.get(CURRENT_PROJECT)
@@ -160,11 +169,30 @@ service.interceptors.request.use(config => {
       }
     }
     if (config.params.ignoreproject !== undefined) {
-      config.params.ignoreproject = null
+      delete config.params.ignoreproject
     }
   }
-  return config
-}, err)
+}
+
+function handlePostRequestParams (config) {
+  if (config && config.data && config.data instanceof URLSearchParams) {
+    const project = vueProps.$localStorage.get(CURRENT_PROJECT)
+    const command = config.data.get('command')
+    const hasProjectId = config.data.has('projectid')
+    const ignoreProject = config.data.has('ignoreproject')
+
+    if (!hasProjectId && !ignoreProject && project && project.id) {
+      if (command === 'listTags') {
+        config.data.append('projectid', '-1')
+      } else if (command !== 'assignVirtualMachine') {
+        config.data.append('projectid', project.id)
+      }
+    }
+    if (config.data.has('ignoreproject')) {
+      config.data.delete('ignoreproject')
+    }
+  }
+}
 
 // response interceptor
 service.interceptors.response.use((response) => {
diff --git a/ui/src/views/compute/KubernetesAddNodes.vue b/ui/src/views/compute/KubernetesAddNodes.vue
index dddcc90be25..2ee0b5ed528 100644
--- a/ui/src/views/compute/KubernetesAddNodes.vue
+++ b/ui/src/views/compute/KubernetesAddNodes.vue
@@ -66,7 +66,7 @@
 
 <script>
 import { ref, reactive, toRaw } from 'vue'
-import { api } from '@/api'
+import { getAPI, postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 
 export default {
@@ -112,7 +112,7 @@ export default {
     callListVms (accountId, domainId) {
       return new Promise((resolve) => {
         this.volumes = []
-        api('listVirtualMachines', {
+        getAPI('listVirtualMachines', {
           accountId: accountId,
           domainId: domainId,
           details: 'min',
@@ -172,7 +172,7 @@ export default {
     },
     addNodesToKubernetesCluster (params) {
       return new Promise((resolve, reject) => {
-        api('addNodesToKubernetesCluster', params).then(json => {
+        postAPI('addNodesToKubernetesCluster', params).then(json => {
           const jobId = json.addnodestokubernetesclusterresponse.jobid
           return resolve(jobId)
         }).catch(error => {
diff --git a/ui/src/views/compute/KubernetesRemoveNodes.vue b/ui/src/views/compute/KubernetesRemoveNodes.vue
index 57d6409b784..803ec2bd1b1 100644
--- a/ui/src/views/compute/KubernetesRemoveNodes.vue
+++ b/ui/src/views/compute/KubernetesRemoveNodes.vue
@@ -54,7 +54,7 @@
 
 <script>
 import { ref, reactive, toRaw } from 'vue'
-import { api } from '@/api'
+import { postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 
 export default {
@@ -137,7 +137,7 @@ export default {
     },
     removeNodesFromKubernetesCluster (params) {
       return new Promise((resolve, reject) => {
-        api('removeNodesFromKubernetesCluster', params).then(json => {
+        postAPI('removeNodesFromKubernetesCluster', params).then(json => {
           const jobId = json.removenodesfromkubernetesclusterresponse.jobid
           return resolve(jobId)
         }).catch(error => {

From 84b807eeee15b8398ebefd1f554f579bb05b14b4 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Wed, 16 Jul 2025 03:23:33 -0300
Subject: [PATCH 20/94] [CKS] Simplify logic for scaling CKS cluster service
 offerings (#11063)

---
 .../KubernetesClusterScaleWorker.java         | 85 ++++++++++---------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
index bfc553f6afa..3461d5c0634 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
@@ -532,6 +532,8 @@ public class KubernetesClusterScaleWorker extends KubernetesClusterResourceModif
         }
         scaleTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterScaleTimeout.value() * 1000;
         final long originalClusterSize = kubernetesCluster.getNodeCount();
+
+        // DEFAULT node type means only the global service offering has been set for the Kubernetes cluster
         boolean scaleClusterDefaultOffering = serviceOfferingNodeTypeMap.containsKey(DEFAULT.name());
         if (scaleClusterDefaultOffering) {
             final ServiceOffering existingServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
@@ -546,38 +548,37 @@ public class KubernetesClusterScaleWorker extends KubernetesClusterResourceModif
         ServiceOffering defaultServiceOffering = serviceOfferingNodeTypeMap.getOrDefault(DEFAULT.name(), null);
 
         for (KubernetesClusterNodeType nodeType : Arrays.asList(CONTROL, ETCD, WORKER)) {
-            boolean isWorkerNodeOrAllNodes = WORKER == nodeType;
-            final long newVMRequired = (!isWorkerNodeOrAllNodes || clusterSize == null) ? 0 : clusterSize - originalClusterSize;
+            boolean isWorkerNode = WORKER == nodeType;
+            final long newVMRequired = (!isWorkerNode || clusterSize == null) ? 0 : clusterSize - originalClusterSize;
             if (!scaleClusterDefaultOffering && !serviceOfferingNodeTypeMap.containsKey(nodeType.name()) && newVMRequired == 0) {
                 continue;
             }
 
-            Long existingNodeTypeOfferingId = getKubernetesClusterNodeTypeOfferingId(kubernetesCluster, nodeType);
-            boolean clusterHasExistingOfferingForNodeType = existingNodeTypeOfferingId != null;
-            boolean serviceOfferingScalingNeeded = isServiceOfferingScalingNeededForNodeType(nodeType, serviceOfferingNodeTypeMap, kubernetesCluster);
-            ServiceOffering serviceOffering = serviceOfferingNodeTypeMap.getOrDefault(nodeType.name(), defaultServiceOffering);
-            boolean updateNodeOffering = serviceOfferingNodeTypeMap.containsKey(nodeType.name()) ||
-                    scaleClusterDefaultOffering && clusterHasExistingOfferingForNodeType;
-            boolean updateClusterOffering = isWorkerNodeOrAllNodes && scaleClusterDefaultOffering;
-            if (isWorkerNodeOrAllNodes && autoscalingChanged) {
+            ServiceOffering existingServiceOffering = getExistingServiceOfferingForNodeType(nodeType, kubernetesCluster);
+            ServiceOffering scalingServiceOffering = serviceOfferingNodeTypeMap.getOrDefault(nodeType.name(), defaultServiceOffering);
+            boolean isNodeOfferingScalingNeeded = isServiceOfferingScalingNeededForNodeType(existingServiceOffering, scalingServiceOffering);
+            boolean updateNodeOffering = serviceOfferingNodeTypeMap.containsKey(nodeType.name()) || isNodeOfferingScalingNeeded;
+
+            boolean updateClusterOffering = isWorkerNode && scaleClusterDefaultOffering;
+            if (isWorkerNode && autoscalingChanged) {
                 boolean autoScaled = autoscaleCluster(this.isAutoscalingEnabled, minSize, maxSize);
-                if (autoScaled && serviceOfferingScalingNeeded) {
-                    scaleKubernetesClusterOffering(nodeType, serviceOffering, updateNodeOffering, updateClusterOffering);
+                if (autoScaled && isNodeOfferingScalingNeeded) {
+                    scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
                 }
                 stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
                 return autoScaled;
             }
-            final boolean clusterSizeScalingNeeded = isWorkerNodeOrAllNodes && clusterSize != null && clusterSize != originalClusterSize;
-            if (serviceOfferingScalingNeeded && clusterSizeScalingNeeded) {
+            final boolean clusterSizeScalingNeeded = isWorkerNode && clusterSize != null && clusterSize != originalClusterSize;
+            if (isNodeOfferingScalingNeeded && clusterSizeScalingNeeded) {
                 if (newVMRequired > 0) {
-                    scaleKubernetesClusterOffering(nodeType, serviceOffering, updateNodeOffering, updateClusterOffering);
+                    scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
                     scaleKubernetesClusterSize(nodeType);
                 } else {
                     scaleKubernetesClusterSize(nodeType);
-                    scaleKubernetesClusterOffering(nodeType, serviceOffering, updateNodeOffering, updateClusterOffering);
+                    scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
                 }
-            } else if (serviceOfferingScalingNeeded) {
-                scaleKubernetesClusterOffering(nodeType, serviceOffering, updateNodeOffering, updateClusterOffering);
+            } else if (isNodeOfferingScalingNeeded) {
+                scaleKubernetesClusterOffering(nodeType, scalingServiceOffering, updateNodeOffering, updateClusterOffering);
             } else if (clusterSizeScalingNeeded) {
                 scaleKubernetesClusterSize(nodeType);
             }
@@ -587,43 +588,45 @@ public class KubernetesClusterScaleWorker extends KubernetesClusterResourceModif
         return true;
     }
 
-    private Long getKubernetesClusterNodeTypeOfferingId(KubernetesCluster kubernetesCluster, KubernetesClusterNodeType nodeType) {
-        if (nodeType == WORKER) {
-            return kubernetesCluster.getWorkerNodeServiceOfferingId();
-        } else if (nodeType == ETCD) {
-            return kubernetesCluster.getEtcdNodeServiceOfferingId();
-        } else if (nodeType == CONTROL) {
-            return kubernetesCluster.getControlNodeServiceOfferingId();
-        }
-        return null;
-    }
-
-    protected boolean isServiceOfferingScalingNeededForNodeType(KubernetesClusterNodeType nodeType,
-                                                                Map<String, ServiceOffering> map, KubernetesCluster kubernetesCluster) {
-        // DEFAULT node type means only the global service offering has been set for the Kubernetes cluster
-        Long existingOfferingId = map.containsKey(DEFAULT.name()) ?
-                kubernetesCluster.getServiceOfferingId() :
-                getExistingOfferingIdForNodeType(nodeType, kubernetesCluster);
+    private ServiceOffering getExistingServiceOfferingForNodeType(KubernetesClusterNodeType nodeType, KubernetesCluster kubernetesCluster) {
+        Long existingOfferingId = getExistingOfferingIdForNodeType(nodeType, kubernetesCluster);
         if (existingOfferingId == null) {
-            logAndThrow(Level.ERROR, String.format("The Kubernetes cluster %s does not have a global service offering set", kubernetesCluster.getName()));
+            logAndThrow(Level.ERROR, String.format("The Kubernetes cluster %s does not have a service offering set for node type %s",
+                    kubernetesCluster.getName(), nodeType.name()));
         }
         ServiceOffering existingOffering = serviceOfferingDao.findById(existingOfferingId);
         if (existingOffering == null) {
-            logAndThrow(Level.ERROR, String.format("Cannot find the global service offering with ID %s set on the Kubernetes cluster %s", existingOfferingId, kubernetesCluster.getName()));
+            logAndThrow(Level.ERROR, String.format("Cannot find service offering with ID %s set on the Kubernetes cluster %s node type %s",
+                    existingOfferingId, kubernetesCluster.getName(), nodeType.name()));
         }
-        ServiceOffering newOffering = map.containsKey(DEFAULT.name()) ? map.get(DEFAULT.name()) : map.get(nodeType.name());
-        return newOffering != null && newOffering.getId() != existingOffering.getId();
+        return existingOffering;
+    }
+
+    protected void compareExistingToScalingServiceOfferingForNodeType(Long existingOfferingId, Long scalingOfferingId,
+                                                                      KubernetesClusterNodeType nodeType) {
+        if (existingOfferingId.equals(scalingOfferingId)) {
+            String err = String.format("Cannot scale the nodes of type %s as the provided offering %s " +
+                    "is the same as the existing offering", nodeType.name(), scalingOfferingId);
+            logger.error(err);
+            throw new CloudRuntimeException(err);
+        }
+    }
+
+    protected boolean isServiceOfferingScalingNeededForNodeType(ServiceOffering existingServiceOffering,
+                                                                ServiceOffering scalingServiceOffering) {
+        return scalingServiceOffering != null && existingServiceOffering != null &&
+                scalingServiceOffering.getId() != existingServiceOffering.getId();
     }
 
     protected Long getExistingOfferingIdForNodeType(KubernetesClusterNodeType nodeType, KubernetesCluster kubernetesCluster) {
         List<KubernetesClusterVmMapVO> clusterVms = kubernetesClusterVmMapDao.listByClusterIdAndVmType(kubernetesCluster.getId(), nodeType);
         if (CollectionUtils.isEmpty(clusterVms)) {
-            return null;
+            return kubernetesCluster.getServiceOfferingId();
         }
         KubernetesClusterVmMapVO clusterVm = clusterVms.get(0);
         UserVmVO clusterUserVm = userVmDao.findById(clusterVm.getVmId());
         if (clusterUserVm == null) {
-            return null;
+            return kubernetesCluster.getServiceOfferingId();
         }
         return clusterUserVm.getServiceOfferingId();
     }

From 3220eb442a5b2a1416b2c44a1112dc029dd35708 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Wed, 16 Jul 2025 11:55:28 +0530
Subject: [PATCH 21/94] PowerFlex/ScaleIO - MDM and host SDC connection
 enhancements (#11047)

* Cumulative enhancements fix for ScaleIO: MDM add/remove, Host prepare/unprepare, validate Storage Pool can be created in Agent.

- Implemented validation to fail Host disconnect from Storage Pool if there are Volumes attached and SDC client MDM removal requires scini service to be restarted
- Implemented Storage Pool validation by checking whether MDM addresses from configuration file and from memory (using CLI) matches, otherwise file ModifyStoragePool command.
- Introduced configuration key to apply timeout after making MDM changes for ScaleIO: powerflex.mdm.change.apply.timeout.ms (default 1000ms)
- Implemented logic to apply timeout after making MDM changes for ScaleIO in prepare and unprepare logic
- Added detection of MDM removal support via CLI
- If MDM removal support via CLI supported then use CLI, fall back to edit drv_cfg.txt and restart scini instead

Co-authored-by: Suresh Kumar Anaparti <suresh.anaparti@shapeblue.com>
Co-authored-by: mprokopchuk <mprokopchuk@apple.com>
---
 .../agent/properties/AgentProperties.java     |   2 +-
 ...ibvirtModifyStoragePoolCommandWrapper.java |  16 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java    | 174 ++++++++-
 .../storage/ScaleIOStorageAdaptorTest.java    |   4 +
 .../client/ScaleIOGatewayClient.java          |   3 +
 .../ScaleIOPrimaryDataStoreLifeCycle.java     |  39 +-
 .../datastore/manager/ScaleIOSDCManager.java  |  37 ++
 .../manager/ScaleIOSDCManagerImpl.java        |  60 ++-
 .../provider/ScaleIOHostListener.java         |  12 +-
 .../storage/datastore/util/ScaleIOUtil.java   | 353 +++++++++++++++---
 .../java/com/cloud/utils/script/Script.java   |  20 +
 11 files changed, 613 insertions(+), 107 deletions(-)

diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
index 69537621673..b6e90160c07 100644
--- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
+++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -833,7 +833,7 @@ public class AgentProperties{
         private T defaultValue;
         private Class<T> typeClass;
 
-        Property(String name, T value) {
+        public Property(String name, T value) {
             init(name, value);
         }
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
index 06883c708d9..990cefda8f3 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
@@ -31,6 +31,7 @@ import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.storage.template.TemplateProp;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 @ResourceWrapper(handles =  ModifyStoragePoolCommand.class)
 public final class LibvirtModifyStoragePoolCommandWrapper extends CommandWrapper<ModifyStoragePoolCommand, Answer, LibvirtComputingResource> {
@@ -49,11 +50,16 @@ public final class LibvirtModifyStoragePoolCommandWrapper extends CommandWrapper
             return answer;
         }
 
-        final KVMStoragePool storagepool =
-                storagePoolMgr.createStoragePool(command.getPool().getUuid(), command.getPool().getHost(), command.getPool().getPort(), command.getPool().getPath(), command.getPool()
-                        .getUserInfo(), command.getPool().getType(), command.getDetails());
-        if (storagepool == null) {
-            return new Answer(command, false, " Failed to create storage pool");
+        final KVMStoragePool storagepool;
+        try {
+            storagepool =
+                    storagePoolMgr.createStoragePool(command.getPool().getUuid(), command.getPool().getHost(), command.getPool().getPort(), command.getPool().getPath(), command.getPool()
+                            .getUserInfo(), command.getPool().getType(), command.getDetails());
+            if (storagepool == null) {
+                return new Answer(command, false, " Failed to create storage pool");
+            }
+        } catch (CloudRuntimeException e) {
+            return new Answer(command, false, String.format("Failed to create storage pool: %s", e.getLocalizedMessage()));
         }
 
         final Map<String, TemplateProp> tInfo = new HashMap<String, TemplateProp>();
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
index 29c152f934f..efa8024a34b 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
@@ -22,11 +22,13 @@ import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.cloud.agent.api.PrepareStorageClientCommand;
 import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClient;
 import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManager;
 import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
@@ -38,6 +40,7 @@ import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
 import org.apache.cloudstack.utils.qemu.QemuImgFile;
 import org.apache.cloudstack.utils.qemu.QemuObject;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -149,7 +152,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
     @Override
     public KVMStoragePool createStoragePool(String uuid, String host, int port, String path, String userInfo, Storage.StoragePoolType type, Map<String, String> details, boolean isPrimaryStorage) {
         ScaleIOStoragePool storagePool = new ScaleIOStoragePool(uuid, host, port, path, type, details, this);
-        if (details != null && details.containsKey(ScaleIOSDCManager.ConnectOnDemand.key())) {
+        if (MapUtils.isNotEmpty(details) && details.containsKey(ScaleIOSDCManager.ConnectOnDemand.key())) {
             String connectOnDemand = details.get(ScaleIOSDCManager.ConnectOnDemand.key());
             if (connectOnDemand != null && !Boolean.parseBoolean(connectOnDemand)) {
                 Ternary<Boolean, Map<String, String>, String> prepareStorageClientStatus = prepareStorageClient(uuid, details);
@@ -158,10 +161,49 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
                 }
             }
         }
+
+        validateMdmState(details);
+
         MapStorageUuidToStoragePool.put(uuid, storagePool);
         return storagePool;
     }
 
+    /**
+     * Validate Storage Pool state to ensure it healthy and can operate requests.
+     * There is observed situation where ScaleIO configuration file has different values than ScaleIO CLI.
+     * Validation compares values from both drv_cfg.txt and drv_cfg CLI and throws exception if there is mismatch.
+     *
+     * @param details see {@link PrepareStorageClientCommand#getDetails()}
+     *                and {@link @UnprepareStorageClientCommand#getDetails()}, expected to contain
+     *                {@link ScaleIOSDCManager#ValidateMdmsOnConnect#key()}
+     * @throws CloudRuntimeException in case if Storage Pool is not operate-able
+     */
+    private void validateMdmState(Map<String, String> details) {
+        String configKey = ScaleIOSDCManager.ValidateMdmsOnConnect.key();
+        if (MapUtils.isEmpty(details) || !details.containsKey(configKey)) {
+            logger.debug(String.format("Skipped PowerFlex MDMs validation as property %s not sent by Management Server", configKey));
+            return;
+        }
+
+        String configValue = details.get(configKey);
+
+        // be as much verbose as possible, otherwise it will be difficult to troubleshoot operational issue without logs
+        if (StringUtils.isEmpty(configValue)) {
+            logger.debug(String.format("Skipped PowerFlex MDMs validation as property %s sent by Management Server is empty", configKey));
+        } else if (Boolean.valueOf(configValue).equals(Boolean.FALSE)) {
+            logger.debug(String.format("Skipped PowerFlex MDMs validation as property %s received as %s", configKey, configValue));
+        } else {
+            Collection<String> mdmsFromConfigFile = ScaleIOUtil.getMdmsFromConfigFile();
+            Collection<String> mdmsFromCliCmd = ScaleIOUtil.getMdmsFromCliCmd();
+            if (!mdmsFromCliCmd.equals(mdmsFromConfigFile)) {
+                String msg = String.format("PowerFlex MDM addresses from CLI and Configuration File doesn't match. " +
+                        "CLI values: %s, Configuration File values: %s", mdmsFromCliCmd, mdmsFromConfigFile);
+                logger.warn(msg);
+                throw new CloudRuntimeException(msg);
+            }
+        }
+    }
+
     @Override
     public boolean deleteStoragePool(String uuid) {
         ScaleIOStoragePool storagePool = (ScaleIOStoragePool) MapStorageUuidToStoragePool.get(uuid);
@@ -173,7 +215,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
 
     @Override
     public boolean deleteStoragePool(String uuid, Map<String, String> details) {
-        if (details != null && details.containsKey(ScaleIOSDCManager.ConnectOnDemand.key())) {
+        if (MapUtils.isNotEmpty(details) && details.containsKey(ScaleIOSDCManager.ConnectOnDemand.key())) {
             String connectOnDemand = details.get(ScaleIOSDCManager.ConnectOnDemand.key());
             if (connectOnDemand != null && !Boolean.parseBoolean(connectOnDemand)) {
                 Pair<Boolean, String> unprepareStorageClientStatus = unprepareStorageClient(uuid, details);
@@ -259,7 +301,7 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
         volumePath = ScaleIOUtil.getVolumePath(volumePath);
 
         int waitTimeInSec = DEFAULT_DISK_WAIT_TIME_IN_SECS;
-        if (details != null && details.containsKey(StorageManager.STORAGE_POOL_DISK_WAIT.toString())) {
+        if (MapUtils.isNotEmpty(details) && details.containsKey(StorageManager.STORAGE_POOL_DISK_WAIT.toString())) {
             String waitTime = details.get(StorageManager.STORAGE_POOL_DISK_WAIT.toString());
             if (StringUtils.isNotEmpty(waitTime)) {
                 waitTimeInSec = Integer.valueOf(waitTime).intValue();
@@ -607,28 +649,37 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
         }
 
         if (!ScaleIOUtil.isSDCServiceActive()) {
+            logger.debug("SDC service is not active on host, starting it");
             if (!ScaleIOUtil.startSDCService()) {
                 return new Ternary<>(false, null, "Couldn't start SDC service on host");
             }
         }
 
-        if (details != null && details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_MDMS)) {
+        if (MapUtils.isNotEmpty(details) && details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_MDMS)) {
             // Assuming SDC service is started, add mdms
             String mdms = details.get(ScaleIOGatewayClient.STORAGE_POOL_MDMS);
             String[] mdmAddresses = mdms.split(",");
             if (mdmAddresses.length > 0) {
-                if (ScaleIOUtil.mdmAdded(mdmAddresses[0])) {
+                if (ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
                     return new Ternary<>(true, getSDCDetails(details), "MDM added, no need to prepare the SDC client");
                 }
 
-                ScaleIOUtil.addMdms(Arrays.asList(mdmAddresses));
-                if (!ScaleIOUtil.mdmAdded(mdmAddresses[0])) {
+                ScaleIOUtil.addMdms(mdmAddresses);
+                if (!ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
                     return new Ternary<>(false, null, "Failed to add MDMs");
+                } else {
+                    logger.debug(String.format("MDMs %s added to storage pool %s", mdms, uuid));
+                    applyMdmsChangeWaitTime(details);
                 }
             }
         }
 
-        return new Ternary<>( true, getSDCDetails(details), "Prepared client successfully");
+        Map<String, String> sdcDetails = getSDCDetails(details);
+        if (MapUtils.isEmpty(sdcDetails)) {
+            return new Ternary<>(false, null, "Couldn't get the SDC details on the host");
+        }
+
+        return new Ternary<>(true, sdcDetails, "Prepared client successfully");
     }
 
     public Pair<Boolean, String> unprepareStorageClient(String uuid, Map<String, String> details) {
@@ -642,40 +693,127 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
             return new Pair<>(true, "SDC service not enabled on host, no need to unprepare the SDC client");
         }
 
-        if (details != null && details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_MDMS)) {
+        if (MapUtils.isNotEmpty(details) && details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_MDMS)) {
             String mdms = details.get(ScaleIOGatewayClient.STORAGE_POOL_MDMS);
             String[] mdmAddresses = mdms.split(",");
             if (mdmAddresses.length > 0) {
-                if (!ScaleIOUtil.mdmAdded(mdmAddresses[0])) {
+                if (!ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
                     return new Pair<>(true, "MDM not added, no need to unprepare the SDC client");
+                } else {
+                    String configKey = ScaleIOSDCManager.BlockSdcUnprepareIfRestartNeededAndVolumesAreAttached.key();
+                    String configValue = details.get(configKey);
+
+                    if (StringUtils.isEmpty(configValue)) {
+                        logger.debug(String.format("Configuration key %s not provided", configKey));
+                    } else {
+                        logger.debug(String.format("Configuration key %s provided as %s", configKey, configValue));
+                    }
+                    Boolean blockUnprepare = Boolean.valueOf(configValue);
+                    if (!ScaleIOUtil.isRemoveMdmCliSupported() // scini restart required when --remove_mdm is not supported
+                            && !ScaleIOUtil.getVolumeIds().isEmpty()
+                            && Boolean.TRUE.equals(blockUnprepare)) {
+                        return new Pair<>(false, "Failed to remove MDMs, SDC client requires service to be restarted, but there are Volumes attached to the Host");
+                    }
                 }
 
-                ScaleIOUtil.removeMdms(Arrays.asList(mdmAddresses));
-                if (ScaleIOUtil.mdmAdded(mdmAddresses[0])) {
+                // Immediate removal of MDMs after unmapping volume throws Error: "Volume is mappedKernel module rejects removing MDM"
+                // Wait before removing MDMs for any volumes to get unmapped.
+                applyMdmsChangeWaitTime(details);
+                ScaleIOUtil.removeMdms(mdmAddresses);
+                if (ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
                     return new Pair<>(false, "Failed to remove MDMs, unable to unprepare the SDC client");
+                } else {
+                    logger.debug(String.format("MDMs %s removed from storage pool %s", mdms, uuid));
+                    applyMdmsChangeWaitTime(details);
                 }
             }
         }
 
+        /*
+         * TODO:
+         * 1. Verify on-demand is true
+         * 2. If on-demand is true check whether other MDM addresses are still present
+         * 3. If there are no MDM addresses, then stop SDC service.
+         */
+
         return new Pair<>(true, "Unprepared SDC client successfully");
     }
 
+    /**
+     * Check whether details map has wait time configured and do "apply wait time" pause before returning response
+     * (to have ScaleIO changes applied).
+     *
+     * @param details see {@link PrepareStorageClientCommand#getDetails()}
+     *                and {@link @UnprepareStorageClientCommand#getDetails()}, expected to contain
+     *                {@link ScaleIOSDCManager#MdmsChangeApplyWaitTime#key()}
+     */
+    private void applyMdmsChangeWaitTime(Map<String, String> details) {
+        String configKey = ScaleIOSDCManager.MdmsChangeApplyWaitTime.key();
+        if (MapUtils.isEmpty(details) || !details.containsKey(configKey)) {
+            logger.debug(String.format("Apply wait time property %s not sent by Management Server, skip", configKey));
+            return;
+        }
+
+        String configValue = details.get(configKey);
+        if (StringUtils.isEmpty(configValue)) {
+            logger.debug(String.format("Apply wait time value not defined in property %s, skip", configKey));
+            return;
+        }
+        long timeoutMs;
+        try {
+            timeoutMs = Long.parseLong(configValue);
+        } catch (NumberFormatException e) {
+            logger.warn(String.format("Invalid apply wait time value defined in property %s, skip", configKey), e);
+            return;
+        }
+        if (timeoutMs < 1) {
+            logger.warn(String.format("Apply wait time value is too small (%s ms), skipping", timeoutMs));
+            return;
+        }
+        try {
+            logger.debug(String.format("Waiting for %d ms as defined in property %s", timeoutMs, configKey));
+            Thread.sleep(timeoutMs);
+        } catch (InterruptedException e) {
+            logger.warn(String.format("Waiting for %d ms interrupted", timeoutMs), e);
+        }
+    }
+
     private Map<String, String> getSDCDetails(Map<String, String> details) {
         Map<String, String> sdcDetails = new HashMap<String, String>();
-        if (details == null || !details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID))  {
+        if (MapUtils.isEmpty(details) || !details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID))  {
             return sdcDetails;
         }
 
         String storageSystemId = details.get(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
-        String sdcId = ScaleIOUtil.getSdcId(storageSystemId);
-        if (sdcId != null) {
-            sdcDetails.put(ScaleIOGatewayClient.SDC_ID, sdcId);
-        } else {
+        if (StringUtils.isEmpty(storageSystemId)) {
+            return sdcDetails;
+        }
+
+        int numberOfTries = 5;
+        int timeBetweenTries = 1000; // Try more frequently (every sec) and return early when SDC Id or Guid found
+        int attempt = 1;
+        do {
+            logger.debug("Get SDC details, attempt #{}", attempt);
+            String sdcId = ScaleIOUtil.getSdcId(storageSystemId);
+            if (sdcId != null) {
+                sdcDetails.put(ScaleIOGatewayClient.SDC_ID, sdcId);
+                return sdcDetails;
+            }
+
             String sdcGuId = ScaleIOUtil.getSdcGuid();
             if (sdcGuId != null) {
                 sdcDetails.put(ScaleIOGatewayClient.SDC_GUID, sdcGuId);
+                return sdcDetails;
             }
-        }
+
+            try {
+                Thread.sleep(timeBetweenTries);
+            } catch (Exception ignore) {
+            }
+            numberOfTries--;
+            attempt++;
+        } while (numberOfTries > 0);
+
         return sdcDetails;
     }
 
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
index 421fee09634..eddaa8f6499 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
@@ -194,8 +194,12 @@ public class ScaleIOStorageAdaptorTest {
         details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, "1.1.1.1,2.2.2.2");
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl status scini"))).thenReturn(3);
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-enabled scini"))).thenReturn(0);
+        when(Script.executeCommand(Mockito.eq("sed -i '/1.1.1.1\\,/d' /etc/emc/scaleio/drv_cfg.txt"))).thenReturn(new Pair<>(null, null));
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl restart scini"))).thenReturn(0);
         when(Script.runSimpleBashScript(Mockito.eq("/opt/emc/scaleio/sdc/bin/drv_cfg --query_mdms|grep 1.1.1.1"))).thenReturn("MDM-ID 71fd458f0775010f SDC ID 4421a91a00000000 INSTALLATION ID 204930df2cbcaf8e IPs [0]-1.1.1.1 [1]-2.2.2.2");
+        when(Script.executeCommand(Mockito.eq("/opt/emc/scaleio/sdc/bin/drv_cfg"))).thenReturn(new Pair<>(null, null));
+        when(Script.executeCommand(Mockito.eq("/opt/emc/scaleio/sdc/bin/drv_cfg --query_vols"))).thenReturn(new Pair<>("", null));
+
 
         Pair<Boolean, String> result = scaleIOStorageAdaptor.unprepareStorageClient(poolUuid, details);
 
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClient.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClient.java
index 2dc5acffcbc..77a8677e6b1 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClient.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClient.java
@@ -38,6 +38,9 @@ public interface ScaleIOGatewayClient {
     String GATEWAY_API_PASSWORD = "powerflex.gw.password";
     String STORAGE_POOL_NAME = "powerflex.storagepool.name";
     String STORAGE_POOL_SYSTEM_ID = "powerflex.storagepool.system.id";
+    /**
+     * Storage Pool Metadata Management (MDM) IP address(es).
+     */
     String STORAGE_POOL_MDMS = "powerflex.storagepool.mdms";
     String SDC_ID = "powerflex.sdc.id";
     String SDC_GUID = "powerflex.sdc.guid";
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java
index 461992be102..5917e7895ca 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycle.java
@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 import com.cloud.host.HostVO;
-import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import org.apache.cloudstack.api.ApiConstants;
 import com.cloud.utils.StringUtils;
 import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
@@ -105,8 +104,6 @@ public class ScaleIOPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCy
     @Inject
     private AgentManager agentMgr;
     private ScaleIOSDCManager sdcManager;
-    @Inject
-    private StoragePoolAndAccessGroupMapDao storagePoolAndAccessGroupMapDao;
 
     public ScaleIOPrimaryDataStoreLifeCycle() {
         sdcManager = new ScaleIOSDCManagerImpl();
@@ -306,14 +303,19 @@ public class ScaleIOPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCy
 
     @Override
     public boolean maintain(DataStore store) {
-        Map<String,String> details = new HashMap<>();
-        StoragePoolDetailVO systemIdDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
-        if (systemIdDetail != null) {
-            details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemIdDetail.getValue());
-            StoragePoolDetailVO mdmsDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_MDMS);
-            if (mdmsDetail != null) {
-                details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, mdmsDetail.getValue());
-                details.put(ScaleIOSDCManager.ConnectOnDemand.key(), "false");
+        Map<String, String> details = new HashMap<>();
+        StoragePoolVO storagePoolVO = primaryDataStoreDao.findById(store.getId());
+        if (storagePoolVO != null) {
+            sdcManager = ComponentContext.inject(sdcManager);
+            sdcManager.populateSdcSettings(details, storagePoolVO.getDataCenterId());
+            StoragePoolDetailVO systemIdDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
+            if (systemIdDetail != null) {
+                details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemIdDetail.getValue());
+                StoragePoolDetailVO mdmsDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_MDMS);
+                if (mdmsDetail != null) {
+                    details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, mdmsDetail.getValue());
+                    details.put(ScaleIOSDCManager.ConnectOnDemand.key(), "false");
+                }
             }
         }
 
@@ -324,14 +326,15 @@ public class ScaleIOPrimaryDataStoreLifeCycle extends BasePrimaryDataStoreLifeCy
 
     @Override
     public boolean cancelMaintain(DataStore store) {
-        Map<String,String> details = new HashMap<>();
-        StoragePoolDetailVO systemIdDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
-        if (systemIdDetail != null) {
-            details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemIdDetail.getValue());
+        Map<String, String> details = new HashMap<>();
+        StoragePoolVO storagePoolVO = primaryDataStoreDao.findById(store.getId());
+        if (storagePoolVO != null) {
             sdcManager = ComponentContext.inject(sdcManager);
-            if (sdcManager.areSDCConnectionsWithinLimit(store.getId())) {
-                StoragePoolVO storagePoolVO = primaryDataStoreDao.findById(store.getId());
-                if (storagePoolVO != null) {
+            sdcManager.populateSdcSettings(details, storagePoolVO.getDataCenterId());
+            StoragePoolDetailVO systemIdDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
+            if (systemIdDetail != null) {
+                details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemIdDetail.getValue());
+                if (sdcManager.areSDCConnectionsWithinLimit(store.getId())) {
                     details.put(ScaleIOSDCManager.ConnectOnDemand.key(), String.valueOf(ScaleIOSDCManager.ConnectOnDemand.valueIn(storagePoolVO.getDataCenterId())));
                     StoragePoolDetailVO mdmsDetail = storagePoolDetailsDao.findDetail(store.getId(), ScaleIOGatewayClient.STORAGE_POOL_MDMS);
                     if (mdmsDetail != null) {
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManager.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManager.java
index b02732051b5..8529d5dac73 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManager.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManager.java
@@ -22,6 +22,8 @@ import org.apache.cloudstack.framework.config.ConfigKey;
 
 import com.cloud.host.Host;
 
+import java.util.Map;
+
 public interface ScaleIOSDCManager {
     ConfigKey<Boolean> ConnectOnDemand = new ConfigKey<>("Storage",
             Boolean.class,
@@ -32,6 +34,34 @@ public interface ScaleIOSDCManager {
             Boolean.TRUE,
             ConfigKey.Scope.Zone);
 
+    /**
+     * Timeout for Host to wait after MDM changes made on Host until changes will be applied.
+     * Needed to avoid cases when Storage Pool is not connected yet, but Agent already starts to use Storage Pool.
+     */
+    ConfigKey<Integer> MdmsChangeApplyWaitTime = new ConfigKey<>("Storage",
+            Integer.class,
+            "powerflex.mdm.change.apply.wait",
+            "3000",
+            "Time (in ms) to wait after MDM addition, and before & after MDM removal changes made on the Host, default value: 3000 ms",
+            Boolean.TRUE,
+            ConfigKey.Scope.Zone);
+
+    ConfigKey<Boolean> ValidateMdmsOnConnect = new ConfigKey<>("Storage",
+            Boolean.class,
+            "powerflex.mdm.validate.on.connect",
+            Boolean.FALSE.toString(),
+            "Flag to validate PowerFlex MDMs on the host, present in Configuration File and in CLI during storage pool registration in agent, default value: false",
+            Boolean.TRUE,
+            ConfigKey.Scope.Zone);
+
+    ConfigKey<Boolean> BlockSdcUnprepareIfRestartNeededAndVolumesAreAttached = new ConfigKey<>("Storage",
+            Boolean.class,
+            "powerflex.block.sdc.unprepare",
+            Boolean.FALSE.toString(),
+            "Block storage client un-preparation if SDC service restart needed after PowerFlex MDM removal (i.e. no support for --remove_mdm in drv_cfg cmd) when there are Volumes mapped to the Host",
+            Boolean.TRUE,
+            ConfigKey.Scope.Zone);
+
     /**
      * Checks SDC connections limit.
      * @param storagePoolId the storage pool id
@@ -93,4 +123,11 @@ public interface ScaleIOSDCManager {
      * @return Comma-separated list of MDM IPs of the pool
      */
     String getMdms(long poolId);
+
+    /**
+     * Adds the SDC settings to the details map.
+     * @param details the details map to add the settings
+     * @param dataCenterId the datacenter id for the settings
+     */
+    void populateSdcSettings(Map<String, String> details, long dataCenterId);
 }
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
index 79f82a1e0df..c13ad61a6cd 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
@@ -183,12 +183,13 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
                     storagePoolHost.setLocalPath(sdcId);
                     storagePoolHostDao.update(storagePoolHost.getId(), storagePoolHost);
                 }
+
+                int waitTimeInSecs = 15; // Wait for 15 secs (usual tests with SDC service start took 10-15 secs)
+                if (isHostSdcConnected(sdcId, dataStore, waitTimeInSecs)) {
+                    return sdcId;
+                }
             }
 
-            int waitTimeInSecs = 15; // Wait for 15 secs (usual tests with SDC service start took 10-15 secs)
-            if (isHostSdcConnected(sdcId, dataStore, waitTimeInSecs)) {
-                return sdcId;
-            }
             return null;
         } finally {
             if (storageSystemIdLock != null) {
@@ -204,9 +205,10 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
 
     private String prepareSDCOnHost(Host host, DataStore dataStore, String systemId, String mdms) {
         logger.debug("Preparing SDC on the host {}", host);
-        Map<String,String> details = new HashMap<>();
+        Map<String, String> details = new HashMap<>();
         details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemId);
         details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, mdms);
+        populateSdcSettings(details, host.getDataCenterId());
         PrepareStorageClientCommand cmd = new PrepareStorageClientCommand(((PrimaryDataStore) dataStore).getPoolType(), dataStore.getUuid(), details);
         int timeoutSeconds = 60;
         cmd.setWait(timeoutSeconds);
@@ -247,7 +249,7 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
         }
 
         if (StringUtils.isBlank(sdcId)) {
-            logger.warn("Couldn't retrieve PowerFlex storage SDC details from the host: {}, try (re)install SDC and restart agent", host);
+            logger.warn("Couldn't retrieve PowerFlex storage SDC details from the host: {}, add MDMs if On-demand connect disabled or try (re)install SDC & restart agent", host);
             return null;
         }
 
@@ -297,8 +299,7 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
             }
 
             if (!canUnprepareSDC(host, dataStore)) {
-                logger.debug("Cannot unprepare SDC, there might be other connected pools of same PowerFlex storage cluster," +
-                        "or some volumes mapped to the SDC that belongs to any of the storage pools of the PowerFlex storage cluster");
+                logger.debug("Cannot unprepare SDC, there are other pools of the same PowerFlex storage cluster with some volumes mapped to the host SDC");
                 return false;
             }
 
@@ -324,6 +325,7 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
         logger.debug(String.format("Unpreparing SDC on the host %s (%s)", host.getId(), host.getName()));
         Map<String,String> details = new HashMap<>();
         details.put(ScaleIOGatewayClient.STORAGE_POOL_MDMS, mdms);
+        populateSdcSettings(details, host.getDataCenterId());
         UnprepareStorageClientCommand cmd = new UnprepareStorageClientCommand(((PrimaryDataStore) dataStore).getPoolType(), dataStore.getUuid(), details);
         int timeoutSeconds = 60;
         cmd.setWait(timeoutSeconds);
@@ -359,21 +361,31 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
             return false;
         }
 
-        List<StoragePoolHostVO> poolHostVOsBySdc = storagePoolHostDao.findByLocalPath(sdcId);
-        if (CollectionUtils.isNotEmpty(poolHostVOsBySdc) && poolHostVOsBySdc.size() > 1) {
-            logger.debug(String.format("There are other connected pools with the same SDC of the host %s, shouldn't unprepare SDC", host));
-            return false;
-        }
-
         try {
-            final ScaleIOGatewayClient client = getScaleIOClient(dataStore.getId());
-            return client.listVolumesMappedToSdc(sdcId).isEmpty();
+            if (logger.isDebugEnabled()) {
+                List<StoragePoolHostVO> poolHostVOsBySdc = storagePoolHostDao.findByLocalPath(sdcId);
+                if (CollectionUtils.isNotEmpty(poolHostVOsBySdc) && poolHostVOsBySdc.size() > 1) {
+                    logger.debug(String.format("There are other connected pools with the same SDC of the host %s", host));
+                }
+            }
+
+            return !areVolumesMappedToPoolSdc(dataStore.getId(), sdcId);
         } catch (Exception e) {
             logger.warn("Unable to check whether the SDC of the pool: " + dataStore.getId() + " can be unprepared on the host: " + host.getId() + ", due to " + e.getMessage(), e);
             return false;
         }
     }
 
+    private boolean areVolumesMappedToPoolSdc(long storagePoolId, String sdcId) throws Exception {
+        try {
+            final ScaleIOGatewayClient client = getScaleIOClient(storagePoolId);
+            return CollectionUtils.isNotEmpty(client.listVolumesMappedToSdc(sdcId));
+        } catch (Exception e) {
+            logger.warn("Unable to check the volumes mapped to SDC of the pool: " + storagePoolId + ", due to " + e.getMessage());
+            throw e;
+        }
+    }
+
     @Override
     public String getHostSdcId(String sdcGuid, DataStore dataStore) {
         try {
@@ -467,9 +479,23 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
 
     private ScaleIOGatewayClient getScaleIOClient(final Long storagePoolId) throws Exception {
         StoragePoolVO storagePool = storagePoolDao.findById(storagePoolId);
+        if (storagePool == null) {
+            throw new CloudRuntimeException("Unable to find the storage pool with id " + storagePoolId);
+        }
         return ScaleIOGatewayClientConnectionPool.getInstance().getClient(storagePool, storagePoolDetailsDao);
     }
 
+    @Override
+    public void populateSdcSettings(Map<String, String> details, long dataCenterId) {
+        if (details == null) {
+            details = new HashMap<>();
+        }
+
+        details.put(ScaleIOSDCManager.MdmsChangeApplyWaitTime.key(), String.valueOf(ScaleIOSDCManager.MdmsChangeApplyWaitTime.valueIn(dataCenterId)));
+        details.put(ScaleIOSDCManager.ValidateMdmsOnConnect.key(), String.valueOf(ScaleIOSDCManager.ValidateMdmsOnConnect.valueIn(dataCenterId)));
+        details.put(ScaleIOSDCManager.BlockSdcUnprepareIfRestartNeededAndVolumesAreAttached.key(), String.valueOf(ScaleIOSDCManager.BlockSdcUnprepareIfRestartNeededAndVolumesAreAttached.valueIn(dataCenterId)));
+    }
+
     @Override
     public String getConfigComponentName() {
         return ScaleIOSDCManager.class.getSimpleName();
@@ -477,6 +503,6 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey[]{ConnectOnDemand};
+        return new ConfigKey[]{ConnectOnDemand, MdmsChangeApplyWaitTime, ValidateMdmsOnConnect, BlockSdcUnprepareIfRestartNeededAndVolumesAreAttached};
     }
 }
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
index 0db329204e8..f169b581b2c 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
@@ -27,7 +27,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
 import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClient;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.manager.ScaleIOSDCManager;
@@ -59,7 +58,6 @@ public class ScaleIOHostListener implements HypervisorHostListener {
     @Inject private DataStoreManager _dataStoreMgr;
     @Inject private HostDao _hostDao;
     @Inject private StoragePoolHostDao _storagePoolHostDao;
-    @Inject private PrimaryDataStoreDao _primaryDataStoreDao;
     @Inject private StoragePoolDetailsDao _storagePoolDetailsDao;
     private ScaleIOSDCManager _sdcManager = new ScaleIOSDCManagerImpl();
 
@@ -109,9 +107,10 @@ public class ScaleIOHostListener implements HypervisorHostListener {
         if (systemId == null) {
             throw new CloudRuntimeException("Failed to get the system id for PowerFlex storage pool " + storagePool.getName());
         }
-        Map<String,String> details = new HashMap<>();
+        Map<String, String> details = new HashMap<>();
         details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemId);
         _sdcManager = ComponentContext.inject(_sdcManager);
+        _sdcManager.populateSdcSettings(details, host.getDataCenterId());
         if (_sdcManager.areSDCConnectionsWithinLimit(poolId)) {
             details.put(ScaleIOSDCManager.ConnectOnDemand.key(), String.valueOf(ScaleIOSDCManager.ConnectOnDemand.valueIn(host.getDataCenterId())));
             String mdms = _sdcManager.getMdms(poolId);
@@ -120,7 +119,7 @@ public class ScaleIOHostListener implements HypervisorHostListener {
 
         ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, storagePool, storagePool.getPath(), details);
         ModifyStoragePoolAnswer answer  = sendModifyStoragePoolCommand(cmd, storagePool, host);
-        Map<String,String> poolDetails = answer.getPoolInfo().getDetails();
+        Map<String, String> poolDetails = answer.getPoolInfo().getDetails();
         if (MapUtils.isEmpty(poolDetails)) {
             String msg = String.format("PowerFlex storage SDC details not found on the host: %s, (re)install SDC and restart agent", host);
             logger.warn(msg);
@@ -137,7 +136,7 @@ public class ScaleIOHostListener implements HypervisorHostListener {
         }
 
         if (StringUtils.isBlank(sdcId)) {
-            String msg = String.format("Couldn't retrieve PowerFlex storage SDC details from the host: %s, (re)install SDC and restart agent", host);
+            String msg = String.format("Couldn't retrieve PowerFlex storage SDC details from the host: %s, add MDMs if On-demand connect disabled or try (re)install SDC & restart agent", host);
             logger.warn(msg);
             _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host.getUuid(), msg);
             return null;
@@ -201,9 +200,10 @@ public class ScaleIOHostListener implements HypervisorHostListener {
         if (systemId == null) {
             throw new CloudRuntimeException("Failed to get the system id for PowerFlex storage pool " + storagePool.getName());
         }
-        Map<String,String> details = new HashMap<>();
+        Map<String, String> details = new HashMap<>();
         details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemId);
         _sdcManager = ComponentContext.inject(_sdcManager);
+        _sdcManager.populateSdcSettings(details, host.getDataCenterId());
         if (_sdcManager.canUnprepareSDC(host, dataStore)) {
             details.put(ScaleIOSDCManager.ConnectOnDemand.key(), String.valueOf(ScaleIOSDCManager.ConnectOnDemand.valueIn(host.getDataCenterId())));
             String mdms = _sdcManager.getMdms(poolId);
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
index a8c02a90bf9..70ea6f429e7 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
@@ -17,16 +17,27 @@
 
 package org.apache.cloudstack.storage.datastore.util;
 
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
+import com.cloud.agent.properties.AgentProperties;
+import com.cloud.agent.properties.AgentPropertiesFileHandler;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.UuidUtils;
 import com.cloud.utils.script.Script;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class ScaleIOUtil {
     protected static Logger LOGGER = LogManager.getLogger(ScaleIOUtil.class);
 
@@ -39,7 +50,7 @@ public class ScaleIOUtil {
     public static final String VMSNAPSHOT_PREFIX = "vmsnap";
 
     public static final int IDENTIFIER_LENGTH = 16;
-    public static final Long MINIMUM_ALLOWED_IOPS_LIMIT = Long.valueOf(10);
+    public static final Long MINIMUM_ALLOWED_IOPS_LIMIT = 10L;
 
     public static final String DISK_PATH = "/dev/disk/by-id";
     public static final String DISK_NAME_PREFIX = "emc-vol-";
@@ -63,9 +74,17 @@ public class ScaleIOUtil {
     private static final String SDC_SERVICE_ENABLE_CMD = "systemctl enable scini";
 
     public static final String CONNECTED_SDC_COUNT_STAT = "ConnectedSDCCount";
+
+    /**
+     * Time (in seconds) to wait after SDC service 'scini' start/restart/stop.<br>
+     * Data type: Integer.<br>
+     * Default value: <code>3</code>
+     */
+    public static final AgentProperties.Property<Integer> SDC_SERVICE_ACTION_WAIT = new AgentProperties.Property<>("powerflex.sdc.service.wait", 3);
+
     /**
      * Cmd for querying volumes in SDC
-     * Sample output for cmd: drv_cfg --query_vols:
+     * Sample output for cmd {@code drv_cfg --query_vols}:
      * Retrieved 2 volume(s)
      * VOL-ID 6c33633100000009 MDM-ID 218ce1797566a00f
      * VOL-ID 6c3362a30000000a MDM-ID 218ce1797566a00f
@@ -74,14 +93,14 @@ public class ScaleIOUtil {
 
     /**
      * Cmd for querying guid in SDC
-     * Sample output for cmd: drv_cfg --query_guid:
+     * Sample output for cmd {@code drv_cfg --query_guid}:
      * B0E3BFB8-C20B-43BF-93C8-13339E85AA50
      */
     private static final String QUERY_GUID_CMD = "drv_cfg --query_guid";
 
     /**
      * Cmd for querying MDMs in SDC
-     * Sample output for cmd: drv_cfg --query_mdms:
+     * Sample output for cmd {@code drv_cfg --query_mdms}:
      * Retrieved 2 mdm(s)
      * MDM-ID 3ef46cbf2aaf5d0f SDC ID 6b18479c00000003 INSTALLATION ID 68ab55462cbb3ae4 IPs [0]-x.x.x.x [1]-x.x.x.x
      * MDM-ID 2e706b2740ec200f SDC ID 301b852c00000003 INSTALLATION ID 33f8662e7a5c1e6c IPs [0]-x.x.x.x [1]-x.x.x.x
@@ -89,61 +108,251 @@ public class ScaleIOUtil {
     private static final String QUERY_MDMS_CMD = "drv_cfg --query_mdms";
 
     private static final String ADD_MDMS_CMD = "drv_cfg --add_mdm";
+
+    private static final String REMOVE_MDM_PARAMETER = "--remove_mdm";
+
+    /**
+     * Calls the kernel module to remove MDM.
+     */
+    private static final String REMOVE_MDMS_CMD = "drv_cfg " + REMOVE_MDM_PARAMETER;
+
+    /**
+     * Command to get back "Usage" response. As of now it is just drv_cfg without parameters.
+     */
+    private static final String USAGE_CMD = "drv_cfg";
+
     private static final String DRV_CFG_FILE = "/etc/emc/scaleio/drv_cfg.txt";
 
-    public static void addMdms(List<String> mdmAddresses) {
-        if (CollectionUtils.isEmpty(mdmAddresses)) {
-            return;
+    /**
+     * Sample Command - sed -i '/x.x.x.x\,/d' /etc/emc/scaleio/drv_cfg.txt
+     */
+    private static final String REMOVE_MDM_CMD_TEMPLATE = "sed -i '/%s\\,/d' %s";
+
+    /**
+     * Patterns to parse {@link ScaleIOUtil#DRV_CFG_FILE} and {@code --query_mdms} command output.
+     * The format is:
+     * MDM-ID {HEX_ID} SDC ID {HEX_ID} INSTALLATION ID {HEX_ID} IPs [{DEC_INC_NUMBER}]-{IP_ADDRESS} [{DEC_INC_NUMBER}]-{IP_ADDRESS} ...
+     */
+    private static final Pattern NEW_LINE_PATTERN = Pattern.compile("\\r?\\n");
+    /**
+     * Pattern to find "IPs" substring in {@link ScaleIOUtil#QUERY_MDMS_CMD} command output.
+     * The output format is:
+     * MDM-ID {HEX_ID} SDC ID {HEX_ID} INSTALLATION ID {HEX_ID} IPs [{DEC_INC_NUMBER}]-{IP_ADDRESS} [{DEC_INC_NUMBER}]-{IP_ADDRESS} ...
+     */
+    private static final Pattern USAGE_IPS_LINE_PATTERN = Pattern.compile("IPs\\s*(.*)$");
+    /**
+     * Pattern to find individual IP address in {@link ScaleIOUtil#QUERY_MDMS_CMD} command output.
+     */
+    private static final Pattern USAGE_IP_TOKEN_PATTERN = Pattern.compile("(\\s*\\[\\d\\]\\-)([^\\s$]+)");
+
+    /**
+     * Pattern to find Volume ID in {@link  ScaleIOUtil#QUERY_VOLUMES_CMD}
+     */
+    private static final Pattern VOLUME_ID_TOKEN_PATTERN = Pattern.compile("VOL-ID\\s*([^\\s$]+)");
+    /**
+     * Pattern to find MDM entries line in {@link ScaleIOUtil#DRV_CFG_FILE}.
+     */
+    private static final Pattern DRV_CFG_MDM_LINE_PATTERN = Pattern.compile("^mdm\\s*([0-9A-F:\\.,]+)$", Pattern.CASE_INSENSITIVE);
+    /**
+     * Pattern to split comma separated string of IP addresses (space aware).
+     */
+    private static final Pattern DRV_CFG_MDM_IPS_PATTERN = Pattern.compile("\\s*,\\s*");
+
+    public static boolean addMdms(String... mdmAddresses) {
+        if (mdmAddresses.length < 1) {
+            return false;
         }
         // Sample Cmd - /opt/emc/scaleio/sdc/bin/drv_cfg --add_mdm --ip x.x.x.x,x.x.x.x --file /etc/emc/scaleio/drv_cfg.txt
-        String addMdmsCmd = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.ADD_MDMS_CMD;
-        addMdmsCmd += " --ip " + String.join(",", mdmAddresses);
-        addMdmsCmd += " --file " + DRV_CFG_FILE;
-        String result = Script.runSimpleBashScript(addMdmsCmd);
-        if (result == null) {
-            LOGGER.warn("Failed to add mdms");
-        }
+        String command = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.ADD_MDMS_CMD;
+        command += " --ip " + String.join(",", mdmAddresses);
+        command += " --file " + DRV_CFG_FILE;
+        return runCmd(command);
     }
 
-    public static void removeMdms(List<String> mdmAddresses) {
-        if (CollectionUtils.isEmpty(mdmAddresses)) {
-            return;
+    /**
+     * Remove MDM via ScaleIO via CLI.
+     *
+     * @param mdmAddress MDM address to remove
+     * @return true if IP address successfully removed
+     */
+    private static boolean removeMdm(String mdmAddress) {
+        // Sample Cmd - /opt/emc/scaleio/sdc/bin/drv_cfg --remove_mdm --ip x.x.x.x,x.x.x.x --file /etc/emc/scaleio/drv_cfg.txt
+        String command = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.REMOVE_MDMS_CMD;
+        command += " --ip " + String.join(",", mdmAddress);
+        command += " --file " + DRV_CFG_FILE;
+        return runCmd(command);
+    }
+
+    /**
+     * Run command, log command result and return {@link Boolean#TRUE} if command succeeded.
+     * FIXME: may need to do refactoring and replace static method calls with dynamic.
+     */
+    private static boolean runCmd(String command) {
+        Pair<String, String> result = Script.executeCommand(command);
+        String stdOut = result.first();
+        String stdErr = result.second();
+        boolean succeeded = StringUtils.isEmpty(stdErr);
+        if (succeeded) {
+            LOGGER.debug(String.format("Successfully executed command '%s': %s", command, stdOut));
+        } else {
+            LOGGER.warn(String.format("Failed to execute command '%s': %s", command, stdErr));
         }
-        // (i) Remove MDMs from config file (ii) Restart scini
-        //  Sample Cmd - sed -i '/x.x.x.x\,/d' /etc/emc/scaleio/drv_cfg.txt
+        return succeeded;
+    }
+
+    /**
+     * Remove MDMs either via ScaleIO CLI (if supported) or by updating configuration file.
+     *
+     * @param mdmAddresses MDM addresses
+     * @return returns {@link Boolean#TRUE} if changes were applied to the configuration
+     */
+    public static boolean removeMdms(String... mdmAddresses) {
+        if (mdmAddresses.length < 1) {
+            return false;
+        }
+
+        boolean changesApplied = false;
+        boolean removeMdmCliSupported = isRemoveMdmCliSupported();
         boolean restartSDC = false;
-        String removeMdmsCmdFormat = "sed -i '/%s\\,/d' %s";
         for (String mdmAddress : mdmAddresses) {
-            if (mdmAdded(mdmAddress)) {
-                restartSDC = true;
+            // continue to next address if current MDM is not present in configuration
+            if (!isMdmPresent(mdmAddress)) {
+                continue;
+            }
+            // remove MDM via CLI if it is supported
+            if (removeMdmCliSupported) {
+                if (removeMdm(mdmAddress)) {
+                    changesApplied = true;
+                }
+            } else {
+                String command = String.format(REMOVE_MDM_CMD_TEMPLATE, mdmAddress, DRV_CFG_FILE);
+                String stdErr = Script.executeCommand(command).second();
+                if(StringUtils.isEmpty(stdErr)) {
+                    // restart SDC needed only if configuration file modified manually (not by CLI)
+                    restartSDC = true;
+                    changesApplied = true;
+                } else {
+                    LOGGER.error(String.format("Failed to remove MDM %s from %s: %s", mdmAddress, DRV_CFG_FILE, stdErr));
+                }
             }
-            String removeMdmsCmd = String.format(removeMdmsCmdFormat, mdmAddress, DRV_CFG_FILE);
-            Script.runSimpleBashScript(removeMdmsCmd);
         }
         if (restartSDC) {
             restartSDCService();
         }
+        return changesApplied;
     }
 
-    public static boolean mdmAdded(String mdmAddress) {
+    /**
+     * Returns MDM entries from {@link ScaleIOUtil#DRV_CFG_FILE}.
+     */
+    public static Collection<String> getMdmsFromConfigFile() {
+        List<String> configFileLines;
+        try {
+            configFileLines = Files.readAllLines(Path.of(DRV_CFG_FILE));
+        } catch (IOException e) {
+            LOGGER.error(String.format("Failed to read MDMs from %s", DRV_CFG_FILE), e);
+            return List.of();
+        }
+        Set<String> mdms = new LinkedHashSet<>();
+        for (String line : configFileLines) {
+            Matcher mdmLineMatcher = DRV_CFG_MDM_LINE_PATTERN.matcher(line);
+            if(mdmLineMatcher.find() && mdmLineMatcher.groupCount() > 0) {
+                String mdmLine = mdmLineMatcher.group(1);
+                String[] mdmValues = DRV_CFG_MDM_IPS_PATTERN.split(mdmLine);
+                mdms.addAll(Arrays.asList(mdmValues));
+            }
+        }
+        return mdms;
+    }
+    /**
+     * Returns Volume Ids from {@link ScaleIOUtil#DRV_CFG_FILE}.
+     */
+    public static Collection<String> getVolumeIds() {
+        String command = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.QUERY_VOLUMES_CMD;
+        Pair<String, String> result = Script.executeCommand(command);
+        String stdOut = result.first();
+
+        Set<String> volumeIds = new LinkedHashSet<>();
+        String[] stdOutLines = NEW_LINE_PATTERN.split(stdOut);
+        for (String line : stdOutLines) {
+            Matcher volumeIdMatcher = VOLUME_ID_TOKEN_PATTERN.matcher(line);
+            if (volumeIdMatcher.find() && volumeIdMatcher.groupCount() > 0) {
+                volumeIds.add(volumeIdMatcher.group(1));
+            }
+        }
+        return volumeIds;
+    }
+
+    /**
+     * Returns MDM entries from CLI Cmd using {@code --query_mdms}.
+     */
+    public static Collection<String> getMdmsFromCliCmd() {
+        String command = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.QUERY_MDMS_CMD;
+        Pair<String, String> result = Script.executeCommand(command);
+        String stdOut = result.first();
+
+        Set<String> mdms = new LinkedHashSet<>();
+        String[] stdOutLines = NEW_LINE_PATTERN.split(stdOut);
+        for (String line : stdOutLines) {
+            Matcher ipsLineMatcher = USAGE_IPS_LINE_PATTERN.matcher(line);
+            if (ipsLineMatcher.find() && ipsLineMatcher.groupCount() > 0) {
+                String ipToken = ipsLineMatcher.group(1);
+                Matcher ipMatcher = USAGE_IP_TOKEN_PATTERN.matcher(ipToken);
+                while (ipMatcher.find()) {
+                    if (ipMatcher.groupCount() > 1) {
+                        mdms.add(ipMatcher.group(2));
+                    }
+                }
+            }
+        }
+        return mdms;
+    }
+
+    /**
+     * Returns {@link Boolean#TRUE} if ScaleIO CLI tool (drv_cfg) supports MDMs removal.
+     */
+    public static boolean isRemoveMdmCliSupported() {
+        /*
+         * New version of drv_cfg supports remove mdm API.
+         * Instead of defining supported version and checking it, the logic is to check drv_cfg "Usage" output
+         * and see whether remove_mdm command supported.
+         * The "Usage" returned if tool executed without parameters or with invalid parameters.
+         */
+        String command = SDC_HOME_PATH + "/bin/" + USAGE_CMD;
+
+        Pair<String, String> result = Script.executeCommand(command);
+        String stdOut = result.first();
+        String stdErr = result.second();
+
+        /*
+         * Check whether stderr or stdout contains mdm removal "--remove_mdm" parameter.
+         *
+         * Current version returns "Usage" in stderr, check stdout as well in case this will be changed in the future,
+         * as returned "Usage" is not an error.
+         */
+        return (stdOut + stdErr).toLowerCase().contains(REMOVE_MDM_PARAMETER);
+    }
+
+    /**
+     * Returns true if provided MDM address is present in configuration.
+     */
+    public static boolean isMdmPresent(String mdmAddress) {
         //query_mdms outputs "MDM-ID <System/MDM-Id> SDC ID <SDC-Id> INSTALLATION ID <Installation-Id> IPs [0]-x.x.x.x [1]-x.x.x.x" for a MDM with ID: <MDM-Id>
         String queryMdmsCmd = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.QUERY_MDMS_CMD;
         queryMdmsCmd += "|grep " + mdmAddress;
         String result = Script.runSimpleBashScript(queryMdmsCmd);
-        if (StringUtils.isNotBlank(result) && result.contains(mdmAddress)) {
-            return true;
-        }
-        return false;
+
+        return StringUtils.isNotBlank(result) && result.contains(mdmAddress);
     }
 
     public static String getSdcHomePath() {
-        String sdcHomePath = DEFAULT_SDC_HOME_PATH;
         String sdcHomePropertyCmdFormat = "sed -n '/%s/p' '%s' 2>/dev/null  | sed 's/%s=//g' 2>/dev/null";
         String sdcHomeCmd = String.format(sdcHomePropertyCmdFormat, SDC_HOME_PARAMETER, AGENT_PROPERTIES_FILE, SDC_HOME_PARAMETER);
-
         String result = Script.runSimpleBashScript(sdcHomeCmd);
+        String sdcHomePath;
         if (result == null) {
-            LOGGER.warn("Failed to get sdc home path from agent.properties, fallback to default path");
+            sdcHomePath = DEFAULT_SDC_HOME_PATH;
+            LOGGER.warn(String.format("Failed to get sdc home path from agent.properties, fallback to default path %s", sdcHomePath));
         } else {
             sdcHomePath = result;
         }
@@ -151,7 +360,7 @@ public class ScaleIOUtil {
         return sdcHomePath;
     }
 
-    public static final void rescanForNewVolumes() {
+    public static void rescanForNewVolumes() {
         // Detecting new volumes
         String rescanCmd = ScaleIOUtil.SDC_HOME_PATH + "/bin/" + ScaleIOUtil.RESCAN_CMD;
 
@@ -161,7 +370,7 @@ public class ScaleIOUtil {
         }
     }
 
-    public static final String getSystemIdForVolume(String volumeId) {
+    public static String getSystemIdForVolume(String volumeId) {
         //query_vols outputs "VOL-ID <VolumeID> MDM-ID <SystemID>" for a volume with ID: <VolumeID>
         String queryDiskCmd = SDC_HOME_PATH + "/bin/" + ScaleIOUtil.QUERY_VOLUMES_CMD;
         queryDiskCmd += "|grep " + volumeId + "|awk '{print $4}'";
@@ -225,7 +434,7 @@ public class ScaleIOUtil {
         return result;
     }
 
-    public static final String getVolumePath(String volumePathWithName) {
+    public static String getVolumePath(String volumePathWithName) {
         if (StringUtils.isEmpty(volumePathWithName)) {
             return volumePathWithName;
         }
@@ -237,7 +446,7 @@ public class ScaleIOUtil {
         return volumePathWithName;
     }
 
-    public static final String updatedPathWithVolumeName(String volumePath, String volumeName) {
+    public static String updatedPathWithVolumeName(String volumePath, String volumeName) {
         if (StringUtils.isAnyEmpty(volumePath, volumeName)) {
             return volumePath;
         }
@@ -267,16 +476,76 @@ public class ScaleIOUtil {
 
     public static boolean startSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_START_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
     }
 
     public static boolean stopSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_STOP_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
     }
 
     public static boolean restartSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_RESTART_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
+    }
+
+    private static void waitForSdcServiceActionToComplete() {
+        // Wait for the SDC service to settle after start/restart/stop and reaches a stable state
+        int waitTimeInSecs = AgentPropertiesFileHandler.getPropertyValue(SDC_SERVICE_ACTION_WAIT);
+        if (waitTimeInSecs < 0) {
+            waitTimeInSecs = SDC_SERVICE_ACTION_WAIT.getDefaultValue();
+        }
+        try {
+            LOGGER.debug(String.format("Waiting for %d secs after SDC service action, to reach a stable state", waitTimeInSecs));
+            Thread.sleep(waitTimeInSecs * 1000L);
+        } catch (InterruptedException ignore) {
+        }
+    }
+
+    /**
+     * Represents {@link ScaleIOUtil#DRV_CFG_FILE} MDM entry (SDC and Installation Ids are skipped).
+     */
+    public static class MdmEntry {
+        private String mdmId;
+        private Collection<String> ips;
+
+        /**
+         * MDM entry constructor.
+         *
+         * @param mdmId MDM Id
+         * @param ips   IP Addresses
+         */
+        public MdmEntry(String mdmId, Collection<String> ips) {
+            this.mdmId = mdmId;
+            this.ips = ips;
+        }
+
+        public String getMdmId() {
+            return mdmId;
+        }
+
+        public void setMdmId(String mdmId) {
+            this.mdmId = mdmId;
+        }
+
+        public Collection<String> getIps() {
+            return ips;
+        }
+
+        public void setIps(Collection<String> ips) {
+            this.ips = ips;
+        }
     }
 }
diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
index a1104b37c27..7ba2bb1b4d9 100644
--- a/utils/src/main/java/com/cloud/utils/script/Script.java
+++ b/utils/src/main/java/com/cloud/utils/script/Script.java
@@ -671,6 +671,26 @@ public class Script implements Callable<String> {
         return runScript(getScriptForCommandRun(command));
     }
 
+    /**
+     * Execute command and return standard output and standard error.
+     *
+     * @param command OS command to be executed
+     * @return {@link Pair} with standard output as first and standard error as second field
+     */
+    public static Pair<String, String> executeCommand(String command) {
+        // wrap command into bash
+        Script script = new Script("/bin/bash");
+        script.add("-c");
+        script.add(command);
+
+        // parse all lines from the output
+        OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+        String stdErr = script.execute(parser);
+        String stdOut = parser.getLines();
+        LOGGER.debug(String.format("Command [%s] result - stdout: [%s], stderr: [%s]", command, stdOut, stdErr));
+        return new Pair<>(stdOut, stdErr);
+    }
+
     public static int executeCommandForExitValue(long timeout, String... command) {
         return runScriptForExitValue(getScriptForCommandRun(timeout, command));
     }

From bb75abcffa203dbd55ebf33b199f1c13f99b790f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20B=C3=B6ck?=
 <89930804+erikbocks@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:38:47 -0300
Subject: [PATCH 22/94] Usage parsers refactoring (#11097)

---
 .../com/cloud/usage/UsageManagerImpl.java     | 132 ++----------------
 .../cloud/usage/parser/BackupUsageParser.java |  32 ++---
 .../cloud/usage/parser/BucketUsageParser.java |  33 ++---
 .../usage/parser/IPAddressUsageParser.java    |  45 ++----
 .../usage/parser/LoadBalancerUsageParser.java |  46 +++---
 .../parser/NetworkOfferingUsageParser.java    |  46 +++---
 .../usage/parser/NetworkUsageParser.java      |  41 ++----
 .../usage/parser/NetworksUsageParser.java     |  34 ++---
 .../parser/PortForwardingUsageParser.java     |  44 ++----
 .../parser/SecurityGroupUsageParser.java      |  44 ++----
 .../usage/parser/StorageUsageParser.java      |  44 ++----
 .../com/cloud/usage/parser/UsageParser.java   |  31 ++--
 .../usage/parser/VMInstanceUsageParser.java   |  42 ++----
 .../parser/VMSnapshotOnPrimaryParser.java     |  48 +++----
 .../usage/parser/VMSnapshotUsageParser.java   |  48 +++----
 .../usage/parser/VPNUserUsageParser.java      |  44 ++----
 .../cloud/usage/parser/VmDiskUsageParser.java |  41 ++----
 .../cloud/usage/parser/VolumeUsageParser.java |  44 ++----
 .../cloud/usage/parser/VpcUsageParser.java    |  33 ++---
 19 files changed, 255 insertions(+), 617 deletions(-)

diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
index 744b1a2951e..dd58760d275 100644
--- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -34,10 +34,9 @@ import java.util.concurrent.TimeUnit;
 
 import com.cloud.network.Network;
 import com.cloud.usage.dao.UsageNetworksDao;
-import com.cloud.usage.parser.NetworksUsageParser;
+import com.cloud.usage.parser.UsageParser;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.usage.dao.UsageVpcDao;
-import com.cloud.usage.parser.VpcUsageParser;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
@@ -75,21 +74,6 @@ import com.cloud.usage.dao.UsageVMSnapshotOnPrimaryDao;
 import com.cloud.usage.dao.UsageVPNUserDao;
 import com.cloud.usage.dao.UsageVmDiskDao;
 import com.cloud.usage.dao.UsageVolumeDao;
-import com.cloud.usage.parser.BackupUsageParser;
-import com.cloud.usage.parser.BucketUsageParser;
-import com.cloud.usage.parser.IPAddressUsageParser;
-import com.cloud.usage.parser.LoadBalancerUsageParser;
-import com.cloud.usage.parser.NetworkOfferingUsageParser;
-import com.cloud.usage.parser.NetworkUsageParser;
-import com.cloud.usage.parser.PortForwardingUsageParser;
-import com.cloud.usage.parser.SecurityGroupUsageParser;
-import com.cloud.usage.parser.StorageUsageParser;
-import com.cloud.usage.parser.VMInstanceUsageParser;
-import com.cloud.usage.parser.VMSnapshotOnPrimaryParser;
-import com.cloud.usage.parser.VMSnapshotUsageParser;
-import com.cloud.usage.parser.VPNUserUsageParser;
-import com.cloud.usage.parser.VmDiskUsageParser;
-import com.cloud.usage.parser.VolumeUsageParser;
 import com.cloud.user.Account;
 import com.cloud.user.AccountVO;
 import com.cloud.user.UserStatisticsVO;
@@ -180,6 +164,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
     @Inject
     private UsageVpcDao usageVpcDao;
 
+    @Inject
+    private List<UsageParser> usageParsers;
+
     private String _version = null;
     private final Calendar _jobExecTime = Calendar.getInstance();
     private int _aggregationDuration = 0;
@@ -198,6 +185,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
     private Future _heartbeat = null;
     private Future _sanity = null;
     private boolean  usageSnapshotSelection = false;
+
     private static TimeZone usageAggregationTimeZone = TimeZone.getTimeZone("GMT");
 
     public UsageManagerImpl() {
@@ -954,114 +942,12 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
     private boolean parseHelperTables(AccountVO account, Date currentStartDate, Date currentEndDate) {
         boolean parsed = false;
 
-        parsed = VMInstanceUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("vm usage instances successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
+        for (UsageParser parser : usageParsers) {
+            parsed = parser.doParsing(account, currentStartDate, currentEndDate);
+
+            logger.debug("{} usage was {} parsed for [{}].", parser.getParserName(), parsed ? "successfully" : "not successfully", account);
         }
 
-        parsed = NetworkUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("network usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = VmDiskUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("vm disk usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = VolumeUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("volume usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = StorageUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("storage usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = SecurityGroupUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("Security Group usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = LoadBalancerUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("load balancer usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = PortForwardingUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("port forwarding usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = NetworkOfferingUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("network offering usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-
-        parsed = IPAddressUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("IPAddress usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = VPNUserUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("VPN user usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = VMSnapshotUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("VM Snapshot usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = VMSnapshotOnPrimaryParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("VM Snapshot on primary usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = BackupUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("VM Backup usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = BucketUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (logger.isDebugEnabled()) {
-            if (!parsed) {
-                logger.debug("Bucket usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
-            }
-        }
-        parsed = NetworksUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (!parsed) {
-            logger.debug("Networks usage not parsed for account [{}}].", account);
-        }
-
-        parsed = VpcUsageParser.parse(account, currentStartDate, currentEndDate);
-        if (!parsed) {
-            logger.debug(String.format("VPC usage failed to parse for account [%s].", account));
-        }
         return parsed;
     }
 
diff --git a/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
index 82370fcae3e..b639e92c71a 100644
--- a/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
@@ -21,49 +21,35 @@ import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.apache.cloudstack.usage.UsageTypes;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import com.cloud.usage.UsageBackupVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageBackupDao;
 import com.cloud.user.AccountVO;
 
 @Component
-public class BackupUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(BackupUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageBackupDao s_usageBackupDao;
-
-    @Inject
-    private UsageDao usageDao;
+public class BackupUsageParser extends UsageParser {
     @Inject
     private UsageBackupDao usageBackupDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = usageDao;
-        s_usageBackupDao = usageBackupDao;
+    @Override
+    public String getParserName() {
+        return "VM Backup";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all VM Backup usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        final List<UsageBackupVO> usageBackups = s_usageBackupDao.getUsageRecords(account.getId(), startDate, endDate);
+        final List<UsageBackupVO> usageBackups = usageBackupDao.getUsageRecords(account.getId(), startDate, endDate);
         if (usageBackups == null || usageBackups.isEmpty()) {
-            LOGGER.debug("No VM Backup usage for this period");
+            logger.debug("No VM Backup usage for this period");
             return true;
         }
 
@@ -91,7 +77,7 @@ public class BackupUsageParser {
                     new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay + " Hrs",
                             UsageTypes.BACKUP, new Double(usage), vmId, null, offeringId, null, vmId,
                             usageBackup.getSize(), usageBackup.getProtectedSize(), startDate, endDate);
-            s_usageDao.persist(usageRecord);
+            usageDao.persist(usageRecord);
         }
 
         return true;
diff --git a/usage/src/main/java/com/cloud/usage/parser/BucketUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/BucketUsageParser.java
index e8686e95ea0..1c0c30c737c 100644
--- a/usage/src/main/java/com/cloud/usage/parser/BucketUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/BucketUsageParser.java
@@ -19,47 +19,32 @@ package com.cloud.usage.parser;
 import com.cloud.usage.BucketStatisticsVO;
 import com.cloud.usage.UsageVO;
 import com.cloud.usage.dao.BucketStatisticsDao;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.user.AccountVO;
 import org.apache.cloudstack.usage.UsageTypes;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 @Component
-public class BucketUsageParser {
-    public static final Logger LOGGER = LogManager.getLogger(BucketUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static BucketStatisticsDao s_bucketStatisticsDao;
-
+public class BucketUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private BucketStatisticsDao _bucketStatisticsDao;
+    private BucketStatisticsDao bucketStatisticsDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_bucketStatisticsDao = _bucketStatisticsDao;
+    @Override
+    public String getParserName() {
+        return "Bucket";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all Bucket usage events for account {}", account);
-        }
-
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        List<BucketStatisticsVO> BucketStatisticsVOs = s_bucketStatisticsDao.listBy(account.getId());
+        List<BucketStatisticsVO> BucketStatisticsVOs = bucketStatisticsDao.listBy(account.getId());
 
         List<UsageVO> usageRecords = new ArrayList<>();
         for (BucketStatisticsVO bucketStatistics : BucketStatisticsVOs) {
@@ -72,7 +57,7 @@ public class BucketUsageParser {
             }
         }
 
-        s_usageDao.saveUsageRecords(usageRecords);
+        usageDao.saveUsageRecords(usageRecords);
 
         return true;
     }
diff --git a/usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java
index 516f58a0a7b..6a21dce074b 100644
--- a/usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/IPAddressUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageIPAddressVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageIPAddressDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class IPAddressUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(IPAddressUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageIPAddressDao s_usageIPAddressDao;
-
+public class IPAddressUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageIPAddressDao _usageIPAddressDao;
+    private UsageIPAddressDao usageIPAddressDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageIPAddressDao = _usageIPAddressDao;
+    @Override
+    public String getParserName() {
+        return "IP Address";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing IP Address usage for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +57,10 @@ public class IPAddressUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageIPAddressVO> usageIPAddress = s_usageIPAddressDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
+        List<UsageIPAddressVO> usageIPAddress = usageIPAddressDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
 
         if (usageIPAddress.isEmpty()) {
-            LOGGER.debug("No IP Address usage for this period");
+            logger.debug("No IP Address usage for this period");
             return true;
         }
 
@@ -128,7 +114,7 @@ public class IPAddressUsageParser {
         return true;
     }
 
-    private static void updateIpUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long ipId, long duration) {
+    private void updateIpUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long ipId, long duration) {
         Pair<Long, Long> ipUsageInfo = usageDataMap.get(key);
         if (ipUsageInfo == null) {
             ipUsageInfo = new Pair<Long, Long>(new Long(ipId), new Long(duration));
@@ -140,18 +126,17 @@ public class IPAddressUsageParser {
         usageDataMap.put(key, ipUsageInfo);
     }
 
-    private static void createUsageRecord(long zoneId, long runningTime, Date startDate, Date endDate, AccountVO account, long ipId, String ipAddress,
+    private void createUsageRecord(long zoneId, long runningTime, Date startDate, Date endDate, AccountVO account, long ipId, String ipAddress,
         boolean isSourceNat, boolean isSystem, boolean isHidden) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total usage time " + runningTime + "ms");
-        }
+
+        logger.debug("Total usage time {} ms" , runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating IP usage record with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating IP usage record with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 ipId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -162,7 +147,7 @@ public class IPAddressUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", UsageTypes.IP_ADDRESS, new Double(usage), ipId,
                 (isSystem ? 1 : 0), (isSourceNat ? "SourceNat" : ""), startDate, endDate, isHidden);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class IpInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java
index 3d02419aec8..0c97458bf06 100644
--- a/usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/LoadBalancerUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageLoadBalancerPolicyVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageLoadBalancerPolicyDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class LoadBalancerUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(LoadBalancerUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageLoadBalancerPolicyDao s_usageLoadBalancerPolicyDao;
-
+public class LoadBalancerUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageLoadBalancerPolicyDao _usageLoadBalancerPolicyDao;
+    private UsageLoadBalancerPolicyDao usageLoadBalancerPolicyDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageLoadBalancerPolicyDao = _usageLoadBalancerPolicyDao;
+    @Override
+    public String getParserName() {
+        return "Load Balancer Policy";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all LoadBalancerPolicy usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +57,10 @@ public class LoadBalancerUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageLoadBalancerPolicyVO> usageLBs = s_usageLoadBalancerPolicyDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageLoadBalancerPolicyVO> usageLBs = usageLoadBalancerPolicyDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageLBs.isEmpty()) {
-            LOGGER.debug("No load balancer usage events for this period");
+            logger.debug("No Load Balancer usage events for this period");
             return true;
         }
 
@@ -125,7 +111,7 @@ public class LoadBalancerUsageParser {
         return true;
     }
 
-    private static void updateLBUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long lbId, long duration) {
+    private void updateLBUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long lbId, long duration) {
         Pair<Long, Long> lbUsageInfo = usageDataMap.get(key);
         if (lbUsageInfo == null) {
             lbUsageInfo = new Pair<Long, Long>(new Long(lbId), new Long(duration));
@@ -137,18 +123,18 @@ public class LoadBalancerUsageParser {
         usageDataMap.put(key, lbUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long lbId, long zoneId) {
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long lbId, long zoneId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+
+        logger.debug("Total running time {} ms", runningTime);
+
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating usage record for load balancer with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating usage record for load balancer with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 lbId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -159,7 +145,7 @@ public class LoadBalancerUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), null, null, null, null, lbId, null,
                 startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class LBInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java
index b0fc6c2df95..6cc6f609db0 100644
--- a/usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/NetworkOfferingUsageParser.java
@@ -22,46 +22,33 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageNetworkOfferingVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageNetworkOfferingDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class NetworkOfferingUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(NetworkOfferingUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageNetworkOfferingDao s_usageNetworkOfferingDao;
-
+public class NetworkOfferingUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageNetworkOfferingDao _usageNetworkOfferingDao;
+    private UsageNetworkOfferingDao usageNetworkOfferingDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageNetworkOfferingDao = _usageNetworkOfferingDao;
+    @Override
+    public String getParserName() {
+        return "Network Offering";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all NetworkOffering usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
+
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +58,10 @@ public class NetworkOfferingUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageNetworkOfferingVO> usageNOs = s_usageNetworkOfferingDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageNetworkOfferingVO> usageNOs = usageNetworkOfferingDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageNOs.isEmpty()) {
-            LOGGER.debug("No NetworkOffering usage events for this period");
+            logger.debug("No NetworkOffering usage events for this period");
             return true;
         }
 
@@ -126,7 +113,7 @@ public class NetworkOfferingUsageParser {
         return true;
     }
 
-    private static void updateNOUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long vmId, long duration) {
+    private void updateNOUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long vmId, long duration) {
         Pair<Long, Long> noUsageInfo = usageDataMap.get(key);
         if (noUsageInfo == null) {
             noUsageInfo = new Pair<Long, Long>(new Long(vmId), new Long(duration));
@@ -138,19 +125,18 @@ public class NetworkOfferingUsageParser {
         usageDataMap.put(key, noUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, long noId, long zoneId,
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, long noId, long zoneId,
         boolean isDefault) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating network offering usage record for id [{}], vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating network offering usage record for id [{}], vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 noId, vmId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -161,7 +147,7 @@ public class NetworkOfferingUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), vmId, null, noId, null, defaultNic,
                 null, startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class NOInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java
index 912c2b58cb8..ec4d5089a0e 100644
--- a/usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/NetworkUsageParser.java
@@ -22,20 +22,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageNetworkVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageNetworkDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.db.SearchCriteria;
@@ -43,38 +39,27 @@ import com.cloud.utils.db.SearchCriteria;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 @Component
-public class NetworkUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(NetworkUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageNetworkDao s_usageNetworkDao;
-
+public class NetworkUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageNetworkDao _usageNetworkDao;
+    private UsageNetworkDao usageNetworkDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageNetworkDao = _usageNetworkDao;
+    @Override
+    public String getParserName() {
+        return "Network";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all Network usage events for account: " + account.getId());
-        }
-
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
         // - query usage_network table for all entries for userId with
         // event_date in the given range
-        SearchCriteria<UsageNetworkVO> sc = s_usageNetworkDao.createSearchCriteria();
+        SearchCriteria<UsageNetworkVO> sc = usageNetworkDao.createSearchCriteria();
         sc.addAnd("accountId", SearchCriteria.Op.EQ, account.getId());
         sc.addAnd("eventTimeMillis", SearchCriteria.Op.BETWEEN, startDate.getTime(), endDate.getTime());
-        List<UsageNetworkVO> usageNetworkVOs = s_usageNetworkDao.search(sc, null);
+        List<UsageNetworkVO> usageNetworkVOs = usageNetworkDao.search(sc, null);
 
         Map<String, NetworkInfo> networkUsageByZone = new HashMap<String, NetworkInfo>();
 
@@ -105,7 +90,7 @@ public class NetworkUsageParser {
             long totalBytesReceived = networkInfo.getBytesRcvd();
 
             if ((totalBytesSent > 0L) || (totalBytesReceived > 0L)) {
-                LOGGER.debug("Creating usage record, total bytes sent [{}], total bytes received [{}], startDate [{}], and endDate [{}], for account [{}] in " +
+                logger.debug("Creating usage record, total bytes sent [{}], total bytes received [{}], startDate [{}], and endDate [{}], for account [{}] in " +
                                 "availability zone [{}].", toHumanReadableSize(totalBytesSent), toHumanReadableSize(totalBytesReceived),
                         DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                         DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId(), networkInfo.getZoneId());
@@ -135,13 +120,11 @@ public class NetworkUsageParser {
                 usageRecords.add(usageRecord);
             } else {
                 // Don't charge anything if there were zero bytes processed
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("No usage record (0 bytes used) generated for account: " + account.getId());
-                }
+                logger.debug("No usage record (0 bytes used) generated for account: [{}]", account.getUuid());
             }
         }
 
-        s_usageDao.saveUsageRecords(usageRecords);
+        usageDao.saveUsageRecords(usageRecords);
 
         return true;
     }
diff --git a/usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java
index 39a51e8554f..a754e2319c0 100644
--- a/usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/NetworksUsageParser.java
@@ -18,16 +18,12 @@ package com.cloud.usage.parser;
 
 import com.cloud.usage.UsageNetworksVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageNetworksDao;
 import com.cloud.user.AccountVO;
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.apache.cloudstack.usage.UsageTypes;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import java.text.DecimalFormat;
@@ -35,32 +31,24 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class NetworksUsageParser {
-    private static final Logger LOGGER = LogManager.getLogger(NetworksUsageParser.class.getName());
-
+public class NetworksUsageParser extends UsageParser {
     @Inject
     private UsageNetworksDao networksDao;
-    @Inject
-    private UsageDao usageDao;
 
-    private static UsageDao staticUsageDao;
-    private static UsageNetworksDao staticNetworksDao;
-
-    @PostConstruct
-    void init() {
-        staticUsageDao = usageDao;
-        staticNetworksDao = networksDao;
+    @Override
+    public String getParserName() {
+        return "Networks";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        LOGGER.debug("Parsing all networks usage events for account {}", account);
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        final List<UsageNetworksVO> usageNetworksVO = staticNetworksDao.getUsageRecords(account.getId(), startDate, endDate);
+        final List<UsageNetworksVO> usageNetworksVO = networksDao.getUsageRecords(account.getId(), startDate, endDate);
         if (CollectionUtils.isEmpty(usageNetworksVO)) {
-            LOGGER.debug(String.format("Cannot find any VPC usage for account [%s] in period between [%s] and [%s].", account, startDate, endDate));
+            logger.debug("Cannot find any Networks usage for account [{}] in period between [{}] and [{}].", account, startDate, endDate);
             return true;
         }
 
@@ -83,8 +71,8 @@ public class NetworksUsageParser {
 
             long networkId = usageNetwork.getNetworkId();
             long networkOfferingId = usageNetwork.getNetworkOfferingId();
-            LOGGER.debug(String.format("Creating network usage record with id [%s], network offering [%s], usage [%s], startDate [%s], and endDate [%s], for account [%s].",
-                    networkId, networkOfferingId, usageDisplay, startDate, endDate, account));
+            logger.debug("Creating network usage record with id [{}], network offering [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+                    networkId, networkOfferingId, usageDisplay, startDate, endDate, account.getId());
 
             String description = String.format("Network usage for network ID: %d, network offering: %d", usageNetwork.getNetworkId(), usageNetwork.getNetworkOfferingId());
             UsageVO usageRecord =
@@ -92,7 +80,7 @@ public class NetworksUsageParser {
                             UsageTypes.NETWORK, (double) usage, null, null, usageNetwork.getNetworkOfferingId(), null, usageNetwork.getNetworkId(),
                             (long)0, null, startDate, endDate);
             usageRecord.setState(usageNetwork.getState());
-            staticUsageDao.persist(usageRecord);
+            usageDao.persist(usageRecord);
         }
 
         return true;
diff --git a/usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java
index fce2f6f8a9c..8dc27264294 100644
--- a/usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/PortForwardingUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsagePortForwardingRuleVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsagePortForwardingRuleDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class PortForwardingUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(PortForwardingUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsagePortForwardingRuleDao s_usagePFRuleDao;
-
+public class PortForwardingUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsagePortForwardingRuleDao _usagePFRuleDao;
+    private UsagePortForwardingRuleDao usagePFRuleDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usagePFRuleDao = _usagePFRuleDao;
+    @Override
+    public String getParserName() {
+        return "Port Forwarding Rule";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all PortForwardingRule usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +57,10 @@ public class PortForwardingUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsagePortForwardingRuleVO> usagePFs = s_usagePFRuleDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsagePortForwardingRuleVO> usagePFs = usagePFRuleDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usagePFs.isEmpty()) {
-            LOGGER.debug("No port forwarding usage events for this period");
+            logger.debug("No port forwarding usage events for this period");
             return true;
         }
 
@@ -125,7 +111,7 @@ public class PortForwardingUsageParser {
         return true;
     }
 
-    private static void updatePFUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long pfId, long duration) {
+    private void updatePFUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long pfId, long duration) {
         Pair<Long, Long> pfUsageInfo = usageDataMap.get(key);
         if (pfUsageInfo == null) {
             pfUsageInfo = new Pair<Long, Long>(new Long(pfId), new Long(duration));
@@ -137,18 +123,16 @@ public class PortForwardingUsageParser {
         usageDataMap.put(key, pfUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long pfId, long zoneId) {
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long pfId, long zoneId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating usage record for port forwarding rule [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating usage record for port forwarding rule [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 pfId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -159,7 +143,7 @@ public class PortForwardingUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), null, null, null, null, pfId, null,
                 startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class PFInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java
index 4bb146b7763..e09009bd219 100644
--- a/usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/SecurityGroupUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageSecurityGroupVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageSecurityGroupDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class SecurityGroupUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(SecurityGroupUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageSecurityGroupDao s_usageSecurityGroupDao;
-
+public class SecurityGroupUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageSecurityGroupDao _usageSecurityGroupDao;
+    private UsageSecurityGroupDao usageSecurityGroupDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageSecurityGroupDao = _usageSecurityGroupDao;
+    @Override
+    public String getParserName() {
+        return "Security Group";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all SecurityGroup usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +57,10 @@ public class SecurityGroupUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageSecurityGroupVO> usageSGs = s_usageSecurityGroupDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageSecurityGroupVO> usageSGs = usageSecurityGroupDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageSGs.isEmpty()) {
-            LOGGER.debug("No SecurityGroup usage events for this period");
+            logger.debug("No SecurityGroup usage events for this period");
             return true;
         }
 
@@ -126,7 +112,7 @@ public class SecurityGroupUsageParser {
         return true;
     }
 
-    private static void updateSGUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long vmId, long duration) {
+    private void updateSGUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long vmId, long duration) {
         Pair<Long, Long> sgUsageInfo = usageDataMap.get(key);
         if (sgUsageInfo == null) {
             sgUsageInfo = new Pair<Long, Long>(new Long(vmId), new Long(duration));
@@ -138,18 +124,16 @@ public class SecurityGroupUsageParser {
         usageDataMap.put(key, sgUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, long sgId, long zoneId) {
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, long sgId, long zoneId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating security group usage record for id [{}], vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating security group usage record for id [{}], vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 sgId, vmId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -159,7 +143,7 @@ public class SecurityGroupUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), vmId, null, null, null, sgId, null,
                 startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class SGInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java
index 62d1a429ae3..fc2a366ab99 100644
--- a/usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/StorageUsageParser.java
@@ -22,13 +22,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
@@ -36,7 +33,6 @@ import org.apache.cloudstack.usage.UsageTypes;
 import com.cloud.usage.StorageTypes;
 import com.cloud.usage.UsageStorageVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageStorageDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
@@ -44,27 +40,17 @@ import com.cloud.utils.Pair;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 @Component
-public class StorageUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(StorageUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageStorageDao s_usageStorageDao;
-
+public class StorageUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageStorageDao _usageStorageDao;
+    private UsageStorageDao usageStorageDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageStorageDao = _usageStorageDao;
+    @Override
+    public String getParserName() {
+        return "Storage";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all Storage usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -74,10 +60,10 @@ public class StorageUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageStorageVO> usageUsageStorages = s_usageStorageDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageStorageVO> usageUsageStorages = usageStorageDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageUsageStorages.isEmpty()) {
-            LOGGER.debug("No Storage usage events for this period");
+            logger.debug("No Storage usage events for this period");
             return true;
         }
 
@@ -137,7 +123,7 @@ public class StorageUsageParser {
         return true;
     }
 
-    private static void updateStorageUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long storageId, long duration) {
+    private void updateStorageUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long storageId, long duration) {
         Pair<Long, Long> volUsageInfo = usageDataMap.get(key);
         if (volUsageInfo == null) {
             volUsageInfo = new Pair<Long, Long>(new Long(storageId), new Long(duration));
@@ -149,19 +135,17 @@ public class StorageUsageParser {
         usageDataMap.put(key, volUsageInfo);
     }
 
-    private static void createUsageRecord(long zoneId, int type, long runningTime, Date startDate, Date endDate, AccountVO account, long storageId, Long sourceId,
+    private void createUsageRecord(long zoneId, int type, long runningTime, Date startDate, Date endDate, AccountVO account, long storageId, Long sourceId,
         long size, Long virtualSize) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating Storage usage record for type [{}], with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating Storage usage record for type [{}], with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 type, storageId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -199,7 +183,7 @@ public class StorageUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", usage_type, new Double(usage), null, null, null, tmplSourceId,
                 storageId, size, virtualSize, startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class StorageInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/UsageParser.java b/usage/src/main/java/com/cloud/usage/parser/UsageParser.java
index d37150cf9b9..7cd17732e43 100644
--- a/usage/src/main/java/com/cloud/usage/parser/UsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/UsageParser.java
@@ -16,21 +16,30 @@
 // under the License.
 package com.cloud.usage.parser;
 
+import com.cloud.usage.dao.UsageDao;
+import com.cloud.user.AccountVO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.inject.Inject;
 import java.util.Date;
 
+public abstract class UsageParser {
+    Logger logger = LogManager.getLogger(getClass());
 
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+    @Inject
+    UsageDao usageDao;
 
-public abstract class UsageParser extends ManagedContextRunnable {
-
-    @Override
-    protected void runInContext() {
-        try {
-            parse(null);
-        } catch (Exception e) {
-            logger.warn("Error while parsing usage events", e);
-        }
+    private void beforeParse(AccountVO account) {
+        logger.debug("Parsing all {} usage events for account: [{}]", getParserName(), account);
     }
 
-    public abstract void parse(Date endDate);
+    public abstract String getParserName();
+
+    protected abstract boolean parse(AccountVO account, Date startDate, Date endDate);
+
+    public boolean doParsing(AccountVO account, Date startDate, Date endDate) {
+        beforeParse(account);
+        return parse(account, startDate, endDate);
+    }
 }
diff --git a/usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java
index b261cc717e6..05afabcd01e 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VMInstanceUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 import org.apache.cloudstack.usage.UsageTypes;
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.usage.UsageVMInstanceVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVMInstanceDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class VMInstanceUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(VMInstanceUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVMInstanceDao s_usageInstanceDao;
-
+public class VMInstanceUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;;
-    @Inject
-    private UsageVMInstanceDao _usageInstanceDao;
+    private UsageVMInstanceDao usageInstanceDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageInstanceDao = _usageInstanceDao;
+    @Override
+    public String getParserName() {
+        return "VM Instance";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all VMInstance usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,7 +57,7 @@ public class VMInstanceUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageVMInstanceVO> usageInstances = s_usageInstanceDao.getUsageRecords(account.getId(), startDate, endDate);
+        List<UsageVMInstanceVO> usageInstances = usageInstanceDao.getUsageRecords(account.getId(), startDate, endDate);
 //ToDo: Add domainID for getting usage records
 
         // This map has both the running time *and* the usage amount.
@@ -151,7 +137,7 @@ public class VMInstanceUsageParser {
         return true;
     }
 
-    private static void updateVmUsageData(Map<String, Pair<String, Long>> usageDataMap, String key, String vmName, long duration) {
+    private void updateVmUsageData(Map<String, Pair<String, Long>> usageDataMap, String key, String vmName, long duration) {
         Pair<String, Long> vmUsageInfo = usageDataMap.get(key);
         if (vmUsageInfo == null) {
             vmUsageInfo = new Pair<String, Long>(vmName, new Long(duration));
@@ -163,19 +149,17 @@ public class VMInstanceUsageParser {
         usageDataMap.put(key, vmUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, String vmName, long zoneId,
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, String vmName, long zoneId,
         long serviceOfferingId, long templateId, String hypervisorType, Long cpuCores, Long cpuSpeed, Long memory) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating VM usage record for vm [{}], type [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating VM usage record for vm [{}], type [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 vmName, type, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -190,7 +174,7 @@ public class VMInstanceUsageParser {
         UsageVO usageRecord =
             new UsageVO(Long.valueOf(zoneId), account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), Long.valueOf(vmId),
                 vmName, cpuCores, cpuSpeed, memory, Long.valueOf(serviceOfferingId), Long.valueOf(templateId), Long.valueOf(vmId), startDate, endDate, hypervisorType);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class VMInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
index d59d3c741f1..7723f1660f0 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
@@ -22,65 +22,51 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageSnapshotOnPrimaryVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVMSnapshotOnPrimaryDao;
 import com.cloud.user.AccountVO;
 
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 @Component
-public class VMSnapshotOnPrimaryParser {
-    protected static Logger LOGGER = LogManager.getLogger(VMSnapshotOnPrimaryParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVMSnapshotOnPrimaryDao s_usageSnapshotOnPrimaryDao;
-
+public class VMSnapshotOnPrimaryParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageVMSnapshotOnPrimaryDao _usageSnapshotOnPrimaryDao;
+    private UsageVMSnapshotOnPrimaryDao usageSnapshotOnPrimaryDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageSnapshotOnPrimaryDao = _usageSnapshotOnPrimaryDao;
+    @Override
+    public String getParserName() {
+        return "VM Snapshot on Primary";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all VmSnapshot on primary usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        List<UsageSnapshotOnPrimaryVO> usageUsageVMSnapshots = s_usageSnapshotOnPrimaryDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
+        List<UsageSnapshotOnPrimaryVO> usageUsageVMSnapshots = usageSnapshotOnPrimaryDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
 
         if (usageUsageVMSnapshots.isEmpty()) {
-            LOGGER.debug("No VM snapshot on primary usage events for this period");
+            logger.debug("No VM snapshot on primary usage events for this period");
             return true;
         }
 
         Map<String, UsageSnapshotOnPrimaryVO> unprocessedUsage = new HashMap<String, UsageSnapshotOnPrimaryVO>();
         for (UsageSnapshotOnPrimaryVO usageRec : usageUsageVMSnapshots) {
-            LOGGER.debug("usageRec for VMsnap on primary " + usageRec.toString());
+            logger.debug("usageRec for VMsnap on primary [{}]", usageRec.toString());
             String key = usageRec.getName();
             if (usageRec.getPhysicalSize() == 0) {
                 usageRec.setDeleted(new Date());
-                s_usageSnapshotOnPrimaryDao.updateDeleted(usageRec);
+                usageSnapshotOnPrimaryDao.updateDeleted(usageRec);
             } else {
                 unprocessedUsage.put(key, usageRec);
             }
@@ -95,7 +81,7 @@ public class VMSnapshotOnPrimaryParser {
             Date endDateEffective = endDate;
             if (usageRec.getDeleted() != null && usageRec.getDeleted().before(endDate)){
                 endDateEffective = usageRec.getDeleted();
-                LOGGER.debug("Remoevd vm snapshot found endDateEffective " + endDateEffective + " period end data " + endDate);
+                logger.debug("Removed vm snapshot found endDateEffective [{}] period end data [{}]", endDateEffective, endDate);
             }
             long duration = (endDateEffective.getTime() - created.getTime()) + 1;
             createUsageRecord(UsageTypes.VM_SNAPSHOT_ON_PRIMARY, duration, created, endDateEffective, account, usageRec.getVolumeId(), usageRec.getName(), usageRec.getZoneId(),
@@ -105,19 +91,17 @@ public class VMSnapshotOnPrimaryParser {
         return true;
     }
 
-    private static void createUsageRecord(int usageType, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, String name, long zoneId, long virtualSize,
+    private void createUsageRecord(int usageType, long runningTime, Date startDate, Date endDate, AccountVO account, long vmId, String name, long zoneId, long virtualSize,
                                           long physicalSize, Long vmSnapshotId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating usage record for VMSnapshot with id [{}] in primary, vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating usage record for VMSnapshot with id [{}] in primary, vm [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 vmSnapshotId, vmId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -127,7 +111,7 @@ public class VMSnapshotOnPrimaryParser {
 
         UsageVO usageRecord = new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", usageType, new Double(usage), vmId, name, null, null,
                 vmSnapshotId, physicalSize, virtualSize, startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
 }
diff --git a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java
index 63fc213f4aa..f5aa2480ece 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java
@@ -22,55 +22,41 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageVMSnapshotVO;
 import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVMSnapshotDao;
 import com.cloud.user.AccountVO;
 
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 @Component
-public class VMSnapshotUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(VMSnapshotUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVMSnapshotDao s_usageVMSnapshotDao;
-
+public class VMSnapshotUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageVMSnapshotDao _usageVMSnapshotDao;
+    private UsageVMSnapshotDao usageVMSnapshotDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageVMSnapshotDao = _usageVMSnapshotDao;
+    @Override
+    public String getParserName() {
+        return "VM Snapshot";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all VmSnapshot volume usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        List<UsageVMSnapshotVO> usageUsageVMSnapshots = s_usageVMSnapshotDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
+        List<UsageVMSnapshotVO> usageUsageVMSnapshots = usageVMSnapshotDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate);
 
         if (usageUsageVMSnapshots.isEmpty()) {
-            LOGGER.debug("No VM snapshot usage events for this period");
+            logger.debug("No VM snapshot usage events for this period");
             return true;
         }
 
@@ -84,7 +70,7 @@ public class VMSnapshotUsageParser {
                 unprocessedUsage.put(key, usageRec);
                 continue;
             }
-            UsageVMSnapshotVO previousEvent = s_usageVMSnapshotDao.getPreviousUsageRecord(usageRec);
+            UsageVMSnapshotVO previousEvent = usageVMSnapshotDao.getPreviousUsageRecord(usageRec);
             if (previousEvent == null || previousEvent.getSize() == 0) {
                 unprocessedUsage.put(key, usageRec);
                 continue;
@@ -101,11 +87,11 @@ public class VMSnapshotUsageParser {
             createUsageRecord(UsageTypes.VM_SNAPSHOT, duration, previousCreated, createDate, account, volId, zoneId, previousEvent.getDiskOfferingId(), vmId,
                 previousEvent.getSize(), usageRec.getVmSnapshotId());
             previousEvent.setProcessed(new Date());
-            s_usageVMSnapshotDao.update(previousEvent);
+            usageVMSnapshotDao.update(previousEvent);
 
             if (usageRec.getSize() == 0) {
                 usageRec.setProcessed(new Date());
-                s_usageVMSnapshotDao.update(usageRec);
+                usageVMSnapshotDao.update(usageRec);
             } else
                 unprocessedUsage.put(key, usageRec);
         }
@@ -124,19 +110,17 @@ public class VMSnapshotUsageParser {
         return true;
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long volId, long zoneId, Long doId, Long vmId,
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long volId, long zoneId, Long doId, Long vmId,
                                           long size, Long vmSnapshotId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating usage record for VMSnapshot with id [{}], vol [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating usage record for VMSnapshot with id [{}], vol [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 vmSnapshotId, volId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -152,7 +136,7 @@ public class VMSnapshotUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), vmId, null, doId, null, vmSnapshotId, size,
                 startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
 }
diff --git a/usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java
index d5eac4fea20..fb4cb0a7537 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VPNUserUsageParser.java
@@ -22,54 +22,40 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageVO;
 import com.cloud.usage.UsageVPNUserVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVPNUserDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class VPNUserUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(VPNUserUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVPNUserDao s_usageVPNUserDao;
-
+public class VPNUserUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageVPNUserDao _usageVPNUserDao;
+    private UsageVPNUserDao usageVPNUserDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageVPNUserDao = _usageVPNUserDao;
+    @Override
+    public String getParserName() {
+        return "VPN User";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all VPN user usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        List<UsageVPNUserVO> usageVUs = s_usageVPNUserDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageVPNUserVO> usageVUs = usageVPNUserDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageVUs.isEmpty()) {
-            LOGGER.debug("No VPN user usage events for this period");
+            logger.debug("No VPN user usage events for this period");
             return true;
         }
 
@@ -121,7 +107,7 @@ public class VPNUserUsageParser {
         return true;
     }
 
-    private static void updateVUUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long userId, long duration) {
+    private void updateVUUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long userId, long duration) {
         Pair<Long, Long> vuUsageInfo = usageDataMap.get(key);
         if (vuUsageInfo == null) {
             vuUsageInfo = new Pair<Long, Long>(new Long(userId), new Long(duration));
@@ -133,18 +119,16 @@ public class VPNUserUsageParser {
         usageDataMap.put(key, vuUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long userId, String userName, long zoneId) {
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long userId, String userName, long zoneId) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating usage record for VPN user [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating usage record for VPN user [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 userId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -154,7 +138,7 @@ public class VPNUserUsageParser {
         UsageVO usageRecord =
             new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), null, null, null, null, userId, null,
                 startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class VUInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java
index a5b537b8ffd..a417edbf14d 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java
@@ -22,20 +22,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageVO;
 import com.cloud.usage.UsageVmDiskVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVmDiskDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.db.SearchCriteria;
@@ -43,38 +39,27 @@ import com.cloud.utils.db.SearchCriteria;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
 @Component
-public class VmDiskUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(VmDiskUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVmDiskDao s_usageVmDiskDao;
-
+public class VmDiskUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageVmDiskDao _usageVmDiskDao;
+    private UsageVmDiskDao usageVmDiskDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageVmDiskDao = _usageVmDiskDao;
+    @Override
+    public String getParserName() {
+        return "VM Disk";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all Vm Disk usage events for account: " + account.getId());
-        }
-
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
         // - query usage_disk table for all entries for userId with
         // event_date in the given range
-        SearchCriteria<UsageVmDiskVO> sc = s_usageVmDiskDao.createSearchCriteria();
+        SearchCriteria<UsageVmDiskVO> sc = usageVmDiskDao.createSearchCriteria();
         sc.addAnd("accountId", SearchCriteria.Op.EQ, account.getId());
         sc.addAnd("eventTimeMillis", SearchCriteria.Op.BETWEEN, startDate.getTime(), endDate.getTime());
-        List<UsageVmDiskVO> usageVmDiskVOs = s_usageVmDiskDao.search(sc, null);
+        List<UsageVmDiskVO> usageVmDiskVOs = usageVmDiskDao.search(sc, null);
 
         Map<String, VmDiskInfo> vmDiskUsageByZone = new HashMap<String, VmDiskInfo>();
 
@@ -110,7 +95,7 @@ public class VmDiskUsageParser {
             long bytesWrite = vmDiskInfo.getBytesWrite();
 
             if ((ioRead > 0L) || (ioWrite > 0L) || (bytesRead > 0L) || (bytesWrite > 0L)) {
-                LOGGER.debug("Creating vm disk usage record, io read [{}], io write [{}], bytes read [{}], bytes write [{}], startDate [{}], and endDate [{}], " +
+                logger.debug("Creating vm disk usage record, io read [{}], io write [{}], bytes read [{}], bytes write [{}], startDate [{}], and endDate [{}], " +
                                 "for account [{}] in availability zone [{}].", toHumanReadableSize(ioRead), toHumanReadableSize(ioWrite), toHumanReadableSize(bytesRead),
                         toHumanReadableSize(bytesWrite), DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                         DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId(), vmDiskInfo.getZoneId());
@@ -162,13 +147,11 @@ public class VmDiskUsageParser {
 
             } else {
                 // Don't charge anything if there were zero bytes processed
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("No vm disk usage record (0 bytes used) generated for account: " + account.getId());
-                }
+                logger.debug("No vm disk usage record (0 bytes used) generated for account: [{}]", account.getId());
             }
         }
 
-        s_usageDao.saveUsageRecords(usageRecords);
+        usageDao.saveUsageRecords(usageRecords);
 
         return true;
     }
diff --git a/usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java
index a5b6d77e9ab..e834b713d42 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VolumeUsageParser.java
@@ -22,46 +22,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.usage.UsageManagerImpl;
 import com.cloud.utils.DateUtil;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.usage.UsageTypes;
 
 import com.cloud.usage.UsageVO;
 import com.cloud.usage.UsageVolumeVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.dao.UsageVolumeDao;
 import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 
 @Component
-public class VolumeUsageParser {
-    protected static Logger LOGGER = LogManager.getLogger(VolumeUsageParser.class);
-
-    private static UsageDao s_usageDao;
-    private static UsageVolumeDao s_usageVolumeDao;
-
+public class VolumeUsageParser extends UsageParser {
     @Inject
-    private UsageDao _usageDao;
-    @Inject
-    private UsageVolumeDao _usageVolumeDao;
+    private UsageVolumeDao usageVolumeDao;
 
-    @PostConstruct
-    void init() {
-        s_usageDao = _usageDao;
-        s_usageVolumeDao = _usageVolumeDao;
+    @Override
+    public String getParserName() {
+        return "Volume";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Parsing all Volume usage events for account: " + account.getId());
-        }
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
@@ -71,10 +57,10 @@ public class VolumeUsageParser {
         //     - look for an entry for accountId with end date in the given range
         //     - look for an entry for accountId with end date null (currently running vm or owned IP)
         //     - look for an entry for accountId with start date before given range *and* end date after given range
-        List<UsageVolumeVO> usageUsageVols = s_usageVolumeDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
+        List<UsageVolumeVO> usageUsageVols = usageVolumeDao.getUsageRecords(account.getId(), account.getDomainId(), startDate, endDate, false, 0);
 
         if (usageUsageVols.isEmpty()) {
-            LOGGER.debug("No volume usage events for this period");
+            logger.debug("No volume usage events for this period");
             return true;
         }
 
@@ -131,7 +117,7 @@ public class VolumeUsageParser {
         return true;
     }
 
-    private static void updateVolUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long volId, long duration) {
+    private void updateVolUsageData(Map<String, Pair<Long, Long>> usageDataMap, String key, long volId, long duration) {
         Pair<Long, Long> volUsageInfo = usageDataMap.get(key);
         if (volUsageInfo == null) {
             volUsageInfo = new Pair<Long, Long>(new Long(volId), new Long(duration));
@@ -143,19 +129,17 @@ public class VolumeUsageParser {
         usageDataMap.put(key, volUsageInfo);
     }
 
-    private static void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long volId, long zoneId, Long doId,
+    private void createUsageRecord(int type, long runningTime, Date startDate, Date endDate, AccountVO account, long volId, long zoneId, Long doId,
         Long templateId, long size) {
         // Our smallest increment is hourly for now
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Total running time " + runningTime + "ms");
-        }
+        logger.debug("Total running time {} ms", runningTime);
 
         float usage = runningTime / 1000f / 60f / 60f;
 
         DecimalFormat dFormat = new DecimalFormat("#.######");
         String usageDisplay = dFormat.format(usage);
 
-        LOGGER.debug("Creating Volume usage record for vol [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+        logger.debug("Creating Volume usage record for vol [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
                 volId, usageDisplay, DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), startDate),
                 DateUtil.displayDateInTimezone(UsageManagerImpl.getUsageAggregationTimeZone(), endDate), account.getId());
 
@@ -170,7 +154,7 @@ public class VolumeUsageParser {
 
         UsageVO usageRecord = new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", type, new Double(usage), null, null, doId, templateId, volId,
                 size, startDate, endDate);
-        s_usageDao.persist(usageRecord);
+        usageDao.persist(usageRecord);
     }
 
     private static class VolInfo {
diff --git a/usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java
index 794e066c897..90fd008570e 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VpcUsageParser.java
@@ -17,15 +17,11 @@
 package com.cloud.usage.parser;
 
 import com.cloud.usage.UsageVpcVO;
-import com.cloud.usage.dao.UsageDao;
 import com.cloud.usage.UsageVO;
 import com.cloud.usage.dao.UsageVpcDao;
 import com.cloud.user.AccountVO;
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import org.apache.cloudstack.usage.UsageTypes;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
 
 import java.text.DecimalFormat;
@@ -33,31 +29,24 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class VpcUsageParser {
-    private static final Logger LOGGER = LogManager.getLogger(VpcUsageParser.class.getName());
-
+public class VpcUsageParser extends UsageParser {
     @Inject
     private UsageVpcDao vpcDao;
-    @Inject
-    private UsageDao usageDao;
 
-    private static UsageDao s_usageDao;
-    private static UsageVpcDao s_usageVpcDao;
-    @PostConstruct
-    void init() {
-        s_usageDao = usageDao;
-        s_usageVpcDao = vpcDao;
+    @Override
+    public String getParserName() {
+        return "VPC";
     }
 
-    public static boolean parse(AccountVO account, Date startDate, Date endDate) {
-        LOGGER.debug("Parsing all VPC usage events for account {}", account);
+    @Override
+    protected boolean parse(AccountVO account, Date startDate, Date endDate) {
         if ((endDate == null) || endDate.after(new Date())) {
             endDate = new Date();
         }
 
-        final List<UsageVpcVO> usageVPCs = s_usageVpcDao.getUsageRecords(account.getId(), startDate, endDate);
+        final List<UsageVpcVO> usageVPCs = vpcDao.getUsageRecords(account.getId(), startDate, endDate);
         if (usageVPCs == null || usageVPCs.isEmpty()) {
-            LOGGER.debug(String.format("Cannot find any VPC usage for account [%s] in period between [%s] and [%s].", account, startDate, endDate));
+            logger.debug("Cannot find any VPC usage for account [{}] in period between [{}] and [{}].", account, startDate, endDate);
             return true;
         }
 
@@ -79,15 +68,15 @@ public class VpcUsageParser {
             String usageDisplay = dFormat.format(usage);
 
             long vpcId = usageVPC.getVpcId();
-            LOGGER.debug("Creating VPC usage record with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
-                    vpcId, usageDisplay, startDate, endDate, account);
+            logger.debug("Creating VPC usage record with id [{}], usage [{}], startDate [{}], and endDate [{}], for account [{}].",
+                    vpcId, usageDisplay, startDate, endDate, account.getId());
 
             String description = String.format("VPC usage for VPC ID: %d", usageVPC.getVpcId());
             UsageVO usageRecord =
                     new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay + " Hrs",
                             UsageTypes.VPC, (double) usage, null, null, null, null, usageVPC.getVpcId(),
                             (long)0, null, startDate, endDate);
-            s_usageDao.persist(usageRecord);
+            usageDao.persist(usageRecord);
         }
 
         return true;

From 53eb2c5b9b7dd1d4acb25180e8799022d64707aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Jandre?=
 <48719461+JoaoJandre@users.noreply.github.com>
Date: Wed, 16 Jul 2025 03:54:07 -0300
Subject: [PATCH 23/94] File-based disk-only VM snapshot with KVM as hypervisor
 (#10632)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: João Jandre <joao@scclouds.com.br>
Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
---
 .../agent/properties/AgentProperties.java     |   8 +
 .../com/cloud/storage/VolumeApiService.java   |   2 +-
 .../com/cloud/vm/snapshot/VMSnapshot.java     |   7 +-
 .../CreateSnapshotFromVMSnapshotCmd.java      |   2 +-
 .../CreateDiskOnlyVmSnapshotAnswer.java       |  39 +
 .../CreateDiskOnlyVmSnapshotCommand.java      |  41 ++
 .../DeleteDiskOnlyVmSnapshotCommand.java      |  44 ++
 .../MergeDiskOnlyVmSnapshotCommand.java       |  55 ++
 .../RevertDiskOnlyVmSnapshotAnswer.java       |  38 +
 .../RevertDiskOnlyVmSnapshotCommand.java      |  50 ++
 .../api/storage/SnapshotMergeTreeTO.java      |  57 ++
 .../com/cloud/storage/dao/SnapshotDao.java    |   2 +
 .../cloud/storage/dao/SnapshotDaoImpl.java    |  23 +
 .../cloud/vm/snapshot/dao/VMSnapshotDao.java  |   4 +
 .../vm/snapshot/dao/VMSnapshotDaoImpl.java    |  27 +
 .../datastore/db/SnapshotDataStoreDao.java    |   2 +
 .../db/SnapshotDataStoreDaoImpl.java          |   6 +
 .../snapshot/DefaultSnapshotStrategy.java     |  44 ++
 .../vmsnapshot/DefaultVMSnapshotStrategy.java |  35 +-
 ...KvmFileBasedStorageVmSnapshotStrategy.java | 689 ++++++++++++++++++
 .../vmsnapshot/StorageVMSnapshotStrategy.java |  25 +-
 ...ngine-storage-snapshot-storage-context.xml |   3 +
 .../vmsnapshot/VMSnapshotStrategyTest.java    |   6 +
 .../cloudstack/backup/NASBackupProvider.java  |  21 +
 .../kvm/resource/BlockCommitListener.java     |  77 ++
 .../resource/LibvirtComputingResource.java    | 242 ++++++
 ...reateDiskOnlyVMSnapshotCommandWrapper.java | 198 +++++
 ...eleteDiskOnlyVMSnapshotCommandWrapper.java |  58 ++
 ...MergeDiskOnlyVMSnapshotCommandWrapper.java | 150 ++++
 ...evertDiskOnlyVMSnapshotCommandWrapper.java | 111 +++
 .../wrapper/LibvirtUtilitiesHelper.java       |  10 +
 .../kvm/storage/KVMStorageProcessor.java      |  79 +-
 .../apache/cloudstack/utils/qemu/QemuImg.java |  40 +
 .../cloudstack/utils/qemu/QemuImgFile.java    |   6 +
 .../LibvirtComputingResourceTest.java         | 159 ++++
 .../kvm/storage/KVMStorageProcessorTest.java  |  57 +-
 .../cloud/storage/VolumeApiServiceImpl.java   |  50 +-
 .../storage/snapshot/SnapshotManagerImpl.java |   2 +
 .../vm/snapshot/VMSnapshotManagerImpl.java    |  11 +-
 .../storage/VolumeApiServiceImplTest.java     |  97 ++-
 ui/src/config/section/compute.js              |   4 +-
 41 files changed, 2413 insertions(+), 168 deletions(-)
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/storage/SnapshotMergeTreeTO.java
 create mode 100644 engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BlockCommitListener.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMergeDiskOnlyVMSnapshotCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertDiskOnlyVMSnapshotCommandWrapper.java

diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
index b6e90160c07..68255e30c75 100644
--- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
+++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -155,6 +155,14 @@ public class AgentProperties{
      */
     public static final Property<Integer> CMDS_TIMEOUT = new Property<>("cmds.timeout", 7200);
 
+    /**
+     * The timeout (in seconds) for the snapshot merge operation, mainly used for classic volume snapshots and disk-only VM snapshots on file-based storage.<br>
+     * This configuration is only considered if libvirt.events.enabled is also true. <br>
+     * Data type: Integer.<br>
+     * Default value: <code>259200</code>
+     */
+    public static final Property<Integer> QCOW2_DELTA_MERGE_TIMEOUT = new Property<>("qcow2.delta.merge.timeout", 60 * 60 * 72);
+
     /**
      * This parameter sets the VM migration speed (in mbps). The default value is -1,<br>
      * which means that the agent will try to guess the speed of the guest network and consume all possible bandwidth.<br>
diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java
index 33c1f272a29..dd7341da1b5 100644
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@ -137,7 +137,7 @@ public interface VolumeApiService {
 
     void updateDisplay(Volume volume, Boolean displayVolume);
 
-    Snapshot allocSnapshotForVm(Long vmId, Long volumeId, String snapshotName) throws ResourceAllocationException;
+    Snapshot allocSnapshotForVm(Long vmId, Long volumeId, String snapshotName, Long vmSnapshotId) throws ResourceAllocationException;
 
     /**
      *  Checks if the storage pool supports the disk offering tags.
diff --git a/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java
index 3897df2d5e6..24e93af1562 100644
--- a/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java
+++ b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java
@@ -31,7 +31,8 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity
     enum State {
         Allocated("The VM snapshot is allocated but has not been created yet."), Creating("The VM snapshot is being created."), Ready(
                 "The VM snapshot is ready to be used."), Reverting("The VM snapshot is being used to revert"), Expunging("The volume is being expunging"), Removed(
-                "The volume is destroyed, and can't be recovered."), Error("The volume is in error state, and can't be recovered");
+                "The volume is destroyed, and can't be recovered."), Error("The volume is in error state, and can't be recovered"),
+        Hidden("The VM snapshot is hidden from the user and cannot be recovered.");
 
         String _description;
 
@@ -60,6 +61,8 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity
             s_fsm.addTransition(Expunging, Event.ExpungeRequested, Expunging);
             s_fsm.addTransition(Expunging, Event.OperationSucceeded, Removed);
             s_fsm.addTransition(Expunging, Event.OperationFailed, Error);
+            s_fsm.addTransition(Expunging, Event.Hide, Hidden);
+            s_fsm.addTransition(Hidden, Event.ExpungeRequested, Expunging);
         }
     }
 
@@ -68,7 +71,7 @@ public interface VMSnapshot extends ControlledEntity, Identity, InternalIdentity
     }
 
     enum Event {
-        CreateRequested, OperationFailed, OperationSucceeded, RevertRequested, ExpungeRequested,
+        CreateRequested, OperationFailed, OperationSucceeded, RevertRequested, ExpungeRequested, Hide,
     }
 
     @Override
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 cdd908dfb87..75089cece8e 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
@@ -153,7 +153,7 @@ public class CreateSnapshotFromVMSnapshotCmd extends BaseAsyncCreateCmd {
 
     @Override
     public void create() throws ResourceAllocationException {
-        Snapshot snapshot = this._volumeService.allocSnapshotForVm(getVmId(), getVolumeId(), getSnapshotName());
+        Snapshot snapshot = this._volumeService.allocSnapshotForVm(getVmId(), getVolumeId(), getSnapshotName(), getVMSnapshotId());
         if (snapshot != null) {
             this.setEntityId(snapshot.getId());
             this.setEntityUuid(snapshot.getUuid());
diff --git a/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java
new file mode 100644
index 00000000000..4d61249c7cb
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.utils.Pair;
+
+import java.util.Map;
+
+public class CreateDiskOnlyVmSnapshotAnswer extends Answer {
+
+    protected Map<String, Pair<Long, String>> mapVolumeToSnapshotSizeAndNewVolumePath;
+
+    public CreateDiskOnlyVmSnapshotAnswer(Command command, boolean success, String details, Map<String, Pair<Long, String>> mapVolumeToSnapshotSizeAndNewVolumePath) {
+        super(command, success, details);
+        this.mapVolumeToSnapshotSizeAndNewVolumePath = mapVolumeToSnapshotSizeAndNewVolumePath;
+    }
+
+    public Map<String, Pair<Long, String>> getMapVolumeToSnapshotSizeAndNewVolumePath() {
+        return mapVolumeToSnapshotSizeAndNewVolumePath;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotCommand.java
new file mode 100644
index 00000000000..952bf0c971d
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotCommand.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+
+import com.cloud.agent.api.VMSnapshotBaseCommand;
+import com.cloud.agent.api.VMSnapshotTO;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
+import java.util.List;
+
+public class CreateDiskOnlyVmSnapshotCommand extends VMSnapshotBaseCommand {
+
+    protected VirtualMachine.State vmState;
+
+    public CreateDiskOnlyVmSnapshotCommand(String vmName, VMSnapshotTO snapshot, List<VolumeObjectTO> volumeTOs, String guestOSType, VirtualMachine.State vmState) {
+        super(vmName, snapshot, volumeTOs, guestOSType);
+        this.vmState = vmState;
+    }
+
+    public VirtualMachine.State getVmState() {
+        return vmState;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java
new file mode 100644
index 00000000000..bf7bdd59736
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Command;
+
+import com.cloud.agent.api.to.DataTO;
+
+
+import java.util.List;
+
+public class DeleteDiskOnlyVmSnapshotCommand extends Command {
+
+    List<DataTO> snapshots;
+
+    public DeleteDiskOnlyVmSnapshotCommand(List<DataTO> snapshots) {
+        this.snapshots = snapshots;
+    }
+
+    public List<DataTO> getSnapshots() {
+        return snapshots;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java
new file mode 100644
index 00000000000..b6396c24d10
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Command;
+import com.cloud.vm.VirtualMachine;
+
+import java.util.List;
+
+public class MergeDiskOnlyVmSnapshotCommand extends Command {
+
+    private List<SnapshotMergeTreeTO> snapshotMergeTreeToList;
+    private VirtualMachine.State vmState;
+    private String vmName;
+
+    public MergeDiskOnlyVmSnapshotCommand(List<SnapshotMergeTreeTO> snapshotMergeTreeToList, VirtualMachine.State vmState, String vmName) {
+        this.snapshotMergeTreeToList = snapshotMergeTreeToList;
+        this.vmState = vmState;
+        this.vmName = vmName;
+    }
+
+    public List<SnapshotMergeTreeTO> getSnapshotMergeTreeToList() {
+        return snapshotMergeTreeToList;
+    }
+
+    public VirtualMachine.State getVmState() {
+        return vmState;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotAnswer.java
new file mode 100644
index 00000000000..2ecf587d59d
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotAnswer.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
+import java.util.List;
+
+public class RevertDiskOnlyVmSnapshotAnswer extends Answer {
+    List<VolumeObjectTO> volumeObjectTos;
+
+    public RevertDiskOnlyVmSnapshotAnswer(Command cmd, List<VolumeObjectTO> volumeObjectTos) {
+        super(cmd, true, null);
+        this.volumeObjectTos = volumeObjectTos;
+    }
+
+    public List<VolumeObjectTO> getVolumeObjectTos() {
+        return volumeObjectTos;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java
new file mode 100644
index 00000000000..72bb92bcb10
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.Command;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+
+import java.util.List;
+
+public class RevertDiskOnlyVmSnapshotCommand extends Command {
+
+    private List<SnapshotObjectTO> snapshotObjectTos;
+    private String vmName;
+
+    public RevertDiskOnlyVmSnapshotCommand(List<SnapshotObjectTO> snapshotObjectTos, String vmName) {
+        super();
+        this.snapshotObjectTos = snapshotObjectTos;
+        this.vmName = vmName;
+    }
+
+    public List<SnapshotObjectTO> getSnapshotObjectTos() {
+        return snapshotObjectTos;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+
+}
diff --git a/core/src/main/java/com/cloud/agent/api/storage/SnapshotMergeTreeTO.java b/core/src/main/java/com/cloud/agent/api/storage/SnapshotMergeTreeTO.java
new file mode 100644
index 00000000000..78f23105e19
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/storage/SnapshotMergeTreeTO.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.to.DataTO;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+
+import java.util.List;
+
+public class SnapshotMergeTreeTO {
+    DataTO parent;
+    DataTO child;
+    List<DataTO> grandChildren;
+
+    public SnapshotMergeTreeTO(DataTO parent, DataTO child, List<DataTO> grandChildren) {
+        this.parent = parent;
+        this.child = child;
+        this.grandChildren = grandChildren;
+    }
+
+    public DataTO getParent() {
+        return parent;
+    }
+
+    public DataTO getChild() {
+        return child;
+    }
+
+    public List<DataTO> getGrandChildren() {
+        return grandChildren;
+    }
+
+    public void addGrandChild(DataTO grandChild) {
+        grandChildren.add(grandChild);
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java
index 171634fb104..3cda7d42760 100755
--- a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDao.java
@@ -58,4 +58,6 @@ public interface SnapshotDao extends GenericDao<SnapshotVO, Long>, StateDao<Snap
      */
     List<SnapshotVO> listByIds(Object... ids);
     List<SnapshotVO> searchByVolumes(List<Long> volumeIds);
+
+    List<SnapshotVO> listByVolumeIdAndTypeNotInAndStateNotRemoved(long volumeId, Type... type);
 }
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
index f5fc9c47d03..c479a386d79 100755
--- a/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -19,6 +19,7 @@ package com.cloud.storage.dao;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -56,6 +57,10 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
     private static final String GET_LAST_SNAPSHOT =
         "SELECT snapshots.id FROM snapshot_store_ref, snapshots where snapshots.id = snapshot_store_ref.snapshot_id AND snapshosts.volume_id = ? AND snapshot_store_ref.role = ? ORDER BY created DESC";
 
+    private static final String VOLUME_ID = "volumeId";
+    private static final String NOT_TYPE = "notType";
+    private static final String STATUS = "status";
+
     private SearchBuilder<SnapshotVO> snapshotIdsSearch;
     private SearchBuilder<SnapshotVO> VolumeIdSearch;
     private SearchBuilder<SnapshotVO> VolumeIdTypeSearch;
@@ -66,6 +71,8 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
     private SearchBuilder<SnapshotVO> StatusSearch;
     private SearchBuilder<SnapshotVO> notInStatusSearch;
     private GenericSearchBuilder<SnapshotVO, Long> CountSnapshotsByAccount;
+
+    private SearchBuilder<SnapshotVO> volumeIdAndTypeNotInSearch;
     @Inject
     ResourceTagDao _tagsDao;
     @Inject
@@ -181,6 +188,12 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
 
         InstanceIdSearch.join("instanceSnapshots", volumeSearch, volumeSearch.entity().getId(), InstanceIdSearch.entity().getVolumeId(), JoinType.INNER);
         InstanceIdSearch.done();
+
+        volumeIdAndTypeNotInSearch = createSearchBuilder();
+        volumeIdAndTypeNotInSearch.and(VOLUME_ID, volumeIdAndTypeNotInSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
+        volumeIdAndTypeNotInSearch.and(STATUS, volumeIdAndTypeNotInSearch.entity().getState(), SearchCriteria.Op.NEQ);
+        volumeIdAndTypeNotInSearch.and(NOT_TYPE, volumeIdAndTypeNotInSearch.entity().getTypeDescription(), SearchCriteria.Op.NOTIN);
+        volumeIdAndTypeNotInSearch.done();
     }
 
     @Override
@@ -299,4 +312,14 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
         sc.setParameters("volumeIds", volumeIds.toArray());
         return search(sc, null);
     }
+
+    @Override
+    public List<SnapshotVO> listByVolumeIdAndTypeNotInAndStateNotRemoved(long volumeId, Type... types) {
+        SearchCriteria<SnapshotVO> sc =  volumeIdAndTypeNotInSearch.create();
+        sc.setParameters(VOLUME_ID, volumeId);
+        sc.setParameters(NOT_TYPE, Arrays.stream(types).map(Type::toString).toArray());
+        sc.setParameters(STATUS, State.Destroyed);
+
+        return listBy(sc);
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
index 0143aaa1e73..4045af58d4b 100644
--- a/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
@@ -27,6 +27,8 @@ public interface VMSnapshotDao extends GenericDao<VMSnapshotVO, Long>, StateDao<
 
     List<VMSnapshotVO> findByVm(Long vmId);
 
+    List<VMSnapshotVO> findByVmAndByType(Long vmId, VMSnapshot.Type type);
+
     List<VMSnapshotVO> listExpungingSnapshot();
 
     List<VMSnapshotVO> listByInstanceId(Long vmId, VMSnapshot.State... status);
@@ -35,6 +37,8 @@ public interface VMSnapshotDao extends GenericDao<VMSnapshotVO, Long>, StateDao<
 
     List<VMSnapshotVO> listByParent(Long vmSnapshotId);
 
+    List<VMSnapshotVO> listByParentAndStateIn(Long vmSnapshotId, VMSnapshot.State... states);
+
     VMSnapshotVO findByName(Long vmId, String name);
 
     List<VMSnapshotVO> listByAccountId(Long accountId);
diff --git a/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
index 03a978f8546..83411b3cf8f 100644
--- a/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
@@ -42,6 +42,12 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem
     private final SearchBuilder<VMSnapshotVO> SnapshotStatusSearch;
     private final SearchBuilder<VMSnapshotVO> AllFieldsSearch;
 
+    private SearchBuilder<VMSnapshotVO> parentIdEqAndStateIn;
+
+    private static final String PARENT = "parent";
+
+    private static final String STATE = "state";
+
     protected VMSnapshotDaoImpl() {
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("state", AllFieldsSearch.entity().getState(), Op.EQ);
@@ -71,6 +77,11 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem
         SnapshotStatusSearch.and("vm_id", SnapshotStatusSearch.entity().getVmId(), SearchCriteria.Op.EQ);
         SnapshotStatusSearch.and("state", SnapshotStatusSearch.entity().getState(), SearchCriteria.Op.IN);
         SnapshotStatusSearch.done();
+
+        parentIdEqAndStateIn = createSearchBuilder();
+        parentIdEqAndStateIn.and(PARENT, parentIdEqAndStateIn.entity().getParent(), Op.EQ);
+        parentIdEqAndStateIn.and(STATE, parentIdEqAndStateIn.entity().getState(), Op.IN);
+        parentIdEqAndStateIn.done();
     }
 
     @Override
@@ -80,6 +91,14 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem
         return listBy(sc, null);
     }
 
+    @Override
+    public List<VMSnapshotVO> findByVmAndByType(Long vmId, VMSnapshot.Type type) {
+        SearchCriteria<VMSnapshotVO> sc = AllFieldsSearch.create();
+        sc.setParameters("vm_id", vmId);
+        sc.setParameters("vm_snapshot_type", type);
+        return listBy(sc, null);
+    }
+
     @Override
     public List<VMSnapshotVO> listExpungingSnapshot() {
         SearchCriteria<VMSnapshotVO> sc = ExpungingSnapshotSearch.create();
@@ -111,6 +130,14 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem
         return listBy(sc, null);
     }
 
+    @Override
+    public List<VMSnapshotVO> listByParentAndStateIn(Long vmSnapshotId, State... states) {
+        SearchCriteria<VMSnapshotVO> sc = parentIdEqAndStateIn.create();
+        sc.setParameters(PARENT, vmSnapshotId);
+        sc.setParameters(STATE, (Object[])states);
+        return listBy(sc, null);
+    }
+
     @Override
     public VMSnapshotVO findByName(Long vmId, String name) {
         SearchCriteria<VMSnapshotVO> sc = AllFieldsSearch.create();
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java
index f0072a414fb..db4c64bd0ab 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java
@@ -67,6 +67,8 @@ StateDao<ObjectInDataStoreStateMachine.State, ObjectInDataStoreStateMachine.Even
 
     List<SnapshotDataStoreVO> findBySnapshotIdAndNotInDestroyedHiddenState(long snapshotId);
 
+    SnapshotDataStoreVO findBySnapshotIdInAnyState(long snapshotId, DataStoreRole role);
+
     List<SnapshotDataStoreVO> listDestroyed(long storeId);
 
     List<SnapshotDataStoreVO> findBySnapshotId(long snapshotId);
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java
index 2b064be6b60..b5faa6caedf 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java
@@ -417,6 +417,12 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO
         return findOneBy(sc);
     }
 
+    @Override
+    public SnapshotDataStoreVO findBySnapshotIdInAnyState(long snapshotId, DataStoreRole role) {
+        SearchCriteria<SnapshotDataStoreVO> sc = createSearchCriteriaBySnapshotIdAndStoreRole(snapshotId, role);
+        return findOneBy(sc);
+    }
+
     @Override
     public List<SnapshotDataStoreVO> listAllByVolumeAndDataStore(long volumeId, DataStoreRole role) {
         SearchCriteria<SnapshotDataStoreVO> sc = searchFilteringStoreIdEqStateEqStoreRoleEqIdEqUpdateCountEqSnapshotIdEqVolumeIdEq.create();
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index 0801731630b..aedc2a12d0f 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@ -23,7 +23,15 @@ import java.util.Objects;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.VolumeApiServiceImpl;
 import com.cloud.utils.db.TransactionCallback;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
@@ -100,6 +108,15 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
     @Inject
     SnapshotZoneDao snapshotZoneDao;
 
+    @Inject
+    private VMSnapshotDao vmSnapshotDao;
+
+    @Inject
+    private VMSnapshotDetailsDao vmSnapshotDetailsDao;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
     private final List<Snapshot.State> snapshotStatesAbleToDeleteSnapshot = Arrays.asList(Snapshot.State.Destroying, Snapshot.State.Destroyed, Snapshot.State.Error, Snapshot.State.Hidden);
 
     public SnapshotDataStoreVO getSnapshotImageStoreRef(long snapshotId, long zoneId) {
@@ -610,6 +627,9 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
 
     @Override
     public StrategyPriority canHandle(Snapshot snapshot, Long zoneId, SnapshotOperation op) {
+        if (SnapshotOperation.TAKE.equals(op)) {
+            return validateVmSnapshot(snapshot);
+        }
         if (SnapshotOperation.REVERT.equals(op)) {
             long volumeId = snapshot.getVolumeId();
             VolumeVO volumeVO = volumeDao.findById(volumeId);
@@ -626,6 +646,30 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
         return StrategyPriority.DEFAULT;
     }
 
+    private StrategyPriority validateVmSnapshot(Snapshot snapshot) {
+        VolumeVO volumeVO = volumeDao.findById(snapshot.getVolumeId());
+        Long instanceId = volumeVO.getInstanceId();
+        if (instanceId == null) {
+            return StrategyPriority.DEFAULT;
+        }
+
+        VMInstanceVO vm = vmInstanceDao.findById(instanceId);
+        if (vm == null) {
+            return StrategyPriority.DEFAULT;
+        }
+
+        for (VMSnapshotVO vmSnapshotVO : vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.Disk)) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
+            if (vmSnapshotDetails.stream().anyMatch(vmSnapshotDetailsVO -> VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT.equals(vmSnapshotDetailsVO.getName()))) {
+                logger.warn("VM [{}] already has KVM File-Based storage VM snapshots. These VM snapshots and volume snapshots are not supported " +
+                        "together for KVM. As restoring volume snapshots will erase the VM snapshots and cause data loss.", vm.getUuid());
+                return StrategyPriority.CANT_HANDLE;
+            }
+        }
+
+        return StrategyPriority.DEFAULT;
+    }
+
     protected boolean isSnapshotStoredOnSameZoneStoreForQCOW2Volume(Snapshot snapshot, VolumeVO volumeVO) {
         if (volumeVO == null || !ImageFormat.QCOW2.equals(volumeVO.getFormat())) {
             return false;
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
index 09f569e6f19..2d9b1e67e09 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
@@ -25,6 +25,9 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
 import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions;
 import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy;
@@ -100,6 +103,13 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot
     @Inject
     PrimaryDataStoreDao primaryDataStoreDao;
 
+    @Inject
+    VMSnapshotDetailsDao vmSnapshotDetailsDao;
+
+    protected static final String KVM_FILE_BASED_STORAGE_SNAPSHOT = "kvmFileBasedStorageSnapshot";
+
+    protected static final String STORAGE_SNAPSHOT = "kvmStorageSnapshot";
+
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         String value = configurationDao.getValue("vmsnapshot.create.wait");
@@ -469,16 +479,39 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot
     @Override
     public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
         UserVmVO vm = userVmDao.findById(vmId);
-        if (vm.getState() == State.Running && !snapshotMemory) {
+        if (State.Running.equals(vm.getState()) && !snapshotMemory) {
+            logger.debug("Default VM snapshot strategy cannot handle VM snapshot for [{}] as it is running and its memory will not be affected.", vm);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        if (vmHasKvmDiskOnlySnapshot(vm)) {
+            logger.debug("Default VM snapshot strategy cannot handle VM snapshot for [{}] as it has a disk-only VM snapshot using kvmFileBasedStorageSnapshot strategy." +
+                    "These two strategies are not compatible, as reverting a disk-only VM snapshot will erase newer disk-and-memory VM snapshots.", vm);
             return StrategyPriority.CANT_HANDLE;
         }
 
         List<VolumeVO> volumes = volumeDao.findByInstance(vmId);
         for (VolumeVO volume : volumes) {
             if (volume.getFormat() != ImageFormat.QCOW2) {
+                logger.debug("Default VM snapshot strategy cannot handle VM snapshot for [{}] as it has a volume [{}] that is not in the QCOW2 format.", vm, volume);
                 return StrategyPriority.CANT_HANDLE;
             }
         }
         return StrategyPriority.DEFAULT;
     }
+
+    private boolean vmHasKvmDiskOnlySnapshot(UserVm vm) {
+        if (!Hypervisor.HypervisorType.KVM.equals(vm.getHypervisorType())) {
+            return false;
+        }
+
+        for (VMSnapshotVO vmSnapshotVO : vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.Disk)) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
+            if (vmSnapshotDetails.stream().anyMatch(vmSnapshotDetailsVO -> vmSnapshotDetailsVO.getName().equals(KVM_FILE_BASED_STORAGE_SNAPSHOT))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java
new file mode 100644
index 00000000000..003065e394f
--- /dev/null
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java
@@ -0,0 +1,689 @@
+/*
+ * 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.
+ */
+package org.apache.cloudstack.storage.vmsnapshot;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.VMSnapshotTO;
+import com.cloud.agent.api.storage.CreateDiskOnlyVmSnapshotAnswer;
+import com.cloud.agent.api.storage.CreateDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.storage.DeleteDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.storage.MergeDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.storage.RevertDiskOnlyVmSnapshotAnswer;
+import com.cloud.agent.api.storage.RevertDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.storage.SnapshotMergeTreeTO;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.configuration.Resource;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.Snapshot;
+import com.cloud.storage.SnapshotVO;
+import com.cloud.storage.Storage;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import org.apache.cloudstack.backup.BackupOfferingVO;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
+import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.snapshot.SnapshotObject;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.commons.collections.CollectionUtils;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class KvmFileBasedStorageVmSnapshotStrategy extends StorageVMSnapshotStrategy {
+
+    private static final List<Storage.StoragePoolType> supportedStoragePoolTypes = List.of(Storage.StoragePoolType.Filesystem, Storage.StoragePoolType.NetworkFilesystem, Storage.StoragePoolType.SharedMountPoint);
+
+    @Inject
+    protected SnapshotDataStoreDao snapshotDataStoreDao;
+
+    @Inject
+    protected ResourceLimitService resourceLimitManager;
+
+    @Inject
+    protected BackupOfferingDao backupOfferingDao;
+
+    @Override
+    public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
+        Map<VolumeInfo, SnapshotObject> volumeInfoToSnapshotObjectMap = new HashMap<>();
+        try {
+            return takeVmSnapshotInternal(vmSnapshot, volumeInfoToSnapshotObjectMap);
+        } catch (CloudRuntimeException | NullPointerException | NoTransitionException ex) {
+            for (VolumeInfo volumeInfo : volumeInfoToSnapshotObjectMap.keySet()) {
+                volumeInfo.stateTransit(Volume.Event.OperationFailed);
+                SnapshotObject snapshot = volumeInfoToSnapshotObjectMap.get(volumeInfo);
+                try {
+                    snapshot.processEvent(Snapshot.Event.OperationFailed);
+                } catch (NoTransitionException e) {
+                    logger.error("Failed to change snapshot [{}] state due to [{}].", snapshot.getUuid(), e.getMessage(), e);
+                }
+                snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
+            }
+            try {
+                vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed);
+            } catch (NoTransitionException e) {
+                throw new CloudRuntimeException(e);
+            }
+            throw new CloudRuntimeException(ex);
+        }
+    }
+
+    @Override
+    public boolean deleteVMSnapshot(VMSnapshot vmSnapshot) {
+        logger.info("Starting VM snapshot delete process for snapshot [{}].", vmSnapshot.getUuid());
+        UserVmVO userVm = userVmDao.findById(vmSnapshot.getVmId());
+        VMSnapshotVO vmSnapshotBeingDeleted = (VMSnapshotVO) vmSnapshot;
+        Long hostId = vmSnapshotHelper.pickRunningHost(vmSnapshotBeingDeleted.getVmId());
+        long virtualSize = 0;
+        boolean isCurrent = vmSnapshotBeingDeleted.getCurrent();
+
+        transitStateWithoutThrow(vmSnapshotBeingDeleted, VMSnapshot.Event.ExpungeRequested);
+
+        List<VolumeObjectTO> volumeTOs = vmSnapshotHelper.getVolumeTOList(vmSnapshotBeingDeleted.getVmId());
+        List<VMSnapshotVO> snapshotChildren = vmSnapshotDao.listByParentAndStateIn(vmSnapshotBeingDeleted.getId(), VMSnapshot.State.Ready, VMSnapshot.State.Hidden);
+
+        long realSize = getVMSnapshotRealSize(vmSnapshotBeingDeleted);
+        int numberOfChildren = snapshotChildren.size();
+
+        List<SnapshotVO> volumeSnapshotVos = new ArrayList<>();
+        if (isCurrent && numberOfChildren == 0) {
+            volumeSnapshotVos = mergeCurrentDeltaOnSnapshot(vmSnapshotBeingDeleted, userVm, hostId, volumeTOs);
+        } else if (numberOfChildren == 0) {
+            logger.debug("Deleting VM snapshot [{}] as no snapshots/volumes depend on it.", vmSnapshot.getUuid());
+            volumeSnapshotVos = deleteSnapshot(vmSnapshotBeingDeleted, hostId);
+            mergeOldSiblingWithOldParentIfOldParentIsDead(vmSnapshotDao.findByIdIncludingRemoved(vmSnapshotBeingDeleted.getParent()), userVm, hostId, volumeTOs);
+        } else if (!isCurrent && numberOfChildren == 1) {
+            VMSnapshotVO childSnapshot = snapshotChildren.get(0);
+            volumeSnapshotVos = mergeSnapshots(vmSnapshotBeingDeleted, childSnapshot, userVm, volumeTOs, hostId);
+        }
+
+        for (SnapshotVO snapshotVO : volumeSnapshotVos) {
+            snapshotVO.setState(Snapshot.State.Destroyed);
+            snapshotDao.update(snapshotVO.getId(), snapshotVO);
+        }
+
+        for (VolumeObjectTO volumeTo : volumeTOs) {
+            publishUsageEvent(EventTypes.EVENT_VM_SNAPSHOT_DELETE, vmSnapshotBeingDeleted, userVm, volumeTo);
+            virtualSize += volumeTo.getSize();
+        }
+
+        publishUsageEvent(EventTypes.EVENT_VM_SNAPSHOT_OFF_PRIMARY, vmSnapshotBeingDeleted, userVm, realSize, virtualSize);
+
+        if (numberOfChildren > 1 || (isCurrent && numberOfChildren == 1)) {
+            transitStateWithoutThrow(vmSnapshotBeingDeleted, VMSnapshot.Event.Hide);
+            return true;
+        }
+
+        transitStateWithoutThrow(vmSnapshotBeingDeleted, VMSnapshot.Event.OperationSucceeded);
+
+        vmSnapshotDetailsDao.removeDetails(vmSnapshotBeingDeleted.getId());
+
+        vmSnapshotBeingDeleted.setRemoved(DateUtil.now());
+        vmSnapshotDao.update(vmSnapshotBeingDeleted.getId(), vmSnapshotBeingDeleted);
+
+        return true;
+    }
+
+    @Override
+    public boolean revertVMSnapshot(VMSnapshot vmSnapshot) {
+        UserVmVO userVm = userVmDao.findById(vmSnapshot.getVmId());
+        if (!VirtualMachine.State.Stopped.equals(userVm.getState())) {
+            throw new CloudRuntimeException("VM must be stopped to revert disk-only VM snapshot.");
+        }
+
+        VMSnapshotVO vmSnapshotBeingReverted = (VMSnapshotVO) vmSnapshot;
+        Long hostId = vmSnapshotHelper.pickRunningHost(vmSnapshotBeingReverted.getVmId());
+
+        transitStateWithoutThrow(vmSnapshotBeingReverted, VMSnapshot.Event.RevertRequested);
+
+        List<SnapshotDataStoreVO> volumeSnapshots = getVolumeSnapshotsAssociatedWithVmSnapshot(vmSnapshotBeingReverted);
+        List<SnapshotObjectTO> volumeSnapshotTos = volumeSnapshots.stream()
+                .map(snapshot -> (SnapshotObjectTO) snapshotDataFactory.getSnapshot(snapshot.getSnapshotId(), snapshot.getDataStoreId(), DataStoreRole.Primary).getTO())
+                .collect(Collectors.toList());
+
+        RevertDiskOnlyVmSnapshotCommand revertDiskOnlyVMSnapshotCommand = new RevertDiskOnlyVmSnapshotCommand(volumeSnapshotTos, userVm.getName());
+        Answer answer = agentMgr.easySend(hostId, revertDiskOnlyVMSnapshotCommand);
+
+        if (answer == null || !answer.getResult()) {
+            transitStateWithoutThrow(vmSnapshotBeingReverted, VMSnapshot.Event.OperationFailed);
+            logger.error(answer != null ? answer.getDetails() : String.format("Communication failure with host [%s].", hostId));
+            throw new CloudRuntimeException(String.format("Error reverting VM snapshot [%s].", vmSnapshot.getUuid()));
+        }
+
+        RevertDiskOnlyVmSnapshotAnswer revertDiskOnlyVMSnapshotAnswer = (RevertDiskOnlyVmSnapshotAnswer) answer;
+
+        for (VolumeObjectTO volumeObjectTo : revertDiskOnlyVMSnapshotAnswer.getVolumeObjectTos()) {
+            VolumeVO volumeVO = volumeDao.findById(volumeObjectTo.getVolumeId());
+            volumeVO.setPath(volumeObjectTo.getPath());
+            updateSizeIfNeeded(volumeSnapshots, volumeVO, volumeObjectTo);
+
+            volumeDao.update(volumeVO.getId(), volumeVO);
+            publishUsageEvent(EventTypes.EVENT_VM_SNAPSHOT_REVERT, vmSnapshotBeingReverted, userVm, volumeObjectTo);
+        }
+
+        transitStateWithoutThrow(vmSnapshotBeingReverted, VMSnapshot.Event.OperationSucceeded);
+
+        VMSnapshotVO currentVmSnapshot = vmSnapshotDao.findCurrentSnapshotByVmId(userVm.getId());
+        currentVmSnapshot.setCurrent(false);
+        vmSnapshotBeingReverted.setCurrent(true);
+
+        vmSnapshotDao.update(currentVmSnapshot.getId(), currentVmSnapshot);
+        vmSnapshotDao.update(vmSnapshotBeingReverted.getId(), vmSnapshotBeingReverted);
+
+        mergeOldSiblingWithOldParentIfOldParentIsDead(currentVmSnapshot, userVm, hostId, vmSnapshotHelper.getVolumeTOList(userVm.getId()));
+        return true;
+    }
+
+    /**
+     * Updates the volume size if it changed due to the snapshot reversion.
+     * */
+    private void updateSizeIfNeeded(List<SnapshotDataStoreVO> volumeSnapshots, VolumeVO volumeVO, VolumeObjectTO volumeObjectTO) {
+        SnapshotDataStoreVO snapshotRef = volumeSnapshots.stream().filter(snapshotDataStoreVO -> snapshotDataStoreVO.getVolumeId() == volumeVO.getId()).
+                findFirst().
+                orElseThrow(() -> new CloudRuntimeException(String.format("Unable to map any snapshot to volume [%s].", volumeVO)));
+
+        if (volumeVO.getSize() == snapshotRef.getSize()) {
+            logger.debug("No need to update the volume size and launch a resize event as the snapshot [{}] and volume [{}] size are equal.", snapshotRef.getSnapshotId(), volumeVO.getUuid());
+            return;
+        }
+
+        long delta = volumeVO.getSize() - snapshotRef.getSize();
+        if (delta < 0) {
+            resourceLimitManager.incrementResourceCount(volumeVO.getAccountId(), Resource.ResourceType.primary_storage, -delta);
+        } else {
+            resourceLimitManager.decrementResourceCount(volumeVO.getAccountId(), Resource.ResourceType.primary_storage, delta);
+        }
+        volumeVO.setSize(snapshotRef.getSize());
+        volumeObjectTO.setSize(snapshotRef.getSize());
+        volumeDao.update(volumeVO.getId(), volumeVO);
+        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_RESIZE, volumeVO.getAccountId(), volumeVO.getDataCenterId(), volumeVO.getId(), volumeVO.getName(),
+                volumeVO.getDiskOfferingId(), volumeVO.getTemplateId(), volumeVO.getSize(), Volume.class.getName(), volumeVO.getUuid());
+    }
+
+    private void mergeOldSiblingWithOldParentIfOldParentIsDead(VMSnapshotVO oldParent, UserVmVO userVm, Long hostId, List<VolumeObjectTO> volumeTOs) {
+        if (oldParent == null || oldParent.getRemoved() != null || !VMSnapshot.State.Hidden.equals(oldParent.getState())) {
+            return;
+        }
+
+        List<SnapshotVO> snapshotVos;
+
+        if (oldParent.getCurrent()) {
+            snapshotVos = mergeCurrentDeltaOnSnapshot(oldParent, userVm, hostId, volumeTOs);
+        } else {
+            List<VMSnapshotVO> oldSiblings = vmSnapshotDao.listByParentAndStateIn(oldParent.getId(), VMSnapshot.State.Ready, VMSnapshot.State.Hidden);
+
+            if (oldSiblings.size() > 1) {
+                logger.debug("The old snapshot [{}] is dead and still has more than one live child snapshot. We will keep it on storage still.", oldParent.getUuid());
+                return;
+            }
+
+            if (oldSiblings.isEmpty()) {
+                logger.warn("The old snapshot [{}] is dead, but it only had one child. This is an inconsistency and should be analysed/reported.", oldParent.getUuid());
+                return;
+            }
+
+            VMSnapshotVO oldSibling = oldSiblings.get(0);
+            logger.debug("Merging VM snapshot [{}] with [{}] as the former was hidden and only the latter depends on it.", oldParent.getUuid(), oldSibling.getUuid());
+
+            snapshotVos = mergeSnapshots(oldParent, oldSibling, userVm, volumeTOs, hostId);
+        }
+
+        for (SnapshotVO snapshotVO : snapshotVos) {
+            snapshotVO.setState(Snapshot.State.Destroyed);
+            snapshotDao.update(snapshotVO.getId(), snapshotVO);
+        }
+
+        vmSnapshotDetailsDao.removeDetails(oldParent.getId());
+
+        oldParent.setRemoved(DateUtil.now());
+        vmSnapshotDao.update(oldParent.getId(), oldParent);
+
+        transitStateWithoutThrow(oldParent, VMSnapshot.Event.ExpungeRequested);
+        transitStateWithoutThrow(oldParent, VMSnapshot.Event.OperationSucceeded);
+    }
+
+    @Override
+    public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
+        if (!VMSnapshot.State.Allocated.equals(vmSnapshot.getState())) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), KVM_FILE_BASED_STORAGE_SNAPSHOT);
+            if (CollectionUtils.isEmpty(vmSnapshotDetails)) {
+                logger.debug("KVM file based storage VM snapshot strategy cannot handle [{}] as it is not a KVM file based storage VM snapshot.",
+                        vmSnapshot.getUuid());
+                return StrategyPriority.CANT_HANDLE;
+            }
+            return StrategyPriority.HIGHEST;
+        }
+
+        long vmId = vmSnapshot.getVmId();
+        boolean memorySnapshot = VMSnapshot.Type.DiskAndMemory.equals(vmSnapshot.getType());
+        return canHandle(vmId, null, memorySnapshot);
+    }
+
+    @Override
+    public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
+        VirtualMachine vm = userVmDao.findById(vmId);
+
+        String cantHandleLog = String.format("KVM file based storage VM snapshot strategy cannot handle VM snapshot for [%s]", vm);
+        if (snapshotMemory) {
+            logger.debug("{} as a snapshot with memory was requested.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        if (!Hypervisor.HypervisorType.KVM.equals(vm.getHypervisorType())) {
+            logger.debug("{} as the hypervisor is not KVM.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVmAndByType(vmId, VMSnapshot.Type.DiskAndMemory))) {
+            logger.debug("{} as there is already a VM snapshot with disk and memory.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        List<VolumeVO> volumes = volumeDao.findByInstance(vmId);
+        for (VolumeVO volume : volumes) {
+            StoragePoolVO storagePoolVO = storagePool.findById(volume.getPoolId());
+            if (!supportedStoragePoolTypes.contains(storagePoolVO.getPoolType())) {
+                logger.debug(String.format("%s as the VM has a volume that is in a storage with unsupported type [%s].", cantHandleLog, storagePoolVO.getPoolType()));
+                return StrategyPriority.CANT_HANDLE;
+            }
+            List<SnapshotVO> snapshots = snapshotDao.listByVolumeIdAndTypeNotInAndStateNotRemoved(volume.getId(), Snapshot.Type.GROUP);
+            if (CollectionUtils.isNotEmpty(snapshots)) {
+                logger.debug("{} as VM has a volume with snapshots {}. Volume snapshots and KvmFileBasedStorageVmSnapshotStrategy are not compatible, as restoring volume snapshots will erase VM " +
+                        "snapshots and cause data loss.", cantHandleLog, snapshots);
+                return StrategyPriority.CANT_HANDLE;
+            }
+        }
+
+        BackupOfferingVO backupOffering = backupOfferingDao.findById(vm.getBackupOfferingId());
+        if (backupOffering != null) {
+            logger.debug("{} as the VM has a backup offering. This strategy does not support snapshots on VMs with current backup providers.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        return StrategyPriority.HIGHEST;
+    }
+
+    private List<SnapshotVO> deleteSnapshot(VMSnapshotVO vmSnapshotVO, Long hostId) {
+        List<SnapshotDataStoreVO> volumeSnapshots = getVolumeSnapshotsAssociatedWithVmSnapshot(vmSnapshotVO);
+        List<DataTO> volumeSnapshotTOList = volumeSnapshots.stream()
+                .map(snapshotDataStoreVO -> snapshotDataFactory.getSnapshot(snapshotDataStoreVO.getSnapshotId(), snapshotDataStoreVO.getDataStoreId(), DataStoreRole.Primary).getTO())
+                .collect(Collectors.toList());
+
+        DeleteDiskOnlyVmSnapshotCommand deleteSnapshotCommand = new DeleteDiskOnlyVmSnapshotCommand(volumeSnapshotTOList);
+        Answer answer = agentMgr.easySend(hostId, deleteSnapshotCommand);
+        if (answer == null || !answer.getResult()) {
+            logger.error("Failed to delete VM snapshot [{}] due to {}.", vmSnapshotVO.getUuid(), answer != null ? answer.getDetails() : "Communication failure");
+            throw new CloudRuntimeException(String.format("Failed to delete VM snapshot [%s].", vmSnapshotVO.getUuid()));
+        }
+
+        logger.debug("Updating metadata of VM snapshot [{}].", vmSnapshotVO.getUuid());
+        List<SnapshotVO> snapshotVOList = new ArrayList<>();
+        for (SnapshotDataStoreVO snapshotDataStoreVO : volumeSnapshots) {
+            snapshotDataStoreDao.remove(snapshotDataStoreVO.getId());
+            snapshotVOList.add(snapshotDao.findById(snapshotDataStoreVO.getSnapshotId()));
+        }
+        return snapshotVOList;
+    }
+
+    private List<SnapshotVO> mergeSnapshots(VMSnapshotVO vmSnapshotVO, VMSnapshotVO childSnapshot, UserVmVO userVm, List<VolumeObjectTO> volumeObjectTOS, Long hostId) {
+        logger.debug("Merging VM snapshot [{}] with its child [{}].", vmSnapshotVO.getUuid(), childSnapshot.getUuid());
+
+        List<VMSnapshotVO> snapshotGrandChildren = vmSnapshotDao.listByParentAndStateIn(childSnapshot.getId(), VMSnapshot.State.Ready, VMSnapshot.State.Hidden);
+
+        if (VirtualMachine.State.Running.equals(userVm.getState()) && !snapshotGrandChildren.isEmpty()) {
+            logger.debug("Removing VM snapshots that are part of the VM's [{}] current backing chain from the list of snapshots to be rebased.", userVm.getUuid());
+            removeCurrentBackingChainSnapshotFromVmSnapshotList(snapshotGrandChildren, userVm);
+        }
+
+        List<SnapshotMergeTreeTO> snapshotMergeTreeToList = generateSnapshotMergeTrees(vmSnapshotVO, childSnapshot, snapshotGrandChildren);
+
+        if (childSnapshot.getCurrent() && !VirtualMachine.State.Running.equals(userVm.getState())) {
+            for (VolumeObjectTO volumeObjectTO : volumeObjectTOS) {
+                snapshotMergeTreeToList.stream().filter(snapshotTree -> Objects.equals(((SnapshotObjectTO) snapshotTree.getParent()).getVolume().getId(), volumeObjectTO.getId()))
+                        .findFirst()
+                        .orElseThrow(() -> new CloudRuntimeException(String.format("Failed to find volume snapshot for volume [%s].", volumeObjectTO.getUuid())))
+                        .addGrandChild(volumeObjectTO);
+            }
+        }
+
+        MergeDiskOnlyVmSnapshotCommand mergeDiskOnlyVMSnapshotCommand = new MergeDiskOnlyVmSnapshotCommand(snapshotMergeTreeToList, userVm.getState(), userVm.getName());
+        Answer answer = agentMgr.easySend(hostId, mergeDiskOnlyVMSnapshotCommand);
+        if (answer == null || !answer.getResult()) {
+            throw new CloudRuntimeException(String.format("Failed to merge VM snapshot [%s] due to %s.", vmSnapshotVO.getUuid(), answer != null ? answer.getDetails() : "Communication failure"));
+        }
+
+        logger.debug("Updating metadata of VM snapshot [{}] and its child [{}].", vmSnapshotVO.getUuid(), childSnapshot.getUuid());
+        List<SnapshotVO> snapshotVOList = new ArrayList<>();
+        for (SnapshotMergeTreeTO snapshotMergeTreeTO : snapshotMergeTreeToList) {
+            SnapshotObjectTO childTO = (SnapshotObjectTO) snapshotMergeTreeTO.getChild();
+            SnapshotObjectTO parentTO = (SnapshotObjectTO) snapshotMergeTreeTO.getParent();
+
+            SnapshotDataStoreVO childSnapshotDataStoreVO = snapshotDataStoreDao.findBySnapshotIdInAnyState(childTO.getId(), DataStoreRole.Primary);
+            childSnapshotDataStoreVO.setInstallPath(parentTO.getPath());
+            snapshotDataStoreDao.update(childSnapshotDataStoreVO.getId(), childSnapshotDataStoreVO);
+
+            snapshotDataStoreDao.expungeReferenceBySnapshotIdAndDataStoreRole(parentTO.getId(), childSnapshotDataStoreVO.getDataStoreId(), DataStoreRole.Primary);
+            snapshotVOList.add(snapshotDao.findById(parentTO.getId()));
+        }
+
+        childSnapshot.setParent(vmSnapshotVO.getParent());
+        vmSnapshotDao.update(childSnapshot.getId(), childSnapshot);
+
+        return snapshotVOList;
+    }
+
+    private List<SnapshotVO> mergeCurrentDeltaOnSnapshot(VMSnapshotVO vmSnapshotVo, UserVmVO userVmVO, Long hostId, List<VolumeObjectTO> volumeObjectTOS) {
+        logger.debug("Merging VM snapshot [{}] with the current volume delta.", vmSnapshotVo.getUuid());
+        List<SnapshotMergeTreeTO> snapshotMergeTreeTOList = new ArrayList<>();
+        List<SnapshotDataStoreVO> volumeSnapshots = getVolumeSnapshotsAssociatedWithVmSnapshot(vmSnapshotVo);
+
+        for (VolumeObjectTO volumeObjectTO : volumeObjectTOS) {
+            SnapshotDataStoreVO volumeParentSnapshot = volumeSnapshots.stream().filter(snapshot -> Objects.equals(snapshot.getVolumeId(), volumeObjectTO.getId()))
+                    .findFirst()
+                    .orElseThrow(() -> new CloudRuntimeException(String.format("Failed to find volume snapshot for volume [%s].", volumeObjectTO.getUuid())));
+            DataTO parentSnapshot = snapshotDataFactory.getSnapshot(volumeParentSnapshot.getSnapshotId(), volumeParentSnapshot.getDataStoreId(), DataStoreRole.Primary).getTO();
+            snapshotMergeTreeTOList.add(new SnapshotMergeTreeTO(parentSnapshot, volumeObjectTO, new ArrayList<>()));
+        }
+
+        MergeDiskOnlyVmSnapshotCommand mergeDiskOnlyVMSnapshotCommand = new MergeDiskOnlyVmSnapshotCommand(snapshotMergeTreeTOList, userVmVO.getState(), userVmVO.getName());
+
+        Answer answer = agentMgr.easySend(hostId, mergeDiskOnlyVMSnapshotCommand);
+        if (answer == null || !answer.getResult()) {
+            throw new CloudRuntimeException(String.format("Failed to delete VM snapshot [%s] due to %s.", vmSnapshotVo.getUuid(), answer != null ? answer.getDetails() : "Communication failure"));
+        }
+
+        logger.debug("Updating metadata of VM snapshot [{}].", vmSnapshotVo.getUuid());
+        List<SnapshotVO> snapshotVOList = new ArrayList<>();
+        for (SnapshotMergeTreeTO snapshotMergeTreeTO : snapshotMergeTreeTOList) {
+            VolumeObjectTO volumeObjectTO = (VolumeObjectTO) snapshotMergeTreeTO.getChild();
+            SnapshotObjectTO parentTO = (SnapshotObjectTO) snapshotMergeTreeTO.getParent();
+
+            VolumeVO volumeVO = volumeDao.findById(volumeObjectTO.getId());
+            volumeVO.setPath(parentTO.getPath());
+            volumeDao.update(volumeVO.getId(), volumeVO);
+
+            snapshotDataStoreDao.expungeReferenceBySnapshotIdAndDataStoreRole(parentTO.getId(), volumeVO.getPoolId(), DataStoreRole.Primary);
+            snapshotVOList.add(snapshotDao.findById(parentTO.getId()));
+        }
+
+        vmSnapshotVo.setCurrent(false);
+        if (vmSnapshotVo.getParent() != null) {
+            VMSnapshotVO parentSnapshot = vmSnapshotDao.findById(vmSnapshotVo.getParent());
+            parentSnapshot.setCurrent(true);
+            vmSnapshotDao.update(parentSnapshot.getId(), parentSnapshot);
+        }
+
+        return snapshotVOList;
+    }
+
+    /**
+     * Takes a disk-only VM snapshot, exceptions thrown will be caught deeper in the stack and treated there.
+     * @param vmSnapshot the definition of the VM Snapshot that will be created.
+     * @param volumeInfoToSnapshotObjectMap Empty map of VolumeInfo to SnapshotObject, will be populated within the method, used for treating the exceptions thrown.
+     * @return the VM Snapshot created.
+     * */
+    protected VMSnapshot takeVmSnapshotInternal(VMSnapshot vmSnapshot, Map<VolumeInfo, SnapshotObject> volumeInfoToSnapshotObjectMap) throws NoTransitionException {
+        UserVm userVm = userVmDao.findById(vmSnapshot.getVmId());
+
+        logger.info("Starting disk-only VM snapshot process for VM [{}].", userVm.getUuid());
+
+        Long hostId = vmSnapshotHelper.pickRunningHost(vmSnapshot.getVmId());
+        VMSnapshotVO vmSnapshotVO = (VMSnapshotVO) vmSnapshot;
+        List<VolumeObjectTO> volumeTOs = vmSnapshotHelper.getVolumeTOList(userVm.getId());
+
+        transitStateWithoutThrow(vmSnapshot, VMSnapshot.Event.CreateRequested);
+
+        VMSnapshotTO parentSnapshotTo = null;
+        VMSnapshotVO parentSnapshotVo = vmSnapshotDao.findCurrentSnapshotByVmId(userVm.getId());
+        if (parentSnapshotVo != null) {
+            parentSnapshotTo = vmSnapshotHelper.getSnapshotWithParents(parentSnapshotVo);
+            vmSnapshotVO.setParent(parentSnapshotTo.getId());
+        }
+
+        VMSnapshotOptions options = ((VMSnapshotVO) vmSnapshot).getOptions();
+        boolean quiesceVm = false;
+        if (options != null) {
+            quiesceVm = options.needQuiesceVM();
+        }
+
+        long virtualSize = createVolumeSnapshotMetadataAndCalculateVirtualSize(vmSnapshot, volumeInfoToSnapshotObjectMap, volumeTOs);
+
+        VMSnapshotTO target = new VMSnapshotTO(vmSnapshot.getId(), vmSnapshot.getName(), vmSnapshot.getType(), null, vmSnapshot.getDescription(), false, parentSnapshotTo, quiesceVm);
+
+        CreateDiskOnlyVmSnapshotCommand ccmd = new CreateDiskOnlyVmSnapshotCommand(userVm.getInstanceName(), target, volumeTOs, null, userVm.getState());
+
+        logger.info("Sending disk-only VM snapshot creation of VM Snapshot [{}] command for host [{}].", vmSnapshot.getUuid(), hostId);
+        Answer answer = agentMgr.easySend(hostId, ccmd);
+
+        if (answer != null && answer.getResult()) {
+            CreateDiskOnlyVmSnapshotAnswer createDiskOnlyVMSnapshotAnswer = (CreateDiskOnlyVmSnapshotAnswer) answer;
+            return processCreateVmSnapshotAnswer(vmSnapshot, volumeInfoToSnapshotObjectMap, createDiskOnlyVMSnapshotAnswer, userVm, vmSnapshotVO, virtualSize, parentSnapshotVo);
+        }
+
+        logger.error("Disk-only VM snapshot for VM [{}] failed{}.", userVm.getUuid(), answer != null ? " due to" + answer.getDetails() : "");
+        throw new CloudRuntimeException(String.format("Disk-only VM snapshot for VM [%s] failed.", userVm.getUuid()));
+    }
+
+    /**
+     * Updates the needed metadata of the given VM Snapshot and its associated volume snapshots.
+     * */
+    private VMSnapshot processCreateVmSnapshotAnswer(VMSnapshot vmSnapshot, Map<VolumeInfo, SnapshotObject> volumeInfoToSnapshotObjectMap, CreateDiskOnlyVmSnapshotAnswer answer, UserVm userVm, VMSnapshotVO vmSnapshotVO, long virtualSize, VMSnapshotVO parentSnapshotVo) throws NoTransitionException {
+        logger.debug("Processing CreateDiskOnlyVMSnapshotCommand answer for disk-only VM snapshot [{}].", vmSnapshot.getUuid());
+        Map<String, Pair<Long, String>> volumeUuidToSnapshotSizeAndNewVolumePathMap = answer.getMapVolumeToSnapshotSizeAndNewVolumePath();
+        long vmSnapshotSize = 0;
+
+        for (VolumeInfo volumeInfo : volumeInfoToSnapshotObjectMap.keySet()) {
+            VolumeVO volumeVO = (VolumeVO) volumeInfo.getVolume();
+            Pair<Long, String> snapSizeAndNewVolumePath = volumeUuidToSnapshotSizeAndNewVolumePathMap.get(volumeVO.getUuid());
+
+            SnapshotObject snapshot = volumeInfoToSnapshotObjectMap.get(volumeInfo);
+            snapshot.markBackedUp();
+
+            logger.debug("Updating metadata for volume [{}] and its corresponding snapshot [{}].", volumeVO, snapshot.getSnapshotVO());
+
+            SnapshotDataStoreVO snapshotDataStoreVO = snapshotDataStoreDao.findBySnapshotId(snapshot.getId()).get(0);
+            snapshotDataStoreVO.setInstallPath(volumeVO.getPath());
+            snapshotDataStoreVO.setPhysicalSize(snapSizeAndNewVolumePath.first());
+            snapshotDataStoreVO.setState(ObjectInDataStoreStateMachine.State.Ready);
+            snapshotDataStoreDao.update(snapshotDataStoreVO.getId(), snapshotDataStoreVO);
+
+            vmSnapshotSize += snapSizeAndNewVolumePath.first();
+
+            volumeVO.setPath(snapSizeAndNewVolumePath.second());
+            volumeDao.update(volumeVO.getId(), volumeVO);
+            volumeInfo.stateTransit(Volume.Event.OperationSucceeded);
+
+            vmSnapshotDetailsDao.persist(new VMSnapshotDetailsVO(vmSnapshot.getId(), KVM_FILE_BASED_STORAGE_SNAPSHOT, String.valueOf(snapshot.getId()), true));
+
+            publishUsageEvent(EventTypes.EVENT_VM_SNAPSHOT_CREATE, vmSnapshot, userVm, (VolumeObjectTO) volumeInfo.getTO());
+        }
+
+        vmSnapshotVO.setCurrent(true);
+        vmSnapshotDao.persist(vmSnapshotVO);
+
+        if (parentSnapshotVo != null) {
+            parentSnapshotVo.setCurrent(false);
+            vmSnapshotDao.persist(parentSnapshotVo);
+        }
+
+        vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationSucceeded);
+
+        publishUsageEvent(EventTypes.EVENT_VM_SNAPSHOT_ON_PRIMARY, vmSnapshot, userVm, vmSnapshotSize, virtualSize);
+
+        return vmSnapshot;
+    }
+
+    private long createVolumeSnapshotMetadataAndCalculateVirtualSize(VMSnapshot vmSnapshot, Map<VolumeInfo, SnapshotObject> volumeInfoToSnapshotObjectMap, List<VolumeObjectTO> volumeTOs) throws NoTransitionException {
+        long virtualSize = 0;
+        for (VolumeObjectTO volumeObjectTO : volumeTOs) {
+            VolumeInfo volumeInfo = volumeDataFactory.getVolume(volumeObjectTO.getId());
+            volumeInfo.stateTransit(Volume.Event.SnapshotRequested);
+            virtualSize += volumeInfo.getSize();
+
+            String snapshotName = String.format("%s_%s", vmSnapshot.getId(), volumeObjectTO.getUuid());
+            SnapshotVO snapshot = new SnapshotVO(volumeInfo.getDataCenterId(), volumeInfo.getAccountId(), volumeInfo.getDomainId(), volumeInfo.getId(),
+                    volumeInfo.getDiskOfferingId(), snapshotName, (short) Snapshot.Type.GROUP.ordinal(), Snapshot.Type.GROUP.name(), volumeInfo.getSize(), volumeInfo.getMinIops(),
+                    volumeInfo.getMaxIops(), Hypervisor.HypervisorType.KVM, null);
+
+            logger.debug("Creating snapshot metadata [{}] as part of the disk-only snapshot process for VM [{}].", snapshot, volumeObjectTO.getVmName());
+
+            snapshot = snapshotDao.persist(snapshot);
+
+            SnapshotInfo snapshotInfo = snapshotDataFactory.getSnapshot(snapshot.getId(), volumeInfo.getDataStore());
+            SnapshotObject snapshotOnPrimary = (SnapshotObject) snapshotInfo.getDataStore().create(snapshotInfo);
+
+            snapshotOnPrimary.processEvent(Snapshot.Event.CreateRequested);
+            snapshotOnPrimary.processEvent(ObjectInDataStoreStateMachine.Event.CreateOnlyRequested);
+
+            volumeInfoToSnapshotObjectMap.put(volumeInfo, snapshotOnPrimary);
+        }
+        return virtualSize;
+    }
+
+    private List<SnapshotMergeTreeTO> generateSnapshotMergeTrees(VMSnapshotVO parent, VMSnapshotVO child, List<VMSnapshotVO> grandChildren) throws NoSuchElementException {
+        logger.debug("Generating list of Snapshot Merge Trees for the merge process of VM Snapshot [{}].", parent.getUuid());
+
+        List<SnapshotMergeTreeTO> snapshotMergeTrees = new ArrayList<>();
+        List<SnapshotDataStoreVO> parentVolumeSnapshots = getVolumeSnapshotsAssociatedWithVmSnapshot(parent);
+        List<SnapshotDataStoreVO> childVolumeSnapshots = getVolumeSnapshotsAssociatedWithVmSnapshot(child);
+        List<SnapshotDataStoreVO> grandChildrenVolumeSnapshots = new ArrayList<>();
+
+        for (VMSnapshotVO grandChild : grandChildren) {
+            grandChildrenVolumeSnapshots.addAll(getVolumeSnapshotsAssociatedWithVmSnapshot(grandChild));
+        }
+
+        for (SnapshotDataStoreVO parentSnapshotDataStoreVO : parentVolumeSnapshots) {
+            DataTO parentTO = snapshotDataFactory.getSnapshot(parentSnapshotDataStoreVO.getSnapshotId(), parentSnapshotDataStoreVO.getDataStoreId(), DataStoreRole.Primary).getTO();
+
+            DataTO childTO = childVolumeSnapshots.stream()
+                    .filter(childSnapshot -> Objects.equals(parentSnapshotDataStoreVO.getVolumeId(), childSnapshot.getVolumeId()))
+                    .map(snapshotDataStoreVO -> snapshotDataFactory.getSnapshot(snapshotDataStoreVO.getSnapshotId(), snapshotDataStoreVO.getDataStoreId(), DataStoreRole.Primary).getTO())
+                    .findFirst().orElseThrow(() -> new CloudRuntimeException(String.format("Could not find child snapshot of parent [%s].", parentSnapshotDataStoreVO.getSnapshotId())));
+
+            List<DataTO> grandChildrenTOList = grandChildrenVolumeSnapshots.stream()
+                    .filter(grandChildSnapshot -> Objects.equals(parentSnapshotDataStoreVO.getVolumeId(), grandChildSnapshot.getVolumeId()))
+                    .map(snapshotDataStoreVO -> snapshotDataFactory.getSnapshot(snapshotDataStoreVO.getSnapshotId(), snapshotDataStoreVO.getDataStoreId(), DataStoreRole.Primary).getTO())
+                    .collect(Collectors.toList());
+
+            snapshotMergeTrees.add(new SnapshotMergeTreeTO(parentTO, childTO, grandChildrenTOList));
+        }
+
+        logger.debug("Generated the following list of Snapshot Merge Trees for the VM snapshot [{}]: [{}].", parent.getUuid(), snapshotMergeTrees);
+        return snapshotMergeTrees;
+    }
+
+    /**
+     * For a given {@code VMSnapshotVO}, populates the {@code associatedVolumeSnapshots} list with all the volume snapshots that are
+     * part of the VMSnapshot.
+     * @param vmSnapshot the VMSnapshotVO that will have its size calculated
+     * @return the list that will be populated with the volume snapshots associated with the VM snapshot.
+     * */
+    private List<SnapshotDataStoreVO> getVolumeSnapshotsAssociatedWithVmSnapshot(VMSnapshotVO vmSnapshot) {
+        List<SnapshotDataStoreVO> associatedVolumeSnapshots = new ArrayList<>();
+        List<VMSnapshotDetailsVO> snapshotDetailList = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), KVM_FILE_BASED_STORAGE_SNAPSHOT);
+        for (VMSnapshotDetailsVO vmSnapshotDetailsVO : snapshotDetailList) {
+            SnapshotDataStoreVO snapshot = snapshotDataStoreDao.findOneBySnapshotAndDatastoreRole(Long.parseLong(vmSnapshotDetailsVO.getValue()), DataStoreRole.Primary);
+            if (snapshot == null) {
+                throw new CloudRuntimeException(String.format("Could not find snapshot for VM snapshot [%s].", vmSnapshot.getUuid()));
+            }
+            associatedVolumeSnapshots.add(snapshot);
+        }
+        return associatedVolumeSnapshots;
+    }
+
+    /**
+     * For a given {@code VMSnapshotVO}, returns the real size of the snapshot.
+     * @param vmSnapshot the VMSnapshotVO that will have its size calculated
+     * */
+    private long getVMSnapshotRealSize(VMSnapshotVO vmSnapshot) {
+        long realSize = 0;
+        List<VMSnapshotDetailsVO> snapshotDetailList = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), KVM_FILE_BASED_STORAGE_SNAPSHOT);
+        for (VMSnapshotDetailsVO vmSnapshotDetailsVO : snapshotDetailList) {
+            SnapshotDataStoreVO snapshot = snapshotDataStoreDao.findOneBySnapshotAndDatastoreRole(Long.parseLong(vmSnapshotDetailsVO.getValue()), DataStoreRole.Primary);
+            if (snapshot == null) {
+                throw new CloudRuntimeException(String.format("Could not find snapshot for VM snapshot [%s].", vmSnapshot.getUuid()));
+            }
+            realSize += snapshot.getPhysicalSize();
+        }
+        return realSize;
+    }
+
+    /**
+     * Given a list of VM snapshots, will remove any that are part of the current direct backing chain (all the direct ancestors of the current vm snapshot).
+     * This is done because, when using <a href="https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockCommit">virDomainBlockCommit</a>}, Libvirt will maintain
+     * the current backing chain consistent; thus we only need to rebase the snapshots that are not on the current backing chain.
+     * */
+    private void removeCurrentBackingChainSnapshotFromVmSnapshotList(List<VMSnapshotVO> vmSnapshotList, UserVm userVm) {
+        VMSnapshotVO currentSnapshotVO = vmSnapshotDao.findCurrentSnapshotByVmId(vmSnapshotList.get(0).getVmId());
+        VMSnapshotTO currentSnapshotTO = vmSnapshotHelper.getSnapshotWithParents(currentSnapshotVO);
+
+        List<VMSnapshotTO> currentBranch = new ArrayList<>();
+        currentBranch.add(currentSnapshotTO);
+        VMSnapshotTO parent = currentSnapshotTO.getParent();
+        while (parent != null) {
+            currentBranch.add(parent);
+            parent = parent.getParent();
+        }
+
+        for (VMSnapshotVO vmSnapshotVO : vmSnapshotList) {
+            if (currentBranch.stream().anyMatch(currentBranchSnap -> Objects.equals(currentBranchSnap.getId(), vmSnapshotVO.getId()))) {
+                logger.trace("Removing snapshot [{}] from the list of VM snapshots of VM [{}] being rebased.", vmSnapshotVO.getUuid(), userVm.getUuid());
+                vmSnapshotList.remove(vmSnapshotVO);
+                return;
+            }
+        }
+    }
+
+    private void transitStateWithoutThrow(VMSnapshot vmSnapshot, VMSnapshot.Event event) {
+        try {
+            vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, event);
+        } catch (NoTransitionException e) {
+            String msg = String.format("Failed to change VM snapshot [%s] state with event [%s].", vmSnapshot, event.toString());
+            logger.error(msg, e);
+            throw new CloudRuntimeException(msg, e);
+        }
+    }
+}
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
index e33edc9ce80..70ac14ec79d 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
@@ -95,8 +95,6 @@ public class StorageVMSnapshotStrategy extends DefaultVMSnapshotStrategy {
     @Inject
     VMSnapshotDetailsDao vmSnapshotDetailsDao;
 
-    private static final String STORAGE_SNAPSHOT = "kvmStorageSnapshot";
-
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
        return super.configure(name, params);
@@ -356,12 +354,25 @@ public class StorageVMSnapshotStrategy extends DefaultVMSnapshotStrategy {
 
     @Override
     public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
-        if (SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
-            UserVmVO vm = userVmDao.findById(vmId);
-            if (vm.getState() == VirtualMachine.State.Running) {
-                return StrategyPriority.HYPERVISOR;
-            }
+        UserVmVO vm = userVmDao.findById(vmId);
+        String cantHandleLog = String.format("Storage VM snapshot strategy cannot handle VM snapshot for [%s]", vm);
+
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVmAndByType(vmId, VMSnapshot.Type.DiskAndMemory))) {
+            logger.debug("{} as it has VM snapshots with disk and memory.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
         }
+
+        if (!VirtualMachine.State.Running.equals(vm.getState())) {
+            logger.debug("{} as the VM is not running.", cantHandleLog);
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        if (SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
+            return StrategyPriority.HYPERVISOR;
+        }
+
+        logger.debug("{} as {}.", () -> cantHandleLog, () -> snapshotMemory ? "A VM snapshot with memory was requested" :
+                String.format("%s is false", SnapshotManager.VmStorageSnapshotKvm.key()));
         return StrategyPriority.CANT_HANDLE;
     }
 
diff --git a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
index fc561159c8e..32ac6e9fc8b 100644
--- a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
+++ b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
@@ -48,4 +48,7 @@
     <bean id="ScaleIOVMSnapshotStrategy"
           class="org.apache.cloudstack.storage.vmsnapshot.ScaleIOVMSnapshotStrategy" />
 
+    <bean id="KvmFileBasedStorageVmSnapshotStrategy"
+          class="org.apache.cloudstack.storage.vmsnapshot.KvmFileBasedStorageVmSnapshotStrategy" />
+
 </beans>
diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyTest.java
index 7bcfd4dda58..829ca5ade39 100644
--- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyTest.java
+++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyTest.java
@@ -25,6 +25,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -283,6 +284,11 @@ public class VMSnapshotStrategyTest extends TestCase {
             return Mockito.mock(VMSnapshotDao.class);
         }
 
+        @Bean
+        public VMSnapshotDetailsDao vmSnapshotDetailsDao() {
+            return Mockito.mock(VMSnapshotDetailsDao.class);
+        }
+
         @Bean
         public ConfigurationDao configurationDao() {
             return Mockito.mock(ConfigurationDao.class);
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index fa9d2b58629..654d68ec6f1 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -28,6 +28,7 @@ import com.cloud.storage.ScopeType;
 import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeApiServiceImpl;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.dao.VolumeDao;
@@ -36,6 +37,12 @@ import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
+
 
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
@@ -88,6 +95,12 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
     @Inject
     private AgentManager agentManager;
 
+    @Inject
+    private VMSnapshotDao vmSnapshotDao;
+
+    @Inject
+    private VMSnapshotDetailsDao vmSnapshotDetailsDao;
+
     protected Host getLastVMHypervisorHost(VirtualMachine vm) {
         Long hostId = vm.getLastHostId();
         if (hostId == null) {
@@ -402,6 +415,14 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
 
     @Override
     public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backupOffering) {
+        for (VMSnapshotVO vmSnapshotVO : vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.Disk)) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
+            if (vmSnapshotDetails.stream().anyMatch(vmSnapshotDetailsVO -> VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT.equals(vmSnapshotDetailsVO.getName()))) {
+                logger.warn("VM [{}] has VM snapshots using the KvmFileBasedStorageVmSnapshot Strategy; this provider does not support backups on VMs with these snapshots!");
+                return false;
+            }
+        }
+
         return Hypervisor.HypervisorType.KVM.equals(vm.getHypervisorType());
     }
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BlockCommitListener.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BlockCommitListener.java
new file mode 100644
index 00000000000..d360aa48137
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BlockCommitListener.java
@@ -0,0 +1,77 @@
+// 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.
+
+package com.cloud.hypervisor.kvm.resource;
+
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+import org.libvirt.event.BlockJobListener;
+import org.libvirt.event.BlockJobStatus;
+import org.libvirt.event.BlockJobType;
+
+import java.util.concurrent.Semaphore;
+
+public class BlockCommitListener implements BlockJobListener {
+    private Semaphore semaphore;
+    private String result;
+    private String vmName;
+
+    private Logger logger;
+    private String logid;
+
+    protected BlockCommitListener(Semaphore semaphore, String vmName, String logid) {
+        this.semaphore = semaphore;
+        this.vmName = vmName;
+        this.logid = logid;
+        logger = LogManager.getLogger(getClass());
+    }
+
+    protected String getResult() {
+        return result;
+    }
+
+    @Override
+    public void onEvent(Domain domain, String diskPath, BlockJobType type, BlockJobStatus status) {
+        if (!BlockJobType.COMMIT.equals(type) && !BlockJobType.ACTIVE_COMMIT.equals(type)) {
+            return;
+        }
+
+        switch (status) {
+            case COMPLETED:
+                result = null;
+                semaphore.release();
+                return;
+            case READY:
+                try {
+                    ThreadContext.put("logcontextid", logid);
+                    logger.debug("Pivoting disk [{}] of VM [{}].", diskPath, vmName);
+                    domain.blockJobAbort(diskPath, Domain.BlockJobAbortFlags.PIVOT);
+                } catch (LibvirtException ex) {
+                    result = String.format("Failed to pivot disk due to [%s].", ex.getMessage());
+                    semaphore.release();
+                }
+                return;
+            default:
+                result = String.format("Failed to block commit disk with status [%s].", status);
+                semaphore.release();
+        }
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 3288e2d6be1..d96290a86ac 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -31,6 +31,7 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,6 +47,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -102,10 +105,12 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.ThreadContext;
 import org.apache.xerces.impl.xpath.regex.Match;
 import org.joda.time.Duration;
 import org.libvirt.Connect;
 import org.libvirt.Domain;
+import org.libvirt.DomainBlockJobInfo;
 import org.libvirt.DomainBlockStats;
 import org.libvirt.DomainInfo;
 import org.libvirt.DomainInfo.DomainState;
@@ -370,6 +375,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     public static final String CHECKPOINT_DELETE_COMMAND = "virsh checkpoint-delete --domain %s --checkpointname %s  --metadata";
 
+    protected int qcow2DeltaMergeTimeout;
+
     private String modifyVlanPath;
     private String versionStringPath;
     private String patchScriptPath;
@@ -561,6 +568,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     public static final String CGROUP_V2 = "cgroup2fs";
 
+    /**
+     * Virsh command to merge (blockcommit) snapshot into the base file.<br><br>
+     * 1st parameter: VM's name;<br>
+     * 2nd parameter: disk's label (target.dev tag from VM's XML);<br>
+     * 3rd parameter: the absolute path of the base file;
+     */
+    private static final String COMMAND_MERGE_SNAPSHOT = "virsh blockcommit %s %s --base %s";
+
     public long getHypervisorLibvirtVersion() {
         return hypervisorLibvirtVersion;
     }
@@ -1179,6 +1194,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         cmdsTimeout = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CMDS_TIMEOUT) * 1000;
 
         noMemBalloon = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.VM_MEMBALLOON_DISABLE);
+        qcow2DeltaMergeTimeout = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.QCOW2_DELTA_MERGE_TIMEOUT);
+        qcow2DeltaMergeTimeout = qcow2DeltaMergeTimeout > 0 ? qcow2DeltaMergeTimeout : AgentProperties.QCOW2_DELTA_MERGE_TIMEOUT.getDefaultValue();
 
         manualCpuSpeed = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.HOST_CPU_MANUAL_SPEED_MHZ);
 
@@ -4645,6 +4662,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         }
     }
 
+    public DiskDef getDiskWithPathOfVolumeObjectTO(List<DiskDef> disks, VolumeObjectTO vol) {
+        return disks.stream()
+                .filter(diskDef -> diskDef.getDiskPath() != null && diskDef.getDiskPath().contains(vol.getPath()))
+                .findFirst()
+                .orElseThrow(() -> new CloudRuntimeException(String.format("Unable to find volume [%s].", vol.getUuid())));
+    }
+
     protected String getDiskPathFromDiskDef(DiskDef disk) {
         final String path = disk.getDiskPath();
         if (path != null) {
@@ -5844,10 +5868,228 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         }
     }
 
+    /**
+     * Retrieves the temporary path of the snapshot.
+     * @param diskPath Path of the disk to snapshot;
+     * @param snapshotName Snapshot name;
+     * @return the path of the disk replacing the disk with the snapshot.
+     */
+    public String getSnapshotTemporaryPath(String diskPath, String snapshotName) {
+        String[] diskPathSplitted = diskPath.split(File.separator);
+        diskPathSplitted[diskPathSplitted.length - 1] = snapshotName;
+        return String.join(File.separator, diskPathSplitted);
+    }
+
     public static String generateSecretUUIDFromString(String seed) {
         return UUID.nameUUIDFromBytes(seed.getBytes()).toString();
     }
 
+    /**
+     * Merges the snapshot into base file.
+     *
+     * @param vm           Domain of the VM;
+     * @param diskLabel    Disk label to manage snapshot and base file;
+     * @param baseFilePath Path of the base file;
+     * @param topFilePath Path of the top file, if null, the active image is used;
+     * @param active Whether the snapshot being merged is the active image;
+     * @param snapshotName Name of the snapshot;
+     * @param volume VolumeObjectTO of the corresponding volume;
+     * @param conn Libvirt connection;
+     * @throws LibvirtException
+     */
+    public void mergeSnapshotIntoBaseFile(Domain vm, String diskLabel, String baseFilePath, String topFilePath, boolean active, String snapshotName, VolumeObjectTO volume,
+            Connect conn) throws LibvirtException {
+        if (AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LIBVIRT_EVENTS_ENABLED)) {
+            mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(vm, diskLabel, baseFilePath, topFilePath, active, snapshotName, volume, conn);
+        } else {
+            mergeSnapshotIntoBaseFileWithoutEvents(vm, diskLabel, baseFilePath, topFilePath, active, snapshotName, volume, conn);
+        }
+    }
+
+    /**
+     * This method only works if LIBVIRT_EVENTS_ENABLED is true.
+     * */
+    protected void mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(Domain vm, String diskLabel, String baseFilePath, String topFilePath, boolean active, String snapshotName, VolumeObjectTO volume,
+            Connect conn) throws LibvirtException {
+        boolean isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit = LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(conn);
+        String vmName = vm.getName();
+
+        int commitFlags = 0;
+        if (isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit) {
+            commitFlags |= Domain.BlockCommitFlags.DELETE;
+        }
+        if (active) {
+            commitFlags |= Domain.BlockCommitFlags.ACTIVE;
+        }
+
+        Semaphore semaphore = getSemaphoreToWaitForMerge();
+        BlockCommitListener blockCommitListener = getBlockCommitListener(semaphore, vmName);
+        vm.addBlockJobListener(blockCommitListener);
+
+        logger.info("Starting block commit of snapshot [{}] of VM [{}]. Using parameters: diskLabel [{}]; baseFilePath [{}]; topFilePath [{}]; commitFlags [{}]", snapshotName,
+                vmName, diskLabel, baseFilePath, topFilePath, commitFlags);
+
+        vm.blockCommit(diskLabel, baseFilePath, topFilePath, 0, commitFlags);
+
+        Thread checkProgressThread = new Thread(() -> checkBlockCommitProgress(vm, diskLabel, vmName, snapshotName, topFilePath, baseFilePath));
+        checkProgressThread.start();
+
+        String errorMessage = String.format("the block commit of top file [%s] into base file [%s] for snapshot [%s] of VM [%s]." +
+                " The job will be left running to avoid data corruption, but ACS will return an error and volume [%s] will need to be normalized manually. If the commit" +
+                " involved the active image, the pivot will need to be manually done.", topFilePath, baseFilePath, snapshotName, vmName, volume);
+        try {
+            if (!semaphore.tryAcquire(qcow2DeltaMergeTimeout, TimeUnit.SECONDS)) {
+                throw new CloudRuntimeException("Timed out while waiting for " + errorMessage);
+            }
+        } catch (InterruptedException e) {
+            throw new CloudRuntimeException("Interrupted while waiting for " + errorMessage);
+        } finally {
+            vm.removeBlockJobListener(blockCommitListener);
+        }
+
+        String mergeResult = blockCommitListener.getResult();
+        try {
+            checkProgressThread.join();
+        } catch (InterruptedException ex) {
+            throw new CloudRuntimeException(String.format("Exception while running wait block commit task of snapshot [%s] and VM [%s].", snapshotName, vmName));
+        }
+
+        if (mergeResult != null) {
+            String commitError = String.format("Failed %s The failure occurred due to [%s].", errorMessage, mergeResult);
+            logger.error(commitError);
+            throw new CloudRuntimeException(commitError);
+        }
+
+        logger.info("Completed block commit of snapshot [{}] of VM [{}].", snapshotName, vmName);
+
+        manuallyDeleteUnusedSnapshotFile(isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit, topFilePath != null ? topFilePath : getSnapshotTemporaryPath(baseFilePath, snapshotName));
+    }
+
+    /**
+     * Merges the snapshot into base file to keep volume and VM behavior after stopping - starting.
+     * @param vm Domain of the VM;
+     * @param diskLabel Disk label to manage snapshot and base file;
+     * @param baseFilePath Path of the base file;
+     * @param snapshotName Name of the snapshot;
+     * @throws LibvirtException
+     */
+    protected void mergeSnapshotIntoBaseFileWithoutEvents(Domain vm, String diskLabel, String baseFilePath, String topFilePath, boolean active, String snapshotName, VolumeObjectTO volume, Connect conn) throws LibvirtException {
+        boolean isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit = LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(conn);
+        String vmName = vm.getName();
+        String mergeCommand = buildMergeCommand(vmName, diskLabel, baseFilePath, topFilePath, active, isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit);
+        String mergeResult = Script.runSimpleBashScript(mergeCommand);
+
+        if (mergeResult == null) {
+            logger.debug("Successfully merged snapshot [{}] into VM [{}] {} base file.", snapshotName, vmName, volume);
+            manuallyDeleteUnusedSnapshotFile(isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit, getSnapshotTemporaryPath(baseFilePath, snapshotName));
+            return;
+        }
+
+        String errorMsg = String.format("Failed to merge snapshot [%s] into VM [%s] %s base file. Command [%s] resulted in [%s]. If the VM is stopped and then started, it"
+                + " will start to write in the base file again. All changes made between the snapshot and the VM stop will be in the snapshot. If the VM is stopped, the snapshot must be"
+                + " merged into the base file manually.", snapshotName, vmName, volume, mergeCommand, mergeResult);
+
+        logger.warn("%s VM XML: [{}].", errorMsg, vm.getXMLDesc(0));
+        throw new CloudRuntimeException(errorMsg);
+    }
+
+    protected String buildMergeCommand(String vmName, String diskLabel, String baseFilePath, String topFilePath, boolean active, boolean delete) {
+        StringBuilder cmd = new StringBuilder(COMMAND_MERGE_SNAPSHOT);
+        if (StringUtils.isNotEmpty(topFilePath)) {
+            cmd.append(" --top ");
+            cmd.append(topFilePath);
+        }
+        if (active) {
+            cmd.append(" --active --pivot");
+        }
+        if (delete) {
+            cmd.append(" --delete");
+        }
+        cmd.append(" --wait");
+        return String.format(cmd.toString(), vmName, diskLabel, baseFilePath);
+    }
+
+    /**
+     * This was created to facilitate testing.
+     * */
+    protected BlockCommitListener getBlockCommitListener(Semaphore semaphore, String vmName) {
+        return new BlockCommitListener(semaphore, vmName, ThreadContext.get("logcontextid"));
+    }
+
+    /**
+     * This was created to facilitate testing.
+     * */
+    protected Semaphore getSemaphoreToWaitForMerge() {
+        return new Semaphore(0);
+    }
+
+    protected void checkBlockCommitProgress(Domain vm, String diskLabel, String vmName, String snapshotName, String topFilePath, String baseFilePath) {
+        int timeout = qcow2DeltaMergeTimeout;
+        DomainBlockJobInfo result;
+        long lastCommittedBytes = 0;
+        long endBytes = 0;
+        String partialLog = String.format("of top file [%s] into base file [%s] for snapshot [%s] of VM [%s]", topFilePath, baseFilePath, snapshotName, vmName);
+
+        while (timeout > 0) {
+            timeout -= 1;
+
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex) {
+                logger.debug("Thread that was tracking the progress {} was interrupted.", partialLog, ex);
+                return;
+            }
+
+            try {
+                result = vm.getBlockJobInfo(diskLabel, 0);
+            } catch (LibvirtException ex) {
+                logger.warn("Exception while getting block job info {}: [{}].", partialLog, ex.getMessage(), ex);
+                return;
+            }
+
+            if (result == null || result.type == 0 && result.end == 0 && result.cur == 0) {
+                logger.debug("Block commit job {} has already finished.", partialLog);
+                return;
+            }
+
+            long currentCommittedBytes = result.cur;
+            if (currentCommittedBytes > lastCommittedBytes) {
+                logger.debug("The block commit {} is at [{}] of [{}].", partialLog, currentCommittedBytes, result.end);
+            }
+            lastCommittedBytes = currentCommittedBytes;
+            endBytes = result.end;
+        }
+        logger.warn("Block commit {} has timed out after waiting at least {} seconds. The progress of the operation was [{}] of [{}].", partialLog, qcow2DeltaMergeTimeout, lastCommittedBytes, endBytes);
+    }
+
+    /**
+     * Manually deletes the unused snapshot file.<br/>
+     * This method is necessary due to Libvirt created the tag '--delete' on command 'virsh blockcommit' on version <b>1.2.9</b>, however it was only implemented on version
+     *  <b>6.0.0</b>.
+     * @param snapshotPath The unused snapshot file to manually delete.
+     */
+    protected void manuallyDeleteUnusedSnapshotFile(boolean isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit, String snapshotPath) {
+        if (isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit) {
+            logger.debug("The current Libvirt's version supports the flag '--delete' on command 'virsh blockcommit', we will skip the manually deletion of the"
+                    + " unused snapshot file [{}] as it already was automatically deleted.", snapshotPath);
+            return;
+        }
+
+        logger.debug("The current Libvirt's version does not supports the flag '--delete' on command 'virsh blockcommit', therefore we will manually delete the"
+                + " unused snapshot file [{}].", snapshotPath);
+
+        deleteIfExists(snapshotPath);
+    }
+
+    protected void deleteIfExists(String snapshotPath) {
+        try {
+            Files.deleteIfExists(Paths.get(snapshotPath));
+            logger.debug("Manually deleted unused snapshot file [{}].", snapshotPath);
+        } catch (IOException ex) {
+            throw new CloudRuntimeException(String.format("Unable to manually delete unused snapshot file [%s] due to [%s].", snapshotPath, ex.getMessage()));
+        }
+    }
+
     public void setInterfaceDefQueueSettings(Map<String, String> details, Integer cpus, InterfaceDef interfaceDef) {
         String nicMultiqueueNumber = details.get(VmDetailConstants.NIC_MULTIQUEUE_NUMBER);
         if (nicMultiqueueNumber != null) {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java
new file mode 100644
index 00000000000..84d17a1a116
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java
@@ -0,0 +1,198 @@
+/*
+ * 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.
+ */
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.VMSnapshotTO;
+import com.cloud.agent.api.storage.CreateDiskOnlyVmSnapshotAnswer;
+import com.cloud.agent.api.storage.CreateDiskOnlyVmSnapshotCommand;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.utils.qemu.QemuImg;
+import org.apache.cloudstack.utils.qemu.QemuImgException;
+import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@ResourceWrapper(handles = CreateDiskOnlyVmSnapshotCommand.class)
+public class LibvirtCreateDiskOnlyVMSnapshotCommandWrapper extends CommandWrapper<CreateDiskOnlyVmSnapshotCommand, Answer, LibvirtComputingResource> {
+
+    private static final String SNAPSHOT_XML = "<domainsnapshot>\n" +
+            "<name>%s</name>\n" +
+            "<memory snapshot='no'/>\n" +
+            "<disks> \n" +
+            "%s" +
+            "</disks> \n" +
+            "</domainsnapshot>";
+
+    private static final String TAG_DISK_SNAPSHOT = "<disk name='%s' snapshot='external'>\n" +
+            "<source file='%s'/>\n" +
+            "</disk>\n";
+
+    @Override
+    public Answer execute(CreateDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) {
+        VirtualMachine.State state = cmd.getVmState();
+
+        if (VirtualMachine.State.Running.equals(state)) {
+            return takeDiskOnlyVmSnapshotOfRunningVm(cmd, resource);
+        }
+
+        return takeDiskOnlyVmSnapshotOfStoppedVm(cmd, resource);
+    }
+
+    protected Answer takeDiskOnlyVmSnapshotOfRunningVm(CreateDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) {
+        String vmName = cmd.getVmName();
+        logger.info("Taking disk-only VM snapshot of running VM [{}].", vmName);
+
+        Domain dm = null;
+        try {
+            LibvirtUtilitiesHelper libvirtUtilitiesHelper = resource.getLibvirtUtilitiesHelper();
+            Connect conn = libvirtUtilitiesHelper.getConnection();
+            List<VolumeObjectTO> volumeObjectTOS = cmd.getVolumeTOs();
+            List<LibvirtVMDef.DiskDef> disks = resource.getDisks(conn, vmName);
+
+            dm = resource.getDomain(conn, vmName);
+
+            if (dm == null) {
+                return new CreateDiskOnlyVmSnapshotAnswer(cmd, false, String.format("Creation of disk-only VM Snapshot failed as we could not find the VM [%s].", vmName), null);
+            }
+
+            VMSnapshotTO target = cmd.getTarget();
+            Pair<String, Map<String, Pair<Long, String>>> snapshotXmlAndVolumeToNewPathMap = createSnapshotXmlAndNewVolumePathMap(volumeObjectTOS, disks, target, resource);
+
+            dm.snapshotCreateXML(snapshotXmlAndVolumeToNewPathMap.first(), getFlagsToUseForRunningVmSnapshotCreation(target));
+
+            return new CreateDiskOnlyVmSnapshotAnswer(cmd, true, null, snapshotXmlAndVolumeToNewPathMap.second());
+        } catch (LibvirtException e) {
+            String errorMsg = String.format("Creation of disk-only VM snapshot for VM [%s] failed due to %s.", vmName, e.getMessage());
+            logger.error(errorMsg, e);
+            if (e.getMessage().contains("QEMU guest agent is not connected")) {
+                errorMsg = "QEMU guest agent is not connected. If the VM has been recently started, it might connect soon. Otherwise the VM does not have the" +
+                        " guest agent installed; thus the QuiesceVM parameter is not supported.";
+                return new CreateDiskOnlyVmSnapshotAnswer(cmd, false, errorMsg, null);
+            }
+            return new CreateDiskOnlyVmSnapshotAnswer(cmd, false, e.getMessage(), null);
+        } finally {
+            if (dm != null) {
+                try {
+                    dm.free();
+                } catch (LibvirtException l) {
+                    logger.trace("Ignoring libvirt error.", l);
+                }
+            }
+        }
+    }
+
+    protected Answer takeDiskOnlyVmSnapshotOfStoppedVm(CreateDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) {
+        String vmName = cmd.getVmName();
+        logger.info("Taking disk-only VM snapshot of stopped VM [{}].", vmName);
+
+        Map<String, Pair<Long, String>> mapVolumeToSnapshotSizeAndNewVolumePath = new HashMap<>();
+
+        List<VolumeObjectTO> volumeObjectTos = cmd.getVolumeTOs();
+        KVMStoragePoolManager storagePoolMgr = resource.getStoragePoolMgr();
+        try {
+            for (VolumeObjectTO volumeObjectTO : volumeObjectTos) {
+                PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) volumeObjectTO.getDataStore();
+                KVMStoragePool kvmStoragePool = storagePoolMgr.getStoragePool(primaryDataStoreTO.getPoolType(), primaryDataStoreTO.getUuid());
+
+                String snapshotPath = UUID.randomUUID().toString();
+                String snapshotFullPath = kvmStoragePool.getLocalPathFor(snapshotPath);
+                QemuImgFile newDelta = new QemuImgFile(snapshotFullPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+                String currentDeltaFullPath = kvmStoragePool.getLocalPathFor(volumeObjectTO.getPath());
+                QemuImgFile currentDelta = new QemuImgFile(currentDeltaFullPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+                QemuImg qemuImg = new QemuImg(0);
+
+                logger.debug("Creating new delta for volume [{}] as part of the disk-only VM snapshot process for VM [{}].", volumeObjectTO.getUuid(), vmName);
+                qemuImg.create(newDelta, currentDelta);
+
+                mapVolumeToSnapshotSizeAndNewVolumePath.put(volumeObjectTO.getUuid(), new Pair<>(getFileSize(currentDeltaFullPath), snapshotPath));
+            }
+        } catch (LibvirtException | QemuImgException e) {
+            logger.error("Exception while creating disk-only VM snapshot for VM [{}]. Deleting leftover deltas.", vmName, e);
+            for (VolumeObjectTO volumeObjectTO : volumeObjectTos) {
+                Pair<Long, String> volSizeAndNewPath = mapVolumeToSnapshotSizeAndNewVolumePath.get(volumeObjectTO.getUuid());
+                PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) volumeObjectTO.getDataStore();
+                KVMStoragePool kvmStoragePool = storagePoolMgr.getStoragePool(primaryDataStoreTO.getPoolType(), primaryDataStoreTO.getUuid());
+
+                if (volSizeAndNewPath == null) {
+                    continue;
+                }
+                try {
+                    Files.deleteIfExists(Path.of(kvmStoragePool.getLocalPathFor(volSizeAndNewPath.second())));
+                } catch (IOException ex) {
+                    logger.warn("Tried to delete leftover snapshot at [{}] failed.", volSizeAndNewPath.second(), ex);
+                }
+            }
+            return new Answer(cmd, e);
+        }
+
+        return new CreateDiskOnlyVmSnapshotAnswer(cmd, true, null, mapVolumeToSnapshotSizeAndNewVolumePath);
+    }
+
+    protected int getFlagsToUseForRunningVmSnapshotCreation(VMSnapshotTO target) {
+        int flags = target.getQuiescevm() ? Domain.SnapshotCreateFlags.QUIESCE : 0;
+        flags += Domain.SnapshotCreateFlags.DISK_ONLY +
+                Domain.SnapshotCreateFlags.ATOMIC +
+                Domain.SnapshotCreateFlags.NO_METADATA;
+        return flags;
+    }
+
+    protected Pair<String, Map<String, Pair<Long, String>>> createSnapshotXmlAndNewVolumePathMap(List<VolumeObjectTO> volumeObjectTOS, List<LibvirtVMDef.DiskDef> disks, VMSnapshotTO target, LibvirtComputingResource resource) {
+        StringBuilder stringBuilder = new StringBuilder();
+        Map<String, Pair<Long, String>> volumeObjectToNewPathMap = new HashMap<>();
+
+        for (VolumeObjectTO volumeObjectTO : volumeObjectTOS) {
+            LibvirtVMDef.DiskDef diskdef = resource.getDiskWithPathOfVolumeObjectTO(disks, volumeObjectTO);
+            String newPath = UUID.randomUUID().toString();
+            stringBuilder.append(String.format(TAG_DISK_SNAPSHOT, diskdef.getDiskLabel(), resource.getSnapshotTemporaryPath(diskdef.getDiskPath(), newPath)));
+
+            long snapSize = getFileSize(diskdef.getDiskPath());
+
+            volumeObjectToNewPathMap.put(volumeObjectTO.getUuid(), new Pair<>(snapSize, newPath));
+        }
+
+        String snapshotXml = String.format(SNAPSHOT_XML, target.getSnapshotName(), stringBuilder);
+        return new Pair<>(snapshotXml, volumeObjectToNewPathMap);
+    }
+
+    protected long getFileSize(String path) {
+        return new File(path).length();
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper.java
new file mode 100644
index 00000000000..15df8627a8a
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.storage.DeleteDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+@ResourceWrapper(handles = DeleteDiskOnlyVmSnapshotCommand.class)
+public class LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper extends CommandWrapper<DeleteDiskOnlyVmSnapshotCommand, Answer, LibvirtComputingResource> {
+
+    @Override
+    public Answer execute(DeleteDiskOnlyVmSnapshotCommand command, LibvirtComputingResource resource) {
+        List<DataTO> snapshotsToDelete = command.getSnapshots();
+        KVMStoragePoolManager storagePoolMgr = resource.getStoragePoolMgr();
+
+        for (DataTO snapshot : snapshotsToDelete) {
+            PrimaryDataStoreTO dataStoreTO = (PrimaryDataStoreTO) snapshot.getDataStore();
+            KVMStoragePool kvmStoragePool = storagePoolMgr.getStoragePool(dataStoreTO.getPoolType(), dataStoreTO.getUuid());
+
+            try {
+                String path = kvmStoragePool.getLocalPathFor(snapshot.getPath());
+                logger.debug("Deleting snapshot [{}] file [{}] as part of VM snapshot deletion.", snapshot.getId(), path);
+                Files.deleteIfExists(Path.of(path));
+            } catch (IOException e) {
+                return new Answer(command, e);
+            }
+        }
+        return new Answer(command, true, null);
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMergeDiskOnlyVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMergeDiskOnlyVMSnapshotCommandWrapper.java
new file mode 100644
index 00000000000..ad0678080ed
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMergeDiskOnlyVMSnapshotCommandWrapper.java
@@ -0,0 +1,150 @@
+/*
+ * 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.
+ */
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+
+import com.cloud.agent.api.storage.MergeDiskOnlyVmSnapshotCommand;
+import com.cloud.agent.api.storage.SnapshotMergeTreeTO;
+import com.cloud.agent.api.to.DataObjectType;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.utils.qemu.QemuImg;
+import org.apache.cloudstack.utils.qemu.QemuImgException;
+import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@ResourceWrapper(handles = MergeDiskOnlyVmSnapshotCommand.class)
+public class LibvirtMergeDiskOnlyVMSnapshotCommandWrapper extends CommandWrapper<MergeDiskOnlyVmSnapshotCommand, Answer, LibvirtComputingResource> {
+
+    @Override
+    public Answer execute(MergeDiskOnlyVmSnapshotCommand command, LibvirtComputingResource serverResource) {
+        VirtualMachine.State vmState = command.getVmState();
+
+        try {
+            if (VirtualMachine.State.Running.equals(vmState)) {
+                return mergeDiskOnlySnapshotsForRunningVM(command, serverResource);
+            }
+            return mergeDiskOnlySnapshotsForStoppedVM(command, serverResource);
+        } catch (LibvirtException | QemuImgException | CloudRuntimeException ex) {
+            return new Answer(command, ex);
+        }
+    }
+
+    protected Answer mergeDiskOnlySnapshotsForStoppedVM(MergeDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) throws QemuImgException, LibvirtException {
+        QemuImg qemuImg = new QemuImg(resource.getCmdsTimeout());
+        KVMStoragePoolManager storageManager = resource.getStoragePoolMgr();
+
+        List<SnapshotMergeTreeTO> snapshotMergeTreeTOList = cmd.getSnapshotMergeTreeToList();
+
+        logger.debug("Merging disk-only snapshots for stopped VM [{}] using the following Snapshot Merge Trees [{}].", cmd.getVmName(), snapshotMergeTreeTOList);
+
+        for (SnapshotMergeTreeTO snapshotMergeTreeTO : snapshotMergeTreeTOList) {
+            DataTO parentTo = snapshotMergeTreeTO.getParent();
+            PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) parentTo.getDataStore();
+            KVMStoragePool storagePool = storageManager.getStoragePool(primaryDataStoreTO.getPoolType(), primaryDataStoreTO.getUuid());
+            String childLocalPath = storagePool.getLocalPathFor(snapshotMergeTreeTO.getChild().getPath());
+
+            QemuImgFile parent = new QemuImgFile(storagePool.getLocalPathFor(parentTo.getPath()), QemuImg.PhysicalDiskFormat.QCOW2);
+            QemuImgFile child = new QemuImgFile(childLocalPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+            logger.debug("Committing child delta [{}] into parent snapshot [{}].", parentTo, snapshotMergeTreeTO.getChild());
+            qemuImg.commit(child, parent, true);
+
+            List<QemuImgFile> grandChildren = snapshotMergeTreeTO.getGrandChildren().stream()
+                    .map(snapshotTo -> new QemuImgFile(storagePool.getLocalPathFor(snapshotTo.getPath()), QemuImg.PhysicalDiskFormat.QCOW2))
+                    .collect(Collectors.toList());
+
+            logger.debug("Rebasing grandChildren [{}] into parent at [{}].", grandChildren, parent.getFileName());
+            for (QemuImgFile grandChild : grandChildren) {
+                qemuImg.rebase(grandChild, parent, parent.getFormat().toString(), false);
+            }
+
+            logger.debug("Deleting child at [{}] as it is useless.", childLocalPath);
+            try {
+                Files.deleteIfExists(Path.of(childLocalPath));
+            } catch (IOException e) {
+                return new Answer(cmd, e);
+            }
+        }
+        return new Answer(cmd, true, null);
+    }
+
+    protected Answer mergeDiskOnlySnapshotsForRunningVM(MergeDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) throws LibvirtException, QemuImgException {
+        String vmName = cmd.getVmName();
+        List<SnapshotMergeTreeTO> snapshotMergeTreeTOList = cmd.getSnapshotMergeTreeToList();
+
+        LibvirtUtilitiesHelper libvirtUtilitiesHelper = resource.getLibvirtUtilitiesHelper();
+        Connect conn = libvirtUtilitiesHelper.getConnection();
+        Domain domain = resource.getDomain(conn, vmName);
+        List<LibvirtVMDef.DiskDef> disks = resource.getDisks(conn, vmName);
+        KVMStoragePoolManager storageManager = resource.getStoragePoolMgr();
+        QemuImg qemuImg = new QemuImg(resource.getCmdsTimeout());
+
+        logger.debug("Merging disk-only snapshots for running VM [{}] using the following Snapshot Merge Trees [{}].", vmName, snapshotMergeTreeTOList);
+
+        for (SnapshotMergeTreeTO mergeTreeTO : snapshotMergeTreeTOList) {
+            DataTO childTO = mergeTreeTO.getChild();
+            SnapshotObjectTO parentSnapshotTO = (SnapshotObjectTO) mergeTreeTO.getParent();
+            VolumeObjectTO volumeObjectTO = parentSnapshotTO.getVolume();
+            KVMStoragePool storagePool = libvirtUtilitiesHelper.getPrimaryPoolFromDataTo(volumeObjectTO, storageManager);
+
+            boolean active = DataObjectType.VOLUME.equals(childTO.getObjectType());
+            String label = resource.getDiskWithPathOfVolumeObjectTO(disks, volumeObjectTO).getDiskLabel();
+            String parentSnapshotLocalPath = storagePool.getLocalPathFor(parentSnapshotTO.getPath());
+            String childDeltaPath = storagePool.getLocalPathFor(childTO.getPath());
+
+            logger.debug("Found label [{}] for [{}]. Will merge delta at [{}] into delta at [{}].", label, volumeObjectTO, parentSnapshotLocalPath, childDeltaPath);
+
+            resource.mergeSnapshotIntoBaseFile(domain, label, parentSnapshotLocalPath, childDeltaPath, active, childTO.getPath(),
+                    volumeObjectTO, conn);
+
+            QemuImgFile parent = new QemuImgFile(parentSnapshotLocalPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+            List<QemuImgFile> grandChildren = mergeTreeTO.getGrandChildren().stream()
+                    .map(snapshotTo -> new QemuImgFile(storagePool.getLocalPathFor(snapshotTo.getPath()), QemuImg.PhysicalDiskFormat.QCOW2))
+                    .collect(Collectors.toList());
+
+            logger.debug("Rebasing grandChildren [{}] into parent at [{}].", grandChildren, parentSnapshotLocalPath);
+            for (QemuImgFile grandChild : grandChildren) {
+                qemuImg.rebase(grandChild, parent, parent.getFormat().toString(), false);
+            }
+        }
+
+        return new Answer(cmd, true, null);
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertDiskOnlyVMSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertDiskOnlyVMSnapshotCommandWrapper.java
new file mode 100644
index 00000000000..1aa79d48eec
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertDiskOnlyVMSnapshotCommandWrapper.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.storage.RevertDiskOnlyVmSnapshotAnswer;
+import com.cloud.agent.api.storage.RevertDiskOnlyVmSnapshotCommand;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.utils.qemu.QemuImg;
+import org.apache.cloudstack.utils.qemu.QemuImgException;
+import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.libvirt.LibvirtException;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@ResourceWrapper(handles = RevertDiskOnlyVmSnapshotCommand.class)
+public class LibvirtRevertDiskOnlyVMSnapshotCommandWrapper extends CommandWrapper<RevertDiskOnlyVmSnapshotCommand, Answer, LibvirtComputingResource> {
+
+    @Override
+    public Answer execute(RevertDiskOnlyVmSnapshotCommand cmd, LibvirtComputingResource resource) {
+        List<SnapshotObjectTO> snapshotObjectTos = cmd.getSnapshotObjectTos();
+
+        String vmName = cmd.getVmName();
+        logger.info("Reverting disk-only VM snapshot of VM [{}]", vmName);
+
+        KVMStoragePoolManager storagePoolMgr = resource.getStoragePoolMgr();
+        LibvirtUtilitiesHelper libvirtUtilitiesHelper = resource.getLibvirtUtilitiesHelper();
+
+        HashMap<SnapshotObjectTO, String> snapshotToNewDeltaPath = new HashMap<>();
+        try {
+            for (SnapshotObjectTO snapshotObjectTo : snapshotObjectTos) {
+                KVMStoragePool kvmStoragePool = libvirtUtilitiesHelper.getPrimaryPoolFromDataTo(snapshotObjectTo, storagePoolMgr);
+
+                String deltaPath = libvirtUtilitiesHelper.generateUUIDName();
+                String deltaFullPath = kvmStoragePool.getLocalPathFor(deltaPath);
+                QemuImgFile newDelta = new QemuImgFile(deltaFullPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+                String snapshotFullPath = kvmStoragePool.getLocalPathFor(snapshotObjectTo.getPath());
+                QemuImgFile currentDelta = new QemuImgFile(snapshotFullPath, QemuImg.PhysicalDiskFormat.QCOW2);
+
+                QemuImg qemuImg = new QemuImg(0);
+
+                logger.debug("Creating new delta for volume [{}] as part of the disk-only VM snapshot revert process for VM [{}].", snapshotObjectTo.getVolume().getUuid(), vmName);
+                qemuImg.create(newDelta, currentDelta);
+                snapshotToNewDeltaPath.put(snapshotObjectTo, deltaPath);
+            }
+        } catch (LibvirtException | QemuImgException e) {
+            logger.error("Exception while reverting disk-only VM snapshot for VM [{}]. Deleting leftover deltas.", vmName, e);
+            for (SnapshotObjectTO snapshotObjectTo : snapshotObjectTos) {
+                String newPath = snapshotToNewDeltaPath.get(snapshotObjectTo);
+
+                if (newPath == null) {
+                    continue;
+                }
+
+                KVMStoragePool kvmStoragePool = libvirtUtilitiesHelper.getPrimaryPoolFromDataTo(snapshotObjectTo, storagePoolMgr);
+                try {
+                    Files.deleteIfExists(Path.of(kvmStoragePool.getLocalPathFor(newPath)));
+                } catch (IOException ex) {
+                    logger.warn("Tried to delete leftover snapshot at [{}] failed.", newPath, ex);
+                }
+            }
+            return new Answer(cmd, e);
+        }
+
+        List<VolumeObjectTO> volumeObjectTos = new ArrayList<>();
+        for (SnapshotObjectTO snapshotObjectTo : snapshotObjectTos) {
+            VolumeObjectTO volumeObjectTo = snapshotObjectTo.getVolume();
+
+            KVMStoragePool kvmStoragePool = libvirtUtilitiesHelper.getPrimaryPoolFromDataTo(snapshotObjectTo, storagePoolMgr);
+
+            try {
+                Files.deleteIfExists(Path.of(kvmStoragePool.getLocalPathFor(volumeObjectTo.getPath())));
+            } catch (IOException ex) {
+                logger.warn("Got an error while trying to delete old volume delta [{}], there might be trash on storage [{}].", volumeObjectTo.getPath(),
+                        kvmStoragePool.getUuid());
+            }
+            volumeObjectTo.setPath(snapshotToNewDeltaPath.get(snapshotObjectTo));
+            volumeObjectTos.add(volumeObjectTo);
+        }
+
+        return new RevertDiskOnlyVmSnapshotAnswer(cmd, volumeObjectTos);
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java
index a2d161ac94b..70e7f074c87 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUtilitiesHelper.java
@@ -22,6 +22,10 @@ import java.util.UUID;
 
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.libvirt.Connect;
@@ -145,4 +149,10 @@ public class LibvirtUtilitiesHelper {
                 result.second() ? "" : " does not"));
         return result.second();
     }
+
+    public KVMStoragePool getPrimaryPoolFromDataTo(DataTO dataTO, KVMStoragePoolManager storageManager) {
+        PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) dataTO.getDataStore();
+        return storageManager.getStoragePool(primaryDataStoreTO.getPoolType(), primaryDataStoreTO.getUuid());
+    }
+
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index decbe9c013a..0de4e11817e 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -136,7 +136,6 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.DeviceType;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.DiscardType;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.DiskProtocol;
-import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtUtilitiesHelper;
 import com.cloud.storage.JavaStorageLayer;
 import com.cloud.storage.MigrationOptions;
 import com.cloud.storage.ScopeType;
@@ -1788,15 +1787,6 @@ public class KVMStorageProcessor implements StorageProcessor {
      */
     private static final String TAG_AVOID_DISK_FROM_SNAPSHOT = "<disk name='%s' snapshot='no' />";
 
-    /**
-     * Virsh command to merge (blockcommit) snapshot into the base file.<br><br>
-     * 1st parameter: VM's name;<br>
-     * 2nd parameter: disk's label (target.dev tag from VM's XML);<br>
-     * 3rd parameter: the absolute path of the base file;
-     * 4th parameter: the flag '--delete', if Libvirt supports it. Libvirt started to support it on version <b>6.0.0</b>;
-     */
-    private static final String COMMAND_MERGE_SNAPSHOT = "virsh blockcommit %s %s --base %s --active --wait %s --pivot";
-
     /**
      * Flag to take disk-only snapshots from VM.<br><br>
      * Libvirt lib for java does not have the enum virDomainSnapshotCreateFlags.
@@ -2238,7 +2228,7 @@ public class KVMStorageProcessor implements StorageProcessor {
 
             String convertResult = convertBaseFileToSnapshotFileInStorageDir(ObjectUtils.defaultIfNull(secondaryPool, primaryPool), disk, snapshotPath, directoryPath, volume, cmd.getWait());
 
-            mergeSnapshotIntoBaseFile(vm, diskLabel, diskPath, snapshotName, volume, conn);
+            resource.mergeSnapshotIntoBaseFile(vm, diskLabel, diskPath, null, true, snapshotName, volume, conn);
 
             validateConvertResult(convertResult, snapshotPath);
         } catch (LibvirtException e) {
@@ -2430,59 +2420,6 @@ public class KVMStorageProcessor implements StorageProcessor {
         throw new CloudRuntimeException(convertResult);
     }
 
-    /**
-     * Merges the snapshot into base file to keep volume and VM behavior after stopping - starting.
-     * @param vm Domain of the VM;
-     * @param diskLabel Disk label to manage snapshot and base file;
-     * @param baseFilePath Path of the base file;
-     * @param snapshotName Name of the snapshot;
-     * @throws LibvirtException
-     */
-    protected void mergeSnapshotIntoBaseFile(Domain vm, String diskLabel, String baseFilePath, String snapshotName, VolumeObjectTO volume,
-            Connect conn) throws LibvirtException {
-        boolean isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit = LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(conn);
-        String vmName = vm.getName();
-        String mergeCommand = String.format(COMMAND_MERGE_SNAPSHOT, vmName, diskLabel, baseFilePath, isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit ? "--delete" : "");
-        String mergeResult = Script.runSimpleBashScript(mergeCommand);
-
-        if (mergeResult == null) {
-            logger.debug(String.format("Successfully merged snapshot [%s] into VM [%s] %s base file.", snapshotName, vmName, volume));
-            manuallyDeleteUnusedSnapshotFile(isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit, getSnapshotTemporaryPath(baseFilePath, snapshotName));
-            return;
-        }
-
-        String errorMsg = String.format("Failed to merge snapshot [%s] into VM [%s] %s base file. Command [%s] resulted in [%s]. If the VM is stopped and then started, it"
-          + " will start to write in the base file again. All changes made between the snapshot and the VM stop will be in the snapshot. If the VM is stopped, the snapshot must be"
-          + " merged into the base file manually.", snapshotName, vmName, volume, mergeCommand, mergeResult);
-
-        logger.warn(String.format("%s VM XML: [%s].", errorMsg, vm.getXMLDesc(0)));
-        throw new CloudRuntimeException(errorMsg);
-    }
-
-    /**
-     * Manually deletes the unused snapshot file.<br/>
-     * This method is necessary due to Libvirt created the tag '--delete' on command 'virsh blockcommit' on version <b>1.2.9</b>, however it was only implemented on version
-     *  <b>6.0.0</b>.
-     * @param snapshotPath The unused snapshot file to manually delete.
-     */
-    protected void manuallyDeleteUnusedSnapshotFile(boolean isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit, String snapshotPath) {
-        if (isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit) {
-            logger.debug(String.format("The current Libvirt's version supports the flag '--delete' on command 'virsh blockcommit', we will skip the manually deletion of the"
-                    + " unused snapshot file [%s] as it already was automatically deleted.", snapshotPath));
-            return;
-        }
-
-        logger.debug(String.format("The current Libvirt's version does not supports the flag '--delete' on command 'virsh blockcommit', therefore we will manually delete the"
-                + " unused snapshot file [%s].", snapshotPath));
-
-        try {
-            Files.deleteIfExists(Paths.get(snapshotPath));
-            logger.debug(String.format("Manually deleted unused snapshot file [%s].", snapshotPath));
-        } catch (IOException ex) {
-            throw new CloudRuntimeException(String.format("Unable to manually delete unused snapshot file [%s] due to [%s].", snapshotPath, ex.getMessage()));
-        }
-    }
-
     /**
      * Creates the snapshot directory in the primary storage, if it does not exist; then, converts the base file (VM's old writing file) to the snapshot directory.
      * @param pool         Storage to create folder, if not exists;
@@ -2569,7 +2506,7 @@ public class KVMStorageProcessor implements StorageProcessor {
         String diskLabelToSnapshot = diskToSnapshotAndDisksToAvoid.first();
         String disksToAvoidsOnSnapshot = diskToSnapshotAndDisksToAvoid.second().stream().map(diskLabel -> String.format(TAG_AVOID_DISK_FROM_SNAPSHOT, diskLabel))
           .collect(Collectors.joining());
-        String snapshotTemporaryPath = getSnapshotTemporaryPath(diskPath, snapshotName);
+        String snapshotTemporaryPath = resource.getSnapshotTemporaryPath(diskPath, snapshotName);
 
         String createSnapshotXmlFormated = String.format(XML_CREATE_DISK_SNAPSHOT, snapshotName, diskLabelToSnapshot, snapshotTemporaryPath, disksToAvoidsOnSnapshot);
 
@@ -2620,18 +2557,6 @@ public class KVMStorageProcessor implements StorageProcessor {
         return new Pair<>(diskLabelToSnapshot, disksToAvoid);
     }
 
-    /**
-     * Retrieves the temporary path of the snapshot.
-     * @param diskPath Path of the disk to snapshot;
-     * @param snapshotName Snapshot name;
-     * @return the path of the disk replacing the disk with the snapshot.
-     */
-    protected String getSnapshotTemporaryPath(String diskPath, String snapshotName) {
-        String[] diskPathSplitted = diskPath.split(File.separator);
-        diskPathSplitted[diskPathSplitted.length - 1] = snapshotName;
-        return String.join(File.separator, diskPathSplitted);
-    }
-
     /**
      * Validate if the primary storage has enough capacity to take a disk snapshot, as the snapshot will duplicate the disk to backup.
      * @param primaryPool Primary storage to verify capacity;
diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
index 608ad3c69cb..beba0856241 100644
--- a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
+++ b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
@@ -829,6 +829,46 @@ public class QemuImg {
         this.resize(file, size, false);
     }
 
+    /**
+     * Commits an image.
+     *
+     * This method is a facade for 'qemu-img commit'.
+     *
+     * @param file
+     *            The file to be commited.
+     * @param base
+     *            If base is not specified, the immediate backing file of the top image (which is {@code file}) will be used.
+     * @param skipEmptyingFiles
+     *            If true, the commited file(s) will not be emptied. If base is informed, skipEmptyingFiles is implied.
+     */
+    public void commit(QemuImgFile file, QemuImgFile base, boolean skipEmptyingFiles) throws QemuImgException {
+        if (file == null) {
+            throw new QemuImgException("File should not be null");
+        }
+
+        final Script s = new Script(_qemuImgPath, timeout);
+        s.add("commit");
+        if (skipEmptyingFiles) {
+            s.add("-d");
+        }
+
+        if (file.getFormat() != null) {
+            s.add("-f");
+            s.add(file.getFormat().format);
+        }
+
+        if (base != null) {
+            s.add("-b");
+            s.add(base.getFileName());
+        }
+
+        s.add(file.getFileName());
+        final String result = s.execute();
+        if (result != null) {
+            throw new QemuImgException(result);
+        }
+    }
+
     /**
      * Does qemu-img support --target-is-zero
      * @return boolean
diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java
index b461d967c89..1d00fd18e68 100644
--- a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java
+++ b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgFile.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.utils.qemu;
 
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 public class QemuImgFile {
 
@@ -68,4 +69,9 @@ public class QemuImgFile {
         return this.format;
     }
 
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this);
+    }
+
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 35c5a3bea93..ea380f1a8a7 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -41,6 +41,8 @@ import java.io.IOException;
 import java.net.NetworkInterface;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -49,6 +51,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
 import java.util.Vector;
+import java.util.concurrent.Semaphore;
 
 import javax.naming.ConfigurationException;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -64,6 +67,7 @@ import org.apache.cloudstack.api.ApiConstants.IoDriverPolicy;
 import org.apache.cloudstack.storage.command.AttachAnswer;
 import org.apache.cloudstack.storage.command.AttachCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
 import org.apache.cloudstack.utils.linux.CPUStat;
@@ -73,6 +77,7 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 import org.joda.time.Duration;
 import org.junit.Assert;
 import org.junit.Before;
@@ -261,6 +266,12 @@ public class LibvirtComputingResourceTest {
     @Mock
     DomainBlockStats domainBlockStatsMock;
 
+    @Mock
+    SnapshotObjectTO snapshotObjectToMock;
+
+    @Mock
+    BlockCommitListener blockCommitListenerMock;
+
     private final static long HYPERVISOR_LIBVIRT_VERSION_SUPPORTS_IOURING = 6003000;
     private final static long HYPERVISOR_QEMU_VERSION_SUPPORTS_IOURING = 5000000;
 
@@ -6620,4 +6631,152 @@ public class LibvirtComputingResourceTest {
         Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).recreateCheckpointsOfDisk(Mockito.any(), Mockito.any(), Mockito.any());
         Assert.assertTrue(result);
     }
+
+    @Test
+    public void getSnapshotTemporaryPathTestReturnExpectedResult(){
+        String path = "/path/to/disk";
+        String snapshotName = "snapshot";
+        String expectedResult = "/path/to/snapshot";
+
+        String result = libvirtComputingResourceSpy.getSnapshotTemporaryPath(path, snapshotName);
+        Assert.assertEquals(expectedResult, result);
+    }
+
+    @Test
+    public void mergeSnapshotIntoBaseFileTestActiveAndDeleteFlags() throws Exception {
+        libvirtComputingResourceSpy.qcow2DeltaMergeTimeout = 10;
+
+        try (MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(LibvirtUtilitiesHelper.class);
+                MockedStatic<ThreadContext> threadContextMockedStatic = Mockito.mockStatic(ThreadContext.class)) {
+            libvirtUtilitiesHelperMockedStatic.when(() ->
+                    LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any())).thenAnswer(invocation -> true);
+            Mockito.doReturn(new Semaphore(1)).when(libvirtComputingResourceSpy).getSemaphoreToWaitForMerge();
+
+            threadContextMockedStatic.when(() ->
+                    ThreadContext.get(Mockito.anyString())).thenReturn("logid");
+            Mockito.doNothing().when(domainMock).addBlockJobListener(Mockito.any());
+            Mockito.doReturn(null).when(domainMock).getBlockJobInfo(Mockito.anyString(), Mockito.anyInt());
+            Mockito.doNothing().when(domainMock).removeBlockJobListener(Mockito.any());
+
+            String diskLabel = "vda";
+            String baseFilePath = "/file";
+            String snapshotName = "snap";
+
+            libvirtComputingResourceSpy.mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(domainMock, diskLabel, baseFilePath, null, true, snapshotName, volumeObjectToMock, connMock);
+
+            Mockito.verify(domainMock, Mockito.times(1)).blockCommit(diskLabel, baseFilePath, null, 0, Domain.BlockCommitFlags.ACTIVE | Domain.BlockCommitFlags.DELETE);
+            Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).manuallyDeleteUnusedSnapshotFile(true, "/" + snapshotName);
+        }
+    }
+
+    @Test
+    public void mergeSnapshotIntoBaseFileTestActiveFlag() throws Exception {
+        try (MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(LibvirtUtilitiesHelper.class);
+                MockedStatic<ThreadContext> threadContextMockedStatic = Mockito.mockStatic(ThreadContext.class)) {
+            libvirtUtilitiesHelperMockedStatic.when(() ->
+                    LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any())).thenAnswer(invocation -> false);
+            Mockito.doReturn(new Semaphore(1)).when(libvirtComputingResourceSpy).getSemaphoreToWaitForMerge();
+
+            threadContextMockedStatic.when(() ->
+                    ThreadContext.get(Mockito.anyString())).thenReturn("logid");
+            Mockito.doNothing().when(domainMock).addBlockJobListener(Mockito.any());
+            Mockito.doNothing().when(domainMock).removeBlockJobListener(Mockito.any());
+            Mockito.doNothing().when(libvirtComputingResourceSpy).manuallyDeleteUnusedSnapshotFile(Mockito.anyBoolean(), Mockito.anyString());
+
+            String diskLabel = "vda";
+            String baseFilePath = "/file";
+            String snapshotName = "snap";
+
+            libvirtComputingResourceSpy.mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(domainMock, diskLabel, baseFilePath, null, true, snapshotName, volumeObjectToMock, connMock);
+
+            Mockito.verify(domainMock, Mockito.times(1)).blockCommit(diskLabel, baseFilePath, null, 0, Domain.BlockCommitFlags.ACTIVE);
+            Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).manuallyDeleteUnusedSnapshotFile(false, "/" + snapshotName);
+        }
+    }
+
+    @Test
+    public void mergeSnapshotIntoBaseFileTestDeleteFlag() throws Exception {
+        try (MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(LibvirtUtilitiesHelper.class);
+                MockedStatic<ThreadContext> threadContextMockedStatic = Mockito.mockStatic(ThreadContext.class)) {
+            libvirtComputingResourceSpy.qcow2DeltaMergeTimeout = 10;
+            libvirtUtilitiesHelperMockedStatic.when(() -> LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any())).thenReturn(true);
+            Mockito.doReturn(new Semaphore(1)).when(libvirtComputingResourceSpy).getSemaphoreToWaitForMerge();
+            threadContextMockedStatic.when(() -> ThreadContext.get(Mockito.anyString())).thenReturn("logid");
+            Mockito.doNothing().when(domainMock).addBlockJobListener(Mockito.any());
+            Mockito.doReturn(null).when(domainMock).getBlockJobInfo(Mockito.anyString(), Mockito.anyInt());
+            Mockito.doNothing().when(domainMock).removeBlockJobListener(Mockito.any());
+            Mockito.doNothing().when(libvirtComputingResourceSpy).manuallyDeleteUnusedSnapshotFile(Mockito.anyBoolean(), Mockito.anyString());
+
+            String diskLabel = "vda";
+            String baseFilePath = "/file";
+            String snapshotName = "snap";
+
+            libvirtComputingResourceSpy.mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(domainMock, diskLabel, baseFilePath, null, false, snapshotName, volumeObjectToMock, connMock);
+
+            Mockito.verify(domainMock, Mockito.times(1)).blockCommit(diskLabel, baseFilePath, null, 0, Domain.BlockCommitFlags.DELETE);
+            Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).manuallyDeleteUnusedSnapshotFile(true, "/" + snapshotName);
+        }
+    }
+
+    @Test
+    public void mergeSnapshotIntoBaseFileTestNoFlags() throws Exception {
+        try (MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(LibvirtUtilitiesHelper.class);
+                MockedStatic<ThreadContext> threadContextMockedStatic = Mockito.mockStatic(ThreadContext.class)) {
+            libvirtComputingResourceSpy.qcow2DeltaMergeTimeout = 10;
+            libvirtUtilitiesHelperMockedStatic.when(() -> LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any())).thenReturn(false);
+            Mockito.doReturn(new Semaphore(1)).when(libvirtComputingResourceSpy).getSemaphoreToWaitForMerge();
+            threadContextMockedStatic.when(() -> ThreadContext.get(Mockito.anyString())).thenReturn("logid");
+            Mockito.doNothing().when(domainMock).addBlockJobListener(Mockito.any());
+            Mockito.doReturn(null).when(domainMock).getBlockJobInfo(Mockito.anyString(), Mockito.anyInt());
+            Mockito.doNothing().when(domainMock).removeBlockJobListener(Mockito.any());
+            Mockito.doNothing().when(libvirtComputingResourceSpy).manuallyDeleteUnusedSnapshotFile(Mockito.anyBoolean(), Mockito.anyString());
+
+            String diskLabel = "vda";
+            String baseFilePath = "/file";
+            String snapshotName = "snap";
+
+            libvirtComputingResourceSpy.mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(domainMock, diskLabel, baseFilePath, null, false, snapshotName, volumeObjectToMock, connMock);
+
+            Mockito.verify(domainMock, Mockito.times(1)).blockCommit(diskLabel, baseFilePath, null, 0, 0);
+            Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).manuallyDeleteUnusedSnapshotFile(false, "/" + snapshotName);
+        }
+    }
+
+    @Test (expected = CloudRuntimeException.class)
+    public void mergeSnapshotIntoBaseFileTestMergeFailsThrowException() throws Exception {
+        try (MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(LibvirtUtilitiesHelper.class);
+                MockedStatic<ThreadContext> threadContextMockedStatic = Mockito.mockStatic(ThreadContext.class)) {
+            libvirtComputingResourceSpy.qcow2DeltaMergeTimeout = 10;
+            libvirtUtilitiesHelperMockedStatic.when(() -> LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any())).thenReturn(false);
+            Mockito.doReturn(new Semaphore(1)).when(libvirtComputingResourceSpy).getSemaphoreToWaitForMerge();
+            threadContextMockedStatic.when(() -> ThreadContext.get(Mockito.anyString())).thenReturn("logid");
+            Mockito.doNothing().when(domainMock).addBlockJobListener(Mockito.any());
+            Mockito.doReturn(null).when(domainMock).getBlockJobInfo(Mockito.anyString(), Mockito.anyInt());
+            Mockito.doNothing().when(domainMock).removeBlockJobListener(Mockito.any());
+
+            Mockito.doReturn(blockCommitListenerMock).when(libvirtComputingResourceSpy).getBlockCommitListener(Mockito.any(), Mockito.any());
+            Mockito.doReturn("Failed").when(blockCommitListenerMock).getResult();
+
+            String diskLabel = "vda";
+            String baseFilePath = "/file";
+            String snapshotName = "snap";
+
+            libvirtComputingResourceSpy.mergeSnapshotIntoBaseFileWithEventsAndConfigurableTimeout(domainMock, diskLabel, baseFilePath, null, false, snapshotName, volumeObjectToMock, connMock);
+        }
+    }
+
+    @Test (expected = CloudRuntimeException.class)
+    public void manuallyDeleteUnusedSnapshotFileTestLibvirtDoesNotSupportsFlagDeleteExceptionOnFileDeletionThrowsException() throws IOException {
+        try (MockedStatic<Files> filesMockedStatic = Mockito.mockStatic(Files.class)) {
+            filesMockedStatic.when(() -> Files.deleteIfExists(Mockito.any(Path.class))).thenThrow(IOException.class);
+
+            libvirtComputingResourceSpy.manuallyDeleteUnusedSnapshotFile(false, "");
+        }
+    }
+
+    @Test
+    public void manuallyDeleteUnusedSnapshotFileTestLibvirtSupportingFlagDeleteOnCommandVirshBlockcommitIsTrueReturn() {
+        libvirtComputingResourceSpy.manuallyDeleteUnusedSnapshotFile(true, "");
+        Mockito.verify(libvirtComputingResourceSpy, Mockito.never()).deleteIfExists("");
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
index f6f9b322435..cc1e38a908b 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
@@ -22,7 +22,6 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
 import com.cloud.hypervisor.kvm.resource.LibvirtDomainXMLParser;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
-import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtUtilitiesHelper;
 import com.cloud.storage.template.TemplateConstants;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -67,8 +66,8 @@ public class KVMStorageProcessorTest {
 
     @Mock
     KVMStoragePoolManager storagePoolManager;
-    @Mock
-    LibvirtComputingResource resource;
+
+    LibvirtComputingResource resource = Mockito.mock(LibvirtComputingResource.class);
 
     @InjectMocks
     private KVMStorageProcessor storageProcessor;
@@ -161,16 +160,6 @@ public class KVMStorageProcessorTest {
         }
     }
 
-    @Test
-    public void validateGetSnapshotTemporaryPath(){
-        String path = "/path/to/disk";
-        String snapshotName = "snapshot";
-        String expectedResult = "/path/to/snapshot";
-
-        String result = storageProcessor.getSnapshotTemporaryPath(path, snapshotName);
-        Assert.assertEquals(expectedResult, result);
-    }
-
     @Test
     public void validateGetSnapshotPathInPrimaryStorage(){
         String path = "/path/to/disk";
@@ -245,6 +234,7 @@ public class KVMStorageProcessorTest {
     public void validateTakeVolumeSnapshotFailToCreateSnapshotThrowLibvirtException() throws LibvirtException{
         Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(), Mockito.anyString(), Mockito.any());
         Mockito.doReturn(new HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second();
+        Mockito.doReturn("").when(resource).getSnapshotTemporaryPath(Mockito.anyString(), Mockito.anyString());
         Mockito.doThrow(LibvirtException.class).when(domainMock).snapshotCreateXML(Mockito.anyString(), Mockito.anyInt());
 
         storageProcessorSpy.takeVolumeSnapshot(new ArrayList<>(), "", "", domainMock);
@@ -257,6 +247,7 @@ public class KVMStorageProcessorTest {
         Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(), Mockito.anyString(), Mockito.any());
         Mockito.doReturn(expectedResult).when(diskToSnapshotAndDisksToAvoidMock).first();
         Mockito.doReturn(new HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second();
+        Mockito.doReturn("").when(resource).getSnapshotTemporaryPath(Mockito.anyString(), Mockito.anyString());
         Mockito.doReturn(null).when(domainMock).snapshotCreateXML(Mockito.anyString(), Mockito.anyInt());
 
         String result = storageProcessorSpy.takeVolumeSnapshot(new ArrayList<>(), "", "", domainMock);
@@ -313,46 +304,6 @@ public class KVMStorageProcessorTest {
         }
     }
 
-    @Test (expected = CloudRuntimeException.class)
-    public void validateMergeSnapshotIntoBaseFileErrorOnMergeThrowCloudRuntimeException() throws Exception {
-        try (MockedStatic<Script> ignored = Mockito.mockStatic(
-                Script.class); MockedStatic<LibvirtUtilitiesHelper> ignored2 = Mockito.mockStatic(
-                LibvirtUtilitiesHelper.class)) {
-            Mockito.when(Script.runSimpleBashScript(Mockito.anyString())).thenReturn("");
-            Mockito.when(LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any()))
-                   .thenReturn(true);
-
-            storageProcessorSpy.mergeSnapshotIntoBaseFile(domainMock, "", "", "", volumeObjectToMock, connectMock);
-        }
-    }
-
-    @Test
-    public void validateMergeSnapshotIntoBaseFileMergeSuccessDoNothing() throws Exception {
-        try (MockedStatic<Script> scriptMockedStatic = Mockito.mockStatic(
-                Script.class); MockedStatic<LibvirtUtilitiesHelper> libvirtUtilitiesHelperMockedStatic = Mockito.mockStatic(
-                LibvirtUtilitiesHelper.class)) {
-            Mockito.when(Script.runSimpleBashScript(Mockito.anyString())).thenReturn(null);
-            Mockito.when(LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any()))
-                        .thenReturn(true);
-            Mockito.doNothing().when(storageProcessorSpy).manuallyDeleteUnusedSnapshotFile(Mockito.anyBoolean(),
-                    Mockito.any());
-
-            storageProcessorSpy.mergeSnapshotIntoBaseFile(domainMock, "", "", "", volumeObjectToMock, connectMock);
-            libvirtUtilitiesHelperMockedStatic.verify(() -> LibvirtUtilitiesHelper.isLibvirtSupportingFlagDeleteOnCommandVirshBlockcommit(Mockito.any()), Mockito.times(1));
-            scriptMockedStatic.verify(() -> Script.runSimpleBashScript(Mockito.anyString()), Mockito.times(1));
-
-        }
-    }
-
-    @Test (expected = CloudRuntimeException.class)
-    public void validateManuallyDeleteUnusedSnapshotFileLibvirtDoesNotSupportsFlagDeleteExceptionOnFileDeletionThrowsException() throws IOException {
-        try (MockedStatic<Files> ignored = Mockito.mockStatic(Files.class)) {
-            Mockito.when(Files.deleteIfExists(Mockito.any(Path.class))).thenThrow(IOException.class);
-
-            storageProcessorSpy.manuallyDeleteUnusedSnapshotFile(false, "");
-        }
-    }
-
     @Test
     public void validateIsAvailablePoolSizeDividedByDiskSizeLesserThanMinRate(){
         Assert.assertTrue(storageProcessorSpy.isAvailablePoolSizeDividedByDiskSizeLesserThanMinRate(10499l, 10000l));
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 61a93564255..f88287a2d33 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -35,11 +35,16 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import com.cloud.projects.Project;
+import com.cloud.projects.ProjectManager;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
+import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.InternalIdentity;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
 import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
 import org.apache.cloudstack.api.command.user.volume.ChangeOfferingForVolumeCmd;
 import org.apache.cloudstack.api.command.user.volume.CheckAndRepairVolumeCmd;
@@ -159,8 +164,6 @@ import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
 import com.cloud.offering.DiskOffering;
 import com.cloud.org.Cluster;
 import com.cloud.org.Grouping;
-import com.cloud.projects.Project;
-import com.cloud.projects.ProjectManager;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceState;
 import com.cloud.serializer.GsonHelper;
@@ -362,6 +365,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
     @Inject
     EndPointSelector _epSelector;
 
+    @Inject
+    private VMSnapshotDetailsDao vmSnapshotDetailsDao;
+
+    public static final String KVM_FILE_BASED_STORAGE_SNAPSHOT = "kvmFileBasedStorageSnapshot";
+
     protected Gson _gson;
 
     private static final List<HypervisorType> SupportedHypervisorsForVolResize = Arrays.asList(HypervisorType.KVM, HypervisorType.XenServer,
@@ -1402,6 +1410,29 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
                 shrinkOk);
     }
 
+    protected void validateNoVmSnapshots(VolumeVO volume) {
+        if (volume.getInstanceId() != null) {
+            if (vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(volume.getInstanceId())) {
+                throw new InvalidParameterValueException("The volume is attached to a VM with memory&disk VM snapshots; therefore, it cannot be resized.");
+            }
+        }
+    }
+
+    protected boolean vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(long instanceId) {
+        for (VMSnapshotVO vmSnapshotVO : _vmSnapshotDao.findByVm(instanceId)) {
+            if (VMSnapshot.Type.DiskAndMemory.equals(vmSnapshotVO.getType())) {
+                return true;
+            }
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
+            if (vmSnapshotDetails.stream().
+                    noneMatch(vmSnapshotDetailsVO -> KVM_FILE_BASED_STORAGE_SNAPSHOT.equals(vmSnapshotDetailsVO.getName()))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * A volume should not be resized if it covers ALL the following scenarios: <br>
      * 1 - Root volume <br>
@@ -2378,12 +2409,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
         // if the caller is looking to change the size of the volume
         if (newSize != null && currentSize != newSize) {
-            if (volume.getInstanceId() != null) {
-                // Check that VM to which this volume is attached does not have VM snapshots
-                if (_vmSnapshotDao.findByVm(volume.getInstanceId()).size() > 0) {
-                    throw new InvalidParameterValueException("A volume that is attached to a VM with any VM snapshots cannot be resized.");
-                }
-            }
+            validateNoVmSnapshots(volume);
 
             if (!validateVolumeSizeInBytes(newSize)) {
                 throw new InvalidParameterValueException("Requested size out of range");
@@ -4009,7 +4035,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
     }
 
     @Override
-    public Snapshot allocSnapshotForVm(Long vmId, Long volumeId, String snapshotName) throws ResourceAllocationException {
+    public Snapshot allocSnapshotForVm(Long vmId, Long volumeId, String snapshotName, Long vmSnapshotId) throws ResourceAllocationException {
         Account caller = CallContext.current().getCallingAccount();
         VMInstanceVO vm = _vmInstanceDao.findById(vmId);
         if (vm == null) {
@@ -4061,6 +4087,10 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             throw new InvalidParameterValueException("Cannot perform this operation, unsupported on storage pool type " + storagePool.getPoolType());
         }
 
+        if (vmSnapshotDetailsDao.listDetails(vmSnapshotId).stream().anyMatch(vmSnapshotDetailsVO -> KVM_FILE_BASED_STORAGE_SNAPSHOT.equals(vmSnapshotDetailsVO.getName()))) {
+            throw new InvalidParameterValueException("Cannot perform this operation, unsupported VM snapshot type.");
+        }
+
         return snapshotMgr.allocSnapshot(volumeId, Snapshot.MANUAL_POLICY_ID, snapshotName, null, true, null);
     }
 
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 69728812fc2..1e54fc6e224 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -1571,6 +1571,8 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
             SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.TAKE);
 
             if (snapshotStrategy == null) {
+                _snapshotDao.remove(snapshotId);
+                logger.debug("No strategy found for creation of snapshot [{}], removing its record from the database.", snapshot);
                 throw new CloudRuntimeException(String.format("Can't find snapshot strategy to deal with snapshot:%s", snapshot.getSnapshotVO()));
             }
 
diff --git a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 907182edc2a..1c1a28eb8c6 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -27,7 +27,6 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.storage.snapshot.SnapshotManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
@@ -379,14 +378,8 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
             //Other Storage volume plugins could integrate this with their own functionality for group snapshots
             VMSnapshotStrategy snapshotStrategy = storageStrategyFactory.getVmSnapshotStrategy(userVmVo.getId(), rootVolumePool.getId(), snapshotMemory);
             if (snapshotStrategy == null) {
-                String message;
-                if (!SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
-                    message = "Creating a snapshot of a running KVM instance without memory is not supported";
-                } else {
-                    message = "KVM does not support the type of snapshot requested";
-                }
-
-                logger.debug(message);
+                String message = String.format("No strategy was able to handle requested snapshot for VM [%s].", userVmVo.getUuid());
+                logger.error(message);
                 throw new CloudRuntimeException(message);
             }
 
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index 7b24451f066..5e37fe7b018 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -41,6 +41,14 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.host.HostVO;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.user.volume.CheckAndRepairVolumeCmd;
@@ -99,12 +107,9 @@ import com.cloud.dc.HostPodVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
-import com.cloud.event.EventTypes;
-import com.cloud.event.UsageEventUtils;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
-import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.org.Grouping;
@@ -113,8 +118,6 @@ import com.cloud.projects.ProjectManager;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementService;
 import com.cloud.server.TaggedResourceService;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.Storage.ProvisioningType;
 import com.cloud.storage.Volume.Type;
 import com.cloud.storage.dao.DiskOfferingDao;
@@ -268,6 +271,9 @@ public class VolumeApiServiceImplTest {
     @Mock
     private ManagementService managementService;
 
+    @Mock
+    private VMSnapshotDetailsDao vmSnapshotDetailsDaoMock;
+
     private long accountMockId = 456l;
     private long volumeMockId = 12313l;
     private long vmInstanceMockId = 1123l;
@@ -2202,4 +2208,85 @@ public class VolumeApiServiceImplTest {
             Assert.fail();
         }
     }
+
+    @Test
+    public void validateNoVmSnapshotsTestNoInstanceId() {
+        Mockito.doReturn(null).when(volumeVoMock).getInstanceId();
+
+        volumeApiServiceImpl.validateNoVmSnapshots(volumeVoMock);
+
+        Mockito.verify(volumeApiServiceImpl, Mockito.never()).vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(Mockito.anyLong());
+    }
+
+    @Test
+    public void validateNoVmSnapshotsTestVmHasVmSnapshotsExceptKvmDiskOnlySnapshotsIsFalse() {
+        Mockito.doReturn(1L).when(volumeVoMock).getInstanceId();
+        Mockito.doReturn(false).when(volumeApiServiceImpl).vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(1L);
+
+        volumeApiServiceImpl.validateNoVmSnapshots(volumeVoMock);
+    }
+
+    @Test (expected = InvalidParameterValueException.class)
+    public void validateNoVmSnapshotsTestVmHasVmSnapshotsExceptKvmDiskOnlySnapshotsIsTrue() {
+        Mockito.doReturn(1L).when(volumeVoMock).getInstanceId();
+        Mockito.doReturn(true).when(volumeApiServiceImpl).vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(1L);
+
+        volumeApiServiceImpl.validateNoVmSnapshots(volumeVoMock);
+    }
+
+    @Test
+    public void vmHasVmSnapshotsExceptKvmDiskOnlySnapshotsTestMultipleDiskAndMemory () {
+        List<VMSnapshotVO> snapList = generateVmSnapshotVoList(VMSnapshot.Type.DiskAndMemory, VMSnapshot.Type.DiskAndMemory);
+        Mockito.doReturn(snapList).when(_vmSnapshotDao).findByVm(0L);
+
+        Assert.assertTrue(volumeApiServiceImpl.vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(0L));
+    }
+
+    @Test
+    public void vmHasVmSnapshotsExceptKvmDiskOnlySnapshotsTestOnlyOneDiskAndMemory () {
+        List<VMSnapshotVO> snapList = generateVmSnapshotVoList(VMSnapshot.Type.Disk, VMSnapshot.Type.DiskAndMemory);
+        Mockito.doReturn(snapList).when(_vmSnapshotDao).findByVm(0L);
+        VMSnapshotDetailsVO snapDetail = new VMSnapshotDetailsVO(0L, VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT, "0", true);
+        Mockito.doReturn(List.of(snapDetail)).when(vmSnapshotDetailsDaoMock).listDetails(Mockito.anyLong());
+
+        Assert.assertTrue(volumeApiServiceImpl.vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(0L));
+    }
+    @Test
+    public void vmHasVmSnapshotsExceptKvmDiskOnlySnapshotsTestDiskSnapshotsButNotKvmFileBasedSnapshots () {
+        List<VMSnapshotVO> snapList = generateVmSnapshotVoList(VMSnapshot.Type.Disk, VMSnapshot.Type.Disk);
+        Mockito.doReturn(snapList).when(_vmSnapshotDao).findByVm(0L);
+
+        Assert.assertTrue(volumeApiServiceImpl.vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(0L));
+    }
+
+    @Test
+    public void vmHasVmSnapshotsExceptKvmDiskOnlySnapshotsTestOnlyOneKvmFileBasedSnapshot () {
+        List<VMSnapshotVO> snapList = generateVmSnapshotVoList(VMSnapshot.Type.Disk, VMSnapshot.Type.Disk);
+        Mockito.doReturn(snapList).when(_vmSnapshotDao).findByVm(0L);
+        VMSnapshotDetailsVO snapDetail = new VMSnapshotDetailsVO(0L, VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT, "0", true);
+        Mockito.doReturn(List.of(snapDetail)).when(vmSnapshotDetailsDaoMock).listDetails(0);
+
+        Assert.assertTrue(volumeApiServiceImpl.vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(0L));
+    }
+
+    @Test
+    public void vmHasVmSnapshotsExceptKvmDiskOnlySnapshotsTestAllKvmFileBasedSnapshots () {
+        List<VMSnapshotVO> snapList = generateVmSnapshotVoList(VMSnapshot.Type.Disk, VMSnapshot.Type.Disk);
+        Mockito.doReturn(snapList).when(_vmSnapshotDao).findByVm(0L);
+        VMSnapshotDetailsVO snapDetail = new VMSnapshotDetailsVO(0L, VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT, "0", true);
+        Mockito.doReturn(List.of(snapDetail)).when(vmSnapshotDetailsDaoMock).listDetails(0);
+        Mockito.doReturn(List.of(snapDetail)).when(vmSnapshotDetailsDaoMock).listDetails(1);
+
+        Assert.assertFalse(volumeApiServiceImpl.vmHasVmSnapshotsExceptKvmDiskOnlySnapshots(0L));
+    }
+
+    private List<VMSnapshotVO> generateVmSnapshotVoList(VMSnapshot.Type t1, VMSnapshot.Type t2) {
+        VMSnapshotVO mock1 = Mockito.mock(VMSnapshotVO.class);
+        Mockito.doReturn(t1).when(mock1).getType();
+        Mockito.doReturn(0L).when(mock1).getId();
+        VMSnapshotVO mock2 = Mockito.mock(VMSnapshotVO.class);
+        Mockito.doReturn(t2).when(mock2).getType();
+        Mockito.doReturn(1L).when(mock2).getId();
+        return List.of(mock1, mock2);
+    }
 }
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index c5647fd2804..719ed25671f 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -201,8 +201,8 @@ export default {
           },
           show: (record) => {
             return (((['Running'].includes(record.state) && record.hypervisor !== 'LXC') ||
-              (['Stopped'].includes(record.state) && ((record.hypervisor !== 'KVM' && record.hypervisor !== 'LXC') ||
-              (record.hypervisor === 'KVM' && record.pooltype === 'PowerFlex')))) && record.vmtype !== 'sharedfsvm')
+              (['Stopped'].includes(record.state) && (!['KVM', 'LXC'].includes(record.hypervisor) ||
+              (record.hypervisor === 'KVM' && ['PowerFlex', 'Filesystem', 'NetworkFilesystem', 'SharedMountPoint'].includes(record.pooltype))))) && record.vmtype !== 'sharedfsvm')
           },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' && record.hypervisor === 'KVM' },
           mapping: {

From c94f75c7ea7dc01b636aec9dfc8c6632ca1a5419 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Wed, 16 Jul 2025 12:32:09 +0530
Subject: [PATCH 24/94] PowerFlex/ScaleIO - Wait after SDC service
 start/restart/stop, and retry to fetch SDC id/guid (#11099)

* [PowerFlex/ScaleIO] Added wait time after SDC service start/restart/stop, and retries to fetch SDC id/guid

* Added agent property 'powerflex.sdc.service.wait' for the time (in secs) to wait after SDC service start/restart/stop

* code improvements
---
 .../agent/properties/AgentProperties.java     |  2 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java    | 54 ++++++++++++++-----
 .../storage/ScaleIOStorageAdaptorTest.java    |  6 +--
 .../manager/ScaleIOSDCManagerImpl.java        | 14 +++--
 .../provider/ScaleIOHostListener.java         |  6 +--
 .../storage/datastore/util/ScaleIOUtil.java   | 41 ++++++++++++--
 6 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
index e5593f10460..c781c07c227 100644
--- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
+++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -823,7 +823,7 @@ public class AgentProperties{
         private T defaultValue;
         private Class<T> typeClass;
 
-        Property(String name, T value) {
+        public Property(String name, T value) {
             init(name, value);
         }
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
index 335ea0d03d2..195ce6c9984 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
 import org.apache.cloudstack.utils.qemu.QemuImgFile;
 import org.apache.cloudstack.utils.qemu.QemuObject;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -581,14 +582,23 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
         }
 
         if (!ScaleIOUtil.isSDCServiceActive()) {
+            logger.debug("SDC service is not active on host, starting it");
             if (!ScaleIOUtil.startSDCService()) {
                 return new Ternary<>(false, null, "Couldn't start SDC service on host");
             }
-        } else if (!ScaleIOUtil.restartSDCService()) {
-            return new Ternary<>(false, null, "Couldn't restart SDC service on host");
+        } else {
+            logger.debug("SDC service is active on host, re-starting it");
+            if (!ScaleIOUtil.restartSDCService()) {
+                return new Ternary<>(false, null, "Couldn't restart SDC service on host");
+            }
         }
 
-        return new Ternary<>( true, getSDCDetails(details), "Prepared client successfully");
+        Map<String, String> sdcDetails = getSDCDetails(details);
+        if (MapUtils.isEmpty(sdcDetails)) {
+            return new Ternary<>(false, null, "Couldn't get the SDC details on the host");
+        }
+
+        return new Ternary<>( true, sdcDetails, "Prepared client successfully");
     }
 
     public Pair<Boolean, String> unprepareStorageClient(Storage.StoragePoolType type, String uuid) {
@@ -611,20 +621,40 @@ public class ScaleIOStorageAdaptor implements StorageAdaptor {
 
     private Map<String, String> getSDCDetails(Map<String, String> details) {
         Map<String, String> sdcDetails = new HashMap<String, String>();
-        if (details == null || !details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID))  {
+        if (MapUtils.isEmpty(details)  || !details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID))  {
             return sdcDetails;
         }
 
         String storageSystemId = details.get(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID);
-        String sdcId = ScaleIOUtil.getSdcId(storageSystemId);
-        if (sdcId != null) {
-            sdcDetails.put(ScaleIOGatewayClient.SDC_ID, sdcId);
-        } else {
-            String sdcGuId = ScaleIOUtil.getSdcGuid();
-            if (sdcGuId != null) {
-                sdcDetails.put(ScaleIOGatewayClient.SDC_GUID, sdcGuId);
-            }
+        if (StringUtils.isEmpty(storageSystemId)) {
+            return sdcDetails;
         }
+
+        int numberOfTries = 5;
+        int timeBetweenTries = 1000; // Try more frequently (every sec) and return early when SDC Id or Guid found
+        int attempt = 1;
+        do {
+            logger.debug("Get SDC details, attempt #{}", attempt);
+            String sdcId = ScaleIOUtil.getSdcId(storageSystemId);
+            if (sdcId != null) {
+                sdcDetails.put(ScaleIOGatewayClient.SDC_ID, sdcId);
+                return sdcDetails;
+            } else {
+                String sdcGuId = ScaleIOUtil.getSdcGuid();
+                if (sdcGuId != null) {
+                    sdcDetails.put(ScaleIOGatewayClient.SDC_GUID, sdcGuId);
+                    return sdcDetails;
+                }
+            }
+
+            try {
+                Thread.sleep(timeBetweenTries);
+            } catch (Exception ignore) {
+            }
+            numberOfTries--;
+            attempt++;
+        } while (numberOfTries > 0);
+
         return sdcDetails;
     }
 
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
index 07aea0cfbee..c2002f56560 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
@@ -116,9 +116,9 @@ public class ScaleIOStorageAdaptorTest {
 
         Ternary<Boolean, Map<String, String>, String> result = scaleIOStorageAdaptor.prepareStorageClient(Storage.StoragePoolType.PowerFlex, poolUuid, new HashMap<>());
 
-        Assert.assertTrue(result.first());
-        Assert.assertNotNull(result.second());
-        Assert.assertTrue(result.second().isEmpty());
+        Assert.assertFalse(result.first());
+        Assert.assertNull(result.second());
+        Assert.assertEquals("Couldn't get the SDC details on the host", result.third());
     }
 
     @Test
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
index f1177acc7b4..5f098badaa1 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java
@@ -183,12 +183,13 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
                     storagePoolHost.setLocalPath(sdcId);
                     storagePoolHostDao.update(storagePoolHost.getId(), storagePoolHost);
                 }
+
+                int waitTimeInSecs = 15; // Wait for 15 secs (usual tests with SDC service start took 10-15 secs)
+                if (hostSdcConnected(sdcId, dataStore, waitTimeInSecs)) {
+                    return sdcId;
+                }
             }
 
-            int waitTimeInSecs = 15; // Wait for 15 secs (usual tests with SDC service start took 10-15 secs)
-            if (hostSdcConnected(sdcId, dataStore, waitTimeInSecs)) {
-                return sdcId;
-            }
             return null;
         } finally {
             if (storageSystemIdLock != null) {
@@ -246,7 +247,7 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
         }
 
         if (StringUtils.isBlank(sdcId)) {
-            logger.warn("Couldn't retrieve PowerFlex storage SDC details from the host: {}, try (re)install SDC and restart agent", host);
+            logger.warn("Couldn't retrieve PowerFlex storage SDC details from the host: {}, add MDMs if not or try (re)install SDC & restart agent", host);
             return null;
         }
 
@@ -381,6 +382,9 @@ public class ScaleIOSDCManagerImpl implements ScaleIOSDCManager, Configurable {
 
     private ScaleIOGatewayClient getScaleIOClient(final Long storagePoolId) throws Exception {
         StoragePoolVO storagePool = storagePoolDao.findById(storagePoolId);
+        if (storagePool == null) {
+            throw new CloudRuntimeException("Unable to find the storage pool with id " + storagePoolId);
+        }
         return ScaleIOGatewayClientConnectionPool.getInstance().getClient(storagePool, storagePoolDetailsDao);
     }
 
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
index 5fc4868902e..4f4400ffacc 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java
@@ -102,12 +102,12 @@ public class ScaleIOHostListener implements HypervisorHostListener {
         if (systemId == null) {
             throw new CloudRuntimeException("Failed to get the system id for PowerFlex storage pool " + storagePool.getName());
         }
-        Map<String,String> details = new HashMap<>();
+        Map<String, String> details = new HashMap<>();
         details.put(ScaleIOGatewayClient.STORAGE_POOL_SYSTEM_ID, systemId);
 
         ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, storagePool, storagePool.getPath(), details);
         ModifyStoragePoolAnswer answer  = sendModifyStoragePoolCommand(cmd, storagePool, host);
-        Map<String,String> poolDetails = answer.getPoolInfo().getDetails();
+        Map<String, String> poolDetails = answer.getPoolInfo().getDetails();
         if (MapUtils.isEmpty(poolDetails)) {
             String msg = String.format("PowerFlex storage SDC details not found on the host: %s, (re)install SDC and restart agent", host);
             logger.warn(msg);
@@ -124,7 +124,7 @@ public class ScaleIOHostListener implements HypervisorHostListener {
         }
 
         if (StringUtils.isBlank(sdcId)) {
-            String msg = String.format("Couldn't retrieve PowerFlex storage SDC details from the host: %s, (re)install SDC and restart agent", host);
+            String msg = String.format("Couldn't retrieve PowerFlex storage SDC details from the host: %s, add MDMs if not or try (re)install SDC & restart agent", host);
             logger.warn(msg);
             _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host.getUuid(), msg);
             return null;
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
index 4bb8df9b60d..d91321a907f 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java
@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.storage.datastore.util;
 
+import com.cloud.agent.properties.AgentProperties;
+import com.cloud.agent.properties.AgentPropertiesFileHandler;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -60,6 +62,14 @@ public class ScaleIOUtil {
     private static final String SDC_SERVICE_ENABLE_CMD = "systemctl enable scini";
 
     public static final String CONNECTED_SDC_COUNT_STAT = "ConnectedSDCCount";
+
+    /**
+     * Time (in seconds) to wait after SDC service 'scini' start/restart/stop.<br>
+     * Data type: Integer.<br>
+     * Default value: <code>3</code>
+     */
+    public static final AgentProperties.Property<Integer> SDC_SERVICE_ACTION_WAIT = new AgentProperties.Property<>("powerflex.sdc.service.wait", 3);
+
     /**
      * Cmd for querying volumes in SDC
      * Sample output for cmd: drv_cfg --query_vols:
@@ -216,16 +226,41 @@ public class ScaleIOUtil {
 
     public static boolean startSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_START_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
     }
 
     public static boolean stopSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_STOP_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
     }
 
     public static boolean restartSDCService() {
         int exitValue = Script.runSimpleBashScriptForExitValue(SDC_SERVICE_RESTART_CMD);
-        return exitValue == 0;
+        if (exitValue != 0) {
+            return false;
+        }
+        waitForSdcServiceActionToComplete();
+        return true;
+    }
+
+    private static void waitForSdcServiceActionToComplete() {
+        // Wait for the SDC service to settle after start/restart/stop and reaches a stable state
+        int waitTimeInSecs = AgentPropertiesFileHandler.getPropertyValue(SDC_SERVICE_ACTION_WAIT);
+        if (waitTimeInSecs < 0) {
+            waitTimeInSecs = SDC_SERVICE_ACTION_WAIT.getDefaultValue();
+        }
+        try {
+            LOGGER.debug(String.format("Waiting for %d secs after SDC service action, to reach a stable state", waitTimeInSecs));
+            Thread.sleep(waitTimeInSecs * 1000L);
+        } catch (InterruptedException ignore) {
+        }
     }
 }

From 65d359228dc06b5a5c991d78cbb56baf510eb6f9 Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Wed, 16 Jul 2025 15:54:06 +0530
Subject: [PATCH 25/94] Allow populating generic templates during Zone
 Deployment (#10947)

---
 ui/public/cloud-image-templates.json          | 110 +++++++
 ui/public/locales/en.json                     |   3 +
 ui/src/views/infra/zone/ZoneWizard.vue        |  40 ++-
 .../views/infra/zone/ZoneWizardLaunchZone.vue |   9 +-
 .../infra/zone/ZoneWizardRegisterTemplate.vue | 298 ++++++++++++++++++
 5 files changed, 455 insertions(+), 5 deletions(-)
 create mode 100644 ui/public/cloud-image-templates.json
 create mode 100644 ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue

diff --git a/ui/public/cloud-image-templates.json b/ui/public/cloud-image-templates.json
new file mode 100644
index 00000000000..395477166f5
--- /dev/null
+++ b/ui/public/cloud-image-templates.json
@@ -0,0 +1,110 @@
+[
+    {
+        "id": 1,
+        "name": "Ubuntu 24.04",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-24.04-server-cloudimg-amd64.img"
+    },
+    {
+        "id": 2,
+        "name": "Ubuntu 22.04",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-22.04-server-cloudimg-amd64.img"
+    },
+    {
+        "id": 3,
+        "name": "Ubuntu 20.04",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-20.04-server-cloudimg-amd64.img"
+    },
+    {
+        "id": 4,
+        "name": "Debian GNU/Linux 12 (64-bit)",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/debian/debian-12-genericcloud-amd64.qcow2"
+    },
+    {
+        "id": 5,
+        "name": "Rocky Linux 8",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/rockylinux/Rocky-8-GenericCloud.latest.x86_64.qcow2"
+    },
+    {
+        "id": 6,
+        "name": "Rocky Linux 9",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/rockylinux/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+    },
+    {
+        "id": 7,
+        "name": "OpenSUSE 15.5",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/opensuse/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
+    },
+    {
+        "id": 8,
+        "name": "Ubuntu 24.04",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-24.04-server-cloudimg-arm64.img"
+    },
+    {
+        "id": 9,
+        "name": "Ubuntu 22.04",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-22.04-server-cloudimg-arm64.img"
+    },
+    {
+        "id": 10,
+        "name": "Ubuntu 20.04",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/ubuntu/ubuntu-20.04-server-cloudimg-arm64.img"
+    },
+    {
+        "id": 11,
+        "name": "Debian GNU/Linux 12 (64-bit)",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/debian/debian-12-genericcloud-arm64.qcow2"
+    },
+    {
+        "id": 12,
+        "name": "Rocky Linux 8",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/rockylinux/Rocky-8-GenericCloud.latest.aarch64.qcow2"
+    },
+    {
+        "id": 13,
+        "name": "Rocky Linux 9",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/rockylinux/Rocky-9-GenericCloud.latest.aarch64.qcow2"
+    },
+    {
+        "id": 14,
+        "name": "OpenSUSE 15.5",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/opensuse/openSUSE-Leap-15.5-Minimal-VM.aarch64-Cloud.qcow2"
+    },
+    {
+        "id": 15,
+        "name": "Oracle Linux 8",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/oraclelinux/OL8U10_aarch64-kvm-b122.qcow2"
+    },
+    {
+        "id": 16,
+        "name": "Oracle Linux 8",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/oraclelinux/OL8U10_x86_64-kvm-b258.qcow2"
+    },
+    {
+        "id": 17,
+        "name": "Oracle Linux 9",
+        "arch": "aarch64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/oraclelinux/OL9U5_aarch64-kvm-b126.qcow2"
+    },
+    {
+        "id": 18,
+        "name": "Oracle Linux 9",
+        "arch": "x86_64",
+        "url": "https://download.cloudstack.org/templates/cloud-images/oraclelinux/OL9U5_x86_64-kvm-b259.qcow2"
+    }
+]
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index b649f6914bb..3fdfa03ecd0 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -1023,6 +1023,7 @@
 "label.filter.annotations.self": "Created by me",
 "label.filterby": "Filter by",
 "label.fingerprint": "FingerPrint",
+"label.skip": "Skip",
 "label.finish": "Finish",
 "label.firewall": "Firewall",
 "label.firewall.policy": "Firewall Policy",
@@ -3100,6 +3101,7 @@
 "message.desc.importexportinstancewizard": "By choosing to manage an Instance, CloudStack takes over the orchestration of that Instance. Unmanaging an Instance removes CloudStack ability to manage it. In both cases, the Instance is left running and no changes are done to the VM on the hypervisor.<br><br>For KVM, managing a VM is an experimental feature.",
 "message.desc.importmigratefromvmwarewizard": "By selecting an existing or external VMware Datacenter and an instance to import, CloudStack migrates the selected instance from VMware to KVM on a conversion host using virt-v2v and imports it into a KVM cluster",
 "message.desc.primary.storage": "Each cluster must contain one or more primary storage servers. We will add the first one now. Primary storage contains the disk volumes for all the Instances running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.",
+"message.desc.register.template": "Hosted on download.cloudstack.org, these templates can be easily registered directly within CloudStack. Simply click <strong>Register Template</strong> for the templates you wish to use.",
 "message.desc.reset.ssh.key.pair": "Please specify a ssh key pair that you would like to add to this Instance.",
 "message.desc.secondary.storage": "Each zone must have at least one NFS or secondary storage server. We will add the first one now. Secondary storage stores Instance Templates, ISO images, and Instance disk volume Snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.",
 "message.desc.register.user.data": "Please fill in the following data to register a User data.",
@@ -3810,6 +3812,7 @@
 "message.warn.change.primary.storage.scope": "This feature is tested and supported for the following configurations:<br>KVM - NFS/Ceph - DefaultPrimary<br>VMware - NFS - DefaultPrimary<br>*There might be extra steps involved to make it work for other configurations.",
 "message.warn.filetype": "jpg, jpeg, png, bmp and svg are the only supported image formats.",
 "message.warn.importing.instance.without.nic": "WARNING: This Instance is being imported without NICs and many Network resources will not be available. Consider creating a NIC via vCenter before importing or as soon as the Instance is imported.",
+"message.warn.select.template": "Please select a Template for Registration.",
 "message.warn.zone.mtu.update": "Please note that this limit won't affect pre-existing Network’s MTU settings",
 "message.webhook.deliveries.time.filter": "Webhook deliveries list can be filtered based on date-time. Select 'Custom' for specifying start and end date range.",
 "message.zone.creation.complete": "Zone creation complete.",
diff --git a/ui/src/views/infra/zone/ZoneWizard.vue b/ui/src/views/infra/zone/ZoneWizard.vue
index 9211aed92a5..5ca0792505c 100644
--- a/ui/src/views/infra/zone/ZoneWizard.vue
+++ b/ui/src/views/infra/zone/ZoneWizard.vue
@@ -74,8 +74,10 @@
         :prefillContent="zoneConfig"
       />
       <zone-wizard-launch-zone
-        v-else
+        v-else-if="zoneSteps[currentStep].name === 'launch'"
         @backPressed="backPressed"
+        @nextPressed="nextPressed"
+        @fieldsChanged="onFieldsChanged"
         @closeAction="onCloseAction"
         @refresh-data="onRefreshData"
         @stepError="onStepError"
@@ -85,6 +87,15 @@
         :isFixError="stepFixError"
         :prefillContent="zoneConfig"
       />
+
+      <zone-wizard-register-template
+        v-else-if="zoneSteps[currentStep].name === 'registerTemplate'"
+        :zoneid="returnedZoneId"
+        :arch="selectedArch"
+        :zoneSuperType="selectedZoneSuperType"
+        @closeAction="onCloseAction"
+        @refresh-data="onRefreshData"
+      />
     </div>
   </div>
 </template>
@@ -95,6 +106,7 @@ import ZoneWizardCoreZoneTypeStep from '@views/infra/zone/ZoneWizardCoreZoneType
 import ZoneWizardZoneDetailsStep from '@views/infra/zone/ZoneWizardZoneDetailsStep'
 import ZoneWizardNetworkSetupStep from '@views/infra/zone/ZoneWizardNetworkSetupStep'
 import ZoneWizardAddResources from '@views/infra/zone/ZoneWizardAddResources'
+import ZoneWizardRegisterTemplate from '@views/infra/zone/ZoneWizardRegisterTemplate'
 import ZoneWizardLaunchZone from '@views/infra/zone/ZoneWizardLaunchZone'
 
 export default {
@@ -103,6 +115,7 @@ export default {
     ZoneWizardCoreZoneTypeStep,
     ZoneWizardZoneDetailsStep,
     ZoneWizardNetworkSetupStep,
+    ZoneWizardRegisterTemplate,
     ZoneWizardAddResources,
     ZoneWizardLaunchZone
   },
@@ -114,6 +127,13 @@ export default {
       launchZone: false,
       launchData: {},
       stepChild: '',
+      registerTemplateStep: {
+        name: 'registerTemplate',
+        title: 'label.register.template',
+        step: ['registerTemplateAction'],
+        description: this.$t('message.desc.register.template'),
+        hint: this.$t('message.hint.register.template')
+      },
       coreZoneTypeStep: {
         name: 'coreType',
         title: 'label.core.zone.type',
@@ -158,7 +178,10 @@ export default {
           hint: this.$t('message.launch.zone.hint')
         }
       ],
-      zoneConfig: {}
+      zoneConfig: {},
+      returnedZoneId: null,
+      selectedArch: null,
+      selectedZoneSuperType: 'Core'
     }
   },
   computed: {
@@ -167,6 +190,9 @@ export default {
       if (this.zoneConfig.zoneSuperType !== 'Edge') {
         steps.splice(1, 0, this.coreZoneTypeStep)
       }
+      if (this.zoneConfig.hypervisor === 'KVM') {
+        steps.splice(steps.length, 0, this.registerTemplateStep)
+      }
       return steps
     }
   },
@@ -200,7 +226,15 @@ export default {
         data.zoneType !== this.zoneConfig.zoneType) {
         this.zoneConfig.physicalNetworks = null
       }
-
+      if (data.zoneSuperType && data.zoneSuperType !== this.selectedZoneSuperType) {
+        this.selectedZoneSuperType = data.zoneSuperType
+      }
+      if (data.arch && data.arch !== this.selectedArch) {
+        this.selectedArch = data.arch
+      }
+      if (data.zoneReturned?.id) {
+        this.returnedZoneId = data.zoneReturned.id
+      }
       this.zoneConfig = { ...this.zoneConfig, ...data }
     },
     onCloseAction () {
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index 23703049c83..ccd1849978c 100644
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -1723,8 +1723,13 @@ export default {
         await this.$message.success('Success')
         this.loading = false
         this.steps = []
-        this.$emit('closeAction')
-        this.$emit('refresh-data')
+        if (this.prefillContent.hypervisor === 'KVM') {
+          this.$emit('fieldsChanged', { zoneReturned: { id: this.stepData.zoneReturned.id } })
+          this.$emit('nextPressed')
+        } else {
+          this.$emit('closeAction')
+          this.$emit('refresh-data')
+        }
       } catch (e) {
         this.loading = false
         await this.$notification.error({
diff --git a/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue b/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
new file mode 100644
index 00000000000..28fd4b95047
--- /dev/null
+++ b/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
@@ -0,0 +1,298 @@
+// 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.
+
+<template>
+    <div>
+      <a-card class="ant-form-text" style="text-align: justify; margin: 10px 0; padding: 15px;" v-html="$t('message.desc.register.template')" />
+      <a-table
+        :columns="columns"
+        :dataSource="predefinedTemplates"
+        :rowSelection="rowSelection"
+        :loading="loading"
+        :scroll="{ y: 450 }"
+        size="middle"
+        :rowKey="record => record.id"
+        :pagination="false"
+        class="form-content"
+      >
+      <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'name'">
+            <os-logo :osName="record.name" size="xl" />
+            {{ record.name }}
+          </template>
+        </template>
+      </a-table>
+      <div class="form-action">
+        <a-button class="button-back" @click="handleDone">{{ selectedRowKeys.length > 0 ? $t('label.done') : $t('label.skip') }}</a-button>
+        <a-button class="button-next" type="primary" @click="handleSubmit" ref="submit">{{ $t('label.register.template') }}</a-button>
+      </div>
+
+      <a-modal
+      :visible="showAlert"
+      :footer="null"
+      style="top: 20px;"
+      centered
+      width="auto"
+      @cancel="showAlert = false"
+      >
+      <template #title>
+        {{ $t('label.warning') }}
+      </template>
+      <a-alert type="warning">
+        <template #message>
+          <span v-html="$t('message.warn.select.template')" />
+        </template>
+      </a-alert>
+      <a-divider style="margin-top: 0;"></a-divider>
+    </a-modal>
+    </div>
+  </template>
+
+<script>
+import { api } from '@/api'
+import { genericCompare } from '@/utils/sort.js'
+import OsLogo from '@/components/widgets/OsLogo'
+
+export default {
+  name: 'ZoneWizardRegisterTemplate',
+  components: {
+    OsLogo
+  },
+  props: {
+    zoneid: {
+      type: String,
+      required: false
+    },
+    arch: {
+      type: String,
+      required: false
+    },
+    zoneSuperType: {
+      type: String,
+      required: false
+    }
+  },
+  data: () => ({
+    columns: null,
+    loading: false,
+    predefinedTemplates: [],
+    rowKey: 0,
+    selectedRowKeys: [],
+    defaultOsTypeId: null,
+    deployedTemplates: {},
+    showAlert: false
+  }),
+  created () {
+    this.initForm()
+  },
+  mounted () {
+    this.fetchPredefinedTemplates()
+  },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys || [],
+        onChange: this.onSelectRow,
+        getCheckboxProps: (record) => {
+          return {
+            disabled: record.disabled
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    async initForm () {
+      this.columns = [
+        {
+          title: 'Name',
+          dataIndex: 'name',
+          key: 'name',
+          width: 240,
+          sorter: (a, b) => { return genericCompare(a.name || '', b.name || '') }
+        },
+        {
+          title: 'Arch',
+          dataIndex: 'arch',
+          key: 'arch',
+          width: 80,
+          sorter: (a, b) => { return genericCompare(a.arch || '', b.arch || '') }
+        },
+        {
+          title: 'URL',
+          dataIndex: 'url',
+          key: 'url'
+        }
+      ]
+      this.defaultOsTypeId = await this.fetchOsTypeId('Other Linux (64-bit)')
+    },
+    handleDone () {
+      this.$emit('refresh-data')
+    },
+    async handleSubmit () {
+      await this.stepRegisterTemplates()
+    },
+    onSelectRow (value) {
+      this.selectedRowKeys = value
+    },
+    async registerTemplate (templateData) {
+      const params = {
+        displaytext: templateData.name + ' ' + templateData.arch,
+        format: this.getImageFormat(templateData.url),
+        hypervisor: 'KVM',
+        name: templateData.name,
+        arch: templateData.arch,
+        url: templateData.url,
+        ostypeid: await this.fetchOsTypeId(templateData.name),
+        zoneid: this.zoneid
+      }
+      if (this.zoneSuperType === 'Edge') {
+        params.directdownload = true
+      }
+      return new Promise((resolve, reject) => {
+        api('registerTemplate', params).then(json => {
+          const result = json.registertemplateresponse.template[0]
+          resolve(result)
+        }).catch(error => {
+          const message = error.response.headers['x-description']
+          reject(message)
+        })
+      })
+    },
+    async stepRegisterTemplates () {
+      const templatesToRegister = this.predefinedTemplates.filter(template => this.selectedRowKeys.includes(template.id) && this.deployedTemplates[template.id] !== true)
+      if (templatesToRegister.length === 0) {
+        this.showAlert = true
+        return
+      }
+      const registrationResults = []
+      for (const templateData of templatesToRegister) {
+        const promise = this.registerTemplate(templateData)
+          .then(() => ({
+            id: templateData.id,
+            status: 'success',
+            name: templateData.name
+          }))
+          .catch(() => ({
+            id: templateData.id,
+            status: 'error',
+            name: templateData.name
+          }))
+        registrationResults.push(promise)
+      }
+      const results = await Promise.all(registrationResults)
+      const successful = results.filter(r => r.status === 'success')
+      const failed = results.filter(r => r.status === 'error')
+
+      if (successful.length > 0) {
+        this.$notification.success({
+          message: this.$t('label.register.template'),
+          description: 'Succesfully registered templates: ' + successful.map(r => r.name).join(', ')
+        })
+
+        successful.forEach(r => {
+          this.deployedTemplates[r.id] = true
+          this.predefinedTemplates.find(t => t.id === r.id).disabled = true
+        })
+      }
+      if (failed.length > 0) {
+        this.$notification.error({
+          message: this.$t('label.register.template'),
+          description: 'Failed registering templates: ' + failed.map(r => r.name).join(', ')
+        })
+
+        failed.forEach(r => {
+          this.predefinedTemplates.find(t => t.id === r.id).disabled = true
+          this.selectedRowKeys = this.selectedRowKeys.filter(id => id !== r.id)
+        })
+      }
+    },
+    async fetchOsTypeId (osName) {
+      let osTypeId = this.defaultOsTypeId
+      this.loading = true
+      try {
+        const json = await api('listOsTypes', { keyword: osName, filter: 'name,id' })
+        if (json && json.listostypesresponse && json.listostypesresponse.ostype && json.listostypesresponse.ostype.length > 0) {
+          osTypeId = json.listostypesresponse.ostype[0].id
+        }
+      } catch (error) {
+        console.error('Error fetching OS types:', error)
+      } finally {
+        this.loading = false
+      }
+      return osTypeId
+    },
+    getImageFormat (url) {
+      const fileExtension = url.split('.').pop()
+      var format = fileExtension
+      switch (fileExtension) {
+        case 'img':
+          format = 'RAW'
+          break
+        case 'qcow2':
+          format = 'qcow2'
+          break
+        default:
+          format = 'RAW'
+      }
+      return format
+    },
+    async fetchPredefinedTemplates () {
+      this.loading = true
+      try {
+        const response = await fetch('./cloud-image-templates.json')
+        if (!response.ok) {
+          throw new Error(`Error fetching predefined templates, status_code: ${response.status}`)
+        }
+        const templates = await response.json()
+        this.predefinedTemplates = this.arch
+          ? templates.filter(template => template.arch === this.arch)
+          : templates
+
+        // Replace 'https' with 'http' in all URLs for EdgeZone
+        if (this.zoneSuperType === 'Edge') {
+          this.predefinedTemplates.forEach(template => {
+            if (template.url.startsWith('https://')) {
+              template.url = template.url.replace('https://', 'http://')
+            }
+          })
+        }
+      } catch (error) {
+        console.error('Error fetching predefined templates:', error)
+        this.predefinedTemplates = []
+      } finally {
+        this.loading = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .form-content {
+    border: 1px dashed #e9e9e9;
+    border-radius: 6px;
+    background-color: #fafafa;
+    min-height: 440px;
+    text-align: center;
+    vertical-align: center;
+    padding: 8px;
+    padding-top: 16px;
+    margin-top: 8px;
+    overflow-y: auto;
+  }
+</style>

From bf464585785b6c0848fb4b07953e12d1039af4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?=
 <bernardomg2004@gmail.com>
Date: Thu, 17 Jul 2025 04:01:49 -0300
Subject: [PATCH 26/94] List templates and ISOs by domain (#11179)

---
 .../com/cloud/api/query/QueryManagerImpl.java | 28 +++++++++++++------
 ui/src/components/view/InfoCard.vue           |  3 ++
 ui/src/config/section/domain.js               |  5 ++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index d0f6fc0b16d..1d8e8687051 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -29,6 +29,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -4443,6 +4444,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         boolean showRemovedTmpl = cmd.getShowRemoved();
         Account caller = CallContext.current().getCallingAccount();
         Long parentTemplateId = cmd.getParentTemplateId();
+        Long domainId = cmd.getDomainId();
+        boolean isRecursive = cmd.isRecursive();
 
         boolean listAll = false;
         if (templateFilter != null && templateFilter == TemplateFilter.all) {
@@ -4453,7 +4456,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         List<Long> permittedAccountIds = new ArrayList<Long>();
-        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), cmd.isRecursive(), null);
+        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(domainId, isRecursive, null);
         accountMgr.buildACLSearchParameters(
                 caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds,
                 domainIdRecursiveListProject, listAll, false
@@ -4481,7 +4484,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 null, cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(),
                 cmd.getImageStoreId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller,
                 listProjectResourcesCriteria, tags, showRemovedTmpl, cmd.getIds(), parentTemplateId, cmd.getShowUnique(),
-                templateType, isVnf);
+                templateType, isVnf, domainId, isRecursive);
     }
 
     private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(Long templateId, String name, String keyword,
@@ -4490,7 +4493,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             boolean showDomr, boolean onlyReady, List<Account> permittedAccounts, Account caller,
             ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags,
             boolean showRemovedTmpl, List<Long> ids, Long parentTemplateId, Boolean showUnique, String templateType,
-            Boolean isVnf) {
+            Boolean isVnf, Long domainId, boolean isRecursive) {
 
         // check if zone is configured, if not, just return empty list
         List<HypervisorType> hypers = null;
@@ -4572,7 +4575,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             if (!permittedAccounts.isEmpty()) {
                 domain = _domainDao.findById(permittedAccounts.get(0).getDomainId());
             } else {
-                domain = _domainDao.findById(caller.getDomainId());
+                domain = _domainDao.findById(Objects.requireNonNullElse(domainId, caller.getDomainId()));
             }
 
             setIdsListToSearchCriteria(sc, ids);
@@ -4584,10 +4587,14 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 sc.addAnd("accountType", SearchCriteria.Op.EQ, Account.Type.PROJECT);
             }
 
-            // add criteria for domain path in case of domain admin
+            // add criteria for domain path in case of admins
             if ((templateFilter == TemplateFilter.self || templateFilter == TemplateFilter.selfexecutable)
-                    && (caller.getType() == Account.Type.DOMAIN_ADMIN || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN)) {
-                sc.addAnd("domainPath", SearchCriteria.Op.LIKE, domain.getPath() + "%");
+                    && (accountMgr.isAdmin(caller.getAccountId()))) {
+                if (isRecursive) {
+                    sc.addAnd("domainPath", SearchCriteria.Op.LIKE, domain.getPath() + "%");
+                } else {
+                    sc.addAnd("domainPath", SearchCriteria.Op.EQ, domain.getPath());
+                }
             }
 
             List<Long> relatedDomainIds = new ArrayList<Long>();
@@ -4893,6 +4900,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Map<String, String> tags = cmd.getTags();
         boolean showRemovedISO = cmd.getShowRemoved();
         Account caller = CallContext.current().getCallingAccount();
+        Long domainId = cmd.getDomainId();
+        boolean isRecursive = cmd.isRecursive();
 
         boolean listAll = false;
         if (isoFilter != null && isoFilter == TemplateFilter.all) {
@@ -4904,7 +4913,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
 
         List<Long> permittedAccountIds = new ArrayList<>();
-        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), cmd.isRecursive(), null);
+        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(domainId, isRecursive, null);
         accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject, listAll, false);
         ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
         List<Account> permittedAccounts = new ArrayList<>();
@@ -4917,7 +4926,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         return searchForTemplatesInternal(cmd.getId(), cmd.getIsoName(), cmd.getKeyword(), isoFilter, true, cmd.isBootable(),
                 cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(), cmd.getImageStoreId(),
                 hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria,
-                tags, showRemovedISO, null, null, cmd.getShowUnique(), null, null);
+                tags, showRemovedISO, null, null, cmd.getShowUnique(), null, null,
+                domainId, isRecursive);
     }
 
     @Override
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 00cb4748a88..e59735c51ea 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -1162,6 +1162,9 @@ export default {
         if (item.name === 'template') {
           query.templatefilter = 'self'
           query.filter = 'self'
+        } else if (item.name === 'iso') {
+          query.isofilter = 'self'
+          query.filter = 'self'
         }
 
         if (item.param === 'account') {
diff --git a/ui/src/config/section/domain.js b/ui/src/config/section/domain.js
index e6807f06278..fbe20ef8891 100644
--- a/ui/src/config/section/domain.js
+++ b/ui/src/config/section/domain.js
@@ -48,6 +48,11 @@ export default {
     name: 'template',
     title: 'label.templates',
     param: 'domainid'
+  },
+  {
+    name: 'iso',
+    title: 'label.isos',
+    param: 'domainid'
   }],
   tabs: [
     {

From 15c09af5cc7b4fbfee2e295ae2bd4e8b51fb57d3 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Thu, 17 Jul 2025 03:31:28 -0400
Subject: [PATCH 27/94] UI: Fix traffic Label on Zone creation wizard for
 VMware (#11101)

---
 .../views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
index 1117cb6ec01..e4354a6d3b0 100644
--- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
@@ -79,14 +79,14 @@
         </template>
         <template v-if="column.key === 'traffics'">
           <div v-for="traffic in record.traffics" :key="traffic.type">
-            <a-tooltip :title="traffic.type.toUpperCase() + ' (' + traffic.label + ')'">
+            <a-tooltip :title="traffic.type.toUpperCase() + ' (' + (hypervisor !== 'VMware' ? traffic.label : traffic.vSwitchName || '') + ')'">
               <a-tag
                 :color="trafficColors[traffic.type]"
                 style="margin:2px"
               >
 
-                {{ (traffic.type.toUpperCase() + ' (' + traffic.label + ')').slice(0, 20) }}
-                {{ (traffic.type.toUpperCase() + ' (' + traffic.label + ')').length > 20 ? '...' : '' }}
+                {{ (traffic.type.toUpperCase() + ' (' + (hypervisor !== 'VMware' ? traffic.label : traffic.vSwitchName || '') + ')').slice(0, 20) }}
+                {{ (traffic.type.toUpperCase() + ' (' + (hypervisor !== 'VMware' ? traffic.label : traffic.vSwitchName || '') + ')').length > 20 ? '...' : '' }}
                 <edit-outlined class="traffic-type-action" @click="editTraffic(record.key, traffic, $event)"/>
                 <delete-outlined class="traffic-type-action" @click="deleteTraffic(record.key, traffic, $event)"/>
               </a-tag>

From 30deec89e6b90c9f36ef40dfa2d2582265016417 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Thu, 17 Jul 2025 15:56:48 +0800
Subject: [PATCH 28/94] kvm: consider Debian same as Ubuntu (#10917)

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../kvm/resource/LibvirtComputingResource.java        | 11 ++++++-----
 .../LibvirtCheckConvertInstanceCommandWrapper.java    |  2 +-
 .../wrapper/LibvirtConvertInstanceCommandWrapper.java |  2 +-
 .../resource/wrapper/LibvirtReadyCommandWrapper.java  |  6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 7fb3839860f..5694c23a216 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3368,7 +3368,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         if (!meetRequirements) {
             return false;
         }
-        return isUbuntuHost() || isIoUringSupportedByQemu();
+        return isUbuntuOrDebianHost() || isIoUringSupportedByQemu();
     }
 
     /**
@@ -3381,13 +3381,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         return diskBus != DiskDef.DiskBus.IDE || getHypervisorQemuVersion() >= HYPERVISOR_QEMU_VERSION_IDE_DISCARD_FIXED;
     }
 
-    public boolean isUbuntuHost() {
+    public boolean isUbuntuOrDebianHost() {
         Map<String, String> versionString = getVersionStrings();
         String hostKey = "Host.OS";
         if (MapUtils.isEmpty(versionString) || !versionString.containsKey(hostKey) || versionString.get(hostKey) == null) {
             return false;
         }
-        return versionString.get(hostKey).equalsIgnoreCase("ubuntu");
+        return versionString.get(hostKey).equalsIgnoreCase("ubuntu")
+                || versionString.get(hostKey).toLowerCase().startsWith("debian");
     }
 
     private KVMPhysicalDisk getPhysicalDiskFromNfsStore(String dataStoreUrl, DataTO data) {
@@ -5357,14 +5358,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     public boolean hostSupportsInstanceConversion() {
         int exitValue = Script.runSimpleBashScriptForExitValue(INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD);
-        if (isUbuntuHost() && exitValue == 0) {
+        if (isUbuntuOrDebianHost() && exitValue == 0) {
             exitValue = Script.runSimpleBashScriptForExitValue(UBUNTU_NBDKIT_PKG_CHECK_CMD);
         }
         return exitValue == 0;
     }
 
     public boolean hostSupportsWindowsGuestConversion() {
-        if (isUbuntuHost()) {
+        if (isUbuntuOrDebianHost()) {
             int exitValue = Script.runSimpleBashScriptForExitValue(UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD);
             return exitValue == 0;
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapper.java
index d3ebb28b106..b94b4830003 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckConvertInstanceCommandWrapper.java
@@ -32,7 +32,7 @@ public class LibvirtCheckConvertInstanceCommandWrapper extends CommandWrapper<Ch
     public Answer execute(CheckConvertInstanceCommand cmd, LibvirtComputingResource serverResource) {
         if (!serverResource.hostSupportsInstanceConversion()) {
             String msg = String.format("Cannot convert the instance from VMware as the virt-v2v binary is not found on host %s. " +
-                    "Please install virt-v2v%s on the host before attempting the instance conversion.", serverResource.getPrivateIp(), serverResource.isUbuntuHost()? ", nbdkit" : "");
+                    "Please install virt-v2v%s on the host before attempting the instance conversion.", serverResource.getPrivateIp(), serverResource.isUbuntuOrDebianHost()? ", nbdkit" : "");
             logger.info(msg);
             return new CheckConvertInstanceAnswer(cmd, false, msg);
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
index e79a8da9dda..abc408f20f6 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -60,7 +60,7 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
 
         if (cmd.getCheckConversionSupport() && !serverResource.hostSupportsInstanceConversion()) {
             String msg = String.format("Cannot convert the instance %s from VMware as the virt-v2v binary is not found. " +
-                    "Please install virt-v2v%s on the host before attempting the instance conversion.", sourceInstanceName, serverResource.isUbuntuHost()? ", nbdkit" : "");
+                    "Please install virt-v2v%s on the host before attempting the instance conversion.", sourceInstanceName, serverResource.isUbuntuOrDebianHost()? ", nbdkit" : "");
             logger.info(msg);
             return new Answer(cmd, false, msg);
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java
index 485254c6bb9..e74923b281f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java
@@ -43,7 +43,7 @@ public final class LibvirtReadyCommandWrapper extends CommandWrapper<ReadyComman
     public Answer execute(final ReadyCommand command, final LibvirtComputingResource libvirtComputingResource) {
         Map<String, String> hostDetails = new HashMap<String, String>();
 
-        if (hostSupportsUefi(libvirtComputingResource.isUbuntuHost()) && libvirtComputingResource.isUefiPropertiesFileLoaded()) {
+        if (hostSupportsUefi(libvirtComputingResource.isUbuntuOrDebianHost()) && libvirtComputingResource.isUefiPropertiesFileLoaded()) {
             hostDetails.put(Host.HOST_UEFI_ENABLE, Boolean.TRUE.toString());
         }
 
@@ -58,10 +58,10 @@ public final class LibvirtReadyCommandWrapper extends CommandWrapper<ReadyComman
         return new ReadyAnswer(command, hostDetails);
     }
 
-    private boolean hostSupportsUefi(boolean isUbuntuHost) {
+    private boolean hostSupportsUefi(boolean isUbuntuOrDebianHost) {
         int timeout = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_SCRIPT_TIMEOUT) * 1000; // Get property value & convert to milliseconds
         int result;
-        if (isUbuntuHost) {
+        if (isUbuntuOrDebianHost) {
             logger.debug("Running command : [dpkg -l ovmf] with timeout : " + timeout + " ms");
             result = Script.executeCommandForExitValue(timeout, Script.getExecutableAbsolutePath("dpkg"), "-l", "ovmf");
         } else {

From 714b04e3a5fec5bf0aaa6ec4d956a052cea71ab7 Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Thu, 17 Jul 2025 14:25:00 +0200
Subject: [PATCH 29/94] npe guard for get host info on vmware (#11054)

Co-authored-by: Daan Hoogland <dahn@apache.org>
---
 .../main/java/com/cloud/hypervisor/vmware/mo/HostMO.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
index 3b96e7e1999..93a471d56bb 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -75,7 +75,7 @@ import com.cloud.utils.Pair;
 
 public class HostMO extends BaseMO implements VmwareHypervisorHost {
     private static final Logger s_logger = Logger.getLogger(HostMO.class);
-    Map<String, VirtualMachineMO> _vmCache = new HashMap<String, VirtualMachineMO>();
+    Map<String, VirtualMachineMO> _vmCache = new HashMap<>();
 
     //Map<String, String> _vmInternalNameMapCache = new HashMap<String, String>();
 
@@ -320,6 +320,11 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
 
     public VmwareHostType getHostType() throws Exception {
         AboutInfo aboutInfo = getHostAboutInfo();
+        if (aboutInfo == null) {
+            String msg = "no type info about host known, assuming ESXi";
+            s_logger.warn(msg);
+            return VmwareHostType.ESXi;
+        }
         if ("VMware ESXi".equals(aboutInfo.getName()))
             return VmwareHostType.ESXi;
         else if ("VMware ESX".equals(aboutInfo.getName()))

From a849b822c212c5b8518f334f24d142886afd6b2a Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Thu, 17 Jul 2025 16:44:20 +0200
Subject: [PATCH 30/94] Update .asf.yaml: remove new committer Bernardo
 (#11231)

---
 .asf.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 0603bf8e487..085ed7ebb73 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -53,13 +53,11 @@ github:
     - acs-robot
     - gpordeus
     - hsato03
-    - bernardodemarco
     - FelipeM525
     - lucas-a-martins
     - nicoschmdt
     - abh1sar
     - sudo87
-    - rosi-shapeblue
 
   protected_branches: ~
 

From 3687032ed68ffa7fbdf100296bd2042bf340f29b Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Fri, 18 Jul 2025 09:19:44 +0200
Subject: [PATCH 31/94] Update .asf.yaml re-add rosi

---
 .asf.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.asf.yaml b/.asf.yaml
index 085ed7ebb73..80fab69462a 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -58,6 +58,7 @@ github:
     - nicoschmdt
     - abh1sar
     - sudo87
+    - rosi-shapeblue
 
   protected_branches: ~
 

From 1003c8034c1142d7e9c42b36e8fc9771b2b6c26f Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Fri, 18 Jul 2025 12:51:48 +0200
Subject: [PATCH 32/94] Update .asf.yaml remove sudo87

---
 .asf.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 80fab69462a..d51afb4e1b6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -57,7 +57,6 @@ github:
     - lucas-a-martins
     - nicoschmdt
     - abh1sar
-    - sudo87
     - rosi-shapeblue
 
   protected_branches: ~

From c5da9e6188ccd5cc4dd688bf8c9b8c3c9cd14cbe Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Fri, 18 Jul 2025 12:52:49 +0200
Subject: [PATCH 33/94] Update .asf.yaml re-add sudo87

---
 .asf.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.asf.yaml b/.asf.yaml
index d51afb4e1b6..be818fda4d3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -58,6 +58,7 @@ github:
     - nicoschmdt
     - abh1sar
     - rosi-shapeblue
+    - sudo87
 
   protected_branches: ~
 

From 23de6c7db4db4f63c95b9f7a95aae1576cc0b583 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Fri, 18 Jul 2025 16:35:38 -0400
Subject: [PATCH 34/94] Fix update resource count failure for domains (#11138)

---
 .../ResourceLimitManagerImpl.java             | 110 +++++++++---------
 1 file changed, 52 insertions(+), 58 deletions(-)

diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 4a2702eb76d..85cca63546c 100644
--- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -139,6 +139,7 @@ import com.cloud.vm.dao.VMInstanceDao;
 @Component
 public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService, Configurable {
 
+    public static final String CHECKING_IF = "Checking if {}";
     @Inject
     private AccountManager _accountMgr;
     @Inject
@@ -164,8 +165,6 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
     @Inject
     private ResourceLimitDao _resourceLimitDao;
     @Inject
-    private ResourceLimitService resourceLimitService;
-    @Inject
     private ReservationDao reservationDao;
     @Inject
     protected SnapshotDao _snapshotDao;
@@ -330,7 +329,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             return;
         }
 
-        final long numToIncrement = (delta.length == 0) ? 1 : delta[0].longValue();
+        final long numToIncrement = (delta.length == 0) ? 1 : delta[0];
         removeResourceReservationIfNeededAndIncrementResourceCount(accountId, type, tag, numToIncrement);
     }
 
@@ -346,7 +345,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             logger.trace("Not decrementing resource count for system accounts, returning");
             return;
         }
-        long numToDecrement = (delta.length == 0) ? 1 : delta[0].longValue();
+        long numToDecrement = (delta.length == 0) ? 1 : delta[0];
 
         if (!updateResourceCountForAccount(accountId, type, tag, false, numToDecrement)) {
             _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, "Failed to decrement resource count of type " + type + " for account id=" + accountId,
@@ -373,11 +372,11 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
         // Check if limit is configured for account
         if (limit != null) {
-            max = limit.getMax().longValue();
+            max = limit.getMax();
         } else {
             String resourceTypeName = type.name();
             // If the account has an no limit set, then return global default account limits
-            Long value = null;
+            Long value;
             if (account.getType() == Account.Type.PROJECT) {
                 value = projectResourceLimitMap.get(resourceTypeName);
             } else {
@@ -418,10 +417,10 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
         // Check if limit is configured for account
         if (limit != null) {
-            max = limit.longValue();
+            max = limit;
         } else {
             // If the account has an no limit set, then return global default account limits
-            Long value = null;
+            Long value;
             if (account.getType() == Account.Type.PROJECT) {
                 value = projectResourceLimitMap.get(type.getName());
             } else {
@@ -453,7 +452,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         ResourceLimitVO limit = _resourceLimitDao.findByOwnerIdAndTypeAndTag(domain.getId(), ResourceOwnerType.Domain, type, tag);
 
         if (limit != null) {
-            max = limit.getMax().longValue();
+            max = limit.getMax();
         } else {
             // check domain hierarchy
             Long domainId = domain.getParent();
@@ -467,12 +466,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             }
 
             if (limit != null) {
-                max = limit.getMax().longValue();
+                max = limit.getMax();
             } else {
                 if (StringUtils.isNotEmpty(tag)) {
                     return findCorrectResourceLimitForDomain(domain, type, null);
                 }
-                Long value = null;
+                Long value;
                 value = domainResourceLimitMap.get(type.name());
                 if (value != null) {
                     if (value < 0) { // return unlimit if value is set to negative
@@ -491,7 +490,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
     protected void checkDomainResourceLimit(final Account account, final Project project, final ResourceType type, String tag, long numResources) throws ResourceAllocationException {
         // check all domains in the account's domain hierarchy
-        Long domainId = null;
+        Long domainId;
         if (project != null) {
             domainId = project.getDomainId();
         } else {
@@ -530,9 +529,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                         convCurrentDomainResourceCount, convCurrentResourceReservation, convNumResources
                 );
 
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Checking if" + messageSuffix);
-                }
+                logger.debug(CHECKING_IF, messageSuffix);
 
                 if (domainResourceLimit != Resource.RESOURCE_UNLIMITED && requestedDomainResourceCount > domainResourceLimit) {
                     String message = "Maximum" + messageSuffix;
@@ -571,9 +568,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 convertedAccountResourceLimit, convertedCurrentResourceCount, convertedCurrentResourceReservation, convertedNumResources
         );
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Checking if" + messageSuffix);
-        }
+        logger.debug(CHECKING_IF, messageSuffix);
 
         if (accountResourceLimit != Resource.RESOURCE_UNLIMITED && requestedResourceCount > accountResourceLimit) {
             String message = "Maximum" + messageSuffix;
@@ -592,14 +587,14 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
     @Override
     public long findDefaultResourceLimitForDomain(ResourceType resourceType) {
-        Long resourceLimit = null;
+        Long resourceLimit;
         resourceLimit = domainResourceLimitMap.get(resourceType.getName());
         if (resourceLimit != null && (resourceType == ResourceType.primary_storage || resourceType == ResourceType.secondary_storage)) {
             if (! Long.valueOf(Resource.RESOURCE_UNLIMITED).equals(resourceLimit)) {
                 resourceLimit = resourceLimit * ResourceType.bytesToGiB;
             }
         } else {
-            resourceLimit = Long.valueOf(Resource.RESOURCE_UNLIMITED);
+            resourceLimit = (long) Resource.RESOURCE_UNLIMITED;
         }
         return resourceLimit;
     }
@@ -677,8 +672,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
     @Override
     public List<ResourceLimitVO> searchForLimits(Long id, Long accountId, Long domainId, ResourceType resourceType, String tag, Long startIndex, Long pageSizeVal) {
         Account caller = CallContext.current().getCallingAccount();
-        List<ResourceLimitVO> limits = new ArrayList<ResourceLimitVO>();
-        boolean isAccount = true;
+        List<ResourceLimitVO> limits = new ArrayList<>();
+        boolean isAccount;
 
         if (!_accountMgr.isAdmin(caller.getId())) {
             accountId = caller.getId();
@@ -770,7 +765,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             if (foundLimits.isEmpty()) {
                 ResourceOwnerType ownerType = ResourceOwnerType.Domain;
                 Long ownerId = domainId;
-                long max = 0;
+                long max;
                 if (isAccount) {
                     ownerType = ResourceOwnerType.Account;
                     ownerId = accountId;
@@ -788,8 +783,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             // see if any limits are missing from the table, and if yes - get it from the config table and add
             ResourceType[] resourceTypes = ResourceCount.ResourceType.values();
             if (foundLimits.size() != resourceTypes.length) {
-                List<String> accountLimitStr = new ArrayList<String>();
-                List<String> domainLimitStr = new ArrayList<String>();
+                List<String> accountLimitStr = new ArrayList<>();
+                List<String> domainLimitStr = new ArrayList<>();
                 for (ResourceLimitVO foundLimit : foundLimits) {
                     if (foundLimit.getAccountId() != null) {
                         accountLimitStr.add(foundLimit.getType().toString());
@@ -883,8 +878,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         Account caller = CallContext.current().getCallingAccount();
 
         if (max == null) {
-            max = new Long(Resource.RESOURCE_UNLIMITED);
-        } else if (max.longValue() < Resource.RESOURCE_UNLIMITED) {
+            max = (long)Resource.RESOURCE_UNLIMITED;
+        } else if (max < Resource.RESOURCE_UNLIMITED) {
             throw new InvalidParameterValueException("Please specify either '-1' for an infinite limit, or a limit that is at least '0'.");
         }
 
@@ -892,7 +887,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         ResourceType resourceType = null;
         if (typeId != null) {
             for (ResourceType type : Resource.ResourceType.values()) {
-                if (type.getOrdinal() == typeId.intValue()) {
+                if (type.getOrdinal() == typeId) {
                     resourceType = type;
                 }
             }
@@ -929,7 +924,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 throw new InvalidParameterValueException("Only " + Resource.RESOURCE_UNLIMITED + " limit is supported for Root Admin accounts");
             }
 
-            if ((caller.getAccountId() == accountId.longValue()) && (_accountMgr.isDomainAdmin(caller.getId()) || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN)) {
+            if ((caller.getAccountId() == accountId) && (_accountMgr.isDomainAdmin(caller.getId()) || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN)) {
                 // If the admin is trying to update their own account, disallow.
                 throw new PermissionDeniedException(String.format("Unable to update resource limit for their own account %s, permission denied", account));
             }
@@ -955,12 +950,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
             _accountMgr.checkAccess(caller, domain);
 
-            if (Domain.ROOT_DOMAIN == domainId.longValue()) {
+            if (Domain.ROOT_DOMAIN == domainId) {
                 // no one can add limits on ROOT domain, disallow...
                 throw new PermissionDeniedException("Cannot update resource limit for ROOT domain " + domainId + ", permission denied");
             }
 
-            if ((caller.getDomainId() == domainId.longValue()) && caller.getType() == Account.Type.DOMAIN_ADMIN || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN) {
+            if ((caller.getDomainId() == domainId) && caller.getType() == Account.Type.DOMAIN_ADMIN || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN) {
                 // if the admin is trying to update their own domain, disallow...
                 throw new PermissionDeniedException("Unable to update resource limit for domain " + domainId + ", permission denied");
             }
@@ -975,7 +970,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             if (parentDomainId != null) {
                 DomainVO parentDomain = _domainDao.findById(parentDomainId);
                 long parentMaximum = findCorrectResourceLimitForDomain(parentDomain, resourceType, tag);
-                if ((parentMaximum >= 0) && (max.longValue() > parentMaximum)) {
+                if ((parentMaximum >= 0) && (max > parentMaximum)) {
                     throw new InvalidParameterValueException(String.format("Domain %s has maximum allowed resource limit %d for %s, please specify a value less than or equal to %d", parentDomain, parentMaximum, resourceType, parentMaximum));
                 }
             }
@@ -1064,15 +1059,15 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
     @Override
     public List<? extends ResourceCount> recalculateResourceCount(Long accountId, Long domainId, Integer typeId, String tag) throws CloudRuntimeException {
         Account callerAccount = CallContext.current().getCallingAccount();
-        long count = 0;
-        List<ResourceCountVO> counts = new ArrayList<ResourceCountVO>();
-        List<ResourceType> resourceTypes = new ArrayList<ResourceType>();
+        long count;
+        List<ResourceCountVO> counts = new ArrayList<>();
+        List<ResourceType> resourceTypes = new ArrayList<>();
 
         ResourceType resourceType = null;
 
         if (typeId != null) {
             for (ResourceType type : Resource.ResourceType.values()) {
-                if (type.getOrdinal() == typeId.intValue()) {
+                if (type.getOrdinal() == typeId) {
                     resourceType = type;
                 }
             }
@@ -1091,12 +1086,13 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             throw new InvalidParameterValueException("Please specify a valid domain ID.");
         }
         _accountMgr.checkAccess(callerAccount, domain);
-        Account account = _entityMgr.findById(Account.class, accountId);
-        if (account == null) {
-            throw new InvalidParameterValueException("Unable to find account " + accountId);
+        if (accountId != null) {
+            Account account = _entityMgr.findById(Account.class, accountId);
+            if (account == null) {
+                throw new InvalidParameterValueException("Unable to find account " + accountId);
+            }
+            _accountMgr.verifyCallerPrivilegeForUserOrAccountOperations(account);
         }
-        _accountMgr.verifyCallerPrivilegeForUserOrAccountOperations(account);
-
         if (resourceType != null) {
             resourceTypes.add(resourceType);
         } else {
@@ -1145,7 +1141,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 convertedDelta = toHumanReadableSize(delta);
             }
             String typeStr = StringUtils.isNotEmpty(tag) ? String.format("%s (tag: %s)", type, tag) : type.getName();
-            logger.debug("Updating resource Type = " + typeStr + " count for Account = " + accountId + " Operation = " + (increment ? "increasing" : "decreasing") + " Amount = " + convertedDelta);
+            logger.debug("Updating resource Type = {} count for Account with id = {} Operation = {} Amount = {}", typeStr, accountId, (increment ? "increasing" : "decreasing"), convertedDelta);
         }
         Set<Long> rowIdsToUpdate = _resourceCountDao.listAllRowsToUpdate(accountId, ResourceOwnerType.Account, type, tag);
         return _resourceCountDao.updateCountByDeltaForIds(new ArrayList<>(rowIdsToUpdate), increment, delta);
@@ -1200,6 +1196,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 newResourceCount += _projectDao.countProjectsForDomain(domainId);
             }
 
+            // TODO make sure that the resource counts are not null
             for (ResourceCountVO resourceCount : resourceCounts) {
                 if (resourceCount.getResourceOwnerType() == ResourceOwnerType.Domain && resourceCount.getDomainId() == domainId) {
                     oldResourceCount = resourceCount.getCount();
@@ -1209,11 +1206,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 }
             }
 
+            // TODO domainRC may be null if there are no resource counts for the domain found in the loop above
             if (oldResourceCount != newResourceCount) {
                 domainRC.setCount(newResourceCount);
                 _resourceCountDao.update(domainRC.getId(), domainRC);
-                logger.warn("Discrepency in the resource count has been detected " + "(original count = " + oldResourceCount + " correct count = " + newResourceCount + ") for Type = " + type
-                        + " for Domain ID = " + domainId + " is fixed during resource count recalculation.");
+                logger.warn("Discrepency in the resource count has been detected (original count = {} correct count = {}) for Type = {} for Domain ID = {} is fixed during resource count recalculation.",
+                        oldResourceCount, newResourceCount, type, domainId);
             }
             return newResourceCount;
         });
@@ -1280,8 +1278,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         // resource count which will not lead to any discrepancy.
         if (newCount != null && !newCount.equals(oldCount) &&
                 type != Resource.ResourceType.primary_storage && type != Resource.ResourceType.secondary_storage) {
-            logger.warn("Discrepancy in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type +
-                    " for account ID " + accountId + " is fixed during resource count recalculation.");
+            logger.warn("Discrepancy in the resource count (original count={} correct count = {}) for type {} for account ID {} is fixed during resource count recalculation.",
+                    oldCount, newCount, type, accountId);
         }
 
         return (newCount == null) ? 0 : newCount;
@@ -1425,20 +1423,16 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
     }
 
     private long calculatePublicIpForAccount(long accountId) {
-        Long dedicatedCount = 0L;
-        Long allocatedCount = 0L;
+        long dedicatedCount = 0L;
+        long allocatedCount;
 
         List<VlanVO> dedicatedVlans = _vlanDao.listDedicatedVlans(accountId);
         for (VlanVO dedicatedVlan : dedicatedVlans) {
             List<IPAddressVO> ips = _ipAddressDao.listByVlanId(dedicatedVlan.getId());
-            dedicatedCount += new Long(ips.size());
+            dedicatedCount += ips.size();
         }
         allocatedCount = _ipAddressDao.countAllocatedIPsForAccount(accountId);
-        if (dedicatedCount > allocatedCount) {
-            return dedicatedCount;
-        } else {
-            return allocatedCount;
-        }
+        return Math.max(dedicatedCount, allocatedCount);
     }
 
     protected long calculatePrimaryStorageForAccount(long accountId, String tag) {
@@ -1526,10 +1520,10 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
 
     protected TaggedResourceLimitAndCountResponse getTaggedResourceLimitAndCountResponse(Account account,
          Domain domain, ResourceOwnerType ownerType, ResourceType type, String tag) {
-        Long limit = ResourceOwnerType.Account.equals(ownerType) ?
+        long limit = ResourceOwnerType.Account.equals(ownerType) ?
                 findCorrectResourceLimitForAccount(account, type, tag) :
                 findCorrectResourceLimitForDomain(domain, type, tag);
-        Long count = 0L;
+        long count = 0L;
         ResourceCountVO countVO = _resourceCountDao.findByOwnerAndTypeAndTag(
                 ResourceOwnerType.Account.equals(ownerType) ? account.getId() : domain.getId(), ownerType, type, tag);
         if (countVO != null) {
@@ -1778,7 +1772,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         if (currentOfferingTags.isEmpty() && newOfferingTags.isEmpty()) {
             return null;
         }
-        Set<String> sameTags = currentOfferingTags.stream().filter(newOfferingTags::contains).collect(Collectors.toSet());;
+        Set<String> sameTags = currentOfferingTags.stream().filter(newOfferingTags::contains).collect(Collectors.toSet());
         Set<String> newTags = newOfferingTags.stream().filter(tag -> !currentOfferingTags.contains(tag)).collect(Collectors.toSet());
         Set<String> removedTags = currentOfferingTags.stream().filter(tag -> !newOfferingTags.contains(tag)).collect(Collectors.toSet());
         return new Ternary<>(sameTags, newTags, removedTags);
@@ -1849,7 +1843,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         if (currentOfferingTags.isEmpty() && newOfferingTags.isEmpty()) {
             return null;
         }
-        Set<String> sameTags = currentOfferingTags.stream().filter(newOfferingTags::contains).collect(Collectors.toSet());;
+        Set<String> sameTags = currentOfferingTags.stream().filter(newOfferingTags::contains).collect(Collectors.toSet());
         Set<String> newTags = newOfferingTags.stream().filter(tag -> !currentOfferingTags.contains(tag)).collect(Collectors.toSet());
         Set<String> removedTags = currentOfferingTags.stream().filter(tag -> !newOfferingTags.contains(tag)).collect(Collectors.toSet());
         return new Ternary<>(sameTags, newTags, removedTags);

From 9c6dfd2b26457fecbb2f0676703756c40233949e Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Sun, 20 Jul 2025 21:31:52 +0530
Subject: [PATCH 35/94] Handle IllegalReferenceCountException for decoder,
 while uploading ISO from local (#10879)

---
 .../storage/resource/HttpUploadServerHandler.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
index 9b1c81284f4..73103c37660 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/HttpUploadServerHandler.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import io.netty.util.IllegalReferenceCountException;
 import org.apache.cloudstack.storage.template.UploadEntity;
 import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -229,8 +230,15 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler<HttpObj
     private void reset() {
         request = null;
         // destroy the decoder to release all resources
-        decoder.destroy();
-        decoder = null;
+        if (decoder != null) {
+            try {
+                decoder.destroy();
+            } catch (IllegalReferenceCountException e) {
+                logger.warn("Decoder already destroyed", e);
+            }
+
+            decoder = null;
+        }
     }
 
     private HttpResponseStatus readFileUploadData() throws IOException {

From 3fc02ddd45e41d6b358c55290d923aa90297aafd Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Mon, 21 Jul 2025 15:52:38 +0530
Subject: [PATCH 36/94] Add format and physicalsize in listIsoOs api response
 (#11214)

---
 .../java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 063766761db..26a18818dbf 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
@@ -480,6 +480,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         isoResponse.setExtractable(iso.isExtractable() && !(iso.getTemplateType() == TemplateType.PERHOST));
         isoResponse.setCreated(iso.getCreatedOnStore());
         isoResponse.setDynamicallyScalable(iso.isDynamicallyScalable());
+        isoResponse.setFormat(iso.getFormat());
         if (iso.getTemplateType() == TemplateType.PERHOST) {
             // for TemplateManager.XS_TOOLS_ISO and TemplateManager.VMWARE_TOOLS_ISO, we didn't download, but is ready to use.
             isoResponse.setReady(true);
@@ -578,10 +579,14 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
             isoResponse.setZoneName(iso.getDataCenterName());
         }
 
-        Long isoSize = iso.getSize();
+        long isoSize = iso.getSize();
         if (isoSize > 0) {
             isoResponse.setSize(isoSize);
         }
+        long isoPhysicalSize = iso.getPhysicalSize();
+        if (isoPhysicalSize > 0) {
+            isoResponse.setPhysicalSize(isoPhysicalSize);
+        }
 
         if (iso.getUserDataId() != null) {
             isoResponse.setUserDataId(iso.getUserDataUUid());

From 6ad929641206b073c83727b32ca17167d5be4818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Jandre?=
 <48719461+JoaoJandre@users.noreply.github.com>
Date: Mon, 21 Jul 2025 08:17:27 -0300
Subject: [PATCH 37/94] Fix KVM incremental snapshot removal when using
 multiple secondary storages (#11180)

When removing an incremental snapshot (For both KVM and XenServer), it is checked if the snapshot has a child or not. If it has, then the snapshot is not removed from the storage.

For KVM incremental snapshots, snapshots in the same chain may be on different secondary storages (within the same zone).

However, the child search process only considers snapshots from the same secondary storage as theirs. Therefore, if a snapshot has its parent snapshot on a different secondary storage, it will be completely removed, making the snapshot chain inconsistent.
---
 .../apache/cloudstack/storage/snapshot/SnapshotObject.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
index 178d42f5c74..6cec193cd0a 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
@@ -155,7 +155,9 @@ public class SnapshotObject implements SnapshotInfo {
     @Override
     public SnapshotInfo getChild() {
         QueryBuilder<SnapshotDataStoreVO> sc = QueryBuilder.create(SnapshotDataStoreVO.class);
-        sc.and(sc.entity().getDataStoreId(), Op.EQ, store.getId());
+        if (!HypervisorType.KVM.equals(snapshot.getHypervisorType())) {
+            sc.and(sc.entity().getDataStoreId(), Op.EQ, store.getId());
+        }
         sc.and(sc.entity().getRole(), Op.EQ, store.getRole());
         sc.and(sc.entity().getState(), Op.NIN, State.Destroying, State.Destroyed, State.Error);
         sc.and(sc.entity().getParentSnapshotId(), Op.EQ, getId());

From e7172161dd2aab58a1dee8db5dbd0f7181afe1ac Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Tue, 22 Jul 2025 18:42:24 +0530
Subject: [PATCH 38/94] Guard OS type update for iso/template with existing vms
 (#11215)

* Guard OS type update for iso/template with existing vms

* fix identation

* rename vm -> instance

* force update iso/template as true by default via api

* add missing message.success.update.iso label
---
 .../apache/cloudstack/api/ApiConstants.java   |  1 +
 .../api/BaseUpdateTemplateOrIsoCmd.java       |  8 ++++++++
 .../cloud/template/TemplateManagerImpl.java   |  6 ++++++
 ui/public/locales/en.json                     |  2 ++
 ui/src/views/image/UpdateISO.vue              | 20 +++++++++++++++++--
 ui/src/views/image/UpdateTemplate.vue         | 19 +++++++++++++++++-
 6 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index f5a1636c30e..607504835c0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -223,6 +223,7 @@ public class ApiConstants {
     public static final String FORCED_DESTROY_LOCAL_STORAGE = "forcedestroylocalstorage";
     public static final String FORCE_DELETE_HOST = "forcedeletehost";
     public static final String FORCE_MS_TO_IMPORT_VM_FILES = "forcemstoimportvmfiles";
+    public static final String FORCE_UPDATE_OS_TYPE = "forceupdateostype";
     public static final String FORMAT = "format";
     public static final String FOR_VIRTUAL_NETWORK = "forvirtualnetwork";
     public static final String FOR_SYSTEM_VMS = "forsystemvms";
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
index 9a8282df112..8489bf05ec7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -51,6 +51,10 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
                description = "the ID of the OS type that best represents the OS of this image.")
     private Long osTypeId;
 
+    @Parameter(name = ApiConstants.FORCE_UPDATE_OS_TYPE, type = CommandType.BOOLEAN, since = "4.21", description = "Force OS type update. Warning: Updating OS type will " +
+            "update the guest OS configuration for all the existing Instances deployed with this template/iso, which may affect their behavior.")
+    private Boolean forceUpdateOsType;
+
     @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, description = "the format for the image")
     private String format;
 
@@ -112,6 +116,10 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
         return osTypeId;
     }
 
+    public Boolean getForceUpdateOsType() {
+        return forceUpdateOsType;
+    }
+
     public Boolean getPasswordEnabled() {
         return passwordEnabled;
     }
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index 6759144837d..d8e90cd3d05 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -2238,6 +2238,12 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
                 sc.addAnd("state", SearchCriteria.Op.NEQ, State.Expunging);
                 List<VMInstanceVO> vms = _vmInstanceDao.search(sc, null);
                 if (vms != null && !vms.isEmpty()) {
+                    if (Boolean.FALSE.equals(cmd.getForceUpdateOsType())) {
+                        String message = String.format("Updating OS type will update the guest OS configuration " +
+                            "for all of the %d Instance(s) deployed with this Template/ISO, which may affect their behavior. " +
+                            "To proceed, please set the 'forceupdateostype' parameter to true.", vms.size());
+                        throw new InvalidParameterValueException(message);
+                    }
                     for (VMInstanceVO vm: vms) {
                         vm.setGuestOSId(guestOSId);
                         _vmInstanceDao.update(vm.getId(), vm);
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 3fdfa03ecd0..93485043010 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -1039,6 +1039,7 @@
 "label.forbidden": "Forbidden",
 "label.forced": "Force",
 "label.force.ms.to.import.vm.files": "Enable to force OVF Download via Management Server. Disable to use KVM Host ovftool (if installed)",
+"label.force.update.os.type": "Force update OS type",
 "label.force.stop": "Force stop",
 "label.force.reboot": "Force reboot",
 "label.forceencap": "Force UDP encapsulation of ESP packets",
@@ -3693,6 +3694,7 @@
 "message.success.update.ipaddress": "Successfully updated IP address",
 "message.success.update.iprange": "Successfully updated IP range",
 "message.success.update.ipv4.subnet": "Successfully updated IPv4 subnet",
+"message.success.update.iso": "Successfully updated ISO",
 "message.success.update.kubeversion": "Successfully updated Kubernetes supported version",
 "message.success.update.network": "Successfully updated Network",
 "message.success.update.template": "Successfully updated Template",
diff --git a/ui/src/views/image/UpdateISO.vue b/ui/src/views/image/UpdateISO.vue
index 856038f2d5f..f4b46665352 100644
--- a/ui/src/views/image/UpdateISO.vue
+++ b/ui/src/views/image/UpdateISO.vue
@@ -67,6 +67,13 @@
             </a-select-option>
           </a-select>
         </a-form-item>
+        <a-form-item name="forceupdateostype" ref="forceupdateostype" v-if="hasOstypeidChanged()">
+          <template #label>
+            <tooltip-label :title="$t('label.force.update.os.type')" :tooltip="apiParams.forceupdateostype.description"/>
+          </template>
+          <a-switch v-model:checked="form.forceupdateostype" />
+        </a-form-item>
+
         <a-form-item name="isdynamicallyscalable" ref="isdynamicallyscalable">
           <template #label>
             <tooltip-label :title="$t('label.isdynamicallyscalable')" :tooltip="apiParams.isdynamicallyscalable.description"/>
@@ -172,7 +179,8 @@ export default {
       userdataid: null,
       userdatapolicy: null,
       userdatapolicylist: {},
-      architectureTypes: {}
+      architectureTypes: {},
+      originalOstypeid: null
     }
   },
   beforeCreate () {
@@ -195,7 +203,7 @@ export default {
         displaytext: [{ required: true, message: this.$t('message.error.required.input') }],
         ostypeid: [{ required: true, message: this.$t('message.error.select') }]
       })
-      const resourceFields = ['name', 'displaytext', 'passwordenabled', 'isdynamicallyscalable', 'ostypeid', 'userdataid', 'userdatapolicy']
+      const resourceFields = ['name', 'displaytext', 'passwordenabled', 'isdynamicallyscalable', 'ostypeid', 'forceupdateostype', 'userdataid', 'userdatapolicy']
 
       for (var field of resourceFields) {
         var fieldValue = this.resource[field]
@@ -207,6 +215,10 @@ export default {
             case 'userdatapolicy':
               this.userdatapolicy = fieldValue
               break
+            case 'ostypeid':
+              this.form[field] = fieldValue
+              this.originalOstypeid = fieldValue
+              break
             default:
               this.form[field] = fieldValue
               break
@@ -214,6 +226,9 @@ export default {
         }
       }
     },
+    hasOstypeidChanged () {
+      return this.form.ostypeid !== this.originalOstypeid
+    },
     fetchData () {
       this.fetchOsTypes()
       this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
@@ -295,6 +310,7 @@ export default {
           if (!this.isValidValueForKey(values, key)) continue
           params[key] = values[key]
         }
+        params.forceupdateostype = this.form.forceupdateostype || false
         postAPI('updateIso', params).then(json => {
           if (this.userdataid !== null) {
             this.linkUserdataToTemplate(this.userdataid, json.updateisoresponse.iso.id, this.userdatapolicy)
diff --git a/ui/src/views/image/UpdateTemplate.vue b/ui/src/views/image/UpdateTemplate.vue
index 75a41accecb..117b53bbc28 100644
--- a/ui/src/views/image/UpdateTemplate.vue
+++ b/ui/src/views/image/UpdateTemplate.vue
@@ -103,6 +103,14 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :md="24" :lg="24" v-if="hasOstypeidChanged()">
+            <a-form-item name="forceupdateostype" ref="forceupdateostype">
+              <template #label>
+                <tooltip-label :title="$t('label.force.update.os.type')" :tooltip="apiParams.forceupdateostype.description"/>
+              </template>
+              <a-switch v-model:checked="form.forceupdateostype" />
+            </a-form-item>
+          </a-col>
         </a-row>
         <a-row :gutter="12">
           <a-col :md="24" :lg="12">
@@ -251,7 +259,8 @@ export default {
       userdataid: null,
       userdatapolicy: null,
       userdatapolicylist: {},
-      architectureTypes: {}
+      architectureTypes: {},
+      originalOstypeid: null
     }
   },
   beforeCreate () {
@@ -295,6 +304,10 @@ export default {
             case 'userdatapolicy':
               this.userdatapolicy = fieldValue
               break
+            case 'ostypeid':
+              this.form[field] = fieldValue
+              this.originalOstypeid = fieldValue
+              break
             default:
               this.form[field] = fieldValue
               break
@@ -510,6 +523,7 @@ export default {
           }
           params[key] = values[key]
         }
+        params.forceupdateostype = this.form.forceupdateostype || false
         postAPI('updateTemplate', params).then(json => {
           if (this.userdataid !== null) {
             this.linkUserdataToTemplate(this.userdataid, json.updatetemplateresponse.template.id, this.userdatapolicy)
@@ -546,6 +560,9 @@ export default {
       }).finally(() => {
         this.loading = false
       })
+    },
+    hasOstypeidChanged () {
+      return this.form.ostypeid !== this.originalOstypeid
     }
   }
 }

From d5f6b7cd1d18ad3b6e8057f3f36e95a0a24b7440 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Tue, 22 Jul 2025 21:36:26 +0530
Subject: [PATCH 39/94] Fix to create instances with smaller templates (< 1 GB)
 on PowerFlex/ScaleIO storage (#11211)

* Fix to create instances with smaller templates (< 1 GB) on PowerFlex/ScaleIO storage

* code improvements
---
 .../driver/ScaleIOPrimaryDataStoreDriver.java    | 16 ++++++++--------
 .../ScaleIOPrimaryDataStoreDriverTest.java       | 12 ++++++++++++
 .../kvm/storage/StorPoolStorageAdaptor.java      |  3 +++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
index 192ae4636e9..3d2ca5b1d09 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
@@ -1230,13 +1230,13 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
             }
 
             org.apache.cloudstack.storage.datastore.api.Volume scaleIOVolume = client.getVolume(scaleIOVolumeId);
-            long newSizeInGB = newSizeInBytes / (1024 * 1024 * 1024);
-            long newSizeIn8gbBoundary = (long) (Math.ceil(newSizeInGB / 8.0) * 8.0);
+            double newSizeInGB = newSizeInBytes / (1024.0 * 1024 * 1024);
+            long newSizeIn8GBBoundary = (long) (Math.ceil(newSizeInGB / 8.0) * 8.0);
 
-            if (scaleIOVolume.getSizeInKb() == newSizeIn8gbBoundary << 20) {
+            if (scaleIOVolume.getSizeInKb() == newSizeIn8GBBoundary << 20) {
                 logger.debug("No resize necessary at API");
             } else {
-                scaleIOVolume = client.resizeVolume(scaleIOVolumeId, (int) newSizeIn8gbBoundary);
+                scaleIOVolume = client.resizeVolume(scaleIOVolumeId, (int) newSizeIn8GBBoundary);
                 if (scaleIOVolume == null) {
                     throw new CloudRuntimeException("Failed to resize volume: " + volumeInfo.getName());
                 }
@@ -1362,12 +1362,12 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
 
     @Override
     public long getVolumeSizeRequiredOnPool(long volumeSize, Long templateSize, boolean isEncryptionRequired) {
-        long newSizeInGB = volumeSize / (1024 * 1024 * 1024);
+        double newSizeInGB = volumeSize / (1024.0 * 1024 * 1024);
         if (templateSize != null && isEncryptionRequired && needsExpansionForEncryptionHeader(templateSize, volumeSize)) {
-            newSizeInGB = (volumeSize + (1<<30)) / (1024 * 1024 * 1024);
+            newSizeInGB = (volumeSize + (1<<30)) / (1024.0 * 1024 * 1024);
         }
-        long newSizeIn8gbBoundary = (long) (Math.ceil(newSizeInGB / 8.0) * 8.0);
-        return newSizeIn8gbBoundary * (1024 * 1024 * 1024);
+        long newSizeIn8GBBoundary = (long) (Math.ceil(newSizeInGB / 8.0) * 8.0);
+        return newSizeIn8GBBoundary * (1024 * 1024 * 1024);
     }
 
     @Override
diff --git a/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java b/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java
index 921dd3d4d9f..610b595ee05 100644
--- a/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java
+++ b/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriverTest.java
@@ -555,6 +555,18 @@ public class ScaleIOPrimaryDataStoreDriverTest {
 
     @Test
     public void testGetVolumeSizeRequiredOnPool() {
+        Assert.assertEquals(8L * (1024 * 1024 * 1024),
+                scaleIOPrimaryDataStoreDriver.getVolumeSizeRequiredOnPool(
+                        52428800,
+                        null,
+                        false));
+
+        Assert.assertEquals(8L * (1024 * 1024 * 1024),
+                scaleIOPrimaryDataStoreDriver.getVolumeSizeRequiredOnPool(
+                        52428800,
+                        52428800L,
+                        true));
+
         Assert.assertEquals(16L * (1024 * 1024 * 1024),
                 scaleIOPrimaryDataStoreDriver.getVolumeSizeRequiredOnPool(
                         10L * (1024 * 1024 * 1024),
diff --git a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java
index d68e9cbd110..897b293f30d 100644
--- a/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java
+++ b/plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java
@@ -139,6 +139,9 @@ public class StorPoolStorageAdaptor implements StorageAdaptor {
     }
 
     public static String getVolumeNameFromPath(final String volumeUuid, boolean tildeNeeded) {
+        if (volumeUuid == null) {
+            return null;
+        }
         if (volumeUuid.startsWith("/dev/storpool/")) {
             return volumeUuid.split("/")[3];
         } else if (volumeUuid.startsWith("/dev/storpool-byid/")) {

From d72a05aa5adb29952a3eb7eeef0c95d535e09768 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 23 Jul 2025 11:21:59 +0530
Subject: [PATCH 40/94] Add special Icon to Shared FileSystem Instances
 (#10857)

* Use special icon for sharedfs instance and prefix for sharedfs volumes

* Give custom icon precedence over shared fs icon

* Fix sharedfsvm icon size

* Fix UT failure in StorageVmSharedFSLifeCycleTest
---
 .../lifecycle/StorageVmSharedFSLifeCycle.java | 25 +++++++++++++++----
 .../StorageVmSharedFSLifeCycleTest.java       | 11 +++++---
 ui/src/components/view/InfoCard.vue           |  7 +++++-
 ui/src/components/view/ListView.vue           |  7 +++++-
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java b/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
index 31159e7d3d9..ed26963cf81 100644
--- a/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
+++ b/plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java
@@ -140,13 +140,18 @@ public class StorageVmSharedFSLifeCycle implements SharedFSLifeCycle {
         return fsVmConfig;
     }
 
-    private String getStorageVmName(String fileShareName) {
+    private String getStorageVmPrefix(String fileShareName) {
         String prefix = String.format("%s-%s", SharedFSVmNamePrefix, fileShareName);
-        String suffix = Long.toHexString(System.currentTimeMillis());
-
         if (!NetUtils.verifyDomainNameLabel(prefix, true)) {
             prefix = prefix.replaceAll("[^a-zA-Z0-9-]", "");
         }
+        return prefix;
+    }
+
+    private String getStorageVmName(String fileShareName) {
+        String prefix = getStorageVmPrefix(fileShareName);
+        String suffix = Long.toHexString(System.currentTimeMillis());
+
         int nameLength = prefix.length() + suffix.length() + SharedFSVmNamePrefix.length();
         if (nameLength > 63) {
             int prefixLength = prefix.length() - (nameLength - 63);
@@ -236,8 +241,18 @@ public class StorageVmSharedFSLifeCycle implements SharedFSLifeCycle {
         Account owner = accountMgr.getActiveAccountById(sharedFS.getAccountId());
         UserVm vm = deploySharedFSVM(sharedFS.getDataCenterId(), owner, List.of(networkId), sharedFS.getName(), sharedFS.getServiceOfferingId(), diskOfferingId, sharedFS.getFsType(), size, minIops, maxIops);
 
-        List<VolumeVO> volumes = volumeDao.findByInstanceAndType(vm.getId(), Volume.Type.DATADISK);
-        return new Pair<>(volumes.get(0).getId(), vm.getId());
+        List<VolumeVO> volumes = volumeDao.findByInstance(vm.getId());
+        VolumeVO dataVol = null;
+        for (VolumeVO vol : volumes) {
+            String volumeName = vol.getName();
+            String updatedVolumeName = SharedFSVmNamePrefix + "-" + volumeName;
+            vol.setName(updatedVolumeName);
+            volumeDao.update(vol.getId(), vol);
+            if (vol.getVolumeType() == Volume.Type.DATADISK) {
+                dataVol = vol;
+            }
+        }
+        return new Pair<>(dataVol.getId(), vm.getId());
     }
 
     @Override
diff --git a/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java b/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
index 4393b0565f8..2cc909ce0d7 100644
--- a/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
+++ b/plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java
@@ -260,9 +260,14 @@ public class StorageVmSharedFSLifeCycleTest {
                 anyMap(), isNull(), isNull(), isNull(), isNull(),
                 anyBoolean(), anyString(), isNull())).thenReturn(vm);
 
-        VolumeVO volume = mock(VolumeVO.class);
-        when(volume.getId()).thenReturn(s_volumeId);
-        when(volumeDao.findByInstanceAndType(s_vmId, Volume.Type.DATADISK)).thenReturn(List.of(volume));
+        VolumeVO rootVol = mock(VolumeVO.class);
+        when(rootVol.getVolumeType()).thenReturn(Volume.Type.ROOT);
+        when(rootVol.getName()).thenReturn("ROOT-1");
+        VolumeVO dataVol = mock(VolumeVO.class);
+        when(dataVol.getId()).thenReturn(s_volumeId);
+        when(dataVol.getName()).thenReturn("DATA-1");
+        when(dataVol.getVolumeType()).thenReturn(Volume.Type.DATADISK);
+        when(volumeDao.findByInstance(s_vmId)).thenReturn(List.of(rootVol, dataVol));
 
          Pair<Long, Long> result = lifeCycle.deploySharedFS(sharedFS, s_networkId, s_diskOfferingId, s_size, s_minIops, s_maxIops);
          Assert.assertEquals(Optional.ofNullable(result.first()), Optional.ofNullable(s_volumeId));
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 2ad7b96602f..d467665ed5f 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -34,6 +34,9 @@
                     <span v-if="(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon) && !['router', 'systemvm', 'volume'].includes($route.path.split('/')[1])">
                       <resource-icon :image="getImage(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon)" size="4x" style="margin-right: 5px"/>
                     </span>
+                    <span v-else-if="resource.vmtype === 'sharedfsvm'">
+                      <file-text-outlined style="font-size: 36px;" />
+                    </span>
                     <span v-else>
                       <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.name" size="3x" @update-osname="setResourceOsType"/>
                       <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
@@ -876,6 +879,7 @@ import UploadResourceIcon from '@/components/view/UploadResourceIcon'
 import eventBus from '@/config/eventBus'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import ResourceLabel from '@/components/widgets/ResourceLabel'
+import { FileTextOutlined } from '@ant-design/icons-vue'
 
 export default {
   name: 'InfoCard',
@@ -887,7 +891,8 @@ export default {
     TooltipButton,
     UploadResourceIcon,
     ResourceIcon,
-    ResourceLabel
+    ResourceLabel,
+    FileTextOutlined
   },
   props: {
     resource: {
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 3d41e01bb1c..eca99dc0346 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -44,6 +44,9 @@
           <span v-if="record.icon && record.icon.base64image">
             <resource-icon :image="record.icon.base64image" size="2x"/>
           </span>
+          <span v-else-if="record.vmtype === 'sharedfsvm'">
+            <file-text-outlined style="font-size: 18px;" />
+          </span>
           <os-logo v-else :osId="record.ostypeid" :osName="record.osdisplayname" size="xl" />
         </span>
         <span style="min-width: 120px" >
@@ -591,6 +594,7 @@ import { createPathBasedOnVmType } from '@/utils/plugins'
 import { validateLinks } from '@/utils/links'
 import cronstrue from 'cronstrue/i18n'
 import moment from 'moment-timezone'
+import { FileTextOutlined } from '@ant-design/icons-vue'
 
 export default {
   name: 'ListView',
@@ -601,7 +605,8 @@ export default {
     CopyLabel,
     TooltipButton,
     ResourceIcon,
-    ResourceLabel
+    ResourceLabel,
+    FileTextOutlined
   },
   props: {
     columns: {

From 9d049707d5e5f93733fcac4ed8408964f42e815a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernardo=20De=20Marco=20Gon=C3=A7alves?=
 <bernardomg2004@gmail.com>
Date: Wed, 23 Jul 2025 04:31:17 -0300
Subject: [PATCH 41/94] Fix deletion of backup schedules (#11222)

---
 .../user/backup/DeleteBackupScheduleCmd.java  |  16 +--
 .../api/response/BackupScheduleResponse.java  |  13 +-
 .../cloudstack/backup/BackupSchedule.java     |   1 +
 .../cloudstack/backup/BackupScheduleVO.java   |   9 ++
 .../backup/dao/BackupScheduleDaoImpl.java     |   3 +-
 .../META-INF/db/schema-42010to42100.sql       |   3 +
 .../cloudstack/backup/BackupManagerImpl.java  |  43 +++++--
 .../cloudstack/backup/BackupManagerTest.java  | 111 +++++++++++++++++-
 .../views/compute/backup/BackupSchedule.vue   |   2 +-
 9 files changed, 174 insertions(+), 27 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
index 548f4d67b23..dbfd21d5a56 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
@@ -43,7 +43,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
         description = "Deletes the backup schedule of a VM",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
-public class DeleteBackupScheduleCmd  extends BaseCmd {
+public class DeleteBackupScheduleCmd extends BaseCmd {
 
     @Inject
     private BackupManager backupManager;
@@ -52,17 +52,13 @@ public class DeleteBackupScheduleCmd  extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
-            type = CommandType.UUID,
-            entityType = UserVmResponse.class,
-            description = "ID of the VM")
+    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class,
+            description = "ID of the VM from which all backup schedules will be deleted.")
     private Long vmId;
 
-    @Parameter(name = ApiConstants.ID,
-            type = CommandType.UUID,
-            entityType = BackupScheduleResponse.class,
-            description = "ID of the schedule",
-            since = "4.20.1")
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = BackupScheduleResponse.class,
+            since = "4.20.1", description = "ID of the backup schedule to be deleted. It has precedence over the 'virtualmachineid' parameter, " +
+            "i.e., when the 'id' parameter is specified, the 'virtualmachineid' parameter will be ignored.")
     private Long id;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
index d7c6f96add5..92f1bad5447 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
@@ -28,6 +28,9 @@ import com.google.gson.annotations.SerializedName;
 
 @EntityReference(value = BackupSchedule.class)
 public class BackupScheduleResponse extends BaseResponse {
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the backup schedule.")
+    private String id;
 
     @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
     @Param(description = "name of the VM")
@@ -51,7 +54,11 @@ public class BackupScheduleResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.MAX_BACKUPS)
     @Param(description = "maximum number of backups retained")
-    private Integer maxBakups;
+    private Integer maxBackups;
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
     public String getVmName() {
         return vmName;
@@ -93,7 +100,7 @@ public class BackupScheduleResponse extends BaseResponse {
         this.timezone = timezone;
     }
 
-    public void setMaxBakups(Integer maxBakups) {
-        this.maxBakups = maxBakups;
+    public void setMaxBackups(Integer maxBackups) {
+        this.maxBackups = maxBackups;
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java b/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
index 4ff946be9cd..f439b3a9139 100644
--- a/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
@@ -31,4 +31,5 @@ public interface BackupSchedule extends InternalIdentity {
     Date getScheduledTimestamp();
     Long getAsyncJobId();
     Integer getMaxBackups();
+    String getUuid();
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java
index 0258c42c52b..75c7a8be55c 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java
@@ -18,6 +18,7 @@
 package org.apache.cloudstack.backup;
 
 import java.util.Date;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -39,6 +40,9 @@ public class BackupScheduleVO implements BackupSchedule {
     @Column(name = "id")
     private long id;
 
+    @Column(name = "uuid", nullable = false)
+    private String uuid = UUID.randomUUID().toString();
+
     @Column(name = "vm_id")
     private Long vmId;
 
@@ -84,6 +88,11 @@ public class BackupScheduleVO implements BackupSchedule {
         return id;
     }
 
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
     public Long getVmId() {
         return vmId;
     }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java
index aac2e3bf232..9374798dde3 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java
@@ -92,12 +92,13 @@ public class BackupScheduleDaoImpl extends GenericDaoBase<BackupScheduleVO, Long
     public BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
         VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(schedule.getVmId());
         BackupScheduleResponse response = new BackupScheduleResponse();
+        response.setId(schedule.getUuid());
         response.setVmId(vm.getUuid());
         response.setVmName(vm.getHostName());
         response.setIntervalType(schedule.getScheduleType());
         response.setSchedule(schedule.getSchedule());
         response.setTimezone(schedule.getTimezone());
-        response.setMaxBakups(schedule.getMaxBackups());
+        response.setMaxBackups(schedule.getMaxBackups());
         response.setObjectName("backupschedule");
         return response;
     }
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 3fd4914b2e2..9688d3c7637 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -233,3 +233,6 @@ CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
     PRIMARY KEY (`id`),
     CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
 );
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'uuid', 'VARCHAR(40) NOT NULL');
+UPDATE `cloud`.`backup_schedule` SET uuid = UUID();
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 68b6a2ad047..4a53edd9570 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -71,6 +71,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.amazonaws.util.CollectionUtils;
@@ -515,24 +516,44 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
     public boolean deleteBackupSchedule(DeleteBackupScheduleCmd cmd) {
         Long vmId = cmd.getVmId();
         Long id = cmd.getId();
-        if (Objects.isNull(vmId) && Objects.isNull(id)) {
-            throw new InvalidParameterValueException("Either instance ID or ID of backup schedule needs to be specified");
+        if (ObjectUtils.allNull(vmId, id)) {
+            throw new InvalidParameterValueException("Either instance ID or ID of backup schedule needs to be specified.");
         }
-        if (Objects.nonNull(vmId)) {
-            final VMInstanceVO vm = findVmById(vmId);
-            validateForZone(vm.getDataCenterId());
-            accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
-            return deleteAllVMBackupSchedules(vm.getId());
-        } else {
-            final BackupSchedule schedule = backupScheduleDao.findById(id);
+
+        if (Objects.nonNull(id)) {
+            BackupSchedule schedule = backupScheduleDao.findById(id);
             if (schedule == null) {
-                throw new CloudRuntimeException("Could not find the requested backup schedule.");
+                throw new InvalidParameterValueException("Could not find the requested backup schedule.");
             }
+            checkCallerAccessToBackupScheduleVm(schedule.getVmId());
             return backupScheduleDao.remove(schedule.getId());
         }
+
+        checkCallerAccessToBackupScheduleVm(vmId);
+        return deleteAllVmBackupSchedules(vmId);
     }
 
-    private boolean deleteAllVMBackupSchedules(long vmId) {
+    /**
+     * Checks if the backup framework is enabled for the zone in which the VM with specified ID is allocated and
+     * if the caller has access to the VM.
+     *
+     * @param vmId The ID of the virtual machine to check access for
+     * @throws PermissionDeniedException if the caller doesn't have access to the VM
+     * @throws CloudRuntimeException if the backup framework is disabled
+     */
+    protected void checkCallerAccessToBackupScheduleVm(long vmId) {
+        VMInstanceVO vm = findVmById(vmId);
+        validateForZone(vm.getDataCenterId());
+        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+    }
+
+    /**
+     * Deletes all backup schedules associated with a specific VM.
+     *
+     * @param vmId The ID of the virtual machine whose backup schedules should be deleted
+     * @return true if all backup schedules were successfully deleted, false if any deletion failed
+     */
+    protected boolean deleteAllVmBackupSchedules(long vmId) {
         List<BackupScheduleVO> vmBackupSchedules = backupScheduleDao.listByVM(vmId);
         boolean success = true;
         for (BackupScheduleVO vmBackupSchedule : vmBackupSchedules) {
diff --git a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
index 808511e6fdf..969a4202c51 100644
--- a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
+++ b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
@@ -47,6 +47,7 @@ import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.backup.UpdateBackupOfferingCmd;
 import org.apache.cloudstack.api.command.user.backup.CreateBackupScheduleCmd;
+import org.apache.cloudstack.api.command.user.backup.DeleteBackupScheduleCmd;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;
 import org.apache.cloudstack.backup.dao.BackupScheduleDao;
@@ -75,6 +76,8 @@ import java.util.Map;
 import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -127,7 +130,21 @@ public class BackupManagerTest {
     @Mock
     AlertManager alertManager;
 
-    private AccountVO account;
+    @Mock
+    private VMInstanceVO vmInstanceVOMock;
+
+    @Mock
+    private CallContext callContextMock;
+
+    @Mock
+    private AccountVO accountVOMock;
+
+    @Mock
+    private DeleteBackupScheduleCmd deleteBackupScheduleCmdMock;
+
+    @Mock
+    private BackupScheduleVO backupScheduleVOMock;
+
     private UserVO user;
 
     private String[] hostPossibleValues = {"127.0.0.1", "hostname"};
@@ -657,4 +674,96 @@ public class BackupManagerTest {
             }
         }
     }
+
+    @Test
+    public void checkCallerAccessToBackupScheduleVmTestExecuteAccessCheckMethods() {
+        long vmId = 1L;
+        long dataCenterId = 2L;
+
+        try (MockedStatic<CallContext> mockedCallContext = Mockito.mockStatic(CallContext.class)) {
+            Mockito.when(vmInstanceDao.findById(vmId)).thenReturn(vmInstanceVOMock);
+            Mockito.when(vmInstanceVOMock.getDataCenterId()).thenReturn(dataCenterId);
+            Mockito.when(backupManager.isDisabled(dataCenterId)).thenReturn(false);
+
+            mockedCallContext.when(CallContext::current).thenReturn(callContextMock);
+            Mockito.when(callContextMock.getCallingAccount()).thenReturn(accountVOMock);
+            Mockito.doNothing().when(accountManager).checkAccess(accountVOMock, null, true, vmInstanceVOMock);
+            backupManager.checkCallerAccessToBackupScheduleVm(vmId);
+
+            verify(accountManager, times(1)).checkAccess(accountVOMock, null, true, vmInstanceVOMock);
+        }
+    }
+
+    @Test
+    public void deleteAllVmBackupSchedulesTestReturnSuccessWhenAllSchedulesAreDeleted() {
+        long vmId = 1L;
+        List<BackupScheduleVO> backupSchedules = List.of(Mockito.mock(BackupScheduleVO.class), Mockito.mock(BackupScheduleVO.class));
+        Mockito.when(backupScheduleDao.listByVM(vmId)).thenReturn(backupSchedules);
+        Mockito.when(backupSchedules.get(0).getId()).thenReturn(2L);
+        Mockito.when(backupSchedules.get(1).getId()).thenReturn(3L);
+        Mockito.when(backupScheduleDao.remove(Mockito.anyLong())).thenReturn(true);
+
+        boolean success = backupManager.deleteAllVmBackupSchedules(vmId);
+        assertTrue(success);
+        Mockito.verify(backupScheduleDao, times(2)).remove(Mockito.anyLong());
+    }
+
+    @Test
+    public void deleteAllVmBackupSchedulesTestReturnFalseWhenAnyDeletionFails() {
+        long vmId = 1L;
+        List<BackupScheduleVO> backupSchedules = List.of(Mockito.mock(BackupScheduleVO.class), Mockito.mock(BackupScheduleVO.class));
+        Mockito.when(backupScheduleDao.listByVM(vmId)).thenReturn(backupSchedules);
+        Mockito.when(backupSchedules.get(0).getId()).thenReturn(2L);
+        Mockito.when(backupSchedules.get(1).getId()).thenReturn(3L);
+        Mockito.when(backupScheduleDao.remove(2L)).thenReturn(true);
+        Mockito.when(backupScheduleDao.remove(3L)).thenReturn(false);
+
+        boolean success = backupManager.deleteAllVmBackupSchedules(vmId);
+        assertFalse(success);
+        Mockito.verify(backupScheduleDao, times(2)).remove(Mockito.anyLong());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void deleteBackupScheduleTestThrowExceptionWhenVmIdAndScheduleIdAreNull() {
+        when(deleteBackupScheduleCmdMock.getVmId()).thenReturn(null);
+        when(deleteBackupScheduleCmdMock.getId()).thenReturn(null);
+
+        backupManager.deleteBackupSchedule(deleteBackupScheduleCmdMock);
+    }
+
+    @Test
+    public void deleteBackupScheduleTestDeleteVmSchedulesWhenVmIdIsSpecified() {
+        long vmId = 1L;
+
+        when(deleteBackupScheduleCmdMock.getId()).thenReturn(null);
+        when(deleteBackupScheduleCmdMock.getVmId()).thenReturn(vmId);
+        Mockito.doNothing().when(backupManager).checkCallerAccessToBackupScheduleVm(vmId);
+        Mockito.doReturn(true).when(backupManager).deleteAllVmBackupSchedules(vmId);
+
+        boolean success = backupManager.deleteBackupSchedule(deleteBackupScheduleCmdMock);
+        assertTrue(success);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void deleteBackupScheduleTestThrowExceptionWhenSpecificScheduleIsNotFound() {
+        long id = 1L;
+        when(deleteBackupScheduleCmdMock.getId()).thenReturn(id);
+        backupManager.deleteBackupSchedule(deleteBackupScheduleCmdMock);
+    }
+
+    @Test
+    public void deleteBackupScheduleTestDeleteSpecificScheduleWhenItsIdIsSpecified() {
+        long id = 1L;
+        long vmId = 2L;
+        when(deleteBackupScheduleCmdMock.getId()).thenReturn(id);
+        when(deleteBackupScheduleCmdMock.getVmId()).thenReturn(null);
+        when(backupScheduleDao.findById(id)).thenReturn(backupScheduleVOMock);
+        when(backupScheduleVOMock.getVmId()).thenReturn(vmId);
+        Mockito.doNothing().when(backupManager).checkCallerAccessToBackupScheduleVm(vmId);
+        when(backupScheduleVOMock.getId()).thenReturn(id);
+        when(backupScheduleDao.remove(id)).thenReturn(true);
+
+        boolean success = backupManager.deleteBackupSchedule(deleteBackupScheduleCmdMock);
+        assertTrue(success);
+    }
 }
diff --git a/ui/src/views/compute/backup/BackupSchedule.vue b/ui/src/views/compute/backup/BackupSchedule.vue
index 0e1106e6504..fd615e8e8d6 100644
--- a/ui/src/views/compute/backup/BackupSchedule.vue
+++ b/ui/src/views/compute/backup/BackupSchedule.vue
@@ -167,7 +167,7 @@ export default {
   methods: {
     handleClickDelete (record) {
       const params = {}
-      params.virtualmachineid = record.virtualmachineid
+      params.id = record.id
       this.actionLoading = true
       postAPI('deleteBackupSchedule', params).then(json => {
         if (json.deletebackupscheduleresponse.success) {

From a710ff8c6dbac9aa15f6336cd70fc36e7337e083 Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Wed, 23 Jul 2025 13:07:02 +0530
Subject: [PATCH 42/94] UI: Fix ISO Hypervisor selection (#11261)

---
 ui/src/views/compute/DeployVM.vue                      | 2 +-
 ui/src/views/compute/wizard/OsBasedImageSelection.vue  | 6 +++---
 ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 16ff8066489..ac98f35d806 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -148,7 +148,7 @@
                       @handle-image-search-filter="filters => fetchImages(filters)"
                       @update-image="updateFieldValue"
                       @update-disk-size="updateFieldValue"
-                      @change-iso-hypervisor="value => hypervisor = value" />
+                      @change-iso-hypervisor="value => form.hypervisor = value" />
                     <a-card
                       v-else
                       :tabList="imageTypeList"
diff --git a/ui/src/views/compute/wizard/OsBasedImageSelection.vue b/ui/src/views/compute/wizard/OsBasedImageSelection.vue
index 57fb4b355ac..ca157384a9a 100644
--- a/ui/src/views/compute/wizard/OsBasedImageSelection.vue
+++ b/ui/src/views/compute/wizard/OsBasedImageSelection.vue
@@ -112,7 +112,7 @@
           v-model:value="localSelectedIsoHypervisor"
           :preFillContent="preFillContent"
           :options="isoHypervisorItems"
-          @change="handleIsoHypervisorChange()"
+          @change="handleIsoHypervisorChange"
           showSearch
           optionFilterProp="label"
           :filterOption="filterOption" />
@@ -325,8 +325,8 @@ export default {
     emitUpdateDiskSize (decorator, value) {
       this.$emit('update-disk-size', decorator, value)
     },
-    handleIsoHypervisorChange () {
-      this.$emit('change-iso-hypervisor', this.localIsoHypervisor)
+    handleIsoHypervisorChange (hypervisor) {
+      this.$emit('change-iso-hypervisor', hypervisor)
     }
   }
 }
diff --git a/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue b/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
index 28fd4b95047..0d94fc5d3b1 100644
--- a/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
+++ b/ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
@@ -63,7 +63,7 @@
   </template>
 
 <script>
-import { api } from '@/api'
+import { getAPI, postAPI } from '@/api'
 import { genericCompare } from '@/utils/sort.js'
 import OsLogo from '@/components/widgets/OsLogo'
 
@@ -164,7 +164,7 @@ export default {
         params.directdownload = true
       }
       return new Promise((resolve, reject) => {
-        api('registerTemplate', params).then(json => {
+        postAPI('registerTemplate', params).then(json => {
           const result = json.registertemplateresponse.template[0]
           resolve(result)
         }).catch(error => {
@@ -225,7 +225,7 @@ export default {
       let osTypeId = this.defaultOsTypeId
       this.loading = true
       try {
-        const json = await api('listOsTypes', { keyword: osName, filter: 'name,id' })
+        const json = await getAPI('listOsTypes', { keyword: osName, filter: 'name,id' })
         if (json && json.listostypesresponse && json.listostypesresponse.ostype && json.listostypesresponse.ostype.length > 0) {
           osTypeId = json.listostypesresponse.ostype[0].id
         }

From 666784f4e57fb20566db38c271567974f50c2dd9 Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Wed, 23 Jul 2025 10:48:27 +0200
Subject: [PATCH 43/94] ovm deprecation (#11196)

Co-authored-by: Daan Hoogland <dahn@apache.org>
---
 client/pom.xml  | 10 ----------
 plugins/pom.xml |  2 --
 2 files changed, 12 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 2b673d7750e..60bd34cc334 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -321,16 +321,6 @@
             <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-hypervisor-ovm</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-hypervisor-ovm3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index db228881a91..3b84ba072a4 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -89,8 +89,6 @@
         <module>hypervisors/baremetal</module>
         <module>hypervisors/hyperv</module>
         <module>hypervisors/kvm</module>
-        <module>hypervisors/ovm3</module>
-        <module>hypervisors/ovm</module>
         <module>hypervisors/ucs</module>
         <module>hypervisors/xenserver</module>
 

From d63899fc8a47d1c55c5bcbaed4ccf1ad2e1cc05f Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:12:53 +0530
Subject: [PATCH 44/94] Set Content-Type from the file type (#11093)

---
 ui/src/components/view/ObjectStoreBrowser.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/view/ObjectStoreBrowser.vue b/ui/src/components/view/ObjectStoreBrowser.vue
index 9f94cc619c7..5507540d1f4 100644
--- a/ui/src/components/view/ObjectStoreBrowser.vue
+++ b/ui/src/components/view/ObjectStoreBrowser.vue
@@ -489,7 +489,12 @@ export default {
     asyncUploadFile (file, objectName) {
       return new Promise((resolve, reject) => {
         file.arrayBuffer().then((buffer) => {
-          this.client.putObject(this.resource.name, objectName, Buffer.from(buffer), file.size, this.uploadMetaData, err => {
+          const metadata = {
+            ...this.uploadMetaData,
+            'Content-Type': file.type || 'binary/octet-stream'
+          }
+
+          this.client.putObject(this.resource.name, objectName, Buffer.from(buffer), file.size, metadata, err => {
             if (err) {
               return reject(this.$notification.error({
                 message: this.$t('message.upload.failed'),

From 0ebf72df0f149445c3bb9c94d4b94e0842c5f2ce Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:15:33 +0530
Subject: [PATCH 45/94] Handle nas backup and restore on Shared mount point.
 (#11204)

---
 .../org/apache/cloudstack/backup/NASBackupProvider.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 141a0073498..46a2cf99e10 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -246,9 +246,13 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
             if (Objects.isNull(storagePool)) {
                 throw new CloudRuntimeException("Unable to find storage pool associated to the volume");
             }
-            String volumePathPrefix = String.format("/mnt/%s", storagePool.getUuid());
+            String volumePathPrefix;
             if (ScopeType.HOST.equals(storagePool.getScope())) {
                 volumePathPrefix = storagePool.getPath();
+            } else if (Storage.StoragePoolType.SharedMountPoint.equals(storagePool.getPoolType())) {
+                volumePathPrefix = storagePool.getPath();
+            } else {
+                volumePathPrefix = String.format("/mnt/%s", storagePool.getUuid());
             }
             volumePaths.add(String.format("%s/%s", volumePathPrefix, volume.getPath()));
         }

From 1b74c2dd3f9eaca5f1d528c82f0aa1e2a078afff Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:15:47 +0530
Subject: [PATCH 46/94] Fix restore from NAS backup when datadisk is older than
 the root disk. (#11258)

---
 .../cloudstack/backup/NASBackupProvider.java  |  7 ++-
 .../LibvirtRestoreBackupCommandWrapper.java   | 60 ++++++++++---------
 .../cloud/storage/VolumeApiServiceImpl.java   | 16 ++---
 .../cloudstack/backup/BackupManagerImpl.java  |  2 +
 .../storage/VolumeApiServiceImplTest.java     |  7 +--
 5 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 46a2cf99e10..9b5672e228f 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -51,6 +51,7 @@ import javax.inject.Inject;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -162,6 +163,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
 
         if (VirtualMachine.State.Stopped.equals(vm.getState())) {
             List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+            vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
             List<String> volumePaths = getVolumePaths(vmVolumes);
             command.setVolumePaths(volumePaths);
         }
@@ -212,7 +214,10 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
     @Override
     public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
         List<Backup.VolumeInfo> backedVolumes = backup.getBackedUpVolumes();
-        List<VolumeVO> volumes = backedVolumes.stream().map(volume -> volumeDao.findByUuid(volume.getUuid())).collect(Collectors.toList());
+        List<VolumeVO> volumes = backedVolumes.stream()
+                .map(volume -> volumeDao.findByUuid(volume.getUuid()))
+                .sorted((v1, v2) -> Long.compare(v1.getDeviceId(), v2.getDeviceId()))
+                .collect(Collectors.toList());
 
         LOG.debug("Restoring vm {} from backup {} on the NAS Backup Provider", vm, backup);
         BackupRepository backupRepository = getBackupRepository(vm, backup);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 2810f98c935..8abc359250c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -62,16 +62,25 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
         String restoreVolumeUuid = command.getRestoreVolumeUUID();
 
         String newVolumeId = null;
-        if (Objects.isNull(vmExists)) {
-            String volumePath = volumePaths.get(0);
-            int lastIndex = volumePath.lastIndexOf("/");
-            newVolumeId = volumePath.substring(lastIndex + 1);
-            restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, diskType, restoreVolumeUuid,
-                    new Pair<>(vmName, command.getVmState()), mountOptions);
-        } else if (Boolean.TRUE.equals(vmExists)) {
-            restoreVolumesOfExistingVM(volumePaths, backupPath, backupRepoType, backupRepoAddress, mountOptions);
-        } else {
-            restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, backupRepoType, backupRepoAddress, mountOptions);
+        try {
+            if (Objects.isNull(vmExists)) {
+                String volumePath = volumePaths.get(0);
+                int lastIndex = volumePath.lastIndexOf("/");
+                newVolumeId = volumePath.substring(lastIndex + 1);
+                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, diskType, restoreVolumeUuid,
+                        new Pair<>(vmName, command.getVmState()), mountOptions);
+            } else if (Boolean.TRUE.equals(vmExists)) {
+                restoreVolumesOfExistingVM(volumePaths, backupPath, backupRepoType, backupRepoAddress, mountOptions);
+            } else {
+                restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, backupRepoType, backupRepoAddress, mountOptions);
+            }
+        } catch (CloudRuntimeException e) {
+            String errorMessage = "Failed to restore backup for VM: " + vmName + ".";
+            if (e.getMessage() != null && !e.getMessage().isEmpty()) {
+                errorMessage += " Details: " + e.getMessage();
+            }
+            logger.error(errorMessage);
+            return new BackupAnswer(command, false, errorMessage);
         }
 
         return new BackupAnswer(command, true, newVolumeId);
@@ -86,10 +95,8 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
                 String volumePath = volumePaths.get(idx);
                 Pair<String, String> bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, backupPath, diskType, null);
                 diskType = "datadisk";
-                try {
-                    replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
-                } catch (IOException e) {
-                    throw new CloudRuntimeException(String.format("Unable to revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), e.getMessage()), e);
+                if (!replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first())) {
+                    throw new CloudRuntimeException(String.format("Unable to restore backup for volume [%s].", bkpPathAndVolUuid.second()));
                 }
             }
         } finally {
@@ -108,10 +115,8 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
                 String volumePath = volumePaths.get(i);
                 Pair<String, String> bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, backupPath, diskType, null);
                 diskType = "datadisk";
-                try {
-                    replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
-                } catch (IOException e) {
-                    throw new CloudRuntimeException(String.format("Unable to revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), e.getMessage()), e);
+                if (!replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first())) {
+                    throw new CloudRuntimeException(String.format("Unable to restore backup for volume [%s].", bkpPathAndVolUuid.second()));
                 }
             }
         } finally {
@@ -126,15 +131,13 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
         Pair<String, String> bkpPathAndVolUuid;
         try {
             bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, backupPath, diskType, volumeUUID);
-            try {
-                replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first());
-                if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
-                    if (!attachVolumeToVm(vmNameAndState.first(), volumePath)) {
-                        throw new CloudRuntimeException(String.format("Failed to attach volume to VM: %s", vmNameAndState.first()));
-                    }
+            if (!replaceVolumeWithBackup(volumePath, bkpPathAndVolUuid.first())) {
+                throw new CloudRuntimeException(String.format("Unable to restore backup for volume [%s].", bkpPathAndVolUuid.second()));
+            }
+            if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
+                if (!attachVolumeToVm(vmNameAndState.first(), volumePath)) {
+                    throw new CloudRuntimeException(String.format("Failed to attach volume to VM: %s", vmNameAndState.first()));
                 }
-            } catch (IOException e) {
-                throw new CloudRuntimeException(String.format("Unable to revert backup for volume [%s] due to [%s].", bkpPathAndVolUuid.second(), e.getMessage()), e);
             }
         } catch (Exception e) {
             throw new CloudRuntimeException("Failed to restore volume", e);
@@ -194,8 +197,9 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
         return new Pair<>(bkpPath, volUuid);
     }
 
-    private void replaceVolumeWithBackup(String volumePath, String backupPath) throws IOException {
-        Script.runSimpleBashScript(String.format(RSYNC_COMMAND, backupPath, volumePath));
+    private boolean replaceVolumeWithBackup(String volumePath, String backupPath) {
+        int exitValue = Script.runSimpleBashScriptForExitValue(String.format(RSYNC_COMMAND, backupPath, volumePath));
+        return exitValue == 0;
     }
 
     private boolean attachVolumeToVm(String vmName, String volumePath) {
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 84e4bbf258f..440da7e2c72 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -2605,7 +2605,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
         excludeLocalStorageIfNeeded(volumeToAttach);
 
-        checkForDevicesInCopies(vmId, vm);
+        checkForVMSnapshots(vmId, vm);
+
+        checkForBackups(vm, true);
 
         checkRightsToAttach(caller, volumeToAttach, vm);
 
@@ -2707,18 +2709,12 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         }
     }
 
-    private void checkForDevicesInCopies(Long vmId, UserVmVO vm) {
+    private void checkForVMSnapshots(Long vmId, UserVmVO vm) {
         // if target VM has associated VM snapshots
         List<VMSnapshotVO> vmSnapshots = _vmSnapshotDao.findByVm(vmId);
         if (vmSnapshots.size() > 0) {
             throw new InvalidParameterValueException(String.format("Unable to attach volume to VM %s/%s, please specify a VM that does not have VM snapshots", vm.getName(), vm.getUuid()));
         }
-
-        // if target VM has backups
-        List<Backup> backups = backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
-        if (vm.getBackupOfferingId() != null && !backups.isEmpty()) {
-            throw new InvalidParameterValueException(String.format("Unable to attach volume to VM %s/%s, please specify a VM that does not have any backups", vm.getName(), vm.getUuid()));
-        }
     }
 
     /**
@@ -2818,7 +2814,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         return volumeToAttach;
     }
 
-    protected void validateIfVmHasBackups(UserVmVO vm, boolean attach) {
+    protected void checkForBackups(UserVmVO vm, boolean attach) {
         if ((vm.getBackupOfferingId() == null || CollectionUtils.isEmpty(vm.getBackupVolumeList())) || BooleanUtils.isTrue(BackupManager.BackupEnableAttachDetachVolumes.value())) {
             return;
         }
@@ -3038,7 +3034,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             throw new InvalidParameterValueException("Unable to detach volume, please specify a VM that does not have VM snapshots");
         }
 
-        validateIfVmHasBackups(vm, false);
+        checkForBackups(vm, false);
 
         AsyncJobExecutionContext asyncExecutionContext = AsyncJobExecutionContext.getCurrentExecutionContext();
         if (asyncExecutionContext != null) {
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 43fc705ad76..1e6ef1a7852 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.backup;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -277,6 +278,7 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
 
     public static String createVolumeInfoFromVolumes(List<VolumeVO> vmVolumes) {
         List<Backup.VolumeInfo> list = new ArrayList<>();
+        vmVolumes.sort(Comparator.comparing(VolumeVO::getDeviceId));
         for (VolumeVO vol : vmVolumes) {
             list.add(new Backup.VolumeInfo(vol.getUuid(), vol.getPath(), vol.getVolumeType(), vol.getSize()));
         }
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index 7dcf30c55e4..6c25e69876f 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -666,7 +666,6 @@ public class VolumeApiServiceImplTest {
         when(vm.getState()).thenReturn(State.Running);
         when(vm.getDataCenterId()).thenReturn(34L);
         when(vm.getBackupOfferingId()).thenReturn(null);
-        when(backupDaoMock.listByVmId(anyLong(), anyLong())).thenReturn(Collections.emptyList());
         when(volumeDaoMock.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList<>(10));
         when(volumeDataFactoryMock.getVolume(9L)).thenReturn(volumeToAttach);
         when(volumeToAttach.getState()).thenReturn(Volume.State.Uploaded);
@@ -1305,7 +1304,7 @@ public class VolumeApiServiceImplTest {
         try {
             UserVmVO vm = Mockito.mock(UserVmVO.class);
             when(vm.getBackupOfferingId()).thenReturn(1l);
-            volumeApiServiceImpl.validateIfVmHasBackups(vm, false);
+            volumeApiServiceImpl.checkForBackups(vm, false);
         } catch (Exception e) {
             Assert.assertEquals("Unable to detach volume, cannot detach volume from a VM that has backups. First remove the VM from the backup offering or set the global configuration 'backup.enable.attach.detach.of.volumes' to true.", e.getMessage());
         }
@@ -1316,7 +1315,7 @@ public class VolumeApiServiceImplTest {
         try {
             UserVmVO vm = Mockito.mock(UserVmVO.class);
             when(vm.getBackupOfferingId()).thenReturn(1l);
-            volumeApiServiceImpl.validateIfVmHasBackups(vm, true);
+            volumeApiServiceImpl.checkForBackups(vm, true);
         } catch (Exception e) {
             Assert.assertEquals("Unable to attach volume, please specify a VM that does not have any backups or set the global configuration 'backup.enable.attach.detach.of.volumes' to true.", e.getMessage());
         }
@@ -1326,7 +1325,7 @@ public class VolumeApiServiceImplTest {
     public void validateIfVmHaveBackupsTestSuccessWhenVMDontHaveBackupOffering() {
         UserVmVO vm = Mockito.mock(UserVmVO.class);
         when(vm.getBackupOfferingId()).thenReturn(null);
-        volumeApiServiceImpl.validateIfVmHasBackups(vm, true);
+        volumeApiServiceImpl.checkForBackups(vm, true);
     }
 
     @Test

From 6d5cefdfe94e5fed5ae9652d00010ef3e0d9c340 Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Wed, 23 Jul 2025 13:28:45 +0200
Subject: [PATCH 47/94] add since parameter to BackupScheduleResponse (#11265)

---
 .../apache/cloudstack/api/response/BackupScheduleResponse.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
index 92f1bad5447..9584223563f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
@@ -29,7 +29,7 @@ import com.google.gson.annotations.SerializedName;
 @EntityReference(value = BackupSchedule.class)
 public class BackupScheduleResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID)
-    @Param(description = "ID of the backup schedule.")
+    @Param(description = "ID of the backup schedule.", since = "4.21.0")
     private String id;
 
     @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)

From fb3bb3fd568b5ffaf971837ece97e78372108b41 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Thu, 24 Jul 2025 01:23:20 +1000
Subject: [PATCH 48/94] pre-commit: upgrade markdownlint to the latest version
 (#11066)

---
 .github/linters/.markdown-lint.yml | 3 +++
 .pre-commit-config.yaml            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
index 5e8d65905eb..531c26ace44 100644
--- a/.github/linters/.markdown-lint.yml
+++ b/.github/linters/.markdown-lint.yml
@@ -86,3 +86,6 @@ MD046: false
 
 # MD052/reference-links-images Reference links and images should use a label that is defined
 MD052: false
+
+# MD059/descriptive-link-text Link text should be descriptive
+MD059: false
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a9bc87454f1..f14b84608c8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -87,7 +87,7 @@ repos:
         ^setup/bindir/cloud-setup-encryption\.in$|
         ^venv/.*$
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.43.0
+    rev: v0.45.0
     hooks:
       - id: markdownlint
         name: run markdownlint

From 165ab0aabe2739271cad9b061bc515b9c7d63e94 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Thu, 24 Jul 2025 01:25:15 +1000
Subject: [PATCH 49/94] Fix HTML license; standardize HTML code (#11067)

Co-authored-by: Vishesh <vishesh92@gmail.com>
---
 systemvm/agent/ui/viewer.ftl      |  10 +--
 tools/apidoc/generatecommands.xsl |   2 +-
 tools/ngui/templates/index.html   | 106 ++++++++++++++++--------------
 ui/public/example.html            |   2 +-
 ui/public/index.html              |   2 +-
 5 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/systemvm/agent/ui/viewer.ftl b/systemvm/agent/ui/viewer.ftl
index e6b12071111..fef0d7e0b68 100644
--- a/systemvm/agent/ui/viewer.ftl
+++ b/systemvm/agent/ui/viewer.ftl
@@ -18,10 +18,10 @@ under the License.
 -->
 <html>
 <head>
-<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/ajaxkeys.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
+<script src="/resource/js/jquery.js"></script>
+<script src="/resource/js/ajaxviewer.js"></script>
+<script src="/resource/js/ajaxkeys.js"></script>
+<script src="/resource/js/handler.js"></script>
 <link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
 <title>${title}</title>
 </head>
@@ -44,7 +44,7 @@ under the License.
 
 <div id="main_panel" tabindex="1"></div>
 
-<script language="javascript">
+<script>
 
 var tileMap = [ ${tileSequence} ];
 var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap,
diff --git a/tools/apidoc/generatecommands.xsl b/tools/apidoc/generatecommands.xsl
index 6e036e07077..ce8dc0eb8ba 100644
--- a/tools/apidoc/generatecommands.xsl
+++ b/tools/apidoc/generatecommands.xsl
@@ -141,7 +141,7 @@ version="1.0">
         </div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
 <div id="footer">
 <div id="comments_thread">
-    <script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=test" async="true">
+    <script src="https://comments.apache.org/show_comments.lua?site=test" async="true">
     </script>
     <noscript>
     <iframe width="930" height="500" src="https://comments.apache.org/iframe.lua?site=test&amp;page=4.2.0/rootadmin"></iframe>
diff --git a/tools/ngui/templates/index.html b/tools/ngui/templates/index.html
index 1dab6555d65..661a8f43999 100644
--- a/tools/ngui/templates/index.html
+++ b/tools/ngui/templates/index.html
@@ -1,19 +1,23 @@
-#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.
+<!--
+     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
 
-<!DOCTYPE html>
+     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.
+-->
+
+<!doctype html>
 <html lang="en" ng-app="cloudstack">
 <head>
     <meta charset="utf-8">
@@ -102,41 +106,41 @@
         </table>
     </script>
 
-    <script type="text/javascript" src="static/js/lib/jquery-1.7.2.js"></script>
-    <script type="text/javascript" src="static/js/lib/angular.js"></script>
-    <script type="text/javascript" src="static/js/app/app.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/virtualmachines.js"></script>
-    <script type="text/javascript" src="static/js/app/instances/instances.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/volumes.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/snapshots.js"></script>
-    <script type="text/javascript" src="static/js/app/storage/storage.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/networks.js"></script>
-    <script type="text/javascript" src="static/js/app/networks/networks.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/templates.js"></script>
-    <script type="text/javascript" src="static/js/app/templates/templates.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/events.js"></script>
-    <script type="text/javascript" src="static/js/app/events/events.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/accounts.js"></script>
-    <script type="text/javascript" src="static/js/app/accounts/accounts.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/domains.js"></script>
-    <script type="text/javascript" src="static/js/app/domains/domains.js"></script>
-    <script type="text/javascript" src="static/js/app/globalsettings/globalsettings.js"></script>
-    <script type="text/javascript" src="static/js/app/serviceofferings/serviceofferings.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/serviceofferings.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/projects.js"></script>
-    <script type="text/javascript" src="static/js/app/projects/projects.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/configurations.js"></script>
-    <script type="text/javascript" src="static/js/common/services/breadcrumbs.js"></script>
-    <script type="text/javascript" src="static/js/common/services/helperfunctions.js"></script>
-    <script type="text/javascript" src="static/js/common/services/requester.js"></script>
-    <script type="text/javascript" src="static/js/common/services/notifications.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/confirm.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/modal-form.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/label.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/edit-in-place.js"></script>
-    <script type="text/javascript" src="static/js/common/dictionary.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/zones.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/diskofferings.js"></script>
-    <script type="text/javascript" src="static/js/lib/angular-ui.min.js"></script>
+    <script src="static/js/lib/jquery-1.7.2.js"></script>
+    <script src="static/js/lib/angular.js"></script>
+    <script src="static/js/app/app.js"></script>
+    <script src="static/js/common/resources/virtualmachines.js"></script>
+    <script src="static/js/app/instances/instances.js"></script>
+    <script src="static/js/common/resources/volumes.js"></script>
+    <script src="static/js/common/resources/snapshots.js"></script>
+    <script src="static/js/app/storage/storage.js"></script>
+    <script src="static/js/common/resources/networks.js"></script>
+    <script src="static/js/app/networks/networks.js"></script>
+    <script src="static/js/common/resources/templates.js"></script>
+    <script src="static/js/app/templates/templates.js"></script>
+    <script src="static/js/common/resources/events.js"></script>
+    <script src="static/js/app/events/events.js"></script>
+    <script src="static/js/common/resources/accounts.js"></script>
+    <script src="static/js/app/accounts/accounts.js"></script>
+    <script src="static/js/common/resources/domains.js"></script>
+    <script src="static/js/app/domains/domains.js"></script>
+    <script src="static/js/app/globalsettings/globalsettings.js"></script>
+    <script src="static/js/app/serviceofferings/serviceofferings.js"></script>
+    <script src="static/js/common/resources/serviceofferings.js"></script>
+    <script src="static/js/common/resources/projects.js"></script>
+    <script src="static/js/app/projects/projects.js"></script>
+    <script src="static/js/common/resources/configurations.js"></script>
+    <script src="static/js/common/services/breadcrumbs.js"></script>
+    <script src="static/js/common/services/helperfunctions.js"></script>
+    <script src="static/js/common/services/requester.js"></script>
+    <script src="static/js/common/services/notifications.js"></script>
+    <script src="static/js/common/directives/confirm.js"></script>
+    <script src="static/js/common/directives/modal-form.js"></script>
+    <script src="static/js/common/directives/label.js"></script>
+    <script src="static/js/common/directives/edit-in-place.js"></script>
+    <script src="static/js/common/dictionary.js"></script>
+    <script src="static/js/common/resources/zones.js"></script>
+    <script src="static/js/common/resources/diskofferings.js"></script>
+    <script src="static/js/lib/angular-ui.min.js"></script>
 </body>
 </html>
diff --git a/ui/public/example.html b/ui/public/example.html
index df59d49086d..2992eae80c7 100644
--- a/ui/public/example.html
+++ b/ui/public/example.html
@@ -16,7 +16,7 @@
      specific language governing permissions and limitations
      under the License.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-gb">
   <head>
     <meta charset="utf-8">
diff --git a/ui/public/index.html b/ui/public/index.html
index 7397f27d545..0f0bfe59397 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -16,7 +16,7 @@
      specific language governing permissions and limitations
      under the License.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-gb">
   <head>
     <meta charset="utf-8">

From 1fbe1d76827d5ba1cb2a9683f0ff9d78744ca91e Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Thu, 24 Jul 2025 01:29:41 +1000
Subject: [PATCH 50/94] pre-commit: add gitleaks to detect hardcoded secrets
 (#11064)

---
 .pre-commit-config.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f14b84608c8..85bba502116 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,6 +25,12 @@ repos:
     hooks:
       - id: identity
       - id: check-hooks-apply
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.27.2
+    hooks:
+      - id: gitleaks
+        name: run gitleaks
+        description: detect hardcoded secrets
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:

From 264e404108ad3b35389e0a444db2fccb6592ae17 Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Thu, 24 Jul 2025 09:30:20 +0530
Subject: [PATCH 51/94] Fix for dynamic scaling toggle for instance (#11086)

* Fix for dynamic scaling toggle for instance

* Update api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../command/user/config/ListCapabilitiesCmd.java |  1 +
 .../api/response/CapabilitiesResponse.java       |  8 ++++++++
 .../com/cloud/server/ManagementServerImpl.java   |  1 +
 ui/src/views/compute/DeployVM.vue                | 14 +++-----------
 ui/src/views/compute/DeployVnfAppliance.vue      | 14 +++-----------
 ui/src/views/compute/EditVM.vue                  | 16 ++--------------
 6 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 65920a97c98..4f036e89a64 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -71,6 +71,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
         response.setInstancesStatsUserOnly((Boolean) capabilities.get(ApiConstants.INSTANCES_STATS_USER_ONLY));
         response.setInstancesDisksStatsRetentionEnabled((Boolean) capabilities.get(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_ENABLED));
         response.setInstancesDisksStatsRetentionTime((Integer) capabilities.get(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME));
+        response.setDynamicScalingEnabled((Boolean) capabilities.get(ApiConstants.DYNAMIC_SCALING_ENABLED));
         response.setObjectName("capability");
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index e4224c85e97..83fb4f4b372 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -124,6 +124,10 @@ public class CapabilitiesResponse extends BaseResponse {
     @Param(description = "the retention time for Instances disks stats", since = "4.18.0")
     private Integer instancesDisksStatsRetentionTime;
 
+    @SerializedName(ApiConstants.DYNAMIC_SCALING_ENABLED)
+    @Param(description = "true if dynamically scaling for instances is enabled", since = "4.21.0")
+    private Boolean dynamicScalingEnabled;
+
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
         this.securityGroupsEnabled = securityGroupsEnabled;
     }
@@ -223,4 +227,8 @@ public class CapabilitiesResponse extends BaseResponse {
     public void setCustomHypervisorDisplayName(String customHypervisorDisplayName) {
         this.customHypervisorDisplayName = customHypervisorDisplayName;
     }
+
+    public void setDynamicScalingEnabled(Boolean dynamicScalingEnabled) {
+        this.dynamicScalingEnabled = dynamicScalingEnabled;
+    }
 }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 7ccd6b5e289..451c8f4e159 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -4408,6 +4408,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         capabilities.put(ApiConstants.INSTANCES_STATS_USER_ONLY, StatsCollector.vmStatsCollectUserVMOnly.value());
         capabilities.put(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_ENABLED, StatsCollector.vmDiskStatsRetentionEnabled.value());
         capabilities.put(ApiConstants.INSTANCES_DISKS_STATS_RETENTION_TIME, StatsCollector.vmDiskStatsMaxRetentionTime.value());
+        capabilities.put(ApiConstants.DYNAMIC_SCALING_ENABLED, UserVmManager.EnableDynamicallyScaleVm.value());
         if (apiLimitEnabled) {
             capabilities.put("apiLimitInterval", apiLimitInterval);
             capabilities.put("apiLimitMax", apiLimitMax);
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index c99ffe4d321..30ac498c5c2 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -944,8 +944,7 @@ export default {
         keyboards: [],
         bootTypes: [],
         bootModes: [],
-        ioPolicyTypes: [],
-        dynamicScalingVmConfig: false
+        ioPolicyTypes: []
       },
       rowCount: {},
       loading: {
@@ -1175,13 +1174,6 @@ export default {
             type: 'Routing'
           },
           field: 'hostid'
-        },
-        dynamicScalingVmConfig: {
-          list: 'listConfigurations',
-          options: {
-            zoneid: _.get(this.zone, 'id'),
-            name: 'enable.dynamic.scale.vm'
-          }
         }
       }
     },
@@ -1312,7 +1304,7 @@ export default {
       return Boolean('listUserData' in this.$store.getters.apis)
     },
     dynamicScalingVmConfigValue () {
-      return this.options.dynamicScalingVmConfig?.[0]?.value === 'true'
+      return this.$store.getters.features.dynamicscalingenabled
     },
     isCustomizedDiskIOPS () {
       return this.diskSelected?.iscustomizediops || false
@@ -2215,7 +2207,7 @@ export default {
       param.loading = true
       param.opts = []
       const options = param.options || {}
-      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'dynamicScalingVmConfig', 'hypervisors'].includes(name)) {
+      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
         options.listall = true
       }
       api(param.list, options).then((response) => {
diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue
index 5e1baac3d8f..b69b67aa8d3 100644
--- a/ui/src/views/compute/DeployVnfAppliance.vue
+++ b/ui/src/views/compute/DeployVnfAppliance.vue
@@ -960,8 +960,7 @@ export default {
         keyboards: [],
         bootTypes: [],
         bootModes: [],
-        ioPolicyTypes: [],
-        dynamicScalingVmConfig: false
+        ioPolicyTypes: []
       },
       rowCount: {},
       loading: {
@@ -1194,13 +1193,6 @@ export default {
             type: 'Routing'
           },
           field: 'hostid'
-        },
-        dynamicScalingVmConfig: {
-          list: 'listConfigurations',
-          options: {
-            zoneid: _.get(this.zone, 'id'),
-            name: 'enable.dynamic.scale.vm'
-          }
         }
       }
     },
@@ -1332,7 +1324,7 @@ export default {
       return Boolean('listUserData' in this.$store.getters.apis)
     },
     dynamicScalingVmConfigValue () {
-      return this.options.dynamicScalingVmConfig?.[0]?.value === 'true'
+      return this.$store.getters.features.dynamicscalingenabled
     },
     isCustomizedDiskIOPS () {
       return this.diskSelected?.iscustomizediops || false
@@ -2403,7 +2395,7 @@ export default {
       param.loading = true
       param.opts = []
       const options = param.options || {}
-      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'dynamicScalingVmConfig', 'hypervisors'].includes(name)) {
+      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
         options.listall = true
       }
       api(param.list, options).then((response) => {
diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue
index 92079b84113..90cc96dd9ef 100644
--- a/ui/src/views/compute/EditVM.vue
+++ b/ui/src/views/compute/EditVM.vue
@@ -145,7 +145,6 @@ export default {
       template: {},
       userDataEnabled: false,
       securityGroupsEnabled: false,
-      dynamicScalingVmConfig: false,
       loading: false,
       securitygroups: {
         loading: false,
@@ -189,7 +188,6 @@ export default {
       this.fetchInstaceGroups()
       this.fetchServiceOfferingData()
       this.fetchTemplateData()
-      this.fetchDynamicScalingVmConfig()
       this.fetchUserData()
     },
     fetchZoneDetails () {
@@ -241,18 +239,8 @@ export default {
         this.template = templateResponses[0]
       })
     },
-    fetchDynamicScalingVmConfig () {
-      const params = {}
-      params.name = 'enable.dynamic.scale.vm'
-      params.zoneid = this.resource.zoneid
-      var apiName = 'listConfigurations'
-      api(apiName, params).then(json => {
-        const configResponse = json.listconfigurationsresponse.configuration
-        this.dynamicScalingVmConfig = configResponse[0]?.value === 'true'
-      })
-    },
-    canDynamicScalingEnabled () {
-      return this.template.isdynamicallyscalable && this.serviceOffering.dynamicscalingenabled && this.dynamicScalingVmConfig
+    isDynamicScalingEnabled () {
+      return this.template.isdynamicallyscalable && this.serviceOffering.dynamicscalingenabled && this.$store.getters.features.dynamicscalingenabled
     },
     fetchOsTypes () {
       this.osTypes.loading = true

From 4111061d2957ae447df05e37f2c8b38171e7eb3c Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Thu, 24 Jul 2025 09:26:57 +0200
Subject: [PATCH 52/94] list only own zones for resource admin (#11087)

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../java/com/cloud/user/AccountService.java   |   2 +
 .../admin/cluster/ListClustersCmd.java        |   6 +-
 .../api/command/admin/pod/ListPodsByCmd.java  |   4 +-
 .../api/command/user/zone/ListZonesCmd.java   |   7 -
 .../apache/cloudstack/query/QueryService.java |  12 +-
 .../management/MockAccountManager.java        |   6 +
 .../com/cloud/api/query/QueryManagerImpl.java | 490 ++++++++----------
 .../com/cloud/user/AccountManagerImpl.java    |   1 +
 .../cloud/user/MockAccountManagerImpl.java    |   5 +
 9 files changed, 254 insertions(+), 279 deletions(-)

diff --git a/api/src/main/java/com/cloud/user/AccountService.java b/api/src/main/java/com/cloud/user/AccountService.java
index e2c3bed0c29..c0ebcf09f59 100644
--- a/api/src/main/java/com/cloud/user/AccountService.java
+++ b/api/src/main/java/com/cloud/user/AccountService.java
@@ -87,6 +87,8 @@ public interface AccountService {
 
     boolean isDomainAdmin(Long accountId);
 
+    boolean isResourceDomainAdmin(Long accountId);
+
     boolean isNormalUser(long accountId);
 
     User getActiveUserByRegistrationToken(String registrationToken);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index 362913a1138..90ec9d1ff07 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -128,19 +128,19 @@ public class ListClustersCmd extends BaseListCmd {
 
     protected Pair<List<ClusterResponse>, Integer> getClusterResponses() {
         Pair<List<? extends Cluster>, Integer> result = _mgr.searchForClusters(this);
-        List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
+        List<ClusterResponse> clusterResponses = new ArrayList<>();
         for (Cluster cluster : result.first()) {
             ClusterResponse clusterResponse = _responseGenerator.createClusterResponse(cluster, showCapacities);
             clusterResponse.setObjectName("cluster");
             clusterResponses.add(clusterResponse);
         }
-        return new Pair<List<ClusterResponse>, Integer>(clusterResponses, result.second());
+        return new Pair<>(clusterResponses, result.second());
     }
 
     @Override
     public void execute() {
         Pair<List<ClusterResponse>, Integer> clusterResponses = getClusterResponses();
-        ListResponse<ClusterResponse> response = new ListResponse<ClusterResponse>();
+        ListResponse<ClusterResponse> response = new ListResponse<>();
         response.setResponses(clusterResponses.first(), clusterResponses.second());
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
index 5ad0b457ced..10370b4c78a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -86,8 +86,8 @@ public class ListPodsByCmd extends BaseListCmd {
     @Override
     public void execute() {
         Pair<List<? extends Pod>, Integer> result = _mgr.searchForPods(this);
-        ListResponse<PodResponse> response = new ListResponse<PodResponse>();
-        List<PodResponse> podResponses = new ArrayList<PodResponse>();
+        ListResponse<PodResponse> response = new ListResponse<>();
+        List<PodResponse> podResponses = new ArrayList<>();
         for (Pod pod : result.first()) {
             PodResponse podResponse = _responseGenerator.createPodResponse(pod, showCapacities);
             podResponse.setObjectName("pod");
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
index d926257437e..8d371bb6761 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
@@ -34,8 +34,6 @@ import org.apache.cloudstack.api.response.ZoneResponse;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListZonesCmd extends BaseListCmd implements UserCmd {
 
-    private static final String s_name = "listzonesresponse";
-
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -113,11 +111,6 @@ public class ListZonesCmd extends BaseListCmd implements UserCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         ListResponse<ZoneResponse> response = _queryService.listDataCenters(this);
diff --git a/api/src/main/java/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
index 0a5721abdc1..0f658e5d20d 100644
--- a/api/src/main/java/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
@@ -112,11 +112,11 @@ public interface QueryService {
     ConfigKey<Boolean> AllowUserViewDestroyedVM = new ConfigKey<>("Advanced", Boolean.class, "allow.user.view.destroyed.vm", "false",
             "Determines whether users can view their destroyed or expunging vm ", true, ConfigKey.Scope.Account);
 
-    static final ConfigKey<String> UserVMDeniedDetails = new ConfigKey<>(String.class,
+    ConfigKey<String> UserVMDeniedDetails = new ConfigKey<>(String.class,
     "user.vm.denied.details", "Advanced", "rootdisksize, cpuOvercommitRatio, memoryOvercommitRatio, Message.ReservedCapacityFreed.Flag",
             "Determines whether users can view certain VM settings. When set to empty, default value used is: rootdisksize, cpuOvercommitRatio, memoryOvercommitRatio, Message.ReservedCapacityFreed.Flag.", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null);
 
-    static final ConfigKey<String> UserVMReadOnlyDetails = new ConfigKey<>(String.class,
+    ConfigKey<String> UserVMReadOnlyDetails = new ConfigKey<>(String.class,
     "user.vm.readonly.details", "Advanced", "dataDiskController, rootDiskController",
             "List of read-only VM settings/details as comma separated string", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null);
 
@@ -125,16 +125,20 @@ public interface QueryService {
                     "network offering, zones), we use the flag to determine if the entities should be sorted ascending (when flag is true) " +
                     "or descending (when flag is false). Within the scope of the config all users see the same result.", true, ConfigKey.Scope.Global);
 
-    public static final ConfigKey<Boolean> AllowUserViewAllDomainAccounts = new ConfigKey<>("Advanced", Boolean.class,
+    ConfigKey<Boolean> AllowUserViewAllDomainAccounts = new ConfigKey<>("Advanced", Boolean.class,
             "allow.user.view.all.domain.accounts", "false",
             "Determines whether users can view all user accounts within the same domain", true, ConfigKey.Scope.Domain);
 
-    static final ConfigKey<Boolean> SharePublicTemplatesWithOtherDomains = new ConfigKey<>("Advanced", Boolean.class, "share.public.templates.with.other.domains", "true",
+    ConfigKey<Boolean> AllowUserViewAllDataCenters = new ConfigKey<>("Advanced", Boolean.class, "allow.user.view.all.zones", "true",
+            "Determines whether for instance a Resource Admin can view zones that are not dedicated to them.", true, ConfigKey.Scope.Domain);
+
+    ConfigKey<Boolean> SharePublicTemplatesWithOtherDomains = new ConfigKey<>("Advanced", Boolean.class, "share.public.templates.with.other.domains", "true",
             "If false, templates of this domain will not show up in the list templates of other domains.", true, ConfigKey.Scope.Domain);
 
     ConfigKey<Boolean> ReturnVmStatsOnVmList = new ConfigKey<>("Advanced", Boolean.class, "list.vm.default.details.stats", "true",
             "Determines whether VM stats should be returned when details are not explicitly specified in listVirtualMachines API request. When false, details default to [group, nics, secgrp, tmpl, servoff, diskoff, backoff, iso, volume, min, affgrp]. When true, all details are returned including 'stats'.", true, ConfigKey.Scope.Global);
 
+
     ListResponse<UserResponse> searchForUsers(ResponseObject.ResponseView responseView, ListUsersCmd cmd) throws PermissionDeniedException;
 
     ListResponse<UserResponse> searchForUsers(Long domainId, boolean recursive) throws PermissionDeniedException;
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index d30d7b2f74d..bc9dbfa7b43 100644
--- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -236,6 +236,12 @@ public class MockAccountManager extends ManagerBase implements AccountManager {
         return false;
     }
 
+    @Override
+    public boolean isResourceDomainAdmin(Long accountId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
     @Override
     public boolean isNormalUser(long accountId) {
         // TODO Auto-generated method stub
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index a2edc05a492..7c8c9ae28c8 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -160,7 +160,6 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.EnumUtils;
@@ -193,6 +192,7 @@ import com.cloud.api.query.dao.VolumeJoinDao;
 import com.cloud.api.query.vo.AccountJoinVO;
 import com.cloud.api.query.vo.AffinityGroupJoinVO;
 import com.cloud.api.query.vo.AsyncJobJoinVO;
+import com.cloud.api.query.vo.BaseViewWithTagInformationVO;
 import com.cloud.api.query.vo.DataCenterJoinVO;
 import com.cloud.api.query.vo.DiskOfferingJoinVO;
 import com.cloud.api.query.vo.DomainJoinVO;
@@ -246,7 +246,6 @@ import com.cloud.network.RouterHealthCheckResult;
 import com.cloud.network.VNF;
 import com.cloud.network.VpcVirtualNetworkApplianceService;
 import com.cloud.network.as.AutoScaleVmGroupVmMapVO;
-import com.cloud.network.as.dao.AutoScaleVmGroupDao;
 import com.cloud.network.as.dao.AutoScaleVmGroupVmMapDao;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
@@ -289,7 +288,6 @@ import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Storage.TemplateType;
-import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.StoragePoolStatus;
@@ -524,9 +522,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Inject
     ProjectInvitationDao projectInvitationDao;
 
-    @Inject
-    TemplateDataStoreDao templateDataStoreDao;
-
     @Inject
     VMTemplatePoolDao templatePoolDao;
 
@@ -544,8 +539,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
     @Inject
     ResourceIconDao resourceIconDao;
-    @Inject
-    StorageManager storageManager;
 
     @Inject
     ManagementServerHostDao msHostDao;
@@ -583,9 +576,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Inject
     BackupOfferingDao backupOfferingDao;
 
-    @Inject
-    AutoScaleVmGroupDao autoScaleVmGroupDao;
-
     @Inject
     AutoScaleVmGroupVmMapDao autoScaleVmGroupVmMapDao;
 
@@ -613,46 +603,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Inject
     ManagementServerHostPeerJoinDao mshostPeerJoinDao;
 
-
-    private SearchCriteria<ServiceOfferingJoinVO> getMinimumCpuServiceOfferingJoinSearchCriteria(int cpu) {
-        SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
-        SearchCriteria<ServiceOfferingJoinVO> sc1 = _srvOfferingJoinDao.createSearchCriteria();
-        sc1.addAnd("cpu", Op.GTEQ, cpu);
-        sc.addOr("cpu", Op.SC, sc1);
-        SearchCriteria<ServiceOfferingJoinVO> sc2 = _srvOfferingJoinDao.createSearchCriteria();
-        sc2.addAnd("cpu", Op.NULL);
-        sc2.addAnd("maxCpu", Op.NULL);
-        sc.addOr("cpu", Op.SC, sc2);
-        SearchCriteria<ServiceOfferingJoinVO> sc3 = _srvOfferingJoinDao.createSearchCriteria();
-        sc3.addAnd("cpu", Op.NULL);
-        sc3.addAnd("maxCpu", Op.GTEQ, cpu);
-        sc.addOr("cpu", Op.SC, sc3);
-        return sc;
-    }
-
-    private SearchCriteria<ServiceOfferingJoinVO> getMinimumMemoryServiceOfferingJoinSearchCriteria(int memory) {
-        SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
-        SearchCriteria<ServiceOfferingJoinVO> sc1 = _srvOfferingJoinDao.createSearchCriteria();
-        sc1.addAnd("ramSize", Op.GTEQ, memory);
-        sc.addOr("ramSize", Op.SC, sc1);
-        SearchCriteria<ServiceOfferingJoinVO> sc2 = _srvOfferingJoinDao.createSearchCriteria();
-        sc2.addAnd("ramSize", Op.NULL);
-        sc2.addAnd("maxMemory", Op.NULL);
-        sc.addOr("ramSize", Op.SC, sc2);
-        SearchCriteria<ServiceOfferingJoinVO> sc3 = _srvOfferingJoinDao.createSearchCriteria();
-        sc3.addAnd("ramSize", Op.NULL);
-        sc3.addAnd("maxMemory", Op.GTEQ, memory);
-        sc.addOr("ramSize", Op.SC, sc3);
-        return sc;
-    }
-
-    private SearchCriteria<ServiceOfferingJoinVO> getMinimumCpuSpeedServiceOfferingJoinSearchCriteria(int speed) {
-        SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
-        sc.addOr("speed", Op.GTEQ, speed);
-        sc.addOr("speed", Op.NULL);
-        return sc;
-    }
-
     /*
      * (non-Javadoc)
      *
@@ -668,7 +618,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             responseView = ResponseView.Full;
         }
         List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(responseView, CallContext.current().getCallingAccount().getDomainId(),
-                result.first().toArray(new UserAccountJoinVO[result.first().size()]));
+                result.first().toArray(new UserAccountJoinVO[0]));
         response.setResponses(userResponses, result.second());
         return response;
     }
@@ -676,17 +626,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<UserResponse> searchForUsers(Long domainId, boolean recursive) throws PermissionDeniedException {
         Account caller = CallContext.current().getCallingAccount();
 
-        List<Long> permittedAccounts = new ArrayList<Long>();
+        List<Long> permittedAccounts = new ArrayList<>();
 
         boolean listAll = true;
         Long id = null;
 
         if (caller.getType() == Account.Type.NORMAL) {
-            long currentId = CallContext.current().getCallingUser().getId();
-            if (id != null && currentId != id.longValue()) {
-                throw new PermissionDeniedException("Calling user is not authorized to see the user requested by id");
-            }
-            id = currentId;
+            id = CallContext.current().getCallingUser().getId();
         }
         Object username = null;
         Object type = null;
@@ -696,9 +642,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
         Pair<List<UserAccountJoinVO>, Integer> result =  getUserListInternal(caller, permittedAccounts, listAll, id,
                 username, type, accountName, state, keyword, null, domainId, recursive, null);
-        ListResponse<UserResponse> response = new ListResponse<UserResponse>();
+        ListResponse<UserResponse> response = new ListResponse<>();
         List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(ResponseView.Restricted, CallContext.current().getCallingAccount().getDomainId(),
-                result.first().toArray(new UserAccountJoinVO[result.first().size()]));
+                result.first().toArray(new UserAccountJoinVO[0]));
         response.setResponses(userResponses, result.second());
         return response;
     }
@@ -706,13 +652,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     private Pair<List<UserAccountJoinVO>, Integer> searchForUsersInternal(ListUsersCmd cmd) throws PermissionDeniedException {
         Account caller = CallContext.current().getCallingAccount();
 
-        List<Long> permittedAccounts = new ArrayList<Long>();
+        List<Long> permittedAccounts = new ArrayList<>();
 
         boolean listAll = cmd.listAll();
         Long id = cmd.getId();
         if (caller.getType() == Account.Type.NORMAL) {
             long currentId = CallContext.current().getCallingUser().getId();
-            if (id != null && currentId != id.longValue()) {
+            if (id != null && currentId != id) {
                 throw new PermissionDeniedException("Calling user is not authorized to see the user requested by id");
             }
             id = currentId;
@@ -736,7 +682,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
     private Pair<List<UserAccountJoinVO>, Integer> getUserListInternal(Account caller, List<Long> permittedAccounts, boolean listAll, Long id, Object username, Object type,
             String accountName, Object state, String keyword, String apiKeyAccess, Long domainId, boolean recursive, Filter searchFilter) {
-        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(domainId, recursive, null);
+        Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(domainId, recursive, null);
         accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false);
         domainId = domainIdRecursiveListProject.first();
         Boolean isRecursive = domainIdRecursiveListProject.second();
@@ -747,8 +693,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         sb.and("username", sb.entity().getUsername(), Op.LIKE);
         if (id != null && id == 1) {
             // system user should NOT be searchable
-            List<UserAccountJoinVO> emptyList = new ArrayList<UserAccountJoinVO>();
-            return new Pair<List<UserAccountJoinVO>, Integer>(emptyList, 0);
+            List<UserAccountJoinVO> emptyList = new ArrayList<>();
+            return new Pair<>(emptyList, 0);
         } else if (id != null) {
             sb.and("id", sb.entity().getId(), Op.EQ);
         } else {
@@ -834,7 +780,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<EventResponse> searchForEvents(ListEventsCmd cmd) {
         Pair<List<EventJoinVO>, Integer> result = searchForEventsInternal(cmd);
         ListResponse<EventResponse> response = new ListResponse<>();
-        List<EventResponse> eventResponses = ViewResponseHelper.createEventResponse(result.first().toArray(new EventJoinVO[result.first().size()]));
+        List<EventResponse> eventResponses = ViewResponseHelper.createEventResponse(result.first().toArray(new EventJoinVO[0]));
         response.setResponses(eventResponses, result.second());
         return response;
     }
@@ -1034,7 +980,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<ResourceTagResponse> listTags(ListTagsCmd cmd) {
         Pair<List<ResourceTagJoinVO>, Integer> tags = listTagsInternal(cmd);
         ListResponse<ResourceTagResponse> response = new ListResponse<>();
-        List<ResourceTagResponse> tagResponses = ViewResponseHelper.createResourceTagResponse(false, tags.first().toArray(new ResourceTagJoinVO[tags.first().size()]));
+        List<ResourceTagResponse> tagResponses = ViewResponseHelper.createResourceTagResponse(false, tags.first().toArray(new ResourceTagJoinVO[0]));
         response.setResponses(tagResponses, tags.second());
         return response;
     }
@@ -1120,7 +1066,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<InstanceGroupResponse> searchForVmGroups(ListVMGroupsCmd cmd) {
         Pair<List<InstanceGroupJoinVO>, Integer> groups = searchForVmGroupsInternal(cmd);
         ListResponse<InstanceGroupResponse> response = new ListResponse<>();
-        List<InstanceGroupResponse> grpResponses = ViewResponseHelper.createInstanceGroupResponse(groups.first().toArray(new InstanceGroupJoinVO[groups.first().size()]));
+        List<InstanceGroupResponse> grpResponses = ViewResponseHelper.createInstanceGroupResponse(groups.first().toArray(new InstanceGroupJoinVO[0]));
         response.setResponses(grpResponses, groups.second());
         return response;
     }
@@ -1183,7 +1129,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
         List<UserVmResponse> vmResponses = ViewResponseHelper.createUserVmResponse(respView, "virtualmachine", cmd.getDetails(), cmd.getAccumulate(), cmd.getShowUserData(),
-                result.first().toArray(new UserVmJoinVO[result.first().size()]));
+                result.first().toArray(new UserVmJoinVO[0]));
 
         response.setResponses(vmResponses, result.second());
         return response;
@@ -1462,11 +1408,11 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             resourceTagSearch.and().op();
             for (int count = 0; count < tags.size(); count++) {
                 if (count == 0) {
-                    resourceTagSearch.op("tagKey" + String.valueOf(count), resourceTagSearch.entity().getKey(), Op.EQ);
+                    resourceTagSearch.op("tagKey" + count, resourceTagSearch.entity().getKey(), Op.EQ);
                 } else {
-                    resourceTagSearch.or().op("tagKey" + String.valueOf(count), resourceTagSearch.entity().getKey(), Op.EQ);
+                    resourceTagSearch.or().op("tagKey" + count, resourceTagSearch.entity().getKey(), Op.EQ);
                 }
-                resourceTagSearch.and("tagValue" + String.valueOf(count), resourceTagSearch.entity().getValue(), Op.EQ);
+                resourceTagSearch.and("tagValue" + count, resourceTagSearch.entity().getValue(), Op.EQ);
                 resourceTagSearch.cp();
             }
             resourceTagSearch.cp();
@@ -1621,8 +1567,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             int count = 0;
             userVmSearchCriteria.setJoinParameters("tags","resourceType", ResourceObjectType.UserVm);
             for (Map.Entry<String, String> entry : tags.entrySet()) {
-                userVmSearchCriteria.setJoinParameters("tags", "tagKey" + String.valueOf(count), entry.getKey());
-                userVmSearchCriteria.setJoinParameters("tags", "tagValue" + String.valueOf(count), entry.getValue());
+                userVmSearchCriteria.setJoinParameters("tags", "tagKey" + count, entry.getKey());
+                userVmSearchCriteria.setJoinParameters("tags", "tagValue" + count, entry.getValue());
                 count++;
             }
         }
@@ -1685,11 +1631,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 userVmSearchCriteria.setParameters("hostId", hostId);
             }
 
-            if (storageId != null && pool != null) {
+            if (storageId != null) {
                 if (pool.getPoolType().equals(Storage.StoragePoolType.DatastoreCluster)) {
                     List<StoragePoolVO> childDatastores = storagePoolDao.listChildStoragePoolsInDatastoreCluster(storageId);
-                    List<Long> childDatastoreIds = childDatastores.stream().map(mo -> mo.getId()).collect(Collectors.toList());
-                    userVmSearchCriteria.setJoinParameters("volume", "storagePoolId", childDatastoreIds.toArray());
+                    userVmSearchCriteria.setJoinParameters("volume", "storagePoolId", childDatastores.stream().map(StoragePoolVO::getId).toArray());
                 } else {
                     userVmSearchCriteria.setJoinParameters("volume", "storagePoolId", storageId);
                 }
@@ -1729,7 +1674,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 throw new InvalidParameterValueException("Unable to list network groups for virtual machine instance " + instanceId + "; instance not found.");
             }
             accountMgr.checkAccess(caller, null, true, userVM);
-            return listSecurityGroupRulesByVM(instanceId.longValue(), cmd.getStartIndex(), cmd.getPageSizeVal());
+            return listSecurityGroupRulesByVM(instanceId, cmd.getStartIndex(), cmd.getPageSizeVal());
         }
 
         Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(cmd.getDomainId(), cmd.isRecursive(), null);
@@ -1779,7 +1724,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search security group together with rules
         Pair<List<SecurityGroupJoinVO>, Integer> uniqueSgPair = _securityGroupJoinDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueSgPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // handle empty result cases
             return uniqueSgPair;
         }
@@ -1798,7 +1743,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Filter sf = new Filter(SecurityGroupVMMapVO.class, null, true, pageInd, pageSize);
         Pair<List<SecurityGroupVMMapVO>, Integer> sgVmMappingPair = securityGroupVMMapDao.listByInstanceId(vmId, sf);
         Integer count = sgVmMappingPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // handle empty result cases
             return new Pair<>(new ArrayList<>(), count);
         }
@@ -1817,7 +1762,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getClusterId(),
                 cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getVersion(), cmd.isHealthCheckFailed());
         ListResponse<DomainRouterResponse> response = new ListResponse<>();
-        List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
+        List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[0]));
         if (VirtualNetworkApplianceManager.RouterHealthChecksEnabled.value()) {
             for (DomainRouterResponse res : routerResponses) {
                 DomainRouterVO resRouter = _routerDao.findByUuid(res.getId());
@@ -1837,7 +1782,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), null, cmd.getHostId(),
                 cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), null, null);
         ListResponse<DomainRouterResponse> response = new ListResponse<>();
-        List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
+        List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[0]));
         if (VirtualNetworkApplianceManager.RouterHealthChecksEnabled.value()) {
             for (DomainRouterResponse res : routerResponses) {
                 DomainRouterVO resRouter = _routerDao.findByUuid(res.getId());
@@ -1978,13 +1923,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         if (routersWithFailures != null && ! routersWithFailures.isEmpty()) {
-            sc.setParameters("routerId", routersWithFailures.toArray(new Object[routersWithFailures.size()]));
+            sc.setParameters("routerId", routersWithFailures.toArray(new Object[0]));
         }
 
         // search VR details by ids
         Pair<List<DomainRouterJoinVO>, Integer> uniqueVrPair = _routerJoinDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueVrPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return uniqueVrPair;
         }
@@ -2002,7 +1947,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<ProjectResponse> listProjects(ListProjectsCmd cmd) {
         Pair<List<ProjectJoinVO>, Integer> projects = listProjectsInternal(cmd);
         ListResponse<ProjectResponse> response = new ListResponse<>();
-        List<ProjectResponse> projectResponses = ViewResponseHelper.createProjectResponse(cmd.getDetails(), projects.first().toArray(new ProjectJoinVO[projects.first().size()]));
+        List<ProjectResponse> projectResponses = ViewResponseHelper.createProjectResponse(cmd.getDetails(), projects.first().toArray(new ProjectJoinVO[0]));
         response.setResponses(projectResponses, projects.second());
         return response;
     }
@@ -2158,7 +2103,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search distinct projects to get count
         Pair<List<ProjectJoinVO>, Integer> uniquePrjPair = _projectJoinDao.searchAndCount(sc, searchFilter);
         Integer count = uniquePrjPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // handle empty result cases
             return uniquePrjPair;
         }
@@ -2176,7 +2121,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<ProjectInvitationResponse> listProjectInvitations(ListProjectInvitationsCmd cmd) {
         Pair<List<ProjectInvitationJoinVO>, Integer> invites = listProjectInvitationsInternal(cmd);
         ListResponse<ProjectInvitationResponse> response = new ListResponse<>();
-        List<ProjectInvitationResponse> projectInvitationResponses = ViewResponseHelper.createProjectInvitationResponse(invites.first().toArray(new ProjectInvitationJoinVO[invites.first().size()]));
+        List<ProjectInvitationResponse> projectInvitationResponses = ViewResponseHelper.createProjectInvitationResponse(invites.first().toArray(new ProjectInvitationJoinVO[0]));
 
         response.setResponses(projectInvitationResponses, invites.second());
         return response;
@@ -2252,7 +2197,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<ProjectAccountResponse> listProjectAccounts(ListProjectAccountsCmd cmd) {
         Pair<List<ProjectAccountJoinVO>, Integer> projectAccounts = listProjectAccountsInternal(cmd);
         ListResponse<ProjectAccountResponse> response = new ListResponse<>();
-        List<ProjectAccountResponse> projectResponses = ViewResponseHelper.createProjectAccountResponse(projectAccounts.first().toArray(new ProjectAccountJoinVO[projectAccounts.first().size()]));
+        List<ProjectAccountResponse> projectResponses = ViewResponseHelper.createProjectAccountResponse(projectAccounts.first().toArray(new ProjectAccountJoinVO[0]));
         response.setResponses(projectResponses, projectAccounts.second());
         return response;
     }
@@ -2327,7 +2272,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<HostJoinVO>, Integer> hosts = searchForServersInternal(cmd);
         ListResponse<HostResponse> response = new ListResponse<>();
         logger.debug(">>>Generating Response>>>");
-        List<HostResponse> hostResponses = ViewResponseHelper.createHostResponse(cmd.getDetails(), hosts.first().toArray(new HostJoinVO[hosts.first().size()]));
+        List<HostResponse> hostResponses = ViewResponseHelper.createHostResponse(cmd.getDetails(), hosts.first().toArray(new HostJoinVO[0]));
         response.setResponses(hostResponses, hosts.second());
         return response;
     }
@@ -2357,7 +2302,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Object outOfBandManagementEnabled = cmd.isOutOfBandManagementEnabled();
         Object powerState = cmd.getHostOutOfBandManagementPowerState();
         Object resourceState = cmd.getResourceState();
-        Object haHosts = cmd.getHaHost();
+        Boolean haHosts = cmd.getHaHost();
         Long startIndex = cmd.getStartIndex();
         Long pageSize = cmd.getPageSizeVal();
         Hypervisor.HypervisorType hypervisorType = cmd.getHypervisor();
@@ -2397,7 +2342,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         String haTag = _haMgr.getHaTag();
         if (haHosts != null && haTag != null && !haTag.isEmpty()) {
             SearchBuilder<HostTagVO> hostTagSearchBuilder = _hostTagDao.createSearchBuilder();
-            if ((Boolean)haHosts) {
+            if (haHosts) {
                 hostTagSearchBuilder.and("tag", hostTagSearchBuilder.entity().getTag(), SearchCriteria.Op.EQ);
             } else {
                 hostTagSearchBuilder.and().op("tag", hostTagSearchBuilder.entity().getTag(), Op.NEQ);
@@ -2484,7 +2429,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
 
-        List<VolumeResponse> volumeResponses = ViewResponseHelper.createVolumeResponse(respView, result.first().toArray(new VolumeJoinVO[result.first().size()]));
+        List<VolumeResponse> volumeResponses = ViewResponseHelper.createVolumeResponse(respView, result.first().toArray(new VolumeJoinVO[0]));
 
         for (VolumeResponse vr : volumeResponses) {
             String poolId = vr.getStoragePoolId();
@@ -2852,7 +2797,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
 
-        List<AccountResponse> accountResponses = ViewResponseHelper.createAccountResponse(respView, cmd.getDetails(), result.first().toArray(new AccountJoinVO[result.first().size()]));
+        List<AccountResponse> accountResponses = ViewResponseHelper.createAccountResponse(respView, cmd.getDetails(), result.first().toArray(new AccountJoinVO[0]));
         response.setResponses(accountResponses, result.second());
         return response;
     }
@@ -3032,7 +2977,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     public ListResponse<AsyncJobResponse> searchForAsyncJobs(ListAsyncJobsCmd cmd) {
         Pair<List<AsyncJobJoinVO>, Integer> result = searchForAsyncJobsInternal(cmd);
         ListResponse<AsyncJobResponse> response = new ListResponse<>();
-        List<AsyncJobResponse> jobResponses = ViewResponseHelper.createAsyncJobResponse(result.first().toArray(new AsyncJobJoinVO[result.first().size()]));
+        List<AsyncJobResponse> jobResponses = ViewResponseHelper.createAsyncJobResponse(result.first().toArray(new AsyncJobJoinVO[0]));
         response.setResponses(jobResponses, result.second());
         return response;
     }
@@ -3149,7 +3094,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     private ListResponse<StoragePoolResponse> createStoragesPoolResponse(Pair<List<StoragePoolJoinVO>, Integer> storagePools, boolean getCustomStats) {
         ListResponse<StoragePoolResponse> response = new ListResponse<>();
 
-        List<StoragePoolResponse> poolResponses = ViewResponseHelper.createStoragePoolResponse(getCustomStats, storagePools.first().toArray(new StoragePoolJoinVO[storagePools.first().size()]));
+        List<StoragePoolResponse> poolResponses = ViewResponseHelper.createStoragePoolResponse(getCustomStats, storagePools.first().toArray(new StoragePoolJoinVO[0]));
         Map<String, Long> poolUuidToIdMap = storagePools.first().stream().collect(Collectors.toMap(StoragePoolJoinVO::getUuid, StoragePoolJoinVO::getId, (a, b) -> a));
         for (StoragePoolResponse poolResponse : poolResponses) {
             DataStore store = dataStoreManager.getPrimaryDataStore(poolResponse.getId());
@@ -3202,16 +3147,16 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
     @Override
     public ListResponse<StorageTagResponse> searchForStorageTags(ListStorageTagsCmd cmd) {
-        Pair<List<StoragePoolTagVO>, Integer> result = searchForStorageTagsInternal(cmd);
+        Pair<List<StoragePoolTagVO>, Integer> result = searchForStorageTagsInternal();
         ListResponse<StorageTagResponse> response = new ListResponse<>();
-        List<StorageTagResponse> tagResponses = ViewResponseHelper.createStorageTagResponse(result.first().toArray(new StoragePoolTagVO[result.first().size()]));
+        List<StorageTagResponse> tagResponses = ViewResponseHelper.createStorageTagResponse(result.first().toArray(new StoragePoolTagVO[0]));
 
         response.setResponses(tagResponses, result.second());
 
         return response;
     }
 
-    private Pair<List<StoragePoolTagVO>, Integer> searchForStorageTagsInternal(ListStorageTagsCmd cmd) {
+    private Pair<List<StoragePoolTagVO>, Integer> searchForStorageTagsInternal() {
         Filter searchFilter = new Filter(StoragePoolTagVO.class, "id", Boolean.TRUE, null, null);
 
         SearchBuilder<StoragePoolTagVO> sb = _storageTagDao.createSearchBuilder();
@@ -3224,7 +3169,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<StoragePoolTagVO>, Integer> uniqueTagPair = _storageTagDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueTagPair.second();
 
-        if (count.intValue() == 0) {
+        if (count == 0) {
             return uniqueTagPair;
         }
 
@@ -3243,16 +3188,16 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
     @Override
     public ListResponse<HostTagResponse> searchForHostTags(ListHostTagsCmd cmd) {
-        Pair<List<HostTagVO>, Integer> result = searchForHostTagsInternal(cmd);
+        Pair<List<HostTagVO>, Integer> result = searchForHostTagsInternal();
         ListResponse<HostTagResponse> response = new ListResponse<>();
-        List<HostTagResponse> tagResponses = ViewResponseHelper.createHostTagResponse(result.first().toArray(new HostTagVO[result.first().size()]));
+        List<HostTagResponse> tagResponses = ViewResponseHelper.createHostTagResponse(result.first().toArray(new HostTagVO[0]));
 
         response.setResponses(tagResponses, result.second());
 
         return response;
     }
 
-    private Pair<List<HostTagVO>, Integer> searchForHostTagsInternal(ListHostTagsCmd cmd) {
+    private Pair<List<HostTagVO>, Integer> searchForHostTagsInternal() {
         Filter searchFilter = new Filter(HostTagVO.class, "id", Boolean.TRUE, null, null);
 
         SearchBuilder<HostTagVO> sb = _hostTagDao.createSearchBuilder();
@@ -3265,7 +3210,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<HostTagVO>, Integer> uniqueTagPair = _hostTagDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueTagPair.second();
 
-        if (count.intValue() == 0) {
+        if (count == 0) {
             return uniqueTagPair;
         }
 
@@ -3287,7 +3232,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<ImageStoreJoinVO>, Integer> result = searchForImageStoresInternal(cmd);
         ListResponse<ImageStoreResponse> response = new ListResponse<>();
 
-        List<ImageStoreResponse> poolResponses = ViewResponseHelper.createImageStoreResponse(result.first().toArray(new ImageStoreJoinVO[result.first().size()]));
+        List<ImageStoreResponse> poolResponses = ViewResponseHelper.createImageStoreResponse(result.first().toArray(new ImageStoreJoinVO[0]));
         response.setResponses(poolResponses, result.second());
         return response;
     }
@@ -3351,7 +3296,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search Store details by ids
         Pair<List<ImageStoreJoinVO>, Integer> uniqueStorePair = _imageStoreJoinDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueStorePair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return uniqueStorePair;
         }
@@ -3371,7 +3316,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<ImageStoreJoinVO>, Integer> result = searchForCacheStoresInternal(cmd);
         ListResponse<ImageStoreResponse> response = new ListResponse<>();
 
-        List<ImageStoreResponse> poolResponses = ViewResponseHelper.createImageStoreResponse(result.first().toArray(new ImageStoreJoinVO[result.first().size()]));
+        List<ImageStoreResponse> poolResponses = ViewResponseHelper.createImageStoreResponse(result.first().toArray(new ImageStoreJoinVO[0]));
         response.setResponses(poolResponses, result.second());
         return response;
     }
@@ -3430,7 +3375,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search Store details by ids
         Pair<List<ImageStoreJoinVO>, Integer> uniqueStorePair = _imageStoreJoinDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueStorePair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return uniqueStorePair;
         }
@@ -3497,10 +3442,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Object id = cmd.getId();
         Object keyword = cmd.getKeyword();
         Long domainId = cmd.getDomainId();
-        Boolean isRootAdmin = accountMgr.isRootAdmin(account.getAccountId());
+        boolean isRootAdmin = accountMgr.isRootAdmin(account.getAccountId());
         Long projectId = cmd.getProjectId();
         String accountName = cmd.getAccountName();
-        Boolean isRecursive = cmd.isRecursive();
+        boolean isRecursive = cmd.isRecursive();
         Long zoneId = cmd.getZoneId();
         Long volumeId = cmd.getVolumeId();
         Long storagePoolId = cmd.getStoragePoolId();
@@ -3726,12 +3671,12 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     }
 
     private List<Long> findRelatedDomainIds(Domain domain, boolean isRecursive) {
-        List<Long> domainIds = _domainDao.getDomainParentIds(domain.getId())
-            .stream().collect(Collectors.toList());
+        List<Long> domainIds = new ArrayList<>(_domainDao.getDomainParentIds(domain.getId()));
         if (isRecursive) {
             List<Long> childrenIds = _domainDao.getDomainChildrenIds(domain.getPath());
-            if (childrenIds != null && !childrenIds.isEmpty())
-            domainIds.addAll(childrenIds);
+            if (childrenIds != null && !childrenIds.isEmpty()) {
+                domainIds.addAll(childrenIds);
+            }
         }
         return domainIds;
     }
@@ -3741,7 +3686,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<ServiceOfferingJoinVO>, Integer> result = searchForServiceOfferingsInternal(cmd);
         result.first();
         ListResponse<ServiceOfferingResponse> response = new ListResponse<>();
-        List<ServiceOfferingResponse> offeringResponses = ViewResponseHelper.createServiceOfferingResponse(result.first().toArray(new ServiceOfferingJoinVO[result.first().size()]));
+        List<ServiceOfferingResponse> offeringResponses = ViewResponseHelper.createServiceOfferingResponse(result.first().toArray(new ServiceOfferingJoinVO[0]));
         response.setResponses(offeringResponses, result.second());
         return response;
     }
@@ -3800,7 +3745,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         String vmTypeStr = cmd.getSystemVmType();
         ServiceOfferingVO currentVmOffering = null;
         DiskOfferingVO diskOffering = null;
-        Boolean isRecursive = cmd.isRecursive();
+        boolean isRecursive = cmd.isRecursive();
         Long zoneId = cmd.getZoneId();
         Integer cpuNumber = cmd.getCpuNumber();
         Integer memory = cmd.getMemory();
@@ -3808,7 +3753,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Boolean encryptRoot = cmd.getEncryptRoot();
         String storageType = cmd.getStorageType();
         ServiceOffering.State state = cmd.getState();
-        final Long templateId = cmd.getTemplateId();
 
         final Account owner = accountMgr.finalizeOwner(caller, accountName, domainId, projectId);
 
@@ -4274,7 +4218,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
 
-        List<ZoneResponse> dcResponses = ViewResponseHelper.createDataCenterResponse(respView, cmd.getShowCapacities(), cmd.getShowIcon(), result.first().toArray(new DataCenterJoinVO[result.first().size()]));
+        List<ZoneResponse> dcResponses = ViewResponseHelper.createDataCenterResponse(respView, cmd.getShowCapacities(), cmd.getShowIcon(), result.first().toArray(new DataCenterJoinVO[0]));
         response.setResponses(dcResponses, result.second());
         return response;
     }
@@ -4282,7 +4226,11 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     private Pair<List<DataCenterJoinVO>, Integer> listDataCentersInternal(ListZonesCmd cmd) {
         Account account = CallContext.current().getCallingAccount();
         Long domainId = cmd.getDomainId();
-        Long id = cmd.getId();
+        Long zoneId = cmd.getId();
+        if( ! AllowUserViewAllDataCenters.valueInDomain(account.getDomainId())) {
+            zoneId = accountMgr.checkAccessAndSpecifyAuthority(CallContext.current().getCallingAccount(), zoneId);
+            logger.debug("not allowing users to view all zones ; selected zone is = {}", zoneId);
+        }
         List<Long> ids = getIdsListFromCmd(cmd.getId(), cmd.getIds());
         String keyword = cmd.getKeyword();
         String name = cmd.getName();
@@ -4293,8 +4241,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         if (resourceTags != null && !resourceTags.isEmpty()) {
             SearchBuilder<ResourceTagVO> tagSearch = resourceTagDao.createSearchBuilder();
             for (int count = 0; count < resourceTags.size(); count++) {
-                tagSearch.or().op("key" + String.valueOf(count), tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
-                tagSearch.and("value" + String.valueOf(count), tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
+                tagSearch.or().op("key" + count, tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
+                tagSearch.and("value" + count, tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
                 tagSearch.cp();
             }
             tagSearch.and("resourceType", tagSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
@@ -4314,8 +4262,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             sc.addAnd("id", SearchCriteria.Op.IN, ids.toArray());
         }
 
-        if (id != null) {
-            sc.addAnd("id", SearchCriteria.Op.EQ, id);
+        if (zoneId != null) {
+            sc.addAnd("id", SearchCriteria.Op.EQ, zoneId);
         } else if (name != null) {
             sc.addAnd("name", SearchCriteria.Op.EQ, name);
         } else {
@@ -4326,109 +4274,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 sc.addAnd("name", SearchCriteria.Op.SC, ssc);
             }
 
-            /*
-             * List all resources due to Explicit Dedication except the
-             * dedicated resources of other account
-             */
-            if (domainId != null) { //
-                // for domainId != null // right now, we made the decision to
-                // only list zones associated // with this domain, private zone
-                sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
-
-                if (accountMgr.isNormalUser(account.getId())) {
-                    // accountId == null (zones dedicated to a domain) or
-                    // accountId = caller
-                    SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
-                    sdc.addOr("accountId", SearchCriteria.Op.EQ, account.getId());
-                    sdc.addOr("accountId", SearchCriteria.Op.NULL);
-
-                    sc.addAnd("accountId", SearchCriteria.Op.SC, sdc);
-                }
-
-            } else if (accountMgr.isNormalUser(account.getId())) {
-                // it was decided to return all zones for the user's domain, and
-                // everything above till root
-                // list all zones belonging to this domain, and all of its
-                // parents
-                // check the parent, if not null, add zones for that parent to
-                // list
-
-                // find all domain Id up to root domain for this account
-                List<Long> domainIds = new ArrayList<>();
-                DomainVO domainRecord = _domainDao.findById(account.getDomainId());
-                if (domainRecord == null) {
-                    logger.error("Could not find the domainId for account: {}", account);
-                    throw new CloudAuthenticationException("Could not find the domainId for account:" + account.getAccountName());
-                }
-                domainIds.add(domainRecord.getId());
-                while (domainRecord.getParent() != null) {
-                    domainRecord = _domainDao.findById(domainRecord.getParent());
-                    domainIds.add(domainRecord.getId());
-                }
-                // domainId == null (public zones) or domainId IN [all domain id
-                // up to root domain]
-                SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
-                sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray());
-                sdc.addOr("domainId", SearchCriteria.Op.NULL);
-                sc.addAnd("domainId", SearchCriteria.Op.SC, sdc);
-
-                // remove disabled zones
-                sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled);
-
-                // accountId == null (zones dedicated to a domain) or
-                // accountId = caller
-                SearchCriteria<DataCenterJoinVO> sdc2 = _dcJoinDao.createSearchCriteria();
-                sdc2.addOr("accountId", SearchCriteria.Op.EQ, account.getId());
-                sdc2.addOr("accountId", SearchCriteria.Op.NULL);
-
-                sc.addAnd("accountId", SearchCriteria.Op.SC, sdc2);
-
-                // remove Dedicated zones not dedicated to this domainId or
-                // subdomainId
-                List<Long> dedicatedZoneIds = removeDedicatedZoneNotSuitabe(domainIds);
-                if (!dedicatedZoneIds.isEmpty()) {
-                    sdc.addAnd("id", SearchCriteria.Op.NIN, dedicatedZoneIds.toArray(new Object[dedicatedZoneIds.size()]));
-                }
-
-            } else if (accountMgr.isDomainAdmin(account.getId()) || account.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN) {
-                // it was decided to return all zones for the domain admin, and
-                // everything above till root, as well as zones till the domain
-                // leaf
-                List<Long> domainIds = new ArrayList<>();
-                DomainVO domainRecord = _domainDao.findById(account.getDomainId());
-                if (domainRecord == null) {
-                    logger.error("Could not find the domainId for account: {}", account);
-                    throw new CloudAuthenticationException("Could not find the domainId for account:" + account.getAccountName());
-                }
-                domainIds.add(domainRecord.getId());
-                // find all domain Ids till leaf
-                List<DomainVO> allChildDomains = _domainDao.findAllChildren(domainRecord.getPath(), domainRecord.getId());
-                for (DomainVO domain : allChildDomains) {
-                    domainIds.add(domain.getId());
-                }
-                // then find all domain Id up to root domain for this account
-                while (domainRecord.getParent() != null) {
-                    domainRecord = _domainDao.findById(domainRecord.getParent());
-                    domainIds.add(domainRecord.getId());
-                }
-
-                // domainId == null (public zones) or domainId IN [all domain id
-                // up to root domain]
-                SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
-                sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray());
-                sdc.addOr("domainId", SearchCriteria.Op.NULL);
-                sc.addAnd("domainId", SearchCriteria.Op.SC, sdc);
-
-                // remove disabled zones
-                sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled);
-
-                // remove Dedicated zones not dedicated to this domainId or
-                // subdomainId
-                List<Long> dedicatedZoneIds = removeDedicatedZoneNotSuitabe(domainIds);
-                if (!dedicatedZoneIds.isEmpty()) {
-                    sdc.addAnd("id", SearchCriteria.Op.NIN, dedicatedZoneIds.toArray(new Object[dedicatedZoneIds.size()]));
-                }
-            }
+            buildSearchCriteriaForOwnedExplicitlyDedicatedResources(domainId, sc, account);
 
             // handle available=FALSE option, only return zones with at least
             // one VM running there
@@ -4442,7 +4288,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                     for (DomainRouterVO router : routers) {
                         dcIds.add(router.getDataCenterId());
                     }
-                    if (dcIds.size() == 0) {
+                    if (dcIds.isEmpty()) {
                         return new Pair<>(new ArrayList<>(), 0);
                     } else {
                         sc.addAnd("id", SearchCriteria.Op.IN, dcIds.toArray());
@@ -4452,25 +4298,147 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             }
         }
 
-        if (resourceTags != null && !resourceTags.isEmpty()) {
-            int count = 0;
-            sc.setJoinParameters("tagSearch", "resourceType", ResourceObjectType.Zone.toString());
-            for (Map.Entry<String, String> entry : resourceTags.entrySet()) {
-                sc.setJoinParameters("tagSearch", "key" + String.valueOf(count), entry.getKey());
-                sc.setJoinParameters("tagSearch", "value" + String.valueOf(count), entry.getValue());
-                count++;
-            }
-        }
+        buildSearchCriteriaForTags(resourceTags, sc);
 
         return _dcJoinDao.searchAndCount(sc, searchFilter);
     }
 
-    private List<Long> removeDedicatedZoneNotSuitabe(List<Long> domainIds) {
+    private static void buildSearchCriteriaForTags(Map<String, String> resourceTags, SearchCriteria<DataCenterJoinVO> sc) {
+        if (resourceTags != null && !resourceTags.isEmpty()) {
+            int count = 0;
+            sc.setJoinParameters("tagSearch", "resourceType", ResourceObjectType.Zone.toString());
+            for (Map.Entry<String, String> entry : resourceTags.entrySet()) {
+                sc.setJoinParameters("tagSearch", "key" + count, entry.getKey());
+                sc.setJoinParameters("tagSearch", "value" + count, entry.getValue());
+                count++;
+            }
+        }
+    }
+
+    /**
+     * List all resources due to Explicit Dedication except the
+     * dedicated resources of other account
+     */
+    private void buildSearchCriteriaForOwnedExplicitlyDedicatedResources(Long domainId, SearchCriteria<DataCenterJoinVO> sc, Account account) {
+        if (domainId != null) {
+            buildSearchCriteriaForZonesBelongingToDomain(domainId, sc, account);
+        } else if (accountMgr.isNormalUser(account.getId())) {
+            buildSearchCriteriaForUserDomainAndAbove(sc, account);
+        } else if (accountMgr.isDomainAdmin(account.getId()) || accountMgr.isResourceDomainAdmin(account.getId())) {
+            buildSearchCriteriaForDomainAdmins(sc, account);
+        }
+    }
+
+    /**
+     * Return all zones for the domain admin, and everything above till root, as well as zones till the domain leaf
+     */
+    private void buildSearchCriteriaForDomainAdmins(SearchCriteria<DataCenterJoinVO> sc, Account account) {
+        List<Long> domainIds = new ArrayList<>();
+        DomainVO domainRecord = _domainDao.findById(account.getDomainId());
+        if (domainRecord == null) {
+            logger.error("Could not find the domainId for account: {}", account);
+            throw new CloudAuthenticationException("Could not find the domainId for account:" + account.getAccountName());
+        }
+        logger.trace("adding caller's domain {} to the list of domains to search for zones", account.getDomainId());
+        domainIds.add(domainRecord.getId());
+        // find all domain Ids till leaf
+        List<DomainVO> allChildDomains = _domainDao.findAllChildren(domainRecord.getPath(), domainRecord.getId());
+        for (DomainVO domain : allChildDomains) {
+            logger.trace("adding caller domain's child {} to the list of domains to search for zones", domain.getId());
+            domainIds.add(domain.getId());
+        }
+        // then find all domain Id up to root domain for this account
+        while (domainRecord.getParent() != null) {
+            domainRecord = _domainDao.findById(domainRecord.getParent());
+            logger.trace("adding caller domain's ancestor {} to the list of domains to search for zones", domainRecord.getId());
+            domainIds.add(domainRecord.getId());
+        }
+
+        // so search for domainId == null (public zones) or domainId this user has access to
+        SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
+        sdc.addOr("domainId", Op.IN, domainIds.toArray());
+        sdc.addOr("domainId", Op.NULL);
+        sc.addAnd("domainId", Op.SC, sdc);
+
+        // remove disabled zones
+        sc.addAnd("allocationState", Op.NEQ, Grouping.AllocationState.Disabled);
+
+        // remove Dedicated zones not dedicated to this domainId or
+        // subdomainId
+        List<Long> dedicatedZoneIds = removeDedicatedZoneNotSuitable(domainIds);
+        if (!dedicatedZoneIds.isEmpty()) {
+            sdc.addAnd("id", Op.NIN, dedicatedZoneIds.toArray(new Object[0]));
+        }
+    }
+
+    /**
+     * Return all zones for the user's domain, and everything above till root
+     * list all zones belonging to this domain, and all of its parents
+     * check the parent, if not null, add zones for that parent to list
+     */
+    private void buildSearchCriteriaForUserDomainAndAbove(SearchCriteria<DataCenterJoinVO> sc, Account account) {
+
+        // find all domain Id up to root domain for this account
+        List<Long> domainIds = new ArrayList<>();
+        DomainVO domainRecord = _domainDao.findById(account.getDomainId());
+        if (domainRecord == null) {
+            logger.error("Could not find the domainId for account: {}", account);
+            throw new CloudAuthenticationException("Could not find the domainId for account:" + account.getAccountName());
+        }
+        domainIds.add(domainRecord.getId());
+        while (domainRecord.getParent() != null) {
+            domainRecord = _domainDao.findById(domainRecord.getParent());
+            domainIds.add(domainRecord.getId());
+        }
+        // domainId == null (public zones) or domainId IN [all domain id
+        // up to root domain]
+        SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
+        sdc.addOr("domainId", Op.IN, domainIds.toArray());
+        sdc.addOr("domainId", Op.NULL);
+        sc.addAnd("domainId", Op.SC, sdc);
+
+        // remove disabled zones
+        sc.addAnd("allocationState", Op.NEQ, Grouping.AllocationState.Disabled);
+
+        // accountId == null (zones dedicated to a domain) or
+        // accountId = caller
+        SearchCriteria<DataCenterJoinVO> sdc2 = _dcJoinDao.createSearchCriteria();
+        sdc2.addOr("accountId", Op.EQ, account.getId());
+        sdc2.addOr("accountId", Op.NULL);
+
+        sc.addAnd("accountId", Op.SC, sdc2);
+
+        // remove Dedicated zones not dedicated to this domainId or
+        // subdomainId
+        List<Long> dedicatedZoneIds = removeDedicatedZoneNotSuitable(domainIds);
+        if (!dedicatedZoneIds.isEmpty()) {
+            sdc.addAnd("id", Op.NIN, dedicatedZoneIds.toArray(new Object[0]));
+        }
+    }
+
+    private void buildSearchCriteriaForZonesBelongingToDomain(Long domainId, SearchCriteria<DataCenterJoinVO> sc, Account account) {
+        // for domainId != null // right now, we made the decision to
+        // only list zones associated // with this domain, private zone
+        sc.addAnd("domainId", Op.EQ, domainId);
+
+        if (accountMgr.isNormalUser(account.getId())) {
+            // accountId == null (zones dedicated to a domain) or
+            // accountId = caller
+            SearchCriteria<DataCenterJoinVO> sdc = _dcJoinDao.createSearchCriteria();
+            sdc.addOr("accountId", Op.EQ, account.getId());
+            sdc.addOr("accountId", Op.NULL);
+
+            sc.addAnd("accountId", Op.SC, sdc);
+        }
+    }
+
+    private List<Long> removeDedicatedZoneNotSuitable(List<Long> domainIds) {
         // remove dedicated zone of other domain
         List<Long> dedicatedZoneIds = new ArrayList<>();
         List<DedicatedResourceVO> dedicatedResources = _dedicatedDao.listZonesNotInDomainIds(domainIds);
         for (DedicatedResourceVO dr : dedicatedResources) {
             if (dr != null) {
+                logger.trace("adding zone to exclude from callers list zones result: {}.", dr.getDataCenterId());
                 dedicatedZoneIds.add(dr.getDataCenterId());
             }
         }
@@ -4515,7 +4483,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
 
-        List<TemplateResponse> templateResponses = ViewResponseHelper.createTemplateResponse(cmd.getDetails(), respView, result.first().toArray(new TemplateJoinVO[result.first().size()]));
+        List<TemplateResponse> templateResponses = ViewResponseHelper.createTemplateResponse(cmd.getDetails(), respView, result.first().toArray(new TemplateJoinVO[0]));
         response.setResponses(templateResponses, result.second());
         return response;
     }
@@ -4943,17 +4911,17 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     private Pair<List<TemplateJoinVO>, Integer> findTemplatesByIdOrTempZonePair(Pair<List<TemplateJoinVO>, Integer> templateDataPair,
                                                                                 boolean showRemoved, boolean showUnique, Account caller) {
         Integer count = templateDataPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return templateDataPair;
         }
         List<TemplateJoinVO> templateData = templateDataPair.first();
         List<TemplateJoinVO> templates;
         if (showUnique) {
-            Long[] templateIds = templateData.stream().map(template -> template.getId()).toArray(Long[]::new);
+            Long[] templateIds = templateData.stream().map(BaseViewWithTagInformationVO::getId).toArray(Long[]::new);
             templates = _templateJoinDao.findByDistinctIds(templateIds);
         } else {
-            String[] templateZonePairs = templateData.stream().map(template -> template.getTempZonePair()).toArray(String[]::new);
+            String[] templateZonePairs = templateData.stream().map(TemplateJoinVO::getTempZonePair).toArray(String[]::new);
             templates = _templateJoinDao.searchByTemplateZonePair(showRemoved, templateZonePairs);
         }
 
@@ -4970,7 +4938,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             respView = ResponseView.Full;
         }
 
-        List<TemplateResponse> templateResponses = ViewResponseHelper.createIsoResponse(respView, result.first().toArray(new TemplateJoinVO[result.first().size()]));
+        List<TemplateResponse> templateResponses = ViewResponseHelper.createIsoResponse(respView, result.first().toArray(new TemplateJoinVO[0]));
         response.setResponses(templateResponses, result.second());
         return response;
     }
@@ -5033,7 +5001,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
         if (CallContext.current().getCallingAccount().getType() != Account.Type.ADMIN) {
             final List<String> userDenyListedSettings = Stream.of(QueryService.UserVMDeniedDetails.value().split(","))
-                    .map(item -> (item).trim())
+                    .map(String::trim)
                     .collect(Collectors.toList());
             userDenyListedSettings.addAll(QueryService.RootAdminOnlyVmSettings);
             for (final String detail : userDenyListedSettings) {
@@ -5055,7 +5023,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     private void fillVnfTemplateDetailOptions(final Map<String, List<String>> options) {
         for (VNF.AccessDetail detail : VNF.AccessDetail.values()) {
             if (VNF.AccessDetail.ACCESS_METHODS.equals(detail)) {
-                options.put(detail.name().toLowerCase(), Arrays.stream(VNF.AccessMethod.values()).map(method -> method.toString()).sorted().collect(Collectors.toList()));
+                options.put(detail.name().toLowerCase(), Arrays.stream(VNF.AccessMethod.values()).map(VNF.AccessMethod::toString).sorted().collect(Collectors.toList()));
             } else {
                 options.put(detail.name().toLowerCase(), Collections.emptyList());
             }
@@ -5106,7 +5074,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Override
     public ListResponse<AffinityGroupResponse> searchForAffinityGroups(ListAffinityGroupsCmd cmd) {
         Pair<List<AffinityGroupJoinVO>, Integer> result = searchForAffinityGroupsInternal(cmd);
-        ListResponse<AffinityGroupResponse> response = new ListResponse<AffinityGroupResponse>();
+        ListResponse<AffinityGroupResponse> response = new ListResponse<>();
         List<AffinityGroupResponse> agResponses = ViewResponseHelper.createAffinityGroupResponses(result.first());
         response.setResponses(agResponses, result.second());
         return response;
@@ -5135,7 +5103,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 throw new InvalidParameterValueException("Unable to list affinity groups for virtual machine instance " + vmId + "; instance not found.");
             }
             accountMgr.checkAccess(caller, null, true, userVM);
-            return listAffinityGroupsByVM(vmId.longValue(), startIndex, pageSize);
+            return listAffinityGroupsByVM(vmId, startIndex, pageSize);
         }
 
         List<Long> permittedAccounts = new ArrayList<>();
@@ -5158,7 +5126,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         List<AffinityGroupJoinVO> affinityGroups = new ArrayList<>();
 
         Integer count = uniqueGroupsPair.second();
-        if (count.intValue() != 0) {
+        if (count != 0) {
             List<AffinityGroupJoinVO> uniqueGroups = uniqueGroupsPair.first();
             Long[] vrIds = new Long[uniqueGroups.size()];
             int i = 0;
@@ -5280,7 +5248,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Filter sf = new Filter(SecurityGroupVMMapVO.class, null, true, pageInd, pageSize);
         Pair<List<AffinityGroupVMMapVO>, Integer> agVmMappingPair = _affinityGroupVMMapDao.listByInstanceId(vmId, sf);
         Integer count = agVmMappingPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // handle empty result cases
             return new Pair<>(new ArrayList<>(), count);
         }
@@ -5316,7 +5284,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             Pair<List<AffinityGroupJoinVO>, Integer> uniqueGroupsPair = _affinityGroupJoinDao.searchAndCount(sc, searchFilter);
             // search group by ids
             Integer count = uniqueGroupsPair.second();
-            if (count.intValue() == 0) {
+            if (count == 0) {
                 // empty result
                 return new Pair<>(new ArrayList<>(), 0);
             }
@@ -5355,9 +5323,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         //Validation - 1.3
         if (resourceIdStr != null) {
             resourceId = resourceManagerUtil.getResourceId(resourceIdStr, resourceType);
-            if (resourceId == null) {
-                throw new InvalidParameterValueException("Cannot find resource with resourceId " + resourceIdStr + " and of resource type " + resourceType);
-            }
         }
 
         List<? extends ResourceDetail> detailList = new ArrayList<>();
@@ -5394,7 +5359,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         resourceDetailResponse.setName(requestedDetail.getName());
         resourceDetailResponse.setValue(requestedDetail.getValue());
         resourceDetailResponse.setForDisplay(requestedDetail.isDisplay());
-        resourceDetailResponse.setResourceType(resourceType.toString().toString());
+        resourceDetailResponse.setResourceType(resourceType.toString());
         resourceDetailResponse.setObjectName("resourcedetail");
         return resourceDetailResponse;
     }
@@ -5489,7 +5454,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         List<RouterHealthCheckResult> result = new ArrayList<>(routerHealthCheckResultDao.getHealthCheckResults(routerId));
-        if (result == null || result.size() == 0) {
+        if (result.isEmpty()) {
             throw new CloudRuntimeException("No health check results found for the router. This could happen for " +
                     "a newly created router. Please wait for periodic results to populate or manually call for checks to execute.");
         }
@@ -5583,7 +5548,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         if (cmd instanceof ListSnapshotsCmdByAdmin) {
             respView = ResponseView.Full;
         }
-        List<SnapshotResponse> templateResponses = ViewResponseHelper.createSnapshotResponse(respView, cmd.isShowUnique(), result.first().toArray(new SnapshotJoinVO[result.first().size()]));
+        List<SnapshotResponse> templateResponses = ViewResponseHelper.createSnapshotResponse(respView, cmd.isShowUnique(), result.first().toArray(new SnapshotJoinVO[0]));
         response.setResponses(templateResponses, result.second());
         return response;
     }
@@ -5659,8 +5624,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         if (tags != null && !tags.isEmpty()) {
             SearchBuilder<ResourceTagVO> tagSearch = resourceTagDao.createSearchBuilder();
             for (int count = 0; count < tags.size(); count++) {
-                tagSearch.or().op("key" + String.valueOf(count), tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
-                tagSearch.and("value" + String.valueOf(count), tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
+                tagSearch.or().op("key" + count, tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
+                tagSearch.and("value" + count, tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
                 tagSearch.cp();
             }
             tagSearch.and("resourceType", tagSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
@@ -5698,8 +5663,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             int count = 0;
             sc.setJoinParameters("tagSearch", "resourceType", ResourceObjectType.Snapshot.toString());
             for (String key : tags.keySet()) {
-                sc.setJoinParameters("tagSearch", "key" + String.valueOf(count), key);
-                sc.setJoinParameters("tagSearch", "value" + String.valueOf(count), tags.get(key));
+                sc.setJoinParameters("tagSearch", "key" + count, key);
+                sc.setJoinParameters("tagSearch", "value" + count, tags.get(key));
                 count++;
             }
         }
@@ -5774,7 +5739,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Pair<List<ObjectStoreVO>, Integer> result = searchForObjectStoresInternal(cmd);
         ListResponse<ObjectStoreResponse> response = new ListResponse<>();
 
-        List<ObjectStoreResponse> poolResponses = ViewResponseHelper.createObjectStoreResponse(result.first().toArray(new ObjectStoreVO[result.first().size()]));
+        List<ObjectStoreResponse> poolResponses = ViewResponseHelper.createObjectStoreResponse(result.first().toArray(new ObjectStoreVO[0]));
         response.setResponses(poolResponses, result.second());
         return response;
     }
@@ -5821,7 +5786,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search Store details by ids
         Pair<List<ObjectStoreVO>, Integer> uniqueStorePair = objectStoreDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueStorePair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return uniqueStorePair;
         }
@@ -5852,7 +5817,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
         Long id = cmd.getId();
         String name = cmd.getBucketName();
-        Long storeId = cmd.getObjectStorageId();
         String keyword = cmd.getKeyword();
         Long startIndex = cmd.getStartIndex();
         Long pageSize = cmd.getPageSizeVal();
@@ -5908,7 +5872,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         // search Volume details by ids
         Pair<List<BucketVO>, Integer> uniqueBktPair = bucketDao.searchAndCount(sc, searchFilter);
         Integer count = uniqueBktPair.second();
-        if (count.intValue() == 0) {
+        if (count == 0) {
             // empty result
             return uniqueBktPair.first();
         }
@@ -5930,6 +5894,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] {AllowUserViewDestroyedVM, UserVMDeniedDetails, UserVMReadOnlyDetails, SortKeyAscending,
-                AllowUserViewAllDomainAccounts, SharePublicTemplatesWithOtherDomains, ReturnVmStatsOnVmList};
+                AllowUserViewAllDomainAccounts, AllowUserViewAllDataCenters, SharePublicTemplatesWithOtherDomains, ReturnVmStatsOnVmList};
     }
 }
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index ecd761bb7d9..04a64fbfc8c 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -650,6 +650,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
         return false;
     }
 
+    @Override
     public boolean isResourceDomainAdmin(Long accountId) {
         if (accountId != null) {
             AccountVO acct = _accountDao.findById(accountId);
diff --git a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
index 8c569fb3ec8..a84f02755c7 100644
--- a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
@@ -422,6 +422,11 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
         return false;
     }
 
+    @Override
+    public boolean isResourceDomainAdmin(Long accountId) {
+        return false;
+    }
+
     @Override
     public boolean isNormalUser(long accountId) {
         // TODO Auto-generated method stub

From 071e612f404a7fe0af778cd66624887353617927 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Thu, 24 Jul 2025 03:29:36 -0400
Subject: [PATCH 53/94] UI: Fix OS Type displayed for a VM (#11075)

* UI: Fix OS Type displayed

* remove unnecessary method for os name change

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 ui/src/components/view/InfoCard.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 53c22c2ef0d..450bf83a35d 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -35,7 +35,7 @@
                       <resource-icon :image="resourceIcon" size="4x" style="margin-right: 5px"/>
                     </span>
                     <span v-else>
-                      <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.name" size="3x" @update-osname="setResourceOsType"/>
+                      <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname || resource.name" size="3x" />
                       <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
                       <font-awesome-icon
                         v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)"
@@ -153,18 +153,18 @@
                 <span style="margin-left: 10px;"><copy-label :label="resource.id" /></span>
               </div>
             </div>
-            <div class="resource-detail-item" v-if="resource.ostypename && resource.ostypeid">
+            <div class="resource-detail-item" v-if="(resource.ostypename || resource.osdisplayname) && resource.ostypeid">
               <div class="resource-detail-item__label">{{ $t('label.ostypename') }}</div>
               <div class="resource-detail-item__details">
                 <span v-if="images.guestoscategory">
                   <resource-icon :image="images.guestoscategory" size="1x" style="margin-right: 5px"/>
                 </span>
-                <os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename" size="lg" style="margin-left: -1px" />
+                <os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname" size="lg" style="margin-left: -1px" />
                 <span style="margin-left: 8px">
                   <router-link v-if="$router.resolve('/guestos/' + resource.ostypeid).matched[0].redirect !== '/exception/404'" :to="{ path: '/guestos/' + resource.ostypeid }">
-                    {{ resource.ostypename }}
+                    {{ resource.ostypename || resource.osdisplayname }}
                   </router-link>
-                  <span v-else>{{ resource.ostypename }}</span>
+                  <span v-else>{{ resource.ostypename || resource.osdisplayname }}</span>
                 </span>
               </div>
             </div>
@@ -1252,10 +1252,6 @@ export default {
         this.getTags()
       })
     },
-    setResourceOsType (name) {
-      this.newResource.ostypename = name
-      this.$emit('change-resource', this.newResource)
-    },
     getRouterQuery (item) {
       const query = {}
       if (item.value) {

From 7da5f9002b24728801f41b6ea50fa787bfa8a23c Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:46:16 +1000
Subject: [PATCH 54/94] misc: fix typo `sercurity` -> `security` (#10966)

---
 .../resources/security_group_agent/cs-sgagent |  2 +-
 .../test_egress_rules_host_maintenance.py     |  6 +-
 .../component/test_egress_rules.py            | 60 ++++++++--------
 .../component/test_project_resources.py       |  6 +-
 .../component/test_security_groups.py         | 72 +++++++++----------
 5 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
index f8a5d7d2c9d..3b3a52561b6 100755
--- a/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
+++ b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
@@ -1,7 +1,7 @@
 #!/bin/sh
 # the following is chkconfig init header
 #
-# cs-sgagent:  cloudStack baremetal sercurity group agent
+# cs-sgagent:  cloudStack baremetal security group agent
 #
 # chkconfig: 345 97 03
 # description:  This is a daemon instructed by CloudStack management server \
diff --git a/test/integration/component/maint/test_egress_rules_host_maintenance.py b/test/integration/component/maint/test_egress_rules_host_maintenance.py
index 40a3913642f..820d4d14550 100644
--- a/test/integration/component/maint/test_egress_rules_host_maintenance.py
+++ b/test/integration/component/maint/test_egress_rules_host_maintenance.py
@@ -175,19 +175,19 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.account.name,
                                         domainid=self.account.domainid
                                       )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index c1d12d11c01..32f1dca5f9f 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -375,19 +375,19 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
                                               )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                               self.apiclient,
                                               account=self.account.name,
                                               domainid=self.account.domainid
                                               )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -533,19 +533,19 @@ class TestDefaultGroupEgress(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                               self.apiclient,
                                               account=self.account.name,
                                               domainid=self.account.domainid
                                               )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -730,19 +730,19 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                               self.apiclient,
                                               account=self.account.name,
                                               domainid=self.account.domainid
                                               )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -910,19 +910,19 @@ class TestRevokeEgressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.account.name,
                                         domainid=self.account.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -1188,19 +1188,19 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.account.name,
                                         domainid=self.account.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -1320,19 +1320,19 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.accountA.name,
                                         domainid=self.accountA.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -1568,19 +1568,19 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_groupA.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.accountA.name,
                                         domainid=self.accountA.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -1594,19 +1594,19 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_groupB.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                     self.apiclient,
                                     account=self.accountB.name,
                                     domainid=self.accountB.domainid
                                     )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -1847,19 +1847,19 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.account.name,
                                         domainid=self.account.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
@@ -2037,19 +2037,19 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                         self.apiclient,
                                         account=self.account.name,
                                         domainid=self.account.domainid
                                         )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             2,
                             "Check List Security groups response"
                             )
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 16d21dfd7cb..37973eb3422 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -1283,18 +1283,18 @@ class TestSecurityGroup(cloudstackTestCase):
                                               )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
                                               self.apiclient,
                                               projectid=self.project.id
                                               )
         self.assertEqual(
-                         isinstance(sercurity_groups, list),
+                         isinstance(security_groups, list),
                          True,
                          "Check for list security groups response"
                          )
 
         self.assertNotEqual(
-                            len(sercurity_groups),
+                            len(security_groups),
                             0,
                             "Check List Security groups response"
                             )
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 449fe10cb28..04d4f0713fb 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -227,25 +227,25 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         #    for the admin account
         # 3. No Ingress Rules should be part of the default security group
 
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
         self.assertNotEqual(
-            len(sercurity_groups),
+            len(security_groups),
             0,
             "Check List Security groups response"
         )
         self.debug("List Security groups response: %s" %
-                   str(sercurity_groups))
+                   str(security_groups))
         self.assertEqual(
-            hasattr(sercurity_groups, 'ingressrule'),
+            hasattr(security_groups, 'ingressrule'),
             False,
             "Check ingress rule attribute for default security group"
         )
@@ -306,26 +306,26 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
             "Check virtual machine displayname in listVirtualMachines"
         )
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
 
         self.debug("List Security groups response: %s" %
-                   str(sercurity_groups))
+                   str(security_groups))
         self.assertNotEqual(
-            len(sercurity_groups),
+            len(security_groups),
             0,
             "Check List Security groups response"
         )
         self.assertEqual(
-            hasattr(sercurity_groups, 'ingressrule'),
+            hasattr(security_groups, 'ingressrule'),
             False,
             "Check ingress rule attribute for default security group"
         )
@@ -432,19 +432,19 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
 
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -580,19 +580,19 @@ class TestRevokeIngressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
 
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -909,18 +909,18 @@ class TestdeployVMWithUserData(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -1072,19 +1072,19 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
 
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -1126,12 +1126,12 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
         time.sleep(self.testdata["sleep"])
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             id=security_group.id
         )
         self.assertNotEqual(
-            sercurity_groups,
+            security_groups,
             None,
             "Check List Security groups response"
         )
@@ -1156,18 +1156,18 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -1303,18 +1303,18 @@ class TestIngressRule(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -1425,18 +1425,18 @@ class TestIngressRule(cloudstackTestCase):
         self.debug("Created security group with ID: %s" % security_group.id)
 
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )
@@ -1594,19 +1594,19 @@ class TestIngressRule(cloudstackTestCase):
         )
         self.debug("Created security group with ID: %s" % security_group.id)
         # Default Security group should not have any ingress rule
-        sercurity_groups = SecurityGroup.list(
+        security_groups = SecurityGroup.list(
             self.apiclient,
             account=self.account.name,
             domainid=self.account.domainid
         )
         self.assertEqual(
-            isinstance(sercurity_groups, list),
+            isinstance(security_groups, list),
             True,
             "Check for list security groups response"
         )
 
         self.assertEqual(
-            len(sercurity_groups),
+            len(security_groups),
             2,
             "Check List Security groups response"
         )

From 948ecda785ee2cc35d25a275dc4f98187f56dcca Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Thu, 24 Jul 2025 03:47:18 -0400
Subject: [PATCH 55/94] UI: Fix missing labels (#11102)

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 ui/public/locales/en.json                          | 3 +++
 ui/src/views/infra/network/ServiceProvidersTab.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 026880e38fd..cb19eb4bdc4 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2305,6 +2305,7 @@
 "label.threshold": "Threshold",
 "label.threshold.description": "Value for which the Counter will be evaluated with the Operator selected",
 "label.thursday": "Thursday",
+"label.tier0gateway": "Tier-0 Gateway",
 "label.time": "Time",
 "label.timeout": "Timeout",
 "label.timeout.in.second ": " Timeout (seconds)",
@@ -2323,6 +2324,7 @@
 "label.traffic.label": "Traffic label",
 "label.traffic.types": "Traffic types",
 "label.traffictype": "Traffic type",
+"label.transportzone": "Transport Zone",
 "label.transportzoneuuid": "Transport zone UUID",
 "label.trigger.shutdown": "Trigger Safe Shutdown",
 "label.true": "True",
@@ -2631,6 +2633,7 @@
 "label.bucket.update": "Update Bucket",
 "label.bucket.delete": "Delete Bucket",
 "label.quotagb": "Quota in GB",
+"label.edgecluster": "Edge Cluster",
 "label.encryption": "Encryption",
 "label.versioning": "Versioning",
 "label.objectlocking": "Object Lock",
diff --git a/ui/src/views/infra/network/ServiceProvidersTab.vue b/ui/src/views/infra/network/ServiceProvidersTab.vue
index 5eb8e3dbcce..beb3fe0d9dc 100644
--- a/ui/src/views/infra/network/ServiceProvidersTab.vue
+++ b/ui/src/views/infra/network/ServiceProvidersTab.vue
@@ -1118,7 +1118,7 @@ export default {
           ],
           lists: [
             {
-              title: 'label.nsx.controller',
+              title: 'label.nsx.provider',
               api: 'listNsxControllers',
               mapping: {
                 zoneid: {

From 83bccead3db4495d6cf6a4a717f0c94c1cab4191 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Thu, 24 Jul 2025 15:38:29 +0530
Subject: [PATCH 56/94] schema, refactor: rename cloud.user_vm_details to
 cloud.vm_instance_details (#10736)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Co-authored-by: dahn <daan@onecht.net>
---
 .../cloud/vm/VirtualMachineProfileImpl.java   |   2 +-
 .../cloud/vm/VirtualMachineManagerImpl.java   |  36 +++----
 .../orchestration/CloudOrchestrator.java      |  10 +-
 .../orchestration/VolumeOrchestrator.java     |  18 ++--
 .../vm/VirtualMachineManagerImplTest.java     |   8 +-
 .../service/dao/ServiceOfferingDaoImpl.java   |   8 +-
 ...mDetailVO.java => VMInstanceDetailVO.java} |   8 +-
 .../java/com/cloud/vm/dao/UserVmDaoImpl.java  |   8 +-
 ...ailsDao.java => VMInstanceDetailsDao.java} |   4 +-
 ...mpl.java => VMInstanceDetailsDaoImpl.java} |   6 +-
 ...s-between-management-and-usage-context.xml |   2 +-
 .../META-INF/db/schema-42010to42100.sql       |   5 +
 .../META-INF/db/views/cloud.user_vm_view.sql  |  14 +--
 .../storage/test/ChildTestConfiguration.java  |   4 +-
 .../presetvariables/PresetVariableHelper.java |  14 +--
 ...ailsDao.java => VMInstanceDetailsDao.java} |   4 +-
 ...mpl.java => VMInstanceDetailsDaoImpl.java} |  14 +--
 ...mDetailVO.java => VMInstanceDetailVO.java} |   8 +-
 .../quota/spring-framework-quota-context.xml  |   2 +-
 .../PresetVariableHelperTest.java             |  20 ++--
 .../implicitplanner/ImplicitPlannerTest.java  |   8 +-
 .../cluster/KubernetesClusterManagerImpl.java |  53 +++++----
 .../KubernetesClusterActionWorker.java        |  10 +-
 .../IntegrationTestConfiguration.java         |   4 +-
 .../allocator/impl/FirstFitAllocator.java     |  12 +--
 .../main/java/com/cloud/api/ApiDBUtils.java   |  14 +--
 .../com/cloud/api/query/QueryManagerImpl.java |  24 ++---
 .../api/query/dao/UserVmJoinDaoImpl.java      |  94 ++++++++--------
 .../cloud/capacity/CapacityManagerImpl.java   |  10 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java |   6 +-
 .../com/cloud/deploy/FirstFitPlanner.java     |   4 +-
 .../cloud/hypervisor/HypervisorGuruBase.java  |   6 +-
 .../hypervisor/kvm/dpdk/DpdkHelperImpl.java   |  13 +--
 .../metadata/ResourceMetaDataManagerImpl.java |   4 +-
 .../element/ConfigDriveNetworkElement.java    |  24 ++---
 .../VirtualNetworkApplianceManagerImpl.java   |   4 +-
 .../cloud/resource/ResourceManagerImpl.java   |   8 +-
 .../RollingMaintenanceManagerImpl.java        |  10 +-
 .../cloud/server/ManagementServerImpl.java    |  14 +--
 .../cloud/storage/VolumeApiServiceImpl.java   |  18 ++--
 .../java/com/cloud/vm/UserVmManagerImpl.java  |  69 ++++++------
 .../vm/snapshot/VMSnapshotManagerImpl.java    |  20 ++--
 .../ConsoleAccessManagerImpl.java             |  16 +--
 .../resource/ResourceCleanupServiceImpl.java  |   6 +-
 .../vm/UnmanagedVMsManagerImpl.java           |   4 +-
 .../vm/lease/VMLeaseManagerImpl.java          |  69 ++++++------
 .../api/query/dao/UserVmJoinDaoImplTest.java  |   4 +-
 .../DeploymentPlanningManagerImplTest.java    |   8 +-
 .../kvm/dpdk/DpdkHelperImplTest.java          |  23 ++--
 .../ConfigDriveNetworkElementTest.java        |  12 +--
 .../element/VirtualRouterElementTest.java     |   5 +-
 ...irtualNetworkApplianceManagerImplTest.java |   4 +-
 ...SecurityGroupManagerTestConfiguration.java |   4 +-
 .../resource/ResourceManagerImplTest.java     |  12 +--
 .../RollingMaintenanceManagerImplTest.java    |  16 +--
 .../server/ManagementServerImplTest.java      |  12 +--
 .../com/cloud/vm/FirstFitPlannerTest.java     |   8 +-
 .../com/cloud/vm/UserVmManagerImplTest.java   | 101 +++++++++---------
 .../vm/snapshot/VMSnapshotManagerTest.java    |  24 ++---
 .../com/cloud/vpc/VpcTestConfiguration.java   |   4 +-
 .../ConsoleAccessManagerImplTest.java         |   4 +-
 .../CreateNetworkOfferingTest.java            |   4 +-
 .../ResourceCleanupServiceImplTest.java       |  10 +-
 .../vm/lease/VMLeaseManagerImplTest.java      |  74 ++++++-------
 .../test/resources/createNetworkOffering.xml  |   2 +-
 .../SecondaryStorageManagerImpl.java          |   4 +-
 66 files changed, 529 insertions(+), 525 deletions(-)
 rename engine/schema/src/main/java/com/cloud/vm/{UserVmDetailVO.java => VMInstanceDetailVO.java} (90%)
 rename engine/schema/src/main/java/com/cloud/vm/dao/{UserVmDetailsDao.java => VMInstanceDetailsDao.java} (84%)
 rename engine/schema/src/main/java/com/cloud/vm/dao/{UserVmDetailsDaoImpl.java => VMInstanceDetailsDaoImpl.java} (81%)
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{UserVmDetailsDao.java => VMInstanceDetailsDao.java} (87%)
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{UserVmDetailsDaoImpl.java => VMInstanceDetailsDaoImpl.java} (80%)
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/vo/{UserVmDetailVO.java => VMInstanceDetailVO.java} (89%)

diff --git a/engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java b/engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java
index a1c54b90328..29b96dcc917 100644
--- a/engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java
+++ b/engine/components-api/src/main/java/com/cloud/vm/VirtualMachineProfileImpl.java
@@ -40,7 +40,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile {
     VirtualMachine _vm;
     ServiceOffering _offering;
     VirtualMachineTemplate _template;
-    UserVmDetailVO _userVmDetails;
+    VMInstanceDetailVO _userVmDetails;
     Map<Param, Object> _params;
     List<NicProfile> _nics = new ArrayList<NicProfile>();
     List<DiskTO> _disks = new ArrayList<DiskTO>();
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index e439872dfb5..45dcbd0cb53 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -286,7 +286,7 @@ import com.cloud.vm.VirtualMachine.PowerState;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotManager;
 import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -381,7 +381,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     private ClusterDetailsDao _clusterDetailsDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private VolumeOrchestrationService volumeMgr;
     @Inject
@@ -1370,8 +1370,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                                 _resourceMgr.updateGPUDetails(destHostId, gpuDevice.getGroupDetails());
                             }
 
-                            if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
-                                userVmDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
+                            if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
+                                vmInstanceDetailsDao.removeDetail(vm.getId(), VmDetailConstants.DEPLOY_VM);
                             }
 
                             startedVm = vm;
@@ -1553,16 +1553,16 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         final ClusterDetailsVO clusterDetailRam = _clusterDetailsDao.findDetail(clusterId, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
         final float parsedClusterCpuDetailCpu = Float.parseFloat(clusterDetailCpu.getValue());
         final float parsedClusterDetailRam = Float.parseFloat(clusterDetailRam.getValue());
-        UserVmDetailVO vmDetailCpu = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
-        UserVmDetailVO vmDetailRam = userVmDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
+        VMInstanceDetailVO vmDetailCpu = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
+        VMInstanceDetailVO vmDetailRam = vmInstanceDetailsDao.findDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);
 
         if ((vmDetailCpu == null && parsedClusterCpuDetailCpu > 1f) ||
                 (vmDetailCpu != null && Float.parseFloat(vmDetailCpu.getValue()) != parsedClusterCpuDetailCpu)) {
-            userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
+            vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO, clusterDetailCpu.getValue(), true);
         }
         if ((vmDetailRam == null && parsedClusterDetailRam > 1f) ||
                 (vmDetailRam != null && Float.parseFloat(vmDetailRam.getValue()) != parsedClusterDetailRam)) {
-            userVmDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
+            vmInstanceDetailsDao.addDetail(vmProfile.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, clusterDetailRam.getValue(), true);
         }
 
         vmProfile.setCpuOvercommitRatio(Float.parseFloat(clusterDetailCpu.getValue()));
@@ -3324,7 +3324,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
             if (defaultNic != null && VirtualMachine.Type.User.equals(vm.getType())) {
                 UserVmVO userVm = _userVmDao.findById(vm.getId());
-                Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+                Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
                 userVm.setDetails(details);
 
                 Network network = _networkModel.getNetwork(defaultNic.getNetworkId());
@@ -4842,29 +4842,29 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     }
 
     private void removeCustomOfferingDetails(long vmId) {
-        Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
+        Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
         details.remove(UsageEventVO.DynamicParameters.cpuNumber.name());
         details.remove(UsageEventVO.DynamicParameters.cpuSpeed.name());
         details.remove(UsageEventVO.DynamicParameters.memory.name());
-        List<UserVmDetailVO> detailList = new ArrayList<>();
+        List<VMInstanceDetailVO> detailList = new ArrayList<>();
         for(Map.Entry<String, String> entry: details.entrySet()) {
-            UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
+            VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
             detailList.add(detailVO);
         }
-        userVmDetailsDao.saveDetails(detailList);
+        vmInstanceDetailsDao.saveDetails(detailList);
     }
 
     private void saveCustomOfferingDetails(long vmId, ServiceOffering serviceOffering) {
-        Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vmId);
+        Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
         details.put(UsageEventVO.DynamicParameters.cpuNumber.name(), serviceOffering.getCpu().toString());
         details.put(UsageEventVO.DynamicParameters.cpuSpeed.name(), serviceOffering.getSpeed().toString());
         details.put(UsageEventVO.DynamicParameters.memory.name(), serviceOffering.getRamSize().toString());
-        List<UserVmDetailVO> detailList = new ArrayList<>();
+        List<VMInstanceDetailVO> detailList = new ArrayList<>();
         for (Map.Entry<String, String> entry: details.entrySet()) {
-            UserVmDetailVO detailVO = new UserVmDetailVO(vmId, entry.getKey(), entry.getValue(), true);
+            VMInstanceDetailVO detailVO = new VMInstanceDetailVO(vmId, entry.getKey(), entry.getValue(), true);
             detailList.add(detailVO);
         }
-        userVmDetailsDao.saveDetails(detailList);
+        vmInstanceDetailsDao.saveDetails(detailList);
     }
 
     @Override
@@ -6182,7 +6182,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Override
     public Map<Long, Boolean> getDiskOfferingSuitabilityForVm(long vmId, List<Long> diskOfferingIds) {
         VMInstanceVO vm = _vmDao.findById(vmId);
-        if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
+        if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
             return new HashMap<>();
         }
         VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index dab06ae995b..c9af76fbddd 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -61,7 +61,7 @@ import com.cloud.vm.NicProfile;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 import static org.apache.cloudstack.api.ApiConstants.MAX_IOPS;
@@ -86,7 +86,7 @@ public class CloudOrchestrator implements OrchestrationService {
     protected UserVmDao _userVmDao = null;
 
     @Inject
-    protected UserVmDetailsDao _userVmDetailsDao = null;
+    protected VMInstanceDetailsDao _vmInstanceDetailsDao = null;
 
     @Inject
     protected ServiceOfferingDao _serviceOfferingDao;
@@ -199,7 +199,7 @@ public class CloudOrchestrator implements OrchestrationService {
         rootDiskOfferingInfo.setSize(rootDiskSize);
 
         if (rootDiskOffering.isCustomizedIops() != null && rootDiskOffering.isCustomizedIops()) {
-            Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+            Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
 
             if (userVmDetails != null) {
                 String minIops = userVmDetails.get(MIN_IOPS);
@@ -231,7 +231,7 @@ public class CloudOrchestrator implements OrchestrationService {
                 dataDiskOfferingInfo.setSize(size);
 
                 if (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) {
-                    Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+                    Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
 
                     if (userVmDetails != null) {
                         String minIops = userVmDetails.get("minIopsDo");
@@ -307,7 +307,7 @@ public class CloudOrchestrator implements OrchestrationService {
         rootDiskOfferingInfo.setSize(size);
 
         if (diskOffering.isCustomizedIops() != null && diskOffering.isCustomizedIops()) {
-            Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+            Map<String, String> userVmDetails = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
 
             if (userVmDetails != null) {
                 String minIops = userVmDetails.get("minIopsDo");
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 9592711d1ee..d9a79f9885b 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -168,7 +168,7 @@ import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.vm.DiskProfile;
 import com.cloud.vm.SecondaryStorageVmVO;
 import com.cloud.vm.UserVmCloneSettingVO;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
@@ -183,7 +183,7 @@ import com.cloud.vm.VmWorkTakeVolumeSnapshot;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
 import com.cloud.vm.dao.UserVmCloneSettingDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrationService, Configurable {
 
@@ -255,7 +255,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
     @Inject
     TemplateService templateService;
     @Inject
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private SecondaryStorageVmDao secondaryStorageVmDao;
     @Inject
@@ -1057,7 +1057,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                 logger.info("Could not find a running SSVM in datacenter [{}] for deploying VM as is. Not deploying VM [{}] as is.",
                         vm.getDataCenterId(), vm);
             } else {
-                UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
+                VMInstanceDetailVO configurationDetail = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION);
                 if (configurationDetail != null) {
                     configurationId = configurationDetail.getValue();
                 }
@@ -1126,13 +1126,13 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
             String diskControllerSubType = disksAsIs.get(0).getDiskControllerSubType();
             if (StringUtils.isNotBlank(diskControllerSubType)) {
                 long vmId = vm.getId();
-                UserVmDetailVO detail = userVmDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
+                VMInstanceDetailVO detail = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER);
                 if (detail != null) {
                     detail.setValue(diskControllerSubType);
-                    userVmDetailsDao.update(detail.getId(), detail);
+                    vmInstanceDetailsDao.update(detail.getId(), detail);
                 } else {
-                    detail = new UserVmDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
-                    userVmDetailsDao.persist(detail);
+                    detail = new VMInstanceDetailVO(vmId, VmDetailConstants.ROOT_DISK_CONTROLLER, diskControllerSubType, false);
+                    vmInstanceDetailsDao.persist(detail);
                 }
             }
         }
@@ -1621,7 +1621,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
 
     private void setIoDriverPolicy(Map<String, String> details, StoragePoolVO storagePool, VolumeVO volume) {
         if (volume.getInstanceId() != null) {
-            UserVmDetailVO ioDriverPolicy = userVmDetailsDao.findDetail(volume.getInstanceId(),
+            VMInstanceDetailVO ioDriverPolicy = vmInstanceDetailsDao.findDetail(volume.getInstanceId(),
                     VmDetailConstants.IO_POLICY);
             if (ioDriverPolicy != null) {
                 if (IoDriverPolicy.STORAGE_SPECIFIC.toString().equals(ioDriverPolicy.getValue())) {
diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index 4a451e4e2d4..6335aae2e0a 100644
--- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -131,7 +131,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -224,7 +224,7 @@ public class VirtualMachineManagerImplTest {
     @Mock
     private ClusterDetailsDao _clusterDetailsDao;
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Mock
     private ItWorkDao _workDao;
     @Mock
@@ -1098,7 +1098,7 @@ public class VirtualMachineManagerImplTest {
         when(cluster.getId()).thenReturn(1L);
         when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
         when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
-        when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
+        when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
         when(cluster_detail_cpu.getValue()).thenReturn("1.0");
         when(cluster_detail_ram.getValue()).thenReturn("1.0");
         doReturn(false).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
@@ -1194,7 +1194,7 @@ public class VirtualMachineManagerImplTest {
         when(cluster.getId()).thenReturn(1L);
         when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.CPU_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_cpu);
         when(_clusterDetailsDao.findDetail(1L, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO)).thenReturn(cluster_detail_ram);
-        when(userVmDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
+        when(vmInstanceDetailsDao.findDetail(anyLong(), Mockito.anyString())).thenReturn(null);
         when(cluster_detail_cpu.getValue()).thenReturn("1.0");
         when(cluster_detail_ram.getValue()).thenReturn("1.0");
         doReturn(true).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
diff --git a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 803522fa6aa..2710aea3b9d 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -39,7 +39,7 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
 @DB()
@@ -48,7 +48,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
     @Inject
     protected ServiceOfferingDetailsDao detailsDao;
     @Inject
-    protected UserVmDetailsDao userVmDetailsDao;
+    protected VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private DiskOfferingDao diskOfferingDao;
 
@@ -176,7 +176,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
             if (vmId == null) {
                 throw new CloudRuntimeException("missing argument vmId");
             }
-            Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
+            Map<String, String> dynamicOffering = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
             return getComputeOffering(offering, dynamicOffering);
         }
         return offering;
@@ -190,7 +190,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
             if (vmId == null) {
                 throw new CloudRuntimeException("missing argument vmId");
             }
-            Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
+            Map<String, String> dynamicOffering = vmInstanceDetailsDao.listDetailsKeyPairs(vmId);
             return getComputeOffering(offering, dynamicOffering);
         }
         return offering;
diff --git a/engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java b/engine/schema/src/main/java/com/cloud/vm/VMInstanceDetailVO.java
similarity index 90%
rename from engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java
rename to engine/schema/src/main/java/com/cloud/vm/VMInstanceDetailVO.java
index 81bb6dd9d4f..7879aa24556 100755
--- a/engine/schema/src/main/java/com/cloud/vm/UserVmDetailVO.java
+++ b/engine/schema/src/main/java/com/cloud/vm/VMInstanceDetailVO.java
@@ -26,8 +26,8 @@ import javax.persistence.Table;
 import org.apache.cloudstack.api.ResourceDetail;
 
 @Entity
-@Table(name = "user_vm_details")
-public class UserVmDetailVO implements ResourceDetail {
+@Table(name = "vm_instance_details")
+public class VMInstanceDetailVO implements ResourceDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -45,10 +45,10 @@ public class UserVmDetailVO implements ResourceDetail {
     @Column(name = "display")
     private boolean display = true;
 
-    public UserVmDetailVO() {
+    public VMInstanceDetailVO() {
     }
 
-    public UserVmDetailVO(long vmId, String name, String value, boolean display) {
+    public VMInstanceDetailVO(long vmId, String name, String value, boolean display) {
         this.resourceId = vmId;
         this.name = name;
         this.value = value;
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
index cc8b9fc59a8..7d7c8de06d6 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -57,7 +57,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
@@ -130,7 +130,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
     private static final int VM_DETAILS_BATCH_SIZE = 100;
 
     @Inject
-    protected UserVmDetailsDao _detailsDao;
+    protected VMInstanceDetailsDao _detailsDao;
     @Inject
     protected NicDao _nicDao;
 
@@ -445,10 +445,10 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
 
         final Map<String, Boolean> visibilityMap = _detailsDao.listDetailsVisibility(vm.getId());
 
-        List<UserVmDetailVO> details = new ArrayList<UserVmDetailVO>();
+        List<VMInstanceDetailVO> details = new ArrayList<VMInstanceDetailVO>();
         for (Map.Entry<String, String> entry : detailsStr.entrySet()) {
             boolean display = !hiddenDetails.contains(entry.getKey()) && visibilityMap.getOrDefault(entry.getKey(), true);
-            details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
+            details.add(new VMInstanceDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display));
         }
 
         _detailsDao.saveDetails(details);
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDao.java
similarity index 84%
rename from engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java
rename to engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDao.java
index c22da6b4ff5..ea9ac5afba6 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDao.java
@@ -19,7 +19,7 @@ package com.cloud.vm.dao;
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
 
 import com.cloud.utils.db.GenericDao;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 
-public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long>, ResourceDetailsDao<UserVmDetailVO> {
+public interface VMInstanceDetailsDao extends GenericDao<VMInstanceDetailVO, Long>, ResourceDetailsDao<VMInstanceDetailVO> {
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDaoImpl.java
similarity index 81%
rename from engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
rename to engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDaoImpl.java
index d8f751842d5..ca11b005fb2 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDetailsDaoImpl.java
@@ -21,14 +21,14 @@ import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 
 @Component
-public class UserVmDetailsDaoImpl extends ResourceDetailsDaoBase<UserVmDetailVO> implements UserVmDetailsDao {
+public class VMInstanceDetailsDaoImpl extends ResourceDetailsDaoBase<VMInstanceDetailVO> implements VMInstanceDetailsDao {
 
     @Override
     public void addDetail(long resourceId, String key, String value, boolean display) {
-        super.addDetail(new UserVmDetailVO(resourceId, key, value, display));
+        super.addDetail(new VMInstanceDetailVO(resourceId, key, value, display));
     }
 
 }
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
index 96579b26516..d308a9e5aaf 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
@@ -63,7 +63,7 @@
 	<bean id="storagePoolHostDaoImpl" class="com.cloud.storage.dao.StoragePoolHostDaoImpl" />
 	<bean id="storagePoolTagsDaoImpl" class="com.cloud.storage.dao.StoragePoolTagsDaoImpl" />
 	<bean id="storagePoolAndAccessGroupMapDaoImpl" class="com.cloud.storage.dao.StoragePoolAndAccessGroupMapDaoImpl" />
-	<bean id="userVmDetailsDaoImpl" class="com.cloud.vm.dao.UserVmDetailsDaoImpl" />
+	<bean id="vmInstanceDetailsDaoImpl" class="com.cloud.vm.dao.VMInstanceDetailsDaoImpl" />
 	<bean id="vGPUTypesDaoImpl" class="com.cloud.gpu.dao.VGPUTypesDaoImpl" />
 	<bean id="vMInstanceDaoImpl" class="com.cloud.vm.dao.VMInstanceDaoImpl" />
 	<bean id="vMSnapshotDaoImpl" class="com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl" />
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 9688d3c7637..b9ce11c327f 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -234,5 +234,10 @@ CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
     CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
 );
 
+-- Rename user_vm_details to vm_instance_details
+ALTER TABLE `cloud`.`user_vm_details` RENAME TO `cloud`.`vm_instance_details`;
+ALTER TABLE `cloud`.`vm_instance_details` DROP FOREIGN KEY `fk_user_vm_details__vm_id`;
+ALTER TABLE `cloud`.`vm_instance_details` ADD CONSTRAINT `fk_vm_instance_details__vm_id` FOREIGN KEY (vm_id) REFERENCES vm_instance(id) ON DELETE CASCADE;
+
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'uuid', 'VARCHAR(40) NOT NULL');
 UPDATE `cloud`.`backup_schedule` SET uuid = UUID();
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
index a0c2720fc63..534579779c4 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
@@ -203,7 +203,7 @@ FROM
         LEFT JOIN `vpc` ON (((`networks`.`vpc_id` = `vpc`.`id`)
         AND ISNULL(`vpc`.`removed`))))
         LEFT JOIN `user_ip_address` FORCE INDEX(`fk_user_ip_address__vm_id`) ON ((`user_ip_address`.`vm_id` = `vm_instance`.`id`)))
-        LEFT JOIN `user_vm_details` `ssh_details` ON (((`ssh_details`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `ssh_details` ON (((`ssh_details`.`vm_id` = `vm_instance`.`id`)
         AND (`ssh_details`.`name` = 'SSH.KeyPairNames'))))
         LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` = `vm_instance`.`id`)
         AND (`resource_tags`.`resource_type` = 'UserVm'))))
@@ -214,15 +214,15 @@ FROM
         LEFT JOIN `affinity_group` ON ((`affinity_group_vm_map`.`affinity_group_id` = `affinity_group`.`id`)))
         LEFT JOIN `autoscale_vmgroup_vm_map` ON ((`autoscale_vmgroup_vm_map`.`instance_id` = `vm_instance`.`id`)))
         LEFT JOIN `autoscale_vmgroups` ON ((`autoscale_vmgroup_vm_map`.`vmgroup_id` = `autoscale_vmgroups`.`id`)))
-        LEFT JOIN `user_vm_details` `custom_cpu` ON (((`custom_cpu`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `custom_cpu` ON (((`custom_cpu`.`vm_id` = `vm_instance`.`id`)
         AND (`custom_cpu`.`name` = 'CpuNumber'))))
-        LEFT JOIN `user_vm_details` `custom_speed` ON (((`custom_speed`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `custom_speed` ON (((`custom_speed`.`vm_id` = `vm_instance`.`id`)
         AND (`custom_speed`.`name` = 'CpuSpeed'))))
-        LEFT JOIN `user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `vm_instance`.`id`)
         AND (`custom_ram_size`.`name` = 'memory')))
-        LEFT JOIN `user_vm_details` `lease_expiry_date` ON ((`lease_expiry_date`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `lease_expiry_date` ON ((`lease_expiry_date`.`vm_id` = `vm_instance`.`id`)
         AND (`lease_expiry_date`.`name` = 'leaseexpirydate'))
-        LEFT JOIN `user_vm_details` `lease_action_execution` ON ((`lease_action_execution`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `lease_action_execution` ON ((`lease_action_execution`.`vm_id` = `vm_instance`.`id`)
         AND (`lease_action_execution`.`name` = 'leaseactionexecution'))
-        LEFT JOIN `user_vm_details` `lease_expiry_action` ON (((`lease_expiry_action`.`vm_id` = `vm_instance`.`id`)
+        LEFT JOIN `vm_instance_details` `lease_expiry_action` ON (((`lease_expiry_action`.`vm_id` = `vm_instance`.`id`)
         AND (`lease_expiry_action`.`name` = 'leaseexpiryaction'))));
diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
index c5321ae6102..4f44051456e 100644
--- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
+++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
@@ -91,7 +91,7 @@ import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDaoImpl;
 import com.cloud.vm.dao.SecondaryStorageVmDaoImpl;
 import com.cloud.vm.dao.UserVmDaoImpl;
-import com.cloud.vm.dao.UserVmDetailsDaoImpl;
+import com.cloud.vm.dao.VMInstanceDetailsDaoImpl;
 import com.cloud.vm.dao.VMInstanceDaoImpl;
 import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
 
@@ -101,7 +101,7 @@ import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
     ConfigurationGroupDaoImpl.class, ConfigurationSubGroupDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class,
     VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class,
     DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, DiskOfferingDaoImpl.class,
-    StoragePoolHostDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class,
+    StoragePoolHostDaoImpl.class, UserVmDaoImpl.class, VMInstanceDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class,
     VMSnapshotDaoImpl.class, OCFS2ManagerImpl.class, ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class, ConsoleProxyDaoImpl.class,
     StoragePoolWorkDaoImpl.class, StorageCacheManagerImpl.class, UserDaoImpl.class, DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class,
     DownloadMonitorImpl.class, AccountDaoImpl.class, ActionEventUtils.class, EventDaoImpl.class},
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
index 05b75f4f64d..2a6ad132f63 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
@@ -92,10 +92,10 @@ import com.cloud.user.AccountVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.constants.VmDetails;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -174,7 +174,7 @@ public class PresetVariableHelper {
     VMSnapshotDao vmSnapshotDao;
 
     @Inject
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Inject
     BackupOfferingDao backupOfferingDao;
@@ -465,7 +465,7 @@ public class PresetVariableHelper {
         computingResources.setCpuSpeed(serviceOfferingVo.getSpeed());
 
         if (serviceOfferingVo.isDynamic()) {
-            List<UserVmDetailVO> details = userVmDetailsDao.listDetails(vmVo.getId());
+            List<VMInstanceDetailVO> details = vmInstanceDetailsDao.listDetails(vmVo.getId());
 
             computingResources.setMemory(getDetailByName(details, VmDetails.MEMORY.getName(), computingResources.getMemory()));
             computingResources.setCpuNumber(getDetailByName(details, VmDetails.CPU_NUMBER.getName(), computingResources.getCpuNumber()));
@@ -485,14 +485,14 @@ public class PresetVariableHelper {
         }
     }
 
-    protected Integer getDetailByName(List<UserVmDetailVO> details, String name, Integer defaultValue) {
-        List<UserVmDetailVO> detailFiltered = details.stream().filter(det -> name.equals(det.getName())).collect(Collectors.toList());
+    protected Integer getDetailByName(List<VMInstanceDetailVO> details, String name, Integer defaultValue) {
+        List<VMInstanceDetailVO> detailFiltered = details.stream().filter(det -> name.equals(det.getName())).collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(detailFiltered)) {
             return defaultValue;
         }
 
-        UserVmDetailVO detail = detailFiltered.get(0);
+        VMInstanceDetailVO detail = detailFiltered.get(0);
 
         if (detail.getValue() != null) {
             return Integer.valueOf(detail.getValue());
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDao.java
similarity index 87%
rename from framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java
rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDao.java
index f8ab3b9dbc4..af94136cecd 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDao.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDao.java
@@ -20,8 +20,8 @@ import java.util.Map;
 
 import com.cloud.utils.db.GenericDao;
 
-import org.apache.cloudstack.quota.vo.UserVmDetailVO;
+import org.apache.cloudstack.quota.vo.VMInstanceDetailVO;
 
-public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long> {
+public interface VMInstanceDetailsDao extends GenericDao<VMInstanceDetailVO, Long> {
     Map<String, String> listDetailsKeyPairs(long resourceId);
 }
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDaoImpl.java
similarity index 80%
rename from framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java
rename to framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDaoImpl.java
index eb852e12aba..b0f87c1c550 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/UserVmDetailsDaoImpl.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VMInstanceDetailsDaoImpl.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.cloudstack.quota.vo.UserVmDetailVO;
+import org.apache.cloudstack.quota.vo.VMInstanceDetailVO;
 import org.springframework.stereotype.Component;
 
 import com.cloud.utils.db.GenericDaoBase;
@@ -28,10 +28,10 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
 @Component
-public class UserVmDetailsDaoImpl extends GenericDaoBase<UserVmDetailVO, Long> implements UserVmDetailsDao {
-    private SearchBuilder<UserVmDetailVO> AllFieldsSearch;
+public class VMInstanceDetailsDaoImpl extends GenericDaoBase<VMInstanceDetailVO, Long> implements VMInstanceDetailsDao {
+    private SearchBuilder<VMInstanceDetailVO> AllFieldsSearch;
 
-    public UserVmDetailsDaoImpl() {
+    public VMInstanceDetailsDaoImpl() {
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("resourceId", AllFieldsSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), SearchCriteria.Op.EQ);
@@ -43,11 +43,11 @@ public class UserVmDetailsDaoImpl extends GenericDaoBase<UserVmDetailVO, Long> i
     @Override
     public Map<String, String> listDetailsKeyPairs(long resourceId) {
         Map<String, String> details = new HashMap<String, String>();
-        SearchCriteria<UserVmDetailVO> sc = AllFieldsSearch.create();
+        SearchCriteria<VMInstanceDetailVO> sc = AllFieldsSearch.create();
         sc.setParameters("resourceId", resourceId);
 
-        List<UserVmDetailVO> results = search(sc, null);
-        for (UserVmDetailVO result : results) {
+        List<VMInstanceDetailVO> results = search(sc, null);
+        for (VMInstanceDetailVO result : results) {
             details.put(result.getName(), result.getValue());
         }
         return details;
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/UserVmDetailVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/VMInstanceDetailVO.java
similarity index 89%
rename from framework/quota/src/main/java/org/apache/cloudstack/quota/vo/UserVmDetailVO.java
rename to framework/quota/src/main/java/org/apache/cloudstack/quota/vo/VMInstanceDetailVO.java
index 21fcdbdb52a..c5ca590e95c 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/UserVmDetailVO.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/VMInstanceDetailVO.java
@@ -26,8 +26,8 @@ import javax.persistence.Table;
 import org.apache.cloudstack.api.ResourceDetail;
 
 @Entity
-@Table(name = "user_vm_details")
-public class UserVmDetailVO implements ResourceDetail {
+@Table(name = "vm_instance_details")
+public class VMInstanceDetailVO implements ResourceDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -45,10 +45,10 @@ public class UserVmDetailVO implements ResourceDetail {
     @Column(name = "display")
     private boolean display = true;
 
-    public UserVmDetailVO() {
+    public VMInstanceDetailVO() {
     }
 
-    public UserVmDetailVO(long vmId, String name, String value, boolean display) {
+    public VMInstanceDetailVO(long vmId, String name, String value, boolean display) {
         this.resourceId = vmId;
         this.name = name;
         this.value = value;
diff --git a/framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml b/framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml
index e634321208f..453355c8522 100644
--- a/framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml
+++ b/framework/quota/src/main/resources/META-INF/cloudstack/quota/spring-framework-quota-context.xml
@@ -25,7 +25,7 @@
 	<bean id="QuotaEmailTemplatesDao"
 		class="org.apache.cloudstack.quota.dao.QuotaEmailTemplatesDaoImpl" />
 	<bean id="QuotaUsageDao" class="org.apache.cloudstack.quota.dao.QuotaUsageDaoImpl" />
-    <bean id="UserVmDetailsDao" class="org.apache.cloudstack.quota.dao.UserVmDetailsDaoImpl" />
+    <bean id="UserVmDetailsDao" class="org.apache.cloudstack.quota.dao.VMInstanceDetailsDaoImpl" />
 
 	<bean id="QuotaManager" class="org.apache.cloudstack.quota.QuotaManagerImpl" />
     <bean id="QuotaAlertManager" class="org.apache.cloudstack.quota.QuotaAlertManagerImpl" />
diff --git a/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
index e2be3acbbb5..c692cb7c1e7 100644
--- a/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
+++ b/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
@@ -93,9 +93,9 @@ import com.cloud.user.AccountVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshot;
 import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -171,7 +171,7 @@ public class PresetVariableHelperTest {
     VolumeDao volumeDaoMock;
 
     @Mock
-    UserVmDetailsDao userVmDetailsDaoMock;
+    VMInstanceDetailsDao vmInstanceDetailsDaoMock;
 
     @InjectMocks
     PresetVariableHelper presetVariableHelperSpy = Mockito.spy(PresetVariableHelper.class);
@@ -296,11 +296,11 @@ public class PresetVariableHelperTest {
         return quotaTypesMap.entrySet();
     }
 
-    private List<UserVmDetailVO> getVmDetailsForTests() {
-        List<UserVmDetailVO> details = new LinkedList<>();
-        details.add(new UserVmDetailVO(1l, "test_with_value", "277", false));
-        details.add(new UserVmDetailVO(1l, "test_with_invalid_value", "invalid", false));
-        details.add(new UserVmDetailVO(1l, "test_with_null", null, false));
+    private List<VMInstanceDetailVO> getVmDetailsForTests() {
+        List<VMInstanceDetailVO> details = new LinkedList<>();
+        details.add(new VMInstanceDetailVO(1l, "test_with_value", "277", false));
+        details.add(new VMInstanceDetailVO(1l, "test_with_invalid_value", "invalid", false));
+        details.add(new VMInstanceDetailVO(1l, "test_with_null", null, false));
         return details;
     }
 
@@ -1245,7 +1245,7 @@ public class PresetVariableHelperTest {
         ComputingResources result = presetVariableHelperSpy.getPresetVariableValueComputingResource(vmInstanceVoMock, serviceOfferingVoMock);
 
         Assert.assertEquals(expected.toString(), result.toString());
-        Mockito.verify(userVmDetailsDaoMock, Mockito.never()).listDetails(Mockito.anyLong());
+        Mockito.verify(vmInstanceDetailsDaoMock, Mockito.never()).listDetails(Mockito.anyLong());
     }
 
     @Test
@@ -1263,7 +1263,7 @@ public class PresetVariableHelperTest {
         ComputingResources result = presetVariableHelperSpy.getPresetVariableValueComputingResource(vmInstanceVoMock, serviceOfferingVoMock);
 
         Assert.assertEquals(expected.toString(), result.toString());
-        Mockito.verify(userVmDetailsDaoMock).listDetails(Mockito.anyLong());
+        Mockito.verify(vmInstanceDetailsDaoMock).listDetails(Mockito.anyLong());
     }
 
     @Test
diff --git a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
index a00fb49bb3f..d859ebd0ffb 100644
--- a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
+++ b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
@@ -95,7 +95,7 @@ import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -123,7 +123,7 @@ public class ImplicitPlannerTest {
     @Inject
     UserVmDao vmDao;
     @Inject
-    UserVmDetailsDao vmDetailsDao;
+    VMInstanceDetailsDao vmDetailsDao;
     @Inject
     VMInstanceDao vmInstanceDao;
     @Inject
@@ -489,8 +489,8 @@ public class ImplicitPlannerTest {
         }
 
         @Bean
-        public UserVmDetailsDao userVmDetailsDao() {
-            return Mockito.mock(UserVmDetailsDao.class);
+        public VMInstanceDetailsDao vmInstanceDetailsDao() {
+            return Mockito.mock(VMInstanceDetailsDao.class);
         }
 
         @Bean
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 f242ded5593..82e486cd103 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
@@ -17,9 +17,9 @@
 package com.cloud.kubernetes.cluster;
 
 import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.CONTROL;
+import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.DEFAULT;
 import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.ETCD;
 import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.WORKER;
-import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.DEFAULT;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 import static com.cloud.vm.UserVmManager.AllowUserExpungeRecoverVm;
 
@@ -47,28 +47,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.bgp.BGPService;
-import com.cloud.dc.DedicatedResourceVO;
-import com.cloud.dc.dao.DedicatedResourceDao;
-import com.cloud.exception.ManagementServerException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.host.Host;
-import com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType;
-import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterRemoveWorker;
-import com.cloud.network.dao.NsxProviderDao;
-import com.cloud.network.element.NsxProviderVO;
-import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterAddWorker;
-import com.cloud.network.rules.PortForwardingRuleVO;
-import com.cloud.network.rules.dao.PortForwardingRulesDao;
-import com.cloud.template.TemplateApiService;
-import com.cloud.user.UserDataVO;
-import com.cloud.user.dao.AccountDao;
-import com.cloud.user.dao.UserDataDao;
-import com.cloud.uservm.UserVm;
-import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmService;
-import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.Role;
 import org.apache.cloudstack.acl.RolePermissionEntity;
@@ -87,7 +65,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.kubernetes.cluster.AddNodesToKubernetesClusterCmd;
 import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
 import org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd;
 import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
@@ -96,6 +73,7 @@ import org.apache.cloudstack.api.command.user.firewall.DeleteFirewallRuleCmd;
 import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
 import org.apache.cloudstack.api.command.user.firewall.UpdateFirewallRuleCmd;
 import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.AddNodesToKubernetesClusterCmd;
 import org.apache.cloudstack.api.command.user.kubernetes.cluster.AddVirtualMachinesToKubernetesClusterCmd;
 import org.apache.cloudstack.api.command.user.kubernetes.cluster.CreateKubernetesClusterCmd;
 import org.apache.cloudstack.api.command.user.kubernetes.cluster.DeleteKubernetesClusterCmd;
@@ -130,13 +108,14 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.cloudstack.network.RoutedIpv4Manager;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Level;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.dao.NetworkOfferingJoinDao;
@@ -144,14 +123,17 @@ import com.cloud.api.query.dao.TemplateJoinDao;
 import com.cloud.api.query.dao.UserVmJoinDao;
 import com.cloud.api.query.vo.NetworkOfferingJoinVO;
 import com.cloud.api.query.vo.UserVmJoinVO;
+import com.cloud.bgp.BGPService;
 import com.cloud.capacity.CapacityManager;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.DedicatedResourceVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.domain.Domain;
 import com.cloud.event.ActionEvent;
@@ -159,13 +141,19 @@ import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ManagementServerException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterActionWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterAddWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterDestroyWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterRemoveWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterScaleWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterStartWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterStopWorker;
@@ -189,10 +177,14 @@ import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.element.NsxProviderVO;
 import com.cloud.network.router.NetworkHelper;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRuleVO;
+import com.cloud.network.rules.PortForwardingRuleVO;
+import com.cloud.network.rules.dao.PortForwardingRulesDao;
 import com.cloud.network.security.SecurityGroup;
 import com.cloud.network.security.SecurityGroupManager;
 import com.cloud.network.security.SecurityGroupService;
@@ -214,6 +206,7 @@ import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.template.TemplateApiService;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountService;
@@ -221,9 +214,13 @@ import com.cloud.user.AccountVO;
 import com.cloud.user.SSHKeyPairVO;
 import com.cloud.user.User;
 import com.cloud.user.UserAccount;
+import com.cloud.user.UserDataVO;
 import com.cloud.user.UserVO;
+import com.cloud.user.dao.AccountDao;
 import com.cloud.user.dao.SSHKeyPairDao;
 import com.cloud.user.dao.UserDao;
+import com.cloud.user.dao.UserDataDao;
+import com.cloud.uservm.UserVm;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.UuidUtils;
@@ -242,10 +239,12 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.UserVmService;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.VMInstanceDao;
-import org.apache.logging.log4j.Level;
 
 public class KubernetesClusterManagerImpl extends ManagerBase implements KubernetesClusterService {
 
@@ -328,8 +327,6 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
     @Inject
     protected UserDao userDao;
     @Inject
-    protected UserVmDetailsDao userVmDetailsDao;
-    @Inject
     protected VMInstanceDao vmInstanceDao;
     @Inject
     protected UserVmJoinDao userVmJoinDao;
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
index 7ce227dfeb7..1f2f42c3fe6 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
@@ -122,12 +122,12 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.ssh.SshHelper;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmService;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.CONTROL;
 import static com.cloud.kubernetes.cluster.KubernetesServiceHelper.KubernetesClusterNodeType.ETCD;
@@ -185,7 +185,7 @@ public class KubernetesClusterActionWorker {
     @Inject
     protected UserVmDao userVmDao;
     @Inject
-    protected UserVmDetailsDao userVmDetailsDao;
+    protected VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     protected UserVmService userVmService;
     @Inject
@@ -281,7 +281,7 @@ public class KubernetesClusterActionWorker {
             if (userVM == null) {
                 throw new CloudRuntimeException("Failed to find login user, Unable to log in to node to fetch details");
             }
-            UserVmDetailVO vmDetail = userVmDetailsDao.findDetail(vmId, VmDetailConstants.CKS_CONTROL_NODE_LOGIN_USER);
+            VMInstanceDetailVO vmDetail = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.CKS_CONTROL_NODE_LOGIN_USER);
             if (vmDetail != null && !org.apache.commons.lang3.StringUtils.isEmpty(vmDetail.getValue())) {
                 return vmDetail.getValue();
             } else {
@@ -654,7 +654,7 @@ public class KubernetesClusterActionWorker {
             for (Long vmId : clusterVMs) {
                 UserVm controlNode = userVmDao.findById(vmId);
                 if (controlNode != null) {
-                    userVmDetailsDao.addDetail(vmId, VmDetailConstants.CKS_CONTROL_NODE_LOGIN_USER, CLUSTER_NODE_VM_USER, true);
+                    vmInstanceDetailsDao.addDetail(vmId, VmDetailConstants.CKS_CONTROL_NODE_LOGIN_USER, CLUSTER_NODE_VM_USER, true);
                 }
             }
         }
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
index 19e617e9d13..9903f0e7490 100644
--- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
+++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
@@ -296,7 +296,7 @@ import com.cloud.vm.dao.NicSecondaryIpDaoImpl;
 import com.cloud.vm.dao.SecondaryStorageVmDaoImpl;
 import com.cloud.vm.dao.UserVmCloneSettingDaoImpl;
 import com.cloud.vm.dao.UserVmDaoImpl;
-import com.cloud.vm.dao.UserVmDetailsDaoImpl;
+import com.cloud.vm.dao.VMInstanceDetailsDaoImpl;
 import com.cloud.vm.dao.VMInstanceDaoImpl;
 import com.cloud.vm.snapshot.VMSnapshotManager;
 import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
@@ -331,7 +331,7 @@ import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
     SnapshotDaoImpl.class, SnapshotPolicyDaoImpl.class, StaticRouteDaoImpl.class, StatsCollector.class, StoragePoolDetailsDaoImpl.class, StoragePoolHostDaoImpl.class,
     StoragePoolJoinDaoImpl.class, SyncQueueItemDaoImpl.class, TemplateDataStoreDaoImpl.class, TemplateJoinDaoImpl.class, UploadDaoImpl.class, UsageEventDaoImpl.class,
     UserAccountJoinDaoImpl.class, UserDaoImpl.class, UserIpv6AddressDaoImpl.class, UserStatisticsDaoImpl.class, UserStatsLogDaoImpl.class,
-    UserVmCloneSettingDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, UserVmJoinDaoImpl.class, UserVmManagerImpl.class, VMInstanceDaoImpl.class, VMSnapshotDaoImpl.class,
+    UserVmCloneSettingDaoImpl.class, UserVmDaoImpl.class, VMInstanceDetailsDaoImpl.class, UserVmJoinDaoImpl.class, UserVmManagerImpl.class, VMInstanceDaoImpl.class, VMSnapshotDaoImpl.class,
     VMTemplateDaoImpl.class, VMTemplateDetailsDaoImpl.class, VMTemplateZoneDaoImpl.class, VirtualMachineManagerImpl.class, VirtualRouterProviderDaoImpl.class,
     VlanDaoImpl.class, VmDiskStatisticsDaoImpl.class, VmRulesetLogDaoImpl.class, VolumeDaoImpl.class, VolumeJoinDaoImpl.class, VpcDaoImpl.class,
     VpcGatewayDaoImpl.class, VpcManagerImpl.class, VpcOfferingDaoImpl.class, VpcOfferingServiceMapDaoImpl.class, VpcServiceMapDaoImpl.class,
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 3ca47caf8af..5f82bc1656c 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -61,10 +61,10 @@ import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -103,7 +103,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
     @Inject
     CapacityDao _capacityDao;
     @Inject
-    UserVmDetailsDao _userVmDetailsDao;
+    VMInstanceDetailsDao _vmInstanceDetailsDao;
 
     boolean _checkHvm = true;
     static DecimalFormat decimalFormat = new DecimalFormat("#.##");
@@ -124,9 +124,9 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
         Account account = vmProfile.getOwner();
 
         boolean isVMDeployedWithUefi = false;
-        UserVmDetailVO userVmDetailVO = _userVmDetailsDao.findDetail(vmProfile.getId(), "UEFI");
-        if(userVmDetailVO != null){
-            if ("secure".equalsIgnoreCase(userVmDetailVO.getValue()) || "legacy".equalsIgnoreCase(userVmDetailVO.getValue())) {
+        VMInstanceDetailVO vmInstanceDetailVO = _vmInstanceDetailsDao.findDetail(vmProfile.getId(), "UEFI");
+        if(vmInstanceDetailVO != null){
+            if ("secure".equalsIgnoreCase(vmInstanceDetailVO.getValue()) || "legacy".equalsIgnoreCase(vmInstanceDetailVO.getValue())) {
                 isVMDeployedWithUefi = true;
             }
         }
diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
index 4783815a9e5..1471ee4220a 100644
--- a/server/src/main/java/com/cloud/api/ApiDBUtils.java
+++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -343,7 +343,7 @@ import com.cloud.vm.InstanceGroup;
 import com.cloud.vm.InstanceGroupVO;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
@@ -357,7 +357,7 @@ import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
 import com.cloud.vm.dao.NicSecondaryIpVO;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshot;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -434,7 +434,7 @@ public class ApiDBUtils {
     static HighAvailabilityManager s_haMgr;
     static VpcManager s_vpcMgr;
     static TaggedResourceService s_taggedResourceService;
-    static UserVmDetailsDao s_userVmDetailsDao;
+    static VMInstanceDetailsDao s_vmInstanceDetailsDao;
     static SSHKeyPairDao s_sshKeyPairDao;
 
     static ConditionDao s_asConditionDao;
@@ -639,7 +639,7 @@ public class ApiDBUtils {
     @Inject
     private TaggedResourceService taggedResourceService;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private SSHKeyPairDao sshKeyPairDao;
 
@@ -839,7 +839,7 @@ public class ApiDBUtils {
         s_vpcMgr = vpcMgr;
         s_taggedResourceService = taggedResourceService;
         s_sshKeyPairDao = sshKeyPairDao;
-        s_userVmDetailsDao = userVmDetailsDao;
+        s_vmInstanceDetailsDao = vmInstanceDetailsDao;
         s_asConditionDao = asConditionDao;
         s_asPolicyDao = asPolicyDao;
         s_asPolicyConditionMapDao = asPolicyConditionMapDao;
@@ -1621,8 +1621,8 @@ public class ApiDBUtils {
         return null;
     }
 
-    public static UserVmDetailVO  findPublicKeyByVmId(long vmId) {
-        return s_userVmDetailsDao.findDetail(vmId, VmDetailConstants.SSH_PUBLIC_KEY);
+    public static VMInstanceDetailVO findPublicKeyByVmId(long vmId) {
+        return s_vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.SSH_PUBLIC_KEY);
     }
 
     public static void getAutoScaleVmGroupPolicies(long vmGroupId, List<AutoScalePolicy> scaleUpPolicies, List<AutoScalePolicy> scaleDownPolicies) {
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 57bc347eeff..cdedd830c0a 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -36,12 +36,6 @@ import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
-import com.cloud.dc.Pod;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.dc.dao.HostPodDao;
-import com.cloud.org.Cluster;
-import com.cloud.server.ManagementService;
-import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker;
@@ -237,8 +231,11 @@ import com.cloud.cpu.CPU;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DedicatedResourceVO;
+import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.DedicatedResourceDao;
+import com.cloud.dc.dao.HostPodDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
@@ -276,6 +273,7 @@ import com.cloud.network.security.dao.SecurityGroupVMMapDao;
 import com.cloud.network.vo.PublicIpQuarantineVO;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.org.Cluster;
 import com.cloud.org.Grouping;
 import com.cloud.projects.Project;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
@@ -287,6 +285,7 @@ import com.cloud.projects.dao.ProjectDao;
 import com.cloud.projects.dao.ProjectInvitationDao;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.icon.dao.ResourceIconDao;
+import com.cloud.server.ManagementService;
 import com.cloud.server.ResourceManagerUtil;
 import com.cloud.server.ResourceMetaDataService;
 import com.cloud.server.ResourceTag;
@@ -317,6 +316,7 @@ import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.BucketDao;
 import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.dao.StoragePoolTagsDao;
 import com.cloud.storage.dao.VMTemplateDao;
@@ -351,8 +351,8 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.InstanceGroupVMMapVO;
 import com.cloud.vm.NicVO;
-import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineManager;
@@ -361,8 +361,8 @@ import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.InstanceGroupVMMapDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
 public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements QueryService, Configurable {
@@ -591,7 +591,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     AffinityGroupVMMapDao affinityGroupVMMapDao;
 
     @Inject
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Inject
     SSHKeyPairDao sshKeyPairDao;
@@ -1519,7 +1519,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         if (cmd.getOnlyLeasedInstances()) {
-            SearchBuilder<UserVmDetailVO> leasedInstancesSearch = userVmDetailsDao.createSearchBuilder();
+            SearchBuilder<VMInstanceDetailVO> leasedInstancesSearch = vmInstanceDetailsDao.createSearchBuilder();
             leasedInstancesSearch.and(leasedInstancesSearch.entity().getName(), SearchCriteria.Op.EQ).values(VmDetailConstants.INSTANCE_LEASE_EXECUTION);
             leasedInstancesSearch.and(leasedInstancesSearch.entity().getValue(), SearchCriteria.Op.EQ).values(VMLeaseManager.LeaseActionExecution.PENDING.name());
             userVmSearchBuilder.join("userVmToLeased", leasedInstancesSearch, leasedInstancesSearch.entity().getResourceId(),
@@ -1527,8 +1527,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         if (keyPairName != null) {
-            SearchBuilder<UserVmDetailVO> vmDetailSearchKeys = userVmDetailsDao.createSearchBuilder();
-            SearchBuilder<UserVmDetailVO> vmDetailSearchVmIds = userVmDetailsDao.createSearchBuilder();
+            SearchBuilder<VMInstanceDetailVO> vmDetailSearchKeys = vmInstanceDetailsDao.createSearchBuilder();
+            SearchBuilder<VMInstanceDetailVO> vmDetailSearchVmIds = vmInstanceDetailsDao.createSearchBuilder();
             vmDetailSearchKeys.and(vmDetailSearchKeys.entity().getName(), Op.EQ).values(SSH_PUBLIC_KEY);
 
             SearchBuilder<SSHKeyPairVO> sshKeyPairSearch = sshKeyPairDao.createSearchBuilder();
diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index ba2aff42329..c174da2993a 100644
--- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -16,6 +16,44 @@
 // under the License.
 package com.cloud.api.query.dao;
 
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.affinity.AffinityGroupResponse;
+import org.apache.cloudstack.annotation.AnnotationService;
+import org.apache.cloudstack.annotation.dao.AnnotationDao;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiConstants.VMDetails;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.response.NicExtraDhcpOptionResponse;
+import org.apache.cloudstack.api.response.NicResponse;
+import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
+import org.apache.cloudstack.api.response.SecurityGroupResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VnfNicResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.query.QueryService;
+import org.apache.cloudstack.vm.lease.VMLeaseManager;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.ApiResponseHelper;
 import com.cloud.api.query.vo.UserVmJoinVO;
@@ -44,50 +82,14 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.net.Dhcp;
-import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VmStats;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpVO;
-import com.cloud.vm.dao.UserVmDetailsDao;
-import org.apache.cloudstack.affinity.AffinityGroupResponse;
-import org.apache.cloudstack.annotation.AnnotationService;
-import org.apache.cloudstack.annotation.dao.AnnotationDao;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.response.NicExtraDhcpOptionResponse;
-import org.apache.cloudstack.api.response.NicResponse;
-import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
-import org.apache.cloudstack.api.response.SecurityGroupResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.api.response.VnfNicResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.query.QueryService;
-import org.apache.cloudstack.vm.lease.VMLeaseManager;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import javax.inject.Inject;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
 public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJoinVO, UserVmResponse> implements UserVmJoinDao {
@@ -97,7 +99,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     @Inject
     public AccountManager _accountMgr;
     @Inject
-    private UserVmDetailsDao _userVmDetailsDao;
+    private VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     private UserDao _userDao;
     @Inject
@@ -415,17 +417,17 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
         // set resource details map
         // Allow passing details to end user
         // Honour the display field and only return if display is set to true
-        List<UserVmDetailVO> vmDetails = _userVmDetailsDao.listDetails(userVm.getId(), true);
+        List<VMInstanceDetailVO> vmDetails = _vmInstanceDetailsDao.listDetails(userVm.getId(), true);
         if (vmDetails != null) {
             Map<String, String> resourceDetails = new HashMap<String, String>();
-            for (UserVmDetailVO userVmDetailVO : vmDetails) {
-                if (!userVmDetailVO.getName().startsWith(ApiConstants.PROPERTIES) ||
-                        (UserVmManager.DisplayVMOVFProperties.value() && userVmDetailVO.getName().startsWith(ApiConstants.PROPERTIES))) {
-                    resourceDetails.put(userVmDetailVO.getName(), userVmDetailVO.getValue());
+            for (VMInstanceDetailVO vmInstanceDetailVO : vmDetails) {
+                if (!vmInstanceDetailVO.getName().startsWith(ApiConstants.PROPERTIES) ||
+                        (UserVmManager.DisplayVMOVFProperties.value() && vmInstanceDetailVO.getName().startsWith(ApiConstants.PROPERTIES))) {
+                    resourceDetails.put(vmInstanceDetailVO.getName(), vmInstanceDetailVO.getValue());
                 }
-                if ((ApiConstants.BootType.UEFI.toString()).equalsIgnoreCase(userVmDetailVO.getName())) {
+                if ((ApiConstants.BootType.UEFI.toString()).equalsIgnoreCase(vmInstanceDetailVO.getName())) {
                     userVmResponse.setBootType("Uefi");
-                    userVmResponse.setBootMode(userVmDetailVO.getValue().toLowerCase());
+                    userVmResponse.setBootMode(vmInstanceDetailVO.getValue().toLowerCase());
 
                 }
             }
diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
index 8eebc04ee68..51efb6a668d 100644
--- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
@@ -89,7 +89,7 @@ import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateListener;
 import com.cloud.utils.fsm.StateMachine2;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
@@ -97,7 +97,7 @@ import com.cloud.vm.VirtualMachine.Event;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 
@@ -130,7 +130,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
     @Inject
     protected UserVmDao _userVMDao;
     @Inject
-    protected UserVmDetailsDao _userVmDetailsDao;
+    protected VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     ClusterDao _clusterDao;
     @Inject
@@ -660,7 +660,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
     }
 
     protected Map<String, String> getVmDetailsForCapacityCalculation(long vmId) {
-        return _userVmDetailsDao.listDetailsKeyPairs(vmId,
+        return _vmInstanceDetailsDao.listDetailsKeyPairs(vmId,
                 List.of(VmDetailConstants.CPU_OVER_COMMIT_RATIO,
                         VmDetailConstants.MEMORY_OVER_COMMIT_RATIO,
                         UsageEventVO.DynamicParameters.memory.name(),
@@ -769,7 +769,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
             } else {
                 // signal if not done already, that the VM has been stopped for skip.counting.hours,
                 // hence capacity will not be reserved anymore.
-                UserVmDetailVO messageSentFlag = _userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.MESSAGE_RESERVED_CAPACITY_FREED_FLAG);
+                VMInstanceDetailVO messageSentFlag = _vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.MESSAGE_RESERVED_CAPACITY_FREED_FLAG);
                 if (messageSentFlag == null || !Boolean.valueOf(messageSentFlag.getValue())) {
                     _messageBus.publish(_name, "VM_ReservedCapacity_Free", PublishScope.LOCAL, vm);
 
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 4331cc494c4..1c69e6ba59d 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -146,7 +146,7 @@ import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineName;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.ConsoleProxyDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -208,7 +208,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     @Inject
     private PrimaryDataStoreDao primaryDataStoreDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private ResourceManager resourceManager;
     @Inject
@@ -1244,7 +1244,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
         final Certificate certificate = caManager.issueCertificate(null, Arrays.asList(profile.getHostName(), profile.getInstanceName()),
                 new ArrayList<>(ipAddressDetails.values()), CAManager.CertValidityPeriod.value(), null);
         ConsoleProxyVO vm = consoleProxyDao.findById(profile.getId());
-        Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+        Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
         vm.setDetails(details);
 
         StringBuilder buf = profile.getBootArgsBuilder();
diff --git a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
index d01e43622c6..9370204fb6e 100644
--- a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
@@ -72,7 +72,7 @@ import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.host.dao.HostDetailsDao;
 
@@ -98,7 +98,7 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
     @Inject
     protected UserVmDao vmDao;
     @Inject
-    protected UserVmDetailsDao vmDetailsDao;
+    protected VMInstanceDetailsDao vmDetailsDao;
     @Inject
     protected VMInstanceDao vmInstanceDao;
     @Inject
diff --git a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
index 7554c1f9704..1be822d673e 100644
--- a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -77,7 +77,7 @@ import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 public abstract class HypervisorGuruBase extends AdapterBase implements HypervisorGuru, Configurable {
@@ -102,7 +102,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
     protected
     VMInstanceDao virtualMachineDao;
     @Inject
-    private UserVmDetailsDao _userVmDetailsDao;
+    private VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     private NicSecondaryIpDao _nicSecIpDao;
     @Inject
@@ -315,7 +315,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
             to.setArch("x86_64");
         }
 
-        Map<String, String> detailsInVm = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+        Map<String, String> detailsInVm = _vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
         if (detailsInVm != null) {
             to.setDetails(detailsInVm);
             addExtraConfig(detailsInVm, to, vm.getAccountId(), vm.getHypervisorType());
diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java b/server/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java
index a4afdb394c1..7a20f5d1518 100644
--- a/server/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java
+++ b/server/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java
@@ -23,12 +23,13 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.service.ServiceOfferingDetailsVO;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -46,7 +47,7 @@ public class DpdkHelperImpl implements DpdkHelper {
     @Inject
     private VMInstanceDao vmInstanceDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
 
     protected Logger logger = LogManager.getLogger(getClass());
 
@@ -93,7 +94,7 @@ public class DpdkHelperImpl implements DpdkHelper {
             return false;
         }
 
-        List<UserVmDetailVO> details = userVmDetailsDao.listDetails(vm.getId());
+        List<VMInstanceDetailVO> details = vmInstanceDetailsDao.listDetails(vm.getId());
         List<ServiceOfferingDetailsVO> offeringDetails = serviceOfferingDetailsDao.listDetails(vm.getServiceOfferingId());
 
         if (!hasRequiredDPDKConfigurations(details, offeringDetails)) {
@@ -106,13 +107,13 @@ public class DpdkHelperImpl implements DpdkHelper {
     /**
      * True if VM is DPDK enabled. NUMA and HUGEPAGES configurations must be present on VM or service offering details
      */
-    private boolean hasRequiredDPDKConfigurations(List<UserVmDetailVO> details, List<ServiceOfferingDetailsVO> offeringDetails) {
+    private boolean hasRequiredDPDKConfigurations(List<VMInstanceDetailVO> details, List<ServiceOfferingDetailsVO> offeringDetails) {
         if (CollectionUtils.isEmpty(details)) {
             return hasValidDPDKConfigurationsOnServiceOffering(false, false, offeringDetails);
         } else {
             boolean isNumaSet = false;
             boolean isHugePagesSet = false;
-            for (UserVmDetailVO detail : details) {
+            for (VMInstanceDetailVO detail : details) {
                 if (detail.getName().equals(DPDK_NUMA)) {
                     isNumaSet = true;
                 } else if (detail.getName().equals(DPDK_HUGE_PAGES)) {
diff --git a/server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index fc2453286cb..2f9d49c42aa 100644
--- a/server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/main/java/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -66,7 +66,7 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
 import com.cloud.utils.db.TransactionStatus;
 import com.cloud.vm.dao.NicDetailsDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
 public class ResourceMetaDataManagerImpl extends ManagerBase implements ResourceMetaDataService, ResourceMetaDataManager {
@@ -75,7 +75,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
     @Inject
     NicDetailsDao _nicDetailDao;
     @Inject
-    UserVmDetailsDao _userVmDetailDao;
+    VMInstanceDetailsDao _userVmDetailDao;
     @Inject
     DataCenterDetailsDao _dcDetailsDao;
     @Inject
diff --git a/server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java b/server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java
index 5f1c1e58d93..a18855fa34a 100644
--- a/server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java
+++ b/server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java
@@ -84,14 +84,14 @@ import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 public class ConfigDriveNetworkElement extends AdapterBase implements NetworkElement,
         UserDataServiceProvider, DhcpServiceProvider, DnsServiceProvider,
@@ -104,7 +104,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     @Inject
     UserVmDao _userVmDao;
     @Inject
-    UserVmDetailsDao _userVmDetailsDao;
+    VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     ConfigurationManager _configMgr;
     @Inject
@@ -224,7 +224,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     }
 
     private String getSshKey(VirtualMachineProfile profile) {
-        final UserVmDetailVO vmDetailSshKey = _userVmDetailsDao.findDetail(profile.getId(), VmDetailConstants.SSH_PUBLIC_KEY);
+        final VMInstanceDetailVO vmDetailSshKey = _vmInstanceDetailsDao.findDetail(profile.getId(), VmDetailConstants.SSH_PUBLIC_KEY);
         return (vmDetailSshKey!=null ? vmDetailSshKey.getValue() : null);
     }
 
@@ -299,7 +299,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
         final String password_encrypted = DBEncryptionUtil.encrypt(password);
         final UserVmVO userVmVO = _userVmDao.findById(vm.getId());
 
-        _userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.PASSWORD,  password_encrypted, false);
+        _vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.PASSWORD,  password_encrypted, false);
 
         userVmVO.setUpdateParameters(true);
         _userVmDao.update(userVmVO.getId(), userVmVO);
@@ -530,7 +530,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     }
 
     private Location getConfigDriveLocation(long vmId) {
-        final UserVmDetailVO vmDetailConfigDriveLocation = _userVmDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
+        final VMInstanceDetailVO vmDetailConfigDriveLocation = _vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
         if (vmDetailConfigDriveLocation != null) {
             if (Location.HOST.toString().equalsIgnoreCase(vmDetailConfigDriveLocation.getValue())) {
                 return Location.HOST;
@@ -544,7 +544,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     }
 
     private boolean isConfigDriveIsoOnHostCache(long vmId) {
-        final UserVmDetailVO vmDetailConfigDriveLocation = _userVmDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
+        final VMInstanceDetailVO vmDetailConfigDriveLocation = _vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
         if (vmDetailConfigDriveLocation != null && Location.HOST.toString().equalsIgnoreCase(vmDetailConfigDriveLocation.getValue())) {
             return true;
         }
@@ -552,7 +552,7 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     }
 
     private boolean isLastConfigDriveIsoOnHostCache(long vmId) {
-        final UserVmDetailVO vmDetailLastConfigDriveLocation = _userVmDetailsDao.findDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION);
+        final VMInstanceDetailVO vmDetailLastConfigDriveLocation = _vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION);
         if (vmDetailLastConfigDriveLocation == null) {
             return isConfigDriveIsoOnHostCache(vmId);
         }
@@ -681,15 +681,15 @@ public class ConfigDriveNetworkElement extends AdapterBase implements NetworkEle
     }
 
     private void updateConfigDriveLocationInVMDetails(long vmId, NetworkElement.Location configDriveLocation) {
-        final UserVmDetailVO vmDetailConfigDriveLocation = _userVmDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
+        final VMInstanceDetailVO vmDetailConfigDriveLocation = _vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION);
         if (vmDetailConfigDriveLocation != null) {
             if (!configDriveLocation.toString().equalsIgnoreCase(vmDetailConfigDriveLocation.getValue())) {
-                _userVmDetailsDao.addDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION, vmDetailConfigDriveLocation.getValue(), false);
+                _vmInstanceDetailsDao.addDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION, vmDetailConfigDriveLocation.getValue(), false);
             } else {
-                _userVmDetailsDao.removeDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION);
+                _vmInstanceDetailsDao.removeDetail(vmId, VmDetailConstants.LAST_CONFIG_DRIVE_LOCATION);
             }
         }
-        _userVmDetailsDao.addDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION, configDriveLocation.toString(), false);
+        _vmInstanceDetailsDao.addDetail(vmId, VmDetailConstants.CONFIG_DRIVE_LOCATION, configDriveLocation.toString(), false);
     }
 
     private Map<String, String> getVMCustomUserdataParamMap(long vmId) {
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 27f04234c33..fa3c3abc681 100644
--- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -262,7 +262,7 @@ import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.NicIpAliasVO;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
@@ -310,7 +310,7 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
     @Inject protected RemoteAccessVpnDao _vpnDao;
     @Inject protected NicDao _nicDao;
     @Inject private NicIpAliasDao _nicIpAliasDao;
-    @Inject private UserVmDetailsDao _vmDetailsDao;
+    @Inject private VMInstanceDetailsDao _vmDetailsDao;
     @Inject protected VirtualRouterProviderDao _vrProviderDao;
     @Inject private ManagementServerHostDao _msHostDao;
     @Inject private Site2SiteCustomerGatewayDao _s2sCustomerGatewayDao;
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 5c8b09e28ab..7e140ecac1b 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -215,7 +215,7 @@ import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 
@@ -305,7 +305,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     @Inject
     private ClusterVSMMapDao _clusterVSMMapDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private AnnotationDao annotationDao;
     @Inject
@@ -1692,8 +1692,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         for (VMInstanceVO vm : vms) {
             GetVncPortAnswer vmVncPortAnswer = (GetVncPortAnswer) _agentMgr.easySend(hostId, new GetVncPortCommand(vm.getId(), vm.getInstanceName()));
             if (vmVncPortAnswer != null) {
-                userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.KVM_VNC_ADDRESS, vmVncPortAnswer.getAddress(), true);
-                userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.KVM_VNC_PORT, String.valueOf(vmVncPortAnswer.getPort()), true);
+                vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.KVM_VNC_ADDRESS, vmVncPortAnswer.getAddress(), true);
+                vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.KVM_VNC_PORT, String.valueOf(vmVncPortAnswer.getPort()), true);
             }
         }
     }
diff --git a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
index 3cfaf6731c7..1e6ab9d0ffa 100644
--- a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
@@ -69,12 +69,12 @@ import com.cloud.utils.StringUtils;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 public class RollingMaintenanceManagerImpl extends ManagerBase implements RollingMaintenanceManager {
@@ -90,7 +90,7 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
     @Inject
     private VMInstanceDao vmInstanceDao;
     @Inject
-    protected UserVmDetailsDao userVmDetailsDao;
+    protected VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private ServiceOfferingDao serviceOfferingDao;
     @Inject
@@ -689,12 +689,12 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
             return new Ternary<>(cpu, speed, ramSize);
         }
 
-        List<UserVmDetailVO> vmDetails = userVmDetailsDao.listDetails(runningVM.getId());
+        List<VMInstanceDetailVO> vmDetails = vmInstanceDetailsDao.listDetails(runningVM.getId());
         if (CollectionUtils.isEmpty(vmDetails)) {
             return new Ternary<>(cpu, speed, ramSize);
         }
 
-        for (UserVmDetailVO vmDetail : vmDetails) {
+        for (VMInstanceDetailVO vmDetail : vmDetails) {
             if (StringUtils.isBlank(vmDetail.getName()) || StringUtils.isBlank(vmDetail.getValue())) {
                 continue;
             }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 1ae2ded5b1c..ea6c595ae13 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -848,7 +848,7 @@ import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.InstanceGroupVO;
 import com.cloud.vm.NicVO;
 import com.cloud.vm.SecondaryStorageVmVO;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
@@ -863,7 +863,7 @@ import com.cloud.vm.dao.InstanceGroupDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 public class ManagementServerImpl extends ManagerBase implements ManagementServer, Configurable {
@@ -894,7 +894,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     private ClusterDao _clusterDao;
     @Inject
-    protected UserVmDetailsDao _UserVmDetailsDao;
+    protected VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     private SecondaryStorageVmDao _secStorageVmDao;
     @Inject
@@ -1416,10 +1416,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     }
 
     protected Pair<Boolean, List<HostVO>> filterUefiHostsForMigration(List<HostVO> allHosts, List<HostVO> filteredHosts, VirtualMachine vm) {
-        UserVmDetailVO userVmDetailVO = _UserVmDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString());
-        if (userVmDetailVO != null &&
-                (ApiConstants.BootMode.LEGACY.toString().equalsIgnoreCase(userVmDetailVO.getValue()) ||
-                        ApiConstants.BootMode.SECURE.toString().equalsIgnoreCase(userVmDetailVO.getValue()))) {
+        VMInstanceDetailVO vmInstanceDetailVO = _vmInstanceDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString());
+        if (vmInstanceDetailVO != null &&
+                (ApiConstants.BootMode.LEGACY.toString().equalsIgnoreCase(vmInstanceDetailVO.getValue()) ||
+                        ApiConstants.BootMode.SECURE.toString().equalsIgnoreCase(vmInstanceDetailVO.getValue()))) {
             logger.info(" Live Migration of UEFI enabled VM : " + vm.getInstanceName() + " is not supported");
             if (CollectionUtils.isEmpty(filteredHosts)) {
                 filteredHosts = new ArrayList<>(allHosts);
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index f88287a2d33..baf75925a02 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -215,7 +215,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.vm.DiskProfile;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmService;
 import com.cloud.vm.UserVmVO;
@@ -237,7 +237,7 @@ import com.cloud.vm.VmWorkResizeVolume;
 import com.cloud.vm.VmWorkSerializer;
 import com.cloud.vm.VmWorkTakeVolumeSnapshot;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -283,7 +283,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
     @Inject
     private UserVmDao _userVmDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private UserVmService _userVmService;
     @Inject
@@ -1597,13 +1597,13 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
             _volsDao.update(volume.getId(), volume);
             if (Volume.Type.ROOT.equals(volume.getVolumeType()) && userVm != null) {
-                UserVmDetailVO userVmDetailVO = userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
-                if (userVmDetailVO != null) {
-                    userVmDetailVO.setValue(String.valueOf(newSize/ GiB_TO_BYTES));
-                    userVmDetailsDao.update(userVmDetailVO.getId(), userVmDetailVO);
+                VMInstanceDetailVO vmInstanceDetailVO = vmInstanceDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
+                if (vmInstanceDetailVO != null) {
+                    vmInstanceDetailVO.setValue(String.valueOf(newSize/ GiB_TO_BYTES));
+                    vmInstanceDetailsDao.update(vmInstanceDetailVO.getId(), vmInstanceDetailVO);
                 } else {
-                    UserVmDetailVO detailVO = new UserVmDetailVO(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE, String.valueOf(newSize/ GiB_TO_BYTES), true);
-                    userVmDetailsDao.persist(detailVO);
+                    VMInstanceDetailVO detailVO = new VMInstanceDetailVO(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE, String.valueOf(newSize/ GiB_TO_BYTES), true);
+                    vmInstanceDetailsDao.persist(detailVO);
                 }
             }
 
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index af6b0f260cf..c3f7f53c224 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -59,8 +59,6 @@ import javax.naming.ConfigurationException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.cloud.deploy.DeploymentPlan;
-import com.cloud.network.NetworkService;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -116,6 +114,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
@@ -140,9 +140,9 @@ import org.apache.cloudstack.storage.template.VnfTemplateManager;
 import org.apache.cloudstack.userdata.UserDataManager;
 import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
 import org.apache.cloudstack.utils.security.ParserUtils;
+import org.apache.cloudstack.vm.UnmanagedVMsManager;
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
 import org.apache.cloudstack.vm.schedule.VMScheduleManager;
-import org.apache.cloudstack.vm.UnmanagedVMsManager;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -211,6 +211,7 @@ import com.cloud.dc.dao.HostPodDao;
 import com.cloud.dc.dao.VlanDao;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
 import com.cloud.deploy.DeploymentPlanningManager;
@@ -261,6 +262,7 @@ import com.cloud.network.Network.IpAddresses;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkModel;
+import com.cloud.network.NetworkService;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.as.AutoScaleManager;
@@ -390,16 +392,13 @@ import com.cloud.vm.dao.InstanceGroupVMMapDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VmStatsDao;
 import com.cloud.vm.snapshot.VMSnapshotManager;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
-
 
 public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, Configurable {
 
@@ -491,7 +490,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     @Inject
     private SSHKeyPairDao _sshKeyPairDao;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private HypervisorCapabilitiesDao _hypervisorCapabilitiesDao;
     @Inject
@@ -1060,7 +1059,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     }
 
     protected void removeEncryptedPasswordFromUserVmVoDetails(long vmId) {
-        userVmDetailsDao.removeDetail(vmId, VmDetailConstants.ENCRYPTED_PASSWORD);
+        vmInstanceDetailsDao.removeDetail(vmId, VmDetailConstants.ENCRYPTED_PASSWORD);
     }
 
     private boolean resetVMSSHKeyInternal(Long vmId, String sshPublicKeys, String keypairnames) throws ResourceUnavailableException, InsufficientCapacityException {
@@ -2863,20 +2862,20 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         final List<String> userReadOnlySettings = Stream.of(QueryService.UserVMReadOnlyDetails.value().split(","))
                 .map(item -> (item).trim())
                 .collect(Collectors.toList());
-        List<UserVmDetailVO> existingDetails = userVmDetailsDao.listDetails(id);
+        List<VMInstanceDetailVO> existingDetails = vmInstanceDetailsDao.listDetails(id);
         if (cleanupDetails){
             if (caller != null && caller.getType() == Account.Type.ADMIN) {
-                for (final UserVmDetailVO detail : existingDetails) {
+                for (final VMInstanceDetailVO detail : existingDetails) {
                     if (detail != null && detail.isDisplay() && !isExtraConfig(detail.getName())) {
-                        userVmDetailsDao.removeDetail(id, detail.getName());
+                        vmInstanceDetailsDao.removeDetail(id, detail.getName());
                     }
                 }
             } else {
-                for (final UserVmDetailVO detail : existingDetails) {
+                for (final VMInstanceDetailVO detail : existingDetails) {
                     if (detail != null && !userDenyListedSettings.contains(detail.getName())
                             && !userReadOnlySettings.contains(detail.getName()) && detail.isDisplay()
                             && !isExtraConfig(detail.getName())) {
-                        userVmDetailsDao.removeDetail(id, detail.getName());
+                        vmInstanceDetailsDao.removeDetail(id, detail.getName());
                     }
                 }
             }
@@ -2909,7 +2908,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                         }
                     }
                     // Add any existing user denied or read-only details. We do it here because admins would already provide these (or can delete them).
-                    for (final UserVmDetailVO detail : existingDetails) {
+                    for (final VMInstanceDetailVO detail : existingDetails) {
                         if (userDenyListedSettings.contains(detail.getName()) || userReadOnlySettings.contains(detail.getName())) {
                             details.put(detail.getName(), detail.getValue());
                         }
@@ -2917,7 +2916,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 }
 
                 // ensure details marked as non-displayable are maintained, regardless of admin or not
-                for (final UserVmDetailVO existingDetail : existingDetails) {
+                for (final VMInstanceDetailVO existingDetail : existingDetails) {
                     if (!existingDetail.isDisplay() || isExtraConfig(existingDetail.getName())) {
                         details.put(existingDetail.getName(), existingDetail.getValue());
                     }
@@ -3316,7 +3315,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
             additonalParams.put(VirtualMachineProfile.Param.BootIntoSetup, cmd.getBootIntoSetup());
         }
-        UserVmDetailVO uefiDetail = userVmDetailsDao.findDetail(cmd.getId(), ApiConstants.BootType.UEFI.toString());
+        VMInstanceDetailVO uefiDetail = vmInstanceDetailsDao.findDetail(cmd.getId(), ApiConstants.BootType.UEFI.toString());
         if (uefiDetail != null) {
             addVmUefiBootOptionsToParams(additonalParams, uefiDetail.getName(), uefiDetail.getValue());
         }
@@ -5111,7 +5110,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             podId = adminCmd.getPodId();
             clusterId = adminCmd.getClusterId();
         }
-        UserVmDetailVO uefiDetail = userVmDetailsDao.findDetail(cmd.getEntityId(), ApiConstants.BootType.UEFI.toString());
+        VMInstanceDetailVO uefiDetail = vmInstanceDetailsDao.findDetail(cmd.getEntityId(), ApiConstants.BootType.UEFI.toString());
         if (uefiDetail != null) {
             addVmUefiBootOptionsToParams(additionalParams, uefiDetail.getName(), uefiDetail.getValue());
         }
@@ -5217,7 +5216,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     @Override
     public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) {
         UserVmVO vm = _vmDao.findById(profile.getId());
-        Map<String, String> details = userVmDetailsDao.listDetailsKeyPairs(vm.getId());
+        Map<String, String> details = vmInstanceDetailsDao.listDetailsKeyPairs(vm.getId());
         vm.setDetails(details);
         StringBuilder buf = profile.getBootArgsBuilder();
         if (CKS_NODE.equals(vm.getUserVmType()) || SHAREDFSVM.equals(vm.getUserVmType())) {
@@ -5689,7 +5688,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             // display purposes
             if (template.isEnablePassword()) {
                 if (vm.getDetail(VmDetailConstants.PASSWORD) != null) {
-                    userVmDetailsDao.removeDetail(vm.getId(), VmDetailConstants.PASSWORD);
+                    vmInstanceDetailsDao.removeDetail(vm.getId(), VmDetailConstants.PASSWORD);
                 }
                 vm.setUpdateParameters(false);
                 _vmDao.update(vm.getId(), vm);
@@ -6399,7 +6398,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         String instanceUuid = instance.getUuid();
 
         // vm must have active lease associated during deployment
-        Map<String, String> vmDetails = userVmDetailsDao.listDetailsKeyPairs(instance.getId(),
+        Map<String, String> vmDetails = vmInstanceDetailsDao.listDetailsKeyPairs(instance.getId(),
                 List.of(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE, VmDetailConstants.INSTANCE_LEASE_EXECUTION));
         String leaseExecution = vmDetails.get(VmDetailConstants.INSTANCE_LEASE_EXECUTION);
         String leaseExpiryDate = vmDetails.get(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
@@ -6432,7 +6431,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         }
 
         if (leaseDuration < 1) {
-            userVmDetailsDao.addDetail(instance.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION,
+            vmInstanceDetailsDao.addDetail(instance.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION,
                     VMLeaseManager.LeaseActionExecution.DISABLED.name(), false);
             ActionEventUtils.onActionEvent(CallContext.current().getCallingUserId(), instance.getAccountId(), instance.getDomainId(),
                     EventTypes.VM_LEASE_DISABLED, "Disabling lease on the instance", instance.getId(), ApiCommandResourceType.VirtualMachine.toString());
@@ -6452,9 +6451,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
         String formattedLeaseExpiryDate = sdf.format(leaseExpiryDate);
-        userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE, formattedLeaseExpiryDate, false);
-        userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION, leaseExpiryAction.name(), false);
-        userVmDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION, "PENDING", false);
+        vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE, formattedLeaseExpiryDate, false);
+        vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION, leaseExpiryAction.name(), false);
+        vmInstanceDetailsDao.addDetail(vm.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION, "PENDING", false);
         logger.debug("Instance lease for instanceId: {} is configured to expire on: {} with action: {}", vm.getUuid(), formattedLeaseExpiryDate, leaseExpiryAction);
     }
 
@@ -6496,7 +6495,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 boolean validXenOrVmwareConfiguration = isValidXenOrVmwareConfiguration(cfg, allowedKeyList);
                 String[] paramArray = cfg.split("=");
                 if (validXenOrVmwareConfiguration && paramArray.length == 2) {
-                    userVmDetailsDao.addDetail(vm.getId(), paramArray[0].trim(), paramArray[1].trim(), true);
+                    vmInstanceDetailsDao.addDetail(vm.getId(), paramArray[0].trim(), paramArray[1].trim(), true);
                 } else {
                     throw new CloudRuntimeException("Extra config " + cfg + " is not on the list of allowed keys for VMware hypervisor hosts.");
                 }
@@ -6525,7 +6524,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 String[] allowedKeyList = XenServerAdditionalConfigAllowList.value().split(",");
                 boolean validXenOrVmwareConfiguration = isValidXenOrVmwareConfiguration(cfg, allowedKeyList);
                 if (validXenOrVmwareConfiguration) {
-                    userVmDetailsDao.addDetail(vm.getId(), extraConfigKey + String.valueOf(i), cfg, true);
+                    vmInstanceDetailsDao.addDetail(vm.getId(), extraConfigKey + String.valueOf(i), cfg, true);
                     i++;
                 } else {
                     throw new CloudRuntimeException("Extra config " + cfg + " is not on the list of allowed keys for XenServer hypervisor hosts.");
@@ -6609,7 +6608,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 extraConfigKey += "-" + String.valueOf(i);
                 extraConfigValue = cfg;
             }
-            userVmDetailsDao.addDetail(vm.getId(), extraConfigKey, extraConfigValue, true);
+            vmInstanceDetailsDao.addDetail(vm.getId(), extraConfigKey, extraConfigValue, true);
             i++;
         }
     }
@@ -8794,7 +8793,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                         vm.setUpdateParameters(false);
                         _vmDao.loadDetails(vm);
                         if (vm.getDetail(VmDetailConstants.PASSWORD) != null) {
-                            userVmDetailsDao.removeDetail(vm.getId(), VmDetailConstants.PASSWORD);
+                            vmInstanceDetailsDao.removeDetail(vm.getId(), VmDetailConstants.PASSWORD);
                         }
                         _vmDao.update(vm.getId(), vm);
                     }
@@ -8816,7 +8815,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         VolumeVO resizedVolume = (VolumeVO) vol;
         Long size = null;
         if (template != null && template.getSize() != null) {
-            UserVmDetailVO vmRootDiskSizeDetail = userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
+            VMInstanceDetailVO vmRootDiskSizeDetail = vmInstanceDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
             if (vmRootDiskSizeDetail == null) {
                 size = template.getSize();
             } else {
@@ -8824,7 +8823,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 if (template.getSize() >= rootDiskSize) {
                     size = template.getSize();
                     if (update) {
-                        userVmDetailsDao.remove(vmRootDiskSizeDetail.getId());
+                        vmInstanceDetailsDao.remove(vmRootDiskSizeDetail.getId());
                     }
                 } else {
                     size = rootDiskSize;
@@ -8865,13 +8864,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 if (update) {
                     resizedVolume.setSize(rootDiskSize);
                 }
-                UserVmDetailVO vmRootDiskSizeDetail = userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
+                VMInstanceDetailVO vmRootDiskSizeDetail = vmInstanceDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
                 if (update) {
                     if (vmRootDiskSizeDetail != null) {
                         vmRootDiskSizeDetail.setValue(details.get(VmDetailConstants.ROOT_DISK_SIZE));
-                        userVmDetailsDao.update(vmRootDiskSizeDetail.getId(), vmRootDiskSizeDetail);
+                        vmInstanceDetailsDao.update(vmRootDiskSizeDetail.getId(), vmRootDiskSizeDetail);
                     } else {
-                        userVmDetailsDao.persist(new UserVmDetailVO(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE,
+                        vmInstanceDetailsDao.persist(new VMInstanceDetailVO(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE,
                                 details.get(VmDetailConstants.ROOT_DISK_SIZE), true));
                     }
                 }
@@ -9336,7 +9335,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
     private void unmanageVMFromDB(long vmId) {
         VMInstanceVO vm = _vmInstanceDao.findById(vmId);
-        userVmDetailsDao.removeDetails(vmId);
+        vmInstanceDetailsDao.removeDetails(vmId);
         vm.setState(State.Expunging);
         vm.setRemoved(new Date());
         _vmInstanceDao.update(vm.getId(), vm);
diff --git a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 1c1a28eb8c6..3ce57ae068c 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -109,7 +109,7 @@ import com.cloud.utils.db.TransactionCallbackWithException;
 import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
 import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
@@ -123,7 +123,7 @@ import com.cloud.vm.VmWorkJobHandler;
 import com.cloud.vm.VmWorkJobHandlerProxy;
 import com.cloud.vm.VmWorkSerializer;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
@@ -164,7 +164,7 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
     @Inject
     protected ServiceOfferingDao _serviceOfferingDao;
     @Inject
-    protected UserVmDetailsDao _userVmDetailsDao;
+    protected VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Inject
     protected VMSnapshotDetailsDao _vmSnapshotDetailsDao;
     @Inject
@@ -473,9 +473,9 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
     protected void addSupportForCustomServiceOffering(long vmId, long serviceOfferingId, long vmSnapshotId) {
         ServiceOfferingVO serviceOfferingVO = _serviceOfferingDao.findById(serviceOfferingId);
         if (serviceOfferingVO.isDynamic()) {
-            List<UserVmDetailVO> vmDetails = _userVmDetailsDao.listDetails(vmId);
+            List<VMInstanceDetailVO> vmDetails = _vmInstanceDetailsDao.listDetails(vmId);
             List<VMSnapshotDetailsVO> vmSnapshotDetails = new ArrayList<VMSnapshotDetailsVO>();
-            for (UserVmDetailVO detail : vmDetails) {
+            for (VMInstanceDetailVO detail : vmDetails) {
                 if(detail.getName().equalsIgnoreCase(VmDetailConstants.CPU_NUMBER) || detail.getName().equalsIgnoreCase(VmDetailConstants.CPU_SPEED) || detail.getName().equalsIgnoreCase(VmDetailConstants.MEMORY)) {
                     vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshotId, detail.getName(), detail.getValue(), detail.isDisplay()));
                 }
@@ -812,9 +812,9 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
      * @return map
      */
     protected Map<String, String> getVmMapDetails(UserVm userVm) {
-        List<UserVmDetailVO> userVmDetails = _userVmDetailsDao.listDetails(userVm.getId());
+        List<VMInstanceDetailVO> userVmDetails = _vmInstanceDetailsDao.listDetails(userVm.getId());
         Map<String, String> details = new HashMap<String, String>();
-        for (UserVmDetailVO detail : userVmDetails) {
+        for (VMInstanceDetailVO detail : userVmDetails) {
             details.put(detail.getName(), detail.getValue());
         }
         return details;
@@ -943,11 +943,11 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
         ServiceOfferingVO serviceOfferingVO = _serviceOfferingDao.findById(vmSnapshotVo.getServiceOfferingId());
         if (serviceOfferingVO.isDynamic()) {
             List<VMSnapshotDetailsVO> vmSnapshotDetails = _vmSnapshotDetailsDao.listDetails(vmSnapshotVo.getId());
-            List<UserVmDetailVO> userVmDetails = new ArrayList<UserVmDetailVO>();
+            List<VMInstanceDetailVO> userVmDetails = new ArrayList<VMInstanceDetailVO>();
             for (VMSnapshotDetailsVO detail : vmSnapshotDetails) {
-                userVmDetails.add(new UserVmDetailVO(userVm.getId(), detail.getName(), detail.getValue(), detail.isDisplay()));
+                userVmDetails.add(new VMInstanceDetailVO(userVm.getId(), detail.getName(), detail.getValue(), detail.isDisplay()));
             }
-            _userVmDetailsDao.saveDetails(userVmDetails);
+            _vmInstanceDetailsDao.saveDetails(userVmDetails);
         }
     }
 
diff --git a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
index b480b37cd89..b497871238b 100644
--- a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
@@ -63,12 +63,12 @@ import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.db.GlobalLock;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.ConsoleSessionVO;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.ConsoleSessionDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
@@ -92,7 +92,7 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
     @Inject
     private EntityManager entityManager;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private KeysManager keysManager;
     @Inject
@@ -344,8 +344,8 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
         if (hostVo.getHypervisorType() == Hypervisor.HypervisorType.KVM &&
                 (hostVo.getResourceState().equals(ResourceState.ErrorInMaintenance) ||
                         hostVo.getResourceState().equals(ResourceState.ErrorInPrepareForMaintenance))) {
-            UserVmDetailVO detailAddress = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_ADDRESS);
-            UserVmDetailVO detailPort = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_PORT);
+            VMInstanceDetailVO detailAddress = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_ADDRESS);
+            VMInstanceDetailVO detailPort = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_PORT);
             if (detailAddress != null && detailPort != null) {
                 portInfo = new Pair<>(detailAddress.getValue(), Integer.valueOf(detailPort.getValue()));
             } else {
@@ -372,7 +372,7 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
         }
 
         String sid = vm.getVncPassword();
-        UserVmDetailVO details = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.KEYBOARD);
+        VMInstanceDetailVO details = vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.KEYBOARD);
 
         String tag = vm.getUuid();
         String displayName = vm.getHostName();
@@ -416,7 +416,7 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
     }
 
     private String generateConsoleAccessUrl(String rootUrl, ConsoleProxyClientParam param, String token, int vncPort,
-                                            VirtualMachine vm, HostVO hostVo, UserVmDetailVO details) {
+                                            VirtualMachine vm, HostVO hostVo, VMInstanceDetailVO details) {
         StringBuilder sb = new StringBuilder(rootUrl);
         if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
             sb.append("/ajax?token=" + token);
@@ -450,7 +450,7 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
                                                                     int port, String sid, String tag, String ticket,
                                                                     String sessionUuid, String addr,
                                                                     String extraSecurityToken, VirtualMachine vm,
-                                                                    HostVO hostVo, UserVmDetailVO details,
+                                                                    HostVO hostVo, VMInstanceDetailVO details,
                                                                     Pair<String, Integer> portInfo, String host,
                                                                     String displayName) {
         ConsoleProxyClientParam param = new ConsoleProxyClientParam();
diff --git a/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java b/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
index 50c4de36b7f..298753a6c4f 100644
--- a/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/resource/ResourceCleanupServiceImpl.java
@@ -93,7 +93,7 @@ import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicDetailsDao;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -125,7 +125,7 @@ public class ResourceCleanupServiceImpl extends ManagerBase implements ResourceC
     @Inject
     InlineLoadBalancerNicMapDao inlineLoadBalancerNicMapDao;
     @Inject
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     VMSnapshotDao vmSnapshotDao;
     @Inject
@@ -269,7 +269,7 @@ public class ResourceCleanupServiceImpl extends ManagerBase implements ResourceC
         }
         purgeVMVolumes(vmIds, batchSize);
         purgeVMNics(vmIds, batchSize);
-        userVmDetailsDao.batchExpungeForResources(vmIds, batchSize);
+        vmInstanceDetailsDao.batchExpungeForResources(vmIds, batchSize);
         purgeVMSnapshots(vmIds, batchSize);
         autoScaleVmGroupVmMapDao.expungeByVmList(vmIds, batchSize);
         commandExecLogDao.expungeByVmList(vmIds, batchSize);
diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index 03c0ad06dc9..4fed2ddd325 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -139,7 +139,7 @@ import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 import org.apache.cloudstack.acl.ControlledEntity;
@@ -223,7 +223,7 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
     @Inject
     private ResourceLimitService resourceLimitService;
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Inject
     private UserVmManager userVmManager;
     @Inject
diff --git a/server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java
index e50b8389ef3..8904d87259c 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java
@@ -18,23 +18,21 @@
 
 package org.apache.cloudstack.vm.lease;
 
-import com.cloud.api.ApiGsonHelper;
-import com.cloud.api.query.dao.UserVmJoinDao;
-import com.cloud.api.query.vo.UserVmJoinVO;
-import com.cloud.event.ActionEventUtils;
-import com.cloud.event.EventTypes;
-import com.cloud.user.Account;
-import com.cloud.user.User;
-import com.cloud.utils.DateUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.component.ComponentContext;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.concurrency.NamedThreadFactory;
-import com.cloud.utils.db.GlobalLock;
-import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.UserVmDetailsDao;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
@@ -52,26 +50,29 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import com.cloud.api.ApiGsonHelper;
+import com.cloud.api.query.dao.UserVmJoinDao;
+import com.cloud.api.query.vo.UserVmJoinVO;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventTypes;
+import com.cloud.user.Account;
+import com.cloud.user.User;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.concurrency.NamedThreadFactory;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 public class VMLeaseManagerImpl extends ManagerBase implements VMLeaseManager, Configurable {
     private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;   // 5 seconds
 
     @Inject
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Inject
     private UserVmJoinDao userVmJoinDao;
@@ -131,7 +132,7 @@ public class VMLeaseManagerImpl extends ManagerBase implements VMLeaseManager, C
         List<UserVmJoinVO> leaseExpiringForInstances = userVmJoinDao.listLeaseInstancesExpiringInDays(-1);
         logger.debug("Total instances found for lease cancellation: {}", leaseExpiringForInstances.size());
         for (UserVmJoinVO instance : leaseExpiringForInstances) {
-            userVmDetailsDao.addDetail(instance.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION,
+            vmInstanceDetailsDao.addDetail(instance.getId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION,
                     LeaseActionExecution.CANCELLED.name(), false);
             String leaseCancellationMsg = String.format("Lease is cancelled for the instance: %s (id: %s) ", instance.getName(), instance.getUuid());
             ActionEventUtils.onActionEvent(instance.getUserId(), instance.getAccountId(), instance.getDomainId(),
@@ -370,7 +371,7 @@ public class VMLeaseManagerImpl extends ManagerBase implements VMLeaseManager, C
 
                     if (VMLeaseManager.class.getSimpleName().equals(params.get(JOB_INITIATOR))) {
                         logger.debug("Lease expiry job: {} successfully executed for instanceId: {}", asyncExpiryJob.getId(), asyncExpiryJob.getInstanceId());
-                        userVmDetailsDao.addDetail(asyncExpiryJob.getInstanceId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION, LeaseActionExecution.DONE.name(), false);
+                        vmInstanceDetailsDao.addDetail(asyncExpiryJob.getInstanceId(), VmDetailConstants.INSTANCE_LEASE_EXECUTION, LeaseActionExecution.DONE.name(), false);
                     }
                 }
             } catch (final Exception e) {
diff --git a/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
index 28bb998c5ce..14074add021 100755
--- a/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
+++ b/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
@@ -49,7 +49,7 @@ import com.cloud.user.dao.UserDao;
 import com.cloud.user.dao.UserStatisticsDao;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseTest<UserVmJoinVO, UserVmResponse> {
@@ -67,7 +67,7 @@ public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseT
     private AccountManager accountMgr;
 
     @Mock
-    private UserVmDetailsDao _userVmDetailsDao;
+    private VMInstanceDetailsDao _vmInstanceDetailsDao;
 
     @Mock
     private UserStatisticsDao userStatsDao;
diff --git a/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java b/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
index e7fe559994d..7e25570dc82 100644
--- a/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
+++ b/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
@@ -79,7 +79,7 @@ import com.cloud.vm.VirtualMachine.Type;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -182,7 +182,7 @@ public class DeploymentPlanningManagerImplTest {
     DedicatedResourceDao _dedicatedDao;
 
     @Inject
-    UserVmDetailsDao vmDetailsDao;
+    VMInstanceDetailsDao vmDetailsDao;
 
     @Inject
     VMTemplateDao templateDao;
@@ -1114,8 +1114,8 @@ public class DeploymentPlanningManagerImplTest {
         }
 
         @Bean
-        public UserVmDetailsDao userVmDetailsDao() {
-            return Mockito.mock(UserVmDetailsDao.class);
+        public VMInstanceDetailsDao vmInstanceDetailsDao() {
+            return Mockito.mock(VMInstanceDetailsDao.class);
         }
 
         @Bean
diff --git a/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java b/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
index 64c5c04f3bb..7e1010e0022 100644
--- a/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
+++ b/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
@@ -22,12 +22,13 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.service.ServiceOfferingDetailsVO;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +55,7 @@ public class DpdkHelperImplTest {
     @Mock
     VMInstanceDao vmInstanceDao;
     @Mock
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Spy
     @InjectMocks
@@ -73,9 +74,9 @@ public class DpdkHelperImplTest {
     @Mock
     ServiceOffering serviceOffering;
     @Mock
-    UserVmDetailVO dpdkNumaVmDetail;
+    VMInstanceDetailVO dpdkNumaVmDetail;
     @Mock
-    UserVmDetailVO dpdkHugePagesVmDetail;
+    VMInstanceDetailVO dpdkHugePagesVmDetail;
     @Mock
     HostVO hostVO;
     @Mock
@@ -135,7 +136,7 @@ public class DpdkHelperImplTest {
         Mockito.lenient().when(dpdkNumaVmDetail.getValue()).thenReturn(dpdkNumaConf);
         Mockito.when(dpdkHugePagesVmDetail.getName()).thenReturn(DpdkHelper.DPDK_HUGE_PAGES);
         Mockito.lenient().when(dpdkHugePagesVmDetail.getValue()).thenReturn(dpdkHugePagesConf);
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(Arrays.asList(dpdkNumaVmDetail, dpdkHugePagesVmDetail));
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(Arrays.asList(dpdkNumaVmDetail, dpdkHugePagesVmDetail));
     }
 
     @Test
@@ -202,7 +203,7 @@ public class DpdkHelperImplTest {
 
     @Test
     public void testIsVMDpdkEnabledGuestTypeMissingConfigurationOnDetails() {
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(Arrays.asList(dpdkNumaVmDetail));
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(Arrays.asList(dpdkNumaVmDetail));
         Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(new ArrayList<>());
         Assert.assertFalse(dpdkHelper.isVMDpdkEnabled(vmId));
         Mockito.verify(dpdkHelper, Mockito.never()).isHostDpdkEnabled(hostId);
@@ -210,7 +211,7 @@ public class DpdkHelperImplTest {
 
     @Test
     public void testIsVMDpdkEnabledGuestTypeEmptyDetails() {
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(new ArrayList<>());
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(new ArrayList<>());
         Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(new ArrayList<>());
         Assert.assertFalse(dpdkHelper.isVMDpdkEnabled(vmId));
         Mockito.verify(dpdkHelper, Mockito.never()).isHostDpdkEnabled(hostId);
@@ -223,21 +224,21 @@ public class DpdkHelperImplTest {
 
     @Test
     public void testIsVMDpdkEnabledGuestTypeMissingConfigurationOnVmDetails() {
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(Collections.singletonList(dpdkNumaVmDetail));
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(Collections.singletonList(dpdkNumaVmDetail));
         Mockito.when(hostVO.getCapabilities()).thenReturn(hostCapabilities + ",dpdk");
         Assert.assertTrue(dpdkHelper.isVMDpdkEnabled(vmId));
     }
 
     @Test
     public void testIsVMDpdkEnabledGuestTypeEmptyVmDetails() {
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(new ArrayList<>());
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(new ArrayList<>());
         Mockito.when(hostVO.getCapabilities()).thenReturn(hostCapabilities + ",dpdk");
         Assert.assertTrue(dpdkHelper.isVMDpdkEnabled(vmId));
     }
 
     @Test
     public void testIsVMDpdkEnabledGuestTypeMixedConfigurationOnDetails() {
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(Collections.singletonList(dpdkNumaVmDetail));
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(Collections.singletonList(dpdkNumaVmDetail));
         Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(Collections.singletonList(dpdkHugePagesDetailVO));
         Mockito.when(hostVO.getCapabilities()).thenReturn(hostCapabilities + ",dpdk");
         Assert.assertTrue(dpdkHelper.isVMDpdkEnabled(vmId));
diff --git a/server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java b/server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java
index 8c8dc33d7ec..0aab5afce4a 100644
--- a/server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java
+++ b/server/src/test/java/com/cloud/network/element/ConfigDriveNetworkElementTest.java
@@ -51,13 +51,13 @@ import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.Ip;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.common.collect.Maps;
 import org.apache.cloudstack.context.CallContext;
@@ -127,7 +127,7 @@ public class ConfigDriveNetworkElementTest {
     @Mock private ServiceOfferingDao _serviceOfferingDao;
     @Mock private UserVmDao _vmDao;
     @Mock private VMInstanceDao _vmInstanceDao;
-    @Mock private UserVmDetailsDao _userVmDetailsDao;
+    @Mock private VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Mock private NetworkDao _networkDao;
     @Mock private NetworkServiceMapDao _ntwkSrvcDao;
     @Mock private IPAddressDao _ipAddressDao;
@@ -269,12 +269,12 @@ public class ConfigDriveNetworkElementTest {
             Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount();
 
             final HandleConfigDriveIsoAnswer answer = mock(HandleConfigDriveIsoAnswer.class);
-            final UserVmDetailVO userVmDetailVO = mock(UserVmDetailVO.class);
+            final VMInstanceDetailVO vmInstanceDetailVO = mock(VMInstanceDetailVO.class);
             when(network.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
             when(virtualMachine.getUuid()).thenReturn("vm-uuid");
-            when(userVmDetailVO.getValue()).thenReturn(PUBLIC_KEY);
+            when(vmInstanceDetailVO.getValue()).thenReturn(PUBLIC_KEY);
             when(nicp.getIPv4Address()).thenReturn("192.168.111.111");
-            when(_userVmDetailsDao.findDetail(Mockito.anyLong(), Mockito.anyString())).thenReturn(userVmDetailVO);
+            when(_vmInstanceDetailsDao.findDetail(Mockito.anyLong(), Mockito.anyString())).thenReturn(vmInstanceDetailVO);
             when(_ipAddressDao.findByAssociatedVmId(VMID)).thenReturn(publicIp);
             when(publicIp.getAddress()).thenReturn(new Ip("7.7.7.7"));
             when(_hostDao.findById(virtualMachine.getHostId())).thenReturn(hostVO);
diff --git a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
index 22a86615c7e..ba6aa55169b 100644
--- a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
+++ b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
@@ -95,8 +95,9 @@ import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.network.BgpPeerVO;
@@ -166,7 +167,7 @@ public class VirtualRouterElementTest {
     @Mock private UserVmDao _userVmDao;
     @Mock private VlanDao _vlanDao;
     @Mock private VMInstanceDao _vmDao;
-    @Mock private UserVmDetailsDao _vmDetailsDao;
+    @Mock private VMInstanceDetailsDao _vmDetailsDao;
     @Mock private VolumeDao _volumeDao;
     @Mock private RemoteAccessVpnDao _vpnDao;
     @Mock private VpnUserDao _vpnUsersDao;
diff --git a/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java b/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
index 1e55f55fbd6..cadbc3eb966 100644
--- a/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
@@ -74,7 +74,7 @@ import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.network.BgpPeer;
@@ -202,7 +202,7 @@ public class VirtualNetworkApplianceManagerImplTest {
     private VMInstanceDao _vmDao;
 
     @Mock
-    private UserVmDetailsDao _vmDetailsDao;
+    private VMInstanceDetailsDao _vmDetailsDao;
 
     @Mock
     private VolumeDao _volumeDao;
diff --git a/server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
index 42e5d15208e..d2639e75854 100644
--- a/server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
+++ b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java
@@ -50,7 +50,7 @@ import com.cloud.vm.UserVmManager;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.NicDaoImpl;
 import com.cloud.vm.dao.UserVmDaoImpl;
-import com.cloud.vm.dao.UserVmDetailsDaoImpl;
+import com.cloud.vm.dao.VMInstanceDetailsDaoImpl;
 import com.cloud.vm.dao.VMInstanceDaoImpl;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl;
@@ -74,7 +74,7 @@ import java.io.IOException;
     ConfigurationSubGroupDaoImpl.class, SecurityGroupWorkDaoImpl.class, VmRulesetLogDaoImpl.class, VMInstanceDaoImpl.class, DomainDaoImpl.class, UsageEventDaoImpl.class,
     ResourceTagsDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class,
     DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, HostTransferMapDaoImpl.class, SecurityGroupManagerImpl2.class, SecurityGroupDaoImpl.class,
-    SecurityGroupVMMapDaoImpl.class, UserVmDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
+    SecurityGroupVMMapDaoImpl.class, VMInstanceDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
     DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, SecurityGroupRuleDaoImpl.class, NicDaoImpl.class,
     SecurityGroupJoinDaoImpl.class},
                includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)},
diff --git a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
index 9ee6ab4c529..15d23775742 100644
--- a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
@@ -50,7 +50,7 @@ import com.cloud.utils.ssh.SSHCmdHelper;
 import com.cloud.utils.ssh.SshException;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.trilead.ssh2.Connection;
 import org.apache.cloudstack.api.command.admin.host.CancelHostAsDegradedCmd;
@@ -105,7 +105,7 @@ public class ResourceManagerImplTest {
     @Mock
     private HighAvailabilityManager haManager;
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Mock
     private AgentManager agentManager;
     @Mock
@@ -341,10 +341,10 @@ public class ResourceManagerImplTest {
         verify(resourceManager).setKVMVncAccess(hostId, vms);
         verify(agentManager, times(vms.size())).easySend(eq(hostId), any(GetVncPortCommand.class));
         verify(agentManager).pullAgentToMaintenance(hostId);
-        verify(userVmDetailsDao).addDetail(eq(vm1Id), eq("kvm.vnc.address"), eq(vm1VncAddress), anyBoolean());
-        verify(userVmDetailsDao).addDetail(eq(vm1Id), eq("kvm.vnc.port"), eq(String.valueOf(vm1VncPort)), anyBoolean());
-        verify(userVmDetailsDao).addDetail(eq(vm2Id), eq("kvm.vnc.address"), eq(vm2VncAddress), anyBoolean());
-        verify(userVmDetailsDao).addDetail(eq(vm2Id), eq("kvm.vnc.port"), eq(String.valueOf(vm2VncPort)), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vm1Id), eq("kvm.vnc.address"), eq(vm1VncAddress), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vm1Id), eq("kvm.vnc.port"), eq(String.valueOf(vm1VncPort)), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vm2Id), eq("kvm.vnc.address"), eq(vm2VncAddress), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vm2Id), eq("kvm.vnc.port"), eq(String.valueOf(vm2VncPort)), anyBoolean());
     }
 
     @Test(expected = CloudRuntimeException.class)
diff --git a/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java b/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java
index 6f67eb8a237..586f2b58eca 100644
--- a/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java
@@ -27,10 +27,10 @@ import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -67,7 +67,7 @@ public class RollingMaintenanceManagerImplTest {
     @Mock
     ServiceOfferingDao serviceOfferingDao;
     @Mock
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Spy
     @InjectMocks
@@ -213,18 +213,18 @@ public class RollingMaintenanceManagerImplTest {
         Mockito.when(serviceOffering.getSpeed()).thenReturn(null);
         Mockito.when(serviceOffering.getRamSize()).thenReturn(null);
 
-        List<UserVmDetailVO> vmDetails = new ArrayList<>();
-        UserVmDetailVO cpuDetail = new UserVmDetailVO(1L, VmDetailConstants.CPU_NUMBER, "2",  false);
+        List<VMInstanceDetailVO> vmDetails = new ArrayList<>();
+        VMInstanceDetailVO cpuDetail = new VMInstanceDetailVO(1L, VmDetailConstants.CPU_NUMBER, "2",  false);
         vmDetails.add(cpuDetail);
-        UserVmDetailVO speedDetail = new UserVmDetailVO(1L, VmDetailConstants.CPU_SPEED, "1000",  false);
+        VMInstanceDetailVO speedDetail = new VMInstanceDetailVO(1L, VmDetailConstants.CPU_SPEED, "1000",  false);
         vmDetails.add(speedDetail);
-        UserVmDetailVO ramSizeDetail = new UserVmDetailVO(1L, VmDetailConstants.MEMORY, "1024",  false);
+        VMInstanceDetailVO ramSizeDetail = new VMInstanceDetailVO(1L, VmDetailConstants.MEMORY, "1024",  false);
         vmDetails.add(ramSizeDetail);
 
         Mockito.when(vm.getId()).thenReturn(1L);
         Mockito.when(vm.getServiceOfferingId()).thenReturn(1L);
         Mockito.when(serviceOfferingDao.findById(1L)).thenReturn(serviceOffering);
-        Mockito.when(userVmDetailsDao.listDetails(1L)).thenReturn(vmDetails);
+        Mockito.when(vmInstanceDetailsDao.listDetails(1L)).thenReturn(vmDetails);
 
         Ternary<Integer, Integer, Integer> cpuSpeedAndRamSize = manager.getComputeResourcesCpuSpeedAndRamSize(vm);
 
diff --git a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
index bdce0a5ae9d..c31db2c6dd7 100644
--- a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
+++ b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
@@ -97,10 +97,10 @@ import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ManagementServerImplTest {
@@ -145,7 +145,7 @@ public class ManagementServerImplTest {
     UserDataManager userDataManager;
 
     @Mock
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Mock
     HostDetailsDao hostDetailsDao;
@@ -585,10 +585,10 @@ public class ManagementServerImplTest {
         UserVmVO vm = Mockito.mock(UserVmVO.class);
         Mockito.when(vm.getId()).thenReturn(1L);
         if (uefiValue == null) {
-            Mockito.when(userVmDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString())).thenReturn(null);
+            Mockito.when(vmInstanceDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString())).thenReturn(null);
         } else {
-            UserVmDetailVO detail = new UserVmDetailVO(vm.getId(), ApiConstants.BootType.UEFI.toString(), uefiValue, true);
-            Mockito.when(userVmDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString())).thenReturn(detail);
+            VMInstanceDetailVO detail = new VMInstanceDetailVO(vm.getId(), ApiConstants.BootType.UEFI.toString(), uefiValue, true);
+            Mockito.when(vmInstanceDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString())).thenReturn(detail);
             Mockito.when(hostDetailsDao.findByName(Host.HOST_UEFI_ENABLE)).thenReturn(new ArrayList<>(List.of(new DetailVO(1l, Host.HOST_UEFI_ENABLE, "true"), new DetailVO(2l, Host.HOST_UEFI_ENABLE, "false"))));
         }
         return vm;
diff --git a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
index 517c2d2287b..fb188d159e2 100644
--- a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
+++ b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
@@ -98,7 +98,7 @@ import com.cloud.user.AccountVO;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -116,7 +116,7 @@ public class FirstFitPlannerTest {
     @Inject
     HostDetailsDao hostDetailsDao;
     @Inject
-    UserVmDetailsDao vmDetailsDao;
+    VMInstanceDetailsDao vmDetailsDao;
     @Inject
     ConfigurationDao configDao;
     @Inject
@@ -476,8 +476,8 @@ public class FirstFitPlannerTest {
         }
 
         @Bean
-        public UserVmDetailsDao userVmDetailsDao() {
-            return Mockito.mock(UserVmDetailsDao.class);
+        public VMInstanceDetailsDao vmInstanceDetailsDao() {
+            return Mockito.mock(VMInstanceDetailsDao.class);
         }
 
         @Bean
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
index b65b4513325..979a411d300 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
@@ -23,6 +23,8 @@ import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -34,14 +36,24 @@ import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
-import com.cloud.storage.StorageManager;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
@@ -56,10 +68,13 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.template.VnfTemplateManager;
 import org.apache.cloudstack.userdata.UserDataManager;
+import org.apache.cloudstack.vm.lease.VMLeaseManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -67,6 +82,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -127,6 +143,7 @@ import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.Storage;
+import com.cloud.storage.StorageManager;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeApiService;
@@ -155,32 +172,10 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.exception.ExceptionProxyObject;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 
-import org.apache.cloudstack.vm.lease.VMLeaseManager;
-
-import org.mockito.MockedStatic;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Mockito.verify;
-
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
-
 @RunWith(MockitoJUnitRunner.class)
 public class UserVmManagerImplTest {
 
@@ -231,7 +226,7 @@ public class UserVmManagerImplTest {
     private EntityManager entityManager;
 
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Mock
     private UserVmVO userVmVoMock;
@@ -524,7 +519,7 @@ public class UserVmManagerImplTest {
         verifyMethodsThatAreAlwaysExecuted();
 
         Mockito.verify(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
-        Mockito.verify(userVmDetailsDao, times(0)).removeDetail(anyLong(), anyString());
+        Mockito.verify(vmInstanceDetailsDao, times(0)).removeDetail(anyLong(), anyString());
     }
 
     @Test
@@ -541,8 +536,8 @@ public class UserVmManagerImplTest {
 
         userVmManagerImpl.updateVirtualMachine(updateVmCommand);
         verifyMethodsThatAreAlwaysExecuted();
-        Mockito.verify(userVmDetailsDao).removeDetail(vmId, "userdetail");
-        Mockito.verify(userVmDetailsDao, times(0)).removeDetail(vmId, "systemdetail");
+        Mockito.verify(vmInstanceDetailsDao).removeDetail(vmId, "userdetail");
+        Mockito.verify(vmInstanceDetailsDao, times(0)).removeDetail(vmId, "systemdetail");
         Mockito.verify(userVmManagerImpl, times(0)).updateDisplayVmFlag(false, vmId, userVmVoMock);
     }
 
@@ -567,13 +562,13 @@ public class UserVmManagerImplTest {
         prepareAndExecuteMethodDealingWithDetails(false, false);
     }
 
-    private List<UserVmDetailVO> prepareExistingDetails(Long vmId, String... existingDetailKeys) {
-        List<UserVmDetailVO> existingDetails = new ArrayList<>();
+    private List<VMInstanceDetailVO> prepareExistingDetails(Long vmId, String... existingDetailKeys) {
+        List<VMInstanceDetailVO> existingDetails = new ArrayList<>();
         for (String detail : existingDetailKeys) {
-            existingDetails.add(new UserVmDetailVO(vmId, detail, "foo", true));
+            existingDetails.add(new VMInstanceDetailVO(vmId, detail, "foo", true));
         }
-        existingDetails.add(new UserVmDetailVO(vmId, "systemdetail", "bar", false));
-        Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(existingDetails);
+        existingDetails.add(new VMInstanceDetailVO(vmId, "systemdetail", "bar", false));
+        Mockito.when(vmInstanceDetailsDao.listDetails(vmId)).thenReturn(existingDetails);
         return existingDetails;
     }
 
@@ -608,15 +603,15 @@ public class UserVmManagerImplTest {
         verifyMethodsThatAreAlwaysExecuted();
 
         Mockito.verify(userVmVoMock, times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).setDetails(details);
-        Mockito.verify(userVmDetailsDao, times(cleanUpDetails ? 1 : 0)).removeDetail(vmId, "existingdetail");
-        Mockito.verify(userVmDetailsDao, times(0)).removeDetail(vmId, "systemdetail");
+        Mockito.verify(vmInstanceDetailsDao, times(cleanUpDetails ? 1 : 0)).removeDetail(vmId, "existingdetail");
+        Mockito.verify(vmInstanceDetailsDao, times(0)).removeDetail(vmId, "systemdetail");
         Mockito.verify(userVmDao, times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).saveDetails(userVmVoMock);
         Mockito.verify(userVmManagerImpl, times(0)).updateDisplayVmFlag(false, vmId, userVmVoMock);
     }
 
     private void configureDoNothingForDetailsMethod() {
         Mockito.lenient().doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
-        Mockito.doNothing().when(userVmDetailsDao).removeDetail(anyLong(), anyString());
+        Mockito.doNothing().when(vmInstanceDetailsDao).removeDetail(anyLong(), anyString());
         Mockito.doNothing().when(userVmDao).saveDetails(userVmVoMock);
     }
 
@@ -1724,9 +1719,9 @@ public class UserVmManagerImplTest {
         Mockito.when(diskOffering.getDiskSize()).thenReturn(8L * GiB_TO_BYTES);
         Map<String, String> details = new HashMap<>();
         details.put(VmDetailConstants.ROOT_DISK_SIZE, "16");
-        UserVmDetailVO vmRootDiskSizeDetail = Mockito.mock(UserVmDetailVO.class);
+        VMInstanceDetailVO vmRootDiskSizeDetail = Mockito.mock(VMInstanceDetailVO.class);
         Mockito.when(vmRootDiskSizeDetail.getValue()).thenReturn("20");
-        Mockito.when(userVmDetailsDao.findDetail(1L, VmDetailConstants.ROOT_DISK_SIZE)).thenReturn(vmRootDiskSizeDetail);
+        Mockito.when(vmInstanceDetailsDao.findDetail(1L, VmDetailConstants.ROOT_DISK_SIZE)).thenReturn(vmRootDiskSizeDetail);
         Long actualSize = userVmManagerImpl.getRootVolumeSizeForVmRestore(null, template, userVm, diskOffering, details, false);
         Assert.assertEquals(16 * GiB_TO_BYTES, actualSize.longValue());
     }
@@ -1739,9 +1734,9 @@ public class UserVmManagerImplTest {
         Mockito.when(userVm.getId()).thenReturn(1L);
         DiskOffering diskOffering = null;
         Map<String, String> details = new HashMap<>();
-        UserVmDetailVO vmRootDiskSizeDetail = Mockito.mock(UserVmDetailVO.class);
+        VMInstanceDetailVO vmRootDiskSizeDetail = Mockito.mock(VMInstanceDetailVO.class);
         Mockito.when(vmRootDiskSizeDetail.getValue()).thenReturn("20");
-        Mockito.when(userVmDetailsDao.findDetail(1L, VmDetailConstants.ROOT_DISK_SIZE)).thenReturn(vmRootDiskSizeDetail);
+        Mockito.when(vmInstanceDetailsDao.findDetail(1L, VmDetailConstants.ROOT_DISK_SIZE)).thenReturn(vmRootDiskSizeDetail);
         Long actualSize = userVmManagerImpl.getRootVolumeSizeForVmRestore(null, template, userVm, diskOffering, details, false);
         Assert.assertEquals(20 * GiB_TO_BYTES, actualSize.longValue());
     }
@@ -3290,16 +3285,16 @@ public class UserVmManagerImplTest {
         when(userVm.getId()).thenReturn(vmId);
         when(userVm.getUuid()).thenReturn(UUID.randomUUID().toString());
         userVmManagerImpl.addLeaseDetailsForInstance(userVm, 10, VMLeaseManager.ExpiryAction.STOP);
-        verify(userVmDetailsDao).addDetail(eq(vmId), eq(VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION), eq(VMLeaseManager.ExpiryAction.STOP.name()), anyBoolean());
-        verify(userVmDetailsDao).addDetail(eq(vmId), eq(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE), eq(getLeaseExpiryDate(10L)), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vmId), eq(VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION), eq(VMLeaseManager.ExpiryAction.STOP.name()), anyBoolean());
+        verify(vmInstanceDetailsDao).addDetail(eq(vmId), eq(VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE), eq(getLeaseExpiryDate(10L)), anyBoolean());
     }
 
     @Test
     public void testAddNullDurationLeaseDetailsForInstance() {
         UserVm userVm = mock(UserVm.class);
         userVmManagerImpl.addLeaseDetailsForInstance(userVm, null, VMLeaseManager.ExpiryAction.STOP);
-        Mockito.verify(userVmDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION);
-        Mockito.verify(userVmDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION);
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
     }
 
     @Test
@@ -3346,7 +3341,7 @@ public class UserVmManagerImplTest {
     public void testApplyLeaseOnUpdateInstanceForNoLease() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
         when(userVm.getId()).thenReturn(vmId);
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.DISABLED.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.DISABLED.name()));
         userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, 10, VMLeaseManager.ExpiryAction.STOP);
         Mockito.verify(userVmManagerImpl, Mockito.times(0)).addLeaseDetailsForInstance(any(), any(), any());
     }
@@ -3355,7 +3350,7 @@ public class UserVmManagerImplTest {
     public void testApplyLeaseOnUpdateInstanceForLease() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
         when(userVm.getId()).thenReturn(vmId);
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.PENDING.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.PENDING.name()));
         userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, 10, VMLeaseManager.ExpiryAction.STOP);
         Mockito.verify(userVmManagerImpl, Mockito.times(1)).addLeaseDetailsForInstance(any(), any(), any());
     }
@@ -3364,7 +3359,7 @@ public class UserVmManagerImplTest {
     public void testApplyLeaseOnUpdateInstanceForDisabledLeaseInstance() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
         when(userVm.getId()).thenReturn(vmId);
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.DISABLED.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(5, VMLeaseManager.LeaseActionExecution.DISABLED.name()));
         userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, 10, VMLeaseManager.ExpiryAction.STOP);
         Mockito.verify(userVmManagerImpl, Mockito.times(1)).addLeaseDetailsForInstance(any(), any(), any());
     }
@@ -3372,7 +3367,7 @@ public class UserVmManagerImplTest {
     @Test(expected = CloudRuntimeException.class)
     public void testApplyLeaseOnUpdateInstanceForLeaseExpired() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(-2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(-2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
         userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, 10, VMLeaseManager.ExpiryAction.STOP);
         Mockito.verify(userVmManagerImpl, Mockito.times(0)).addLeaseDetailsForInstance(any(), any(), any());
     }
@@ -3381,7 +3376,7 @@ public class UserVmManagerImplTest {
     public void testApplyLeaseOnUpdateInstanceToRemoveLease() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
         when(userVm.getId()).thenReturn(vmId);;
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
         try (MockedStatic<ActionEventUtils> ignored = Mockito.mockStatic(ActionEventUtils.class)) {
             Mockito.when(ActionEventUtils.onActionEvent(Mockito.anyLong(), Mockito.anyLong(),
                     Mockito.anyLong(),
@@ -3390,7 +3385,7 @@ public class UserVmManagerImplTest {
             userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, -1, VMLeaseManager.ExpiryAction.STOP);
         }
         Mockito.verify(userVmManagerImpl, Mockito.times(0)).addLeaseDetailsForInstance(any(), any(), any());
-        Mockito.verify(userVmDetailsDao, Mockito.times(1)).
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(1)).
                 addDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXECUTION, VMLeaseManager.LeaseActionExecution.DISABLED.name(), false);
     }
 
@@ -3398,11 +3393,11 @@ public class UserVmManagerImplTest {
     public void testApplyLeaseOnUpdateInstanceToRemoveLeaseForExpired() {
         UserVmVO userVm = Mockito.mock(UserVmVO.class);
         when(userVm.getId()).thenReturn(vmId);
-        when(userVmDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(-2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
+        when(vmInstanceDetailsDao.listDetailsKeyPairs(anyLong(), anyList())).thenReturn(getLeaseDetails(-2, VMLeaseManager.LeaseActionExecution.PENDING.name()));
         userVmManagerImpl.applyLeaseOnUpdateInstance(userVm, -1, VMLeaseManager.ExpiryAction.STOP);
         Mockito.verify(userVmManagerImpl, Mockito.times(0)).addLeaseDetailsForInstance(any(), any(), any());
-        Mockito.verify(userVmDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION);
-        Mockito.verify(userVmDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_ACTION);
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(0)).removeDetail(vmId, VmDetailConstants.INSTANCE_LEASE_EXPIRY_DATE);
     }
 
     String getLeaseExpiryDate(long leaseDuration) {
diff --git a/server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java b/server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
index 06c917a1244..a0f09981a40 100644
--- a/server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
+++ b/server/src/test/java/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
@@ -46,13 +46,13 @@ import com.cloud.user.dao.UserDao;
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
-import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
@@ -131,7 +131,7 @@ public class VMSnapshotManagerTest {
     @Mock
     ServiceOfferingDao _serviceOfferingDao;
     @Mock
-    UserVmDetailsDao _userVmDetailsDao;
+    VMInstanceDetailsDao _vmInstanceDetailsDao;
     @Mock
     VMSnapshotDetailsDao _vmSnapshotDetailsDao;
     @Mock
@@ -141,7 +141,7 @@ public class VMSnapshotManagerTest {
     private static final long SERVICE_OFFERING_ID = 1L;
     private static final long SERVICE_OFFERING_DIFFERENT_ID = 2L;
     private static VMSnapshot.Type vmSnapshotType;
-    private static List<UserVmDetailVO> userVmDetails;
+    private static List<VMInstanceDetailVO> userVmDetails;
     private static List<VMSnapshotDetailsVO> vmSnapshotDetails;
 
     private static final long VM_SNAPSHOT_ID = 1L;
@@ -157,9 +157,9 @@ public class VMSnapshotManagerTest {
     @Mock
     ServiceOfferingVO serviceOffering;
     @Mock
-    UserVmDetailVO userVmDetailCpuNumber;
+    VMInstanceDetailVO userVmDetailCpuNumber;
     @Mock
-    UserVmDetailVO userVmDetailMemory;
+    VMInstanceDetailVO userVmDetailMemory;
     @Mock
     VMSnapshotDetailsVO vmSnapshotDetailCpuNumber;
     @Mock
@@ -172,7 +172,7 @@ public class VMSnapshotManagerTest {
     @Captor
     ArgumentCaptor<Map<String,String>> mapDetailsCaptor;
     @Captor
-    ArgumentCaptor<List<UserVmDetailVO>> listUserVmDetailsCaptor;
+    ArgumentCaptor<List<VMInstanceDetailVO>> listUserVmDetailsCaptor;
 
     private AutoCloseable closeable;
 
@@ -194,7 +194,7 @@ public class VMSnapshotManagerTest {
         doNothing().when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
 
         _vmSnapshotMgr._serviceOfferingDao = _serviceOfferingDao;
-        _vmSnapshotMgr._userVmDetailsDao = _userVmDetailsDao;
+        _vmSnapshotMgr._vmInstanceDetailsDao = _vmInstanceDetailsDao;
         _vmSnapshotMgr._vmSnapshotDetailsDao = _vmSnapshotDetailsDao;
         _vmSnapshotMgr._userVmManager = _userVmManager;
 
@@ -238,7 +238,7 @@ public class VMSnapshotManagerTest {
 
         userVmDetails = Arrays.asList(userVmDetailCpuNumber, userVmDetailMemory);
         vmSnapshotDetails = Arrays.asList(vmSnapshotDetailCpuNumber, vmSnapshotDetailMemory);
-        when(_userVmDetailsDao.listDetails(TEST_VM_ID)).thenReturn(userVmDetails);
+        when(_vmInstanceDetailsDao.listDetails(TEST_VM_ID)).thenReturn(userVmDetails);
         when(_vmSnapshotDetailsDao.listDetails(VM_SNAPSHOT_ID)).thenReturn(vmSnapshotDetails);
 
         when(userVm.getId()).thenReturn(TEST_VM_ID);
@@ -327,7 +327,7 @@ public class VMSnapshotManagerTest {
     @Test
     public void testAddSupportForCustomServiceOfferingNotDynamicServiceOffering() {
         _vmSnapshotMgr.addSupportForCustomServiceOffering(TEST_VM_ID, SERVICE_OFFERING_ID, VM_SNAPSHOT_ID);
-        verify(_userVmDetailsDao, never()).listDetails(TEST_VM_ID);
+        verify(_vmInstanceDetailsDao, never()).listDetails(TEST_VM_ID);
     }
 
     @Test
@@ -335,7 +335,7 @@ public class VMSnapshotManagerTest {
         when(serviceOffering.isDynamic()).thenReturn(true);
         _vmSnapshotMgr.addSupportForCustomServiceOffering(TEST_VM_ID, SERVICE_OFFERING_ID, VM_SNAPSHOT_ID);
 
-        verify(_userVmDetailsDao).listDetails(TEST_VM_ID);
+        verify(_vmInstanceDetailsDao).listDetails(TEST_VM_ID);
         verify(_vmSnapshotDetailsDao).saveDetails(listVmSnapshotDetailsCaptor.capture());
     }
 
@@ -405,7 +405,7 @@ public class VMSnapshotManagerTest {
         when(serviceOffering.isDynamic()).thenReturn(true);
         _vmSnapshotMgr.revertUserVmDetailsFromVmSnapshot(vmMock, vmSnapshotVO);
         verify(_vmSnapshotDetailsDao).listDetails(VM_SNAPSHOT_ID);
-        verify(_userVmDetailsDao).saveDetails(listUserVmDetailsCaptor.capture());
+        verify(_vmInstanceDetailsDao).saveDetails(listUserVmDetailsCaptor.capture());
     }
 
 }
diff --git a/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java b/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java
index 54bb0853478..22c0b47e154 100644
--- a/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java
+++ b/server/src/test/java/com/cloud/vpc/VpcTestConfiguration.java
@@ -82,7 +82,7 @@ import com.cloud.vm.dao.DomainRouterDaoImpl;
 import com.cloud.vm.dao.NicDaoImpl;
 import com.cloud.vm.dao.NicSecondaryIpDaoImpl;
 import com.cloud.vm.dao.UserVmDaoImpl;
-import com.cloud.vm.dao.UserVmDetailsDaoImpl;
+import com.cloud.vm.dao.VMInstanceDetailsDaoImpl;
 import com.cloud.vm.dao.VMInstanceDaoImpl;
 import com.cloud.vpc.dao.MockNetworkOfferingDaoImpl;
 import com.cloud.vpc.dao.MockNetworkOfferingServiceMapDaoImpl;
@@ -113,7 +113,7 @@ import java.io.IOException;
     Site2SiteVpnGatewayDaoImpl.class, PodVlanMapDaoImpl.class, AccountVlanMapDaoImpl.class, DomainVlanMapDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class,
     HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, ClusterDaoImpl.class, HostPodDaoImpl.class, RouterNetworkDaoImpl.class,
     UserStatisticsDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, FirewallRulesCidrsDaoImpl.class, ResourceLimitManagerImpl.class,
-    ResourceLimitDaoImpl.class, ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, NicDaoImpl.class,
+    ResourceLimitDaoImpl.class, ResourceCountDaoImpl.class, DomainDaoImpl.class, UserVmDaoImpl.class, VMInstanceDetailsDaoImpl.class, NicDaoImpl.class,
     SnapshotDaoImpl.class, VMInstanceDaoImpl.class, VolumeDaoImpl.class, UserIpv6AddressDaoImpl.class, NicSecondaryIpDaoImpl.class,
     VpcServiceMapDaoImpl.class, ServiceOfferingDaoImpl.class, MockVpcDaoImpl.class, VMTemplateDaoImpl.class,
     VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class,
diff --git a/server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
index df218f49bfd..748fe19893a 100644
--- a/server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
@@ -24,7 +24,7 @@ import com.cloud.user.AccountManager;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineManager;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.framework.security.keys.KeysManager;
 import org.junit.Assert;
@@ -51,7 +51,7 @@ public class ConsoleAccessManagerImplTest {
     @Mock
     private EntityManager entityManager;
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
     @Mock
     private KeysManager keysManager;
     @Mock
diff --git a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
index 403b14965b1..2a1a0237009 100644
--- a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
+++ b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
@@ -61,7 +61,7 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountVO;
 import com.cloud.user.UserVO;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 import junit.framework.TestCase;
 
@@ -84,7 +84,7 @@ public class CreateNetworkOfferingTest extends TestCase {
     VpcManager vpcMgr;
 
     @Mock
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Mock
     UsageEventDao UsageEventDao;
diff --git a/server/src/test/java/org/apache/cloudstack/resource/ResourceCleanupServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/resource/ResourceCleanupServiceImplTest.java
index 2ca9c0ef11b..d214f04ddb4 100644
--- a/server/src/test/java/org/apache/cloudstack/resource/ResourceCleanupServiceImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/resource/ResourceCleanupServiceImplTest.java
@@ -75,7 +75,7 @@ import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicDetailsDao;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@@ -111,7 +111,7 @@ public class ResourceCleanupServiceImplTest {
     @Mock
     VMSnapshotDetailsDao vmSnapshotDetailsDao;
     @Mock
-    UserVmDetailsDao userVmDetailsDao;
+    VMInstanceDetailsDao vmInstanceDetailsDao;
     @Mock
     AutoScaleVmGroupVmMapDao autoScaleVmGroupVmMapDao;
     @Mock
@@ -297,7 +297,7 @@ public class ResourceCleanupServiceImplTest {
         resourceCleanupService.purgeLinkedVMEntities(new ArrayList<>(), 50L);
         Mockito.verify(resourceCleanupService, Mockito.never()).purgeVMVolumes(Mockito.anyList(),
                 Mockito.anyLong());
-        Mockito.verify(userVmDetailsDao, Mockito.never())
+        Mockito.verify(vmInstanceDetailsDao, Mockito.never())
                 .batchExpungeForResources(Mockito.anyList(), Mockito.anyLong());
     }
 
@@ -307,7 +307,7 @@ public class ResourceCleanupServiceImplTest {
                 Mockito.eq(batchSize));
         Mockito.doReturn(2L).when(resourceCleanupService).purgeVMNics(Mockito.anyList(),
                 Mockito.eq(batchSize));
-        Mockito.when(userVmDetailsDao.batchExpungeForResources(Mockito.anyList(), Mockito.anyLong())).thenReturn(2L);
+        Mockito.when(vmInstanceDetailsDao.batchExpungeForResources(Mockito.anyList(), Mockito.anyLong())).thenReturn(2L);
         Mockito.doReturn(2L).when(resourceCleanupService).purgeVMSnapshots(Mockito.anyList(),
                 Mockito.eq(batchSize));
         Mockito.when(autoScaleVmGroupVmMapDao.expungeByVmList(Mockito.anyList(), Mockito.anyLong())).thenReturn(2);
@@ -327,7 +327,7 @@ public class ResourceCleanupServiceImplTest {
 
         Mockito.verify(resourceCleanupService, Mockito.times(1)).purgeVMVolumes(ids, batchSize);
         Mockito.verify(resourceCleanupService, Mockito.times(1)).purgeVMNics(ids, batchSize);
-        Mockito.verify(userVmDetailsDao, Mockito.times(1))
+        Mockito.verify(vmInstanceDetailsDao, Mockito.times(1))
                 .batchExpungeForResources(ids, batchSize);
         Mockito.verify(resourceCleanupService, Mockito.times(1))
                 .purgeVMSnapshots(ids, batchSize);
diff --git a/server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java
index c93223755b5..c700394b31d 100644
--- a/server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java
@@ -18,16 +18,31 @@
 
 package org.apache.cloudstack.vm.lease;
 
-import com.cloud.api.query.dao.UserVmJoinDao;
-import com.cloud.api.query.vo.UserVmJoinVO;
-import com.cloud.event.ActionEventUtils;
-import com.cloud.user.User;
-import com.cloud.utils.component.ComponentContext;
-import com.cloud.utils.db.GlobalLock;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+import javax.naming.ConfigurationException;
+
 import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
 import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
 import org.apache.cloudstack.framework.config.ConfigKey;
@@ -47,29 +62,16 @@ import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
 
-import javax.naming.ConfigurationException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import com.cloud.api.query.dao.UserVmJoinDao;
+import com.cloud.api.query.vo.UserVmJoinVO;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.user.User;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class VMLeaseManagerImplTest {
@@ -88,7 +90,7 @@ public class VMLeaseManagerImplTest {
     MessageBus messageBus;
 
     @Mock
-    private UserVmDetailsDao userVmDetailsDao;
+    private VMInstanceDetailsDao vmInstanceDetailsDao;
 
     @Mock
     private AsyncJobManager asyncJobManager;
@@ -104,7 +106,7 @@ public class VMLeaseManagerImplTest {
         vmLeaseManager.setAsyncJobDispatcher(asyncJobDispatcher);
         when(asyncJobDispatcher.getName()).thenReturn("AsyncJobDispatcher");
         when(asyncJobManager.submitAsyncJob(any(AsyncJobVO.class))).thenReturn(1L);
-        doNothing().when(userVmDetailsDao).addDetail(
+        doNothing().when(vmInstanceDetailsDao).addDetail(
                 anyLong(), anyString(), anyString(), anyBoolean()
         );
         try {
@@ -275,7 +277,7 @@ public class VMLeaseManagerImplTest {
             utilities.when(() -> ActionEventUtils.onStartedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(),
                     Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyLong())).thenReturn(1L);
             vmLeaseManager.cancelLeaseOnExistingInstances();
-            verify(userVmDetailsDao).addDetail(1L, VmDetailConstants.INSTANCE_LEASE_EXECUTION, VMLeaseManager.LeaseActionExecution.CANCELLED.name(), false);
+            verify(vmInstanceDetailsDao).addDetail(1L, VmDetailConstants.INSTANCE_LEASE_EXECUTION, VMLeaseManager.LeaseActionExecution.CANCELLED.name(), false);
         }
     }
 
diff --git a/server/src/test/resources/createNetworkOffering.xml b/server/src/test/resources/createNetworkOffering.xml
index e62c4c0660f..5a0a51516af 100644
--- a/server/src/test/resources/createNetworkOffering.xml
+++ b/server/src/test/resources/createNetworkOffering.xml
@@ -50,7 +50,7 @@
     <bean id="ipv6ServiceImpl" class="com.cloud.network.Ipv6ServiceImpl" />
     <bean id="managementServiceConfigurationImpl" class="com.cloud.configuration.ManagementServiceConfigurationImpl" />
     <bean class="org.apache.cloudstack.networkoffering.ChildTestConfiguration" />
-    <bean id="UservmDetailsDaoImpl" class="com.cloud.vm.dao.UserVmDetailsDaoImpl" />
+    <bean id="UservmDetailsDaoImpl" class="com.cloud.vm.dao.VMInstanceDetailsDaoImpl" />
     <bean id="hostGpuGroupsDaoImpl" class="com.cloud.gpu.dao.HostGpuGroupsDaoImpl" />
     <bean id="vGPUTypesDaoImpl" class="com.cloud.gpu.dao.VGPUTypesDaoImpl" />
     <bean id="usageEventDaoImpl" class="com.cloud.event.dao.UsageEventDaoImpl" />
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 3ac24d3985a..836cb62adea 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -157,7 +157,7 @@ import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineName;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
 /**
@@ -223,7 +223,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
     @Inject
     protected CapacityDao _capacityDao;
     @Inject
-    UserVmDetailsDao _vmDetailsDao;
+    VMInstanceDetailsDao _vmDetailsDao;
     @Inject
     protected ResourceManager _resourceMgr;
     @Inject

From 22b753e93028c6da43b4d316c743a229796f4b12 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Thu, 24 Jul 2025 07:18:07 -0300
Subject: [PATCH 57/94] [UI] Deploy VM: Preselect first available template
 (#11207)

---
 ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue b/ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue
index 3d84cf342ad..2518ed0c042 100644
--- a/ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue
+++ b/ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue
@@ -145,6 +145,11 @@ export default {
     selected (newVal, oldVal) {
       if (newVal === oldVal) return
       this.onSelectTemplateIso()
+    },
+    imagesList () {
+      if (this.value === '' && this.imagesList && this.imagesList.length > 0) {
+        this.onClickRow(this.imagesList[0])
+      }
     }
   },
   emits: ['emit-update-image', 'handle-search-filter'],

From 111d87b845ab8bddf35f5d0f3303947bfff8719c Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 24 Jul 2025 16:32:35 +0530
Subject: [PATCH 58/94] console: optimise buffer sizes for faster console
 performance (#11221)

* console-proxy: fix stream buffer sizes to improve console performance

This bumps the input and output stream buffers to 64KiB and uses them
consistent across TLS and non-TLS based VNC connections.

This fixes #10650

Co-authored-by: Vishesh Jindal <vishesh.jindal@shapeblue.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

* Make buffer size configurable & other improvements for CPU & memory utilisation

* Setup batching of data for TLS connections to the VNC server

* Apply suggestions from code review

* Fix buffer size for xenserver

---------

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Co-authored-by: Vishesh Jindal <vishesh.jindal@shapeblue.com>
Co-authored-by: vishesh92 <vishesh92@gmail.com>
---
 .../com/cloud/consoleproxy/ConsoleProxy.java  |  7 ++
 .../consoleproxy/ConsoleProxyNoVncClient.java | 84 +++++++++++++++----
 .../cloud/consoleproxy/vnc/NoVncClient.java   |  8 +-
 .../consoleproxy/vnc/network/NioSocket.java   |  3 +-
 .../vnc/network/NioSocketHandler.java         |  3 +-
 .../vnc/network/NioSocketHandlerImpl.java     | 16 ++--
 .../vnc/network/NioSocketInputStream.java     | 48 ++++++-----
 .../network/NioSocketSSLEngineManager.java    | 40 ++++++---
 .../vnc/network/NioSocketTLSInputStream.java  |  3 +-
 .../vnc/network/NioSocketTLSOutputStream.java |  5 +-
 systemvm/agent/conf/consoleproxy.properties   |  1 +
 11 files changed, 146 insertions(+), 72 deletions(-)

diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
index 22922f43f93..0befe392b4e 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
@@ -76,6 +76,7 @@ public class ConsoleProxy {
     static int httpCmdListenPort = 8001;
     static int reconnectMaxRetry = 5;
     static int readTimeoutSeconds = 90;
+    public static int defaultBufferSize = 64 * 1024;
     static int keyboardType = KEYBOARD_RAW;
     static String factoryClzName;
     static boolean standaloneStart = false;
@@ -160,6 +161,12 @@ public class ConsoleProxy {
             readTimeoutSeconds = Integer.parseInt(s);
             LOGGER.info("Setting readTimeoutSeconds=" + readTimeoutSeconds);
         }
+
+        s = conf.getProperty("consoleproxy.defaultBufferSize");
+        if (s != null) {
+            defaultBufferSize = Integer.parseInt(s);
+            LOGGER.info("Setting defaultBufferSize=" + defaultBufferSize);
+        }
     }
 
     public static ConsoleProxyServerFactory getHttpServerFactory() {
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
index fece5bfaa22..85a2e5c541f 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
@@ -52,6 +52,9 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
     private ConsoleProxyClientParam clientParam;
     private String sessionUuid;
 
+    private ByteBuffer readBuffer = null;
+    private int flushThreshold = -1;
+
     public ConsoleProxyNoVncClient(Session session) {
         this.session = session;
     }
@@ -109,8 +112,9 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
                     connectClientToVNCServer(tunnelUrl, tunnelSession, websocketUrl);
                     authenticateToVNCServer(clientSourceIp);
 
-                    int readBytes;
-                    byte[] b;
+                    // Track consecutive iterations with no data and sleep accordingly. Only used for NIO socket connections.
+                    int consecutiveZeroReads = 0;
+                    int sleepTime = 1;
                     while (connectionAlive) {
                         logger.trace("Connection with client [{}] [IP: {}] is alive.", clientId, clientSourceIp);
                         if (client.isVncOverWebSocketConnection()) {
@@ -118,30 +122,53 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
                                 updateFrontEndActivityTime();
                             }
                             connectionAlive = session.isOpen();
+                            sleepTime = 1;
                         } else if (client.isVncOverNioSocket()) {
-                            byte[] bytesArr;
-                            int nextBytes = client.getNextBytes();
-                            bytesArr = new byte[nextBytes];
-                            client.readBytes(bytesArr, nextBytes);
-                            logger.trace("Read [{}] bytes from client [{}].", nextBytes, clientId);
-                            if (nextBytes > 0) {
-                                session.getRemote().sendBytes(ByteBuffer.wrap(bytesArr));
+                            ByteBuffer buffer = getOrCreateReadBuffer();
+                            int bytesRead = client.readAvailableDataIntoBuffer(buffer, buffer.remaining());
+
+                            if (bytesRead > 0) {
                                 updateFrontEndActivityTime();
+                                consecutiveZeroReads = 0; // Reset counter on successful read
+
+                                sleepTime = 0; // Still no sleep to catch any remaining data quickly
                             } else {
                                 connectionAlive = session.isOpen();
+                                consecutiveZeroReads++;
+                                // Use adaptive sleep time to prevent excessive busy waiting
+                                sleepTime = Math.min(consecutiveZeroReads, 10); // Cap at 10ms max
+                            }
+
+                            final boolean bufferHasData = buffer.position() > 0;
+                            if (bufferHasData && (bytesRead == 0 || buffer.remaining() <= flushThreshold)) {
+                                buffer.flip();
+                                logger.trace("Flushing buffer with [{}] bytes for client [{}]", buffer.remaining(), clientId);
+                                session.getRemote().sendBytes(buffer);
+                                buffer.compact();
                             }
                         } else {
-                            b = new byte[100];
-                            readBytes = client.read(b);
+                            ByteBuffer buffer = getOrCreateReadBuffer();
+                            buffer.clear();
+                            int readBytes = client.read(buffer.array());
                             logger.trace("Read [{}] bytes from client [{}].", readBytes, clientId);
-                            if (readBytes == -1 || (readBytes > 0 && !sendReadBytesToNoVNC(b, readBytes))) {
+                            if (readBytes > 0) {
+                                // Update buffer position to reflect bytes read and flip for reading
+                                buffer.position(readBytes);
+                                buffer.flip();
+                                if (!sendReadBytesToNoVNC(buffer)) {
+                                    connectionAlive = false;
+                                }
+                            } else if (readBytes == -1) {
                                 connectionAlive = false;
                             }
+                            sleepTime = 1;
                         }
-                        try {
-                            Thread.sleep(1);
-                        } catch (InterruptedException e) {
-                            logger.error("Error on sleep for vnc sessions", e);
+                        if (sleepTime > 0 && connectionAlive) {
+                            try {
+                                Thread.sleep(sleepTime);
+                            } catch (InterruptedException e) {
+                                logger.error("Error on sleep for vnc sessions", e);
+                            }
                         }
                     }
                     logger.info("Connection with client [{}] [IP: {}] is dead.", clientId, clientSourceIp);
@@ -154,9 +181,10 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
         worker.start();
     }
 
-    private boolean sendReadBytesToNoVNC(byte[] b, int readBytes) {
+    private boolean sendReadBytesToNoVNC(ByteBuffer buffer) {
         try {
-            session.getRemote().sendBytes(ByteBuffer.wrap(b, 0, readBytes));
+            // Buffer is already prepared for reading by flip()
+            session.getRemote().sendBytes(buffer);
             updateFrontEndActivityTime();
         } catch (WebSocketException | IOException e) {
             logger.error("VNC server connection exception.", e);
@@ -316,9 +344,29 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
         this.clientParam = param;
     }
 
+    private ByteBuffer getOrCreateReadBuffer() {
+        if (readBuffer == null) {
+            readBuffer = ByteBuffer.allocate(ConsoleProxy.defaultBufferSize);
+            logger.debug("Allocated {} KB read buffer for client [{}]", ConsoleProxy.defaultBufferSize / 1024 , clientId);
+
+            // Only apply batching logic for NIO TLS connections to work around 16KB record limitation
+            // For non-TLS or non-NIO connections, use immediate flush for better responsiveness
+            if (client != null && client.isVncOverNioSocket() && client.isTLSConnectionEstablished()) {
+                flushThreshold = Math.min(ConsoleProxy.defaultBufferSize / 4, 2048);
+                logger.debug("NIO TLS connection detected - using batching with threshold {} for client [{}]", flushThreshold, clientId);
+            } else {
+                flushThreshold = ConsoleProxy.defaultBufferSize + 1; // Always flush immediately
+                logger.debug("Non-TLS or non-NIO connection - using immediate flush for client [{}]", clientId);
+            }
+        }
+        return readBuffer;
+    }
+
     @Override
     public void closeClient() {
         this.connectionAlive = false;
+        // Clear buffer reference to allow GC when client disconnects
+        this.readBuffer = null;
         ConsoleProxy.removeViewer(this);
     }
 
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
index e4bb93711b9..493c2287931 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
@@ -502,18 +502,14 @@ public class NoVncClient {
         return nioSocketConnection.readServerInit();
     }
 
-    public int getNextBytes() {
-        return nioSocketConnection.readNextBytes();
+    public int readAvailableDataIntoBuffer(ByteBuffer buffer, int maxSize) {
+        return nioSocketConnection.readAvailableDataIntoBuffer(buffer, maxSize);
     }
 
     public boolean isTLSConnectionEstablished() {
         return nioSocketConnection.isTLSConnection();
     }
 
-    public void readBytes(byte[] arr, int len) {
-        nioSocketConnection.readNextByteArray(arr, len);
-    }
-
     public void processHandshakeSecurityType(int secType, String vmPassword, String host, int port) {
         waitForNoVNCReply();
 
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocket.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocket.java
index dfc47f33377..9bd2a10e6f0 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocket.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocket.java
@@ -41,6 +41,8 @@ public class NioSocket {
             socketChannel = SocketChannel.open();
             socketChannel.configureBlocking(false);
             socketChannel.socket().setSoTimeout(5000);
+            socketChannel.socket().setKeepAlive(true);
+            socketChannel.socket().setTcpNoDelay(true);
             writeSelector = Selector.open();
             readSelector = Selector.open();
             socketChannel.register(writeSelector, SelectionKey.OP_WRITE);
@@ -77,7 +79,6 @@ public class NioSocket {
             socketChannel.register(selector, SelectionKey.OP_CONNECT);
 
             waitForSocketSelectorConnected(selector);
-            socketChannel.socket().setTcpNoDelay(false);
         } catch (IOException e) {
             logger.error(String.format("Error creating NioSocket to %s:%s: %s", host, port, e.getMessage()), e);
         }
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandler.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandler.java
index e1ccd6feb11..757f9c126ec 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandler.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandler.java
@@ -29,8 +29,7 @@ public interface NioSocketHandler {
     void readBytes(ByteBuffer data, int length);
     String readString();
     byte[] readServerInit();
-    int readNextBytes();
-    void readNextByteArray(byte[] arr, int len);
+    int readAvailableDataIntoBuffer(ByteBuffer buffer, int maxSize);
 
     // Write operations
     void writeUnsignedInteger(int sizeInBits, int value);
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandlerImpl.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandlerImpl.java
index 3aa3524ea83..fc19c36b3ed 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandlerImpl.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandlerImpl.java
@@ -17,6 +17,7 @@
 package com.cloud.consoleproxy.vnc.network;
 
 
+import com.cloud.consoleproxy.ConsoleProxy;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -28,13 +29,11 @@ public class NioSocketHandlerImpl implements NioSocketHandler {
     private NioSocketOutputStream outputStream;
     private boolean isTLS = false;
 
-    private static final int DEFAULT_BUF_SIZE = 16384;
-
     protected Logger logger = LogManager.getLogger(getClass());
 
     public NioSocketHandlerImpl(NioSocket socket) {
-        this.inputStream = new NioSocketInputStream(DEFAULT_BUF_SIZE, socket);
-        this.outputStream = new NioSocketOutputStream(DEFAULT_BUF_SIZE, socket);
+        this.inputStream = new NioSocketInputStream(ConsoleProxy.defaultBufferSize, socket);
+        this.outputStream = new NioSocketOutputStream(ConsoleProxy.defaultBufferSize, socket);
     }
 
     @Override
@@ -97,13 +96,8 @@ public class NioSocketHandlerImpl implements NioSocketHandler {
     }
 
     @Override
-    public int readNextBytes() {
-        return inputStream.getNextBytes();
-    }
-
-    @Override
-    public void readNextByteArray(byte[] arr, int len) {
-        inputStream.readNextByteArrayFromReadBuffer(arr, len);
+    public int readAvailableDataIntoBuffer(ByteBuffer buffer, int maxSize) {
+        return inputStream.readAvailableDataIntoBuffer(buffer, maxSize);
     }
 
     @Override
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketInputStream.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketInputStream.java
index 8747afd85e2..e347c95f280 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketInputStream.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketInputStream.java
@@ -175,28 +175,38 @@ public class NioSocketInputStream extends NioSocketStream {
         return ArrayUtils.addAll(ret, (byte) 0, (byte) 0, (byte) 0);
     }
 
-    protected int getNextBytes() {
-        int size = 200;
-        while (size > 0) {
-            if (checkForSizeWithoutWait(size)) {
-                break;
-            }
-            size--;
+    /**
+     * This method checks what data is immediately available and returns a reasonable amount.
+     *
+     * @param maxSize Maximum number of bytes to attempt to read
+     * @return Number of bytes available to read (0 if none available)
+     */
+    protected int getAvailableBytes(int maxSize) {
+        // First check if we have data already in our buffer
+        int bufferedData = endPosition - currentPosition;
+        if (bufferedData > 0) {
+            return Math.min(bufferedData, maxSize);
         }
-        return size;
+
+        // Try to read more data with non-blocking call
+        // This determines how much data is available
+        return getReadBytesAvailableToFitSize(1, maxSize, false);
     }
 
-    protected void readNextByteArrayFromReadBuffer(byte[] arr, int len) {
-        copyBytesFromReadBuffer(len, arr);
-    }
-
-    protected void copyBytesFromReadBuffer(int length, byte[] arr) {
-        int ptr = 0;
-        while (length > 0) {
-            int n = getReadBytesAvailableToFitSize(1, length, true);
-            readBytes(ByteBuffer.wrap(arr, ptr, n), n);
-            ptr += n;
-            length -= n;
+    /**
+     * Read available data directly into a ByteBuffer.
+     *
+     * @param buffer ByteBuffer to read data into
+     * @param maxSize Maximum number of bytes to read
+     * @return Number of bytes actually read (0 if none available)
+     */
+    protected int readAvailableDataIntoBuffer(ByteBuffer buffer, int maxSize) {
+        // Get the amount of data available to read
+        int available = getAvailableBytes(maxSize);
+        if (available > 0) {
+            // Read directly into the ByteBuffer
+            readBytes(buffer, available);
         }
+        return available;
     }
 }
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java
index 2b0229b7567..826e7c6dd50 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.consoleproxy.vnc.network;
 
+import com.cloud.consoleproxy.ConsoleProxy;
+
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLException;
@@ -43,9 +45,9 @@ public class NioSocketSSLEngineManager {
 
         executor = Executors.newSingleThreadExecutor();
 
-        int pktBufSize = engine.getSession().getPacketBufferSize();
-        myNetData = ByteBuffer.allocate(pktBufSize);
-        peerNetData = ByteBuffer.allocate(pktBufSize);
+        int networkBufSize = Math.max(engine.getSession().getPacketBufferSize(), ConsoleProxy.defaultBufferSize);
+        myNetData = ByteBuffer.allocate(networkBufSize);
+        peerNetData = ByteBuffer.allocate(networkBufSize);
     }
 
     private void handshakeNeedUnwrap(ByteBuffer peerAppData) throws SSLException {
@@ -155,22 +157,25 @@ public class NioSocketSSLEngineManager {
     }
 
     public int write(ByteBuffer data) throws IOException {
-        int n = 0;
+        int totalBytesConsumed = 0;
+        int sessionAppBufSize = engine.getSession().getApplicationBufferSize();
+        boolean shouldBatch = ConsoleProxy.defaultBufferSize > sessionAppBufSize;
+
         while (data.hasRemaining()) {
             SSLEngineResult result = engine.wrap(data, myNetData);
-            n += result.bytesConsumed();
+            totalBytesConsumed += result.bytesConsumed();
             switch (result.getStatus()) {
                 case OK:
-                    myNetData.flip();
-                    outputStream.writeBytes(myNetData, myNetData.remaining());
-                    outputStream.flushWriteBuffer();
-                    myNetData.compact();
+                    // Flush immediately if: batching is disabled, small data, or last chunk
+                    if (!shouldBatch || result.bytesConsumed() < sessionAppBufSize || !data.hasRemaining()) {
+                        flush();
+                    }
+                    // Otherwise accumulate for batching (large chunk with more data coming)
                     break;
 
                 case BUFFER_OVERFLOW:
-                    myNetData.flip();
-                    outputStream.writeBytes(myNetData, myNetData.remaining());
-                    myNetData.compact();
+                    // Flush when buffer is full
+                    flush();
                     break;
 
                 case CLOSED:
@@ -181,7 +186,16 @@ public class NioSocketSSLEngineManager {
                     break;
             }
         }
-        return n;
+        return totalBytesConsumed;
+    }
+
+    public void flush() {
+        if (myNetData.position() > 0) {
+            myNetData.flip();
+            outputStream.writeBytes(myNetData, myNetData.remaining());
+            outputStream.flushWriteBuffer();
+            myNetData.compact();
+        }
     }
 
     public SSLSession getSession() {
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSInputStream.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSInputStream.java
index f57a56e8a94..c3f46571e8a 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSInputStream.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSInputStream.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.consoleproxy.vnc.network;
 
+import com.cloud.consoleproxy.ConsoleProxy;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 import java.io.IOException;
@@ -26,7 +27,7 @@ public class NioSocketTLSInputStream extends NioSocketInputStream {
     private final NioSocketSSLEngineManager sslEngineManager;
 
     public NioSocketTLSInputStream(NioSocketSSLEngineManager sslEngineManager, NioSocket socket) {
-        super(sslEngineManager.getSession().getApplicationBufferSize(), socket);
+        super(ConsoleProxy.defaultBufferSize, socket);
         this.sslEngineManager = sslEngineManager;
     }
 
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSOutputStream.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSOutputStream.java
index 6024e2718e9..f9bdb5cca49 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSOutputStream.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSOutputStream.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.consoleproxy.vnc.network;
 
+import com.cloud.consoleproxy.ConsoleProxy;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
@@ -24,7 +26,7 @@ public class NioSocketTLSOutputStream extends NioSocketOutputStream {
     private final NioSocketSSLEngineManager sslEngineManager;
 
     public NioSocketTLSOutputStream(NioSocketSSLEngineManager sslEngineManager, NioSocket socket) {
-        super(sslEngineManager.getSession().getApplicationBufferSize(), socket);
+        super(ConsoleProxy.defaultBufferSize, socket);
         this.sslEngineManager = sslEngineManager;
     }
 
@@ -38,6 +40,7 @@ public class NioSocketTLSOutputStream extends NioSocketOutputStream {
         }
 
         currentPosition = start;
+        sslEngineManager.flush();
     }
 
     protected int writeThroughSSLEngineManager(byte[] data, int startPos, int length) {
diff --git a/systemvm/agent/conf/consoleproxy.properties b/systemvm/agent/conf/consoleproxy.properties
index 96a345b31f7..361b0a33a05 100644
--- a/systemvm/agent/conf/consoleproxy.properties
+++ b/systemvm/agent/conf/consoleproxy.properties
@@ -21,3 +21,4 @@ consoleproxy.httpCmdListenPort=8001
 consoleproxy.jarDir=./applet/
 consoleproxy.viewerLinger=180
 consoleproxy.reconnectMaxRetry=5
+consoleproxy.defaultBufferSize=65536

From 11455f6d49c051f56f7c3a2c7d3003bb9e6e74ef Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Thu, 24 Jul 2025 11:42:25 -0300
Subject: [PATCH 59/94] UI: Add option to Login to a specific Project view via
 setting on config.json (#10935)

* UI: Login to a specific Project view

* Fix project icon

* Add the option to display project on login on the config.json file

---------

Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>
---
 ui/public/config.json       |  1 +
 ui/src/views/auth/Login.vue | 44 ++++++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/ui/public/config.json b/ui/public/config.json
index bea9599fa3a..a1069218136 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -98,6 +98,7 @@
   "basicZoneEnabled": true,
   "multipleServer": false,
   "allowSettingTheme": true,
+  "displayProjectFieldOnLogin": false,
   "imageSelectionInterface": "modern",
   "showUserCategoryForModernImageSelection": true,
   "showAllCategoryForModernImageSelection": false,
diff --git a/ui/src/views/auth/Login.vue b/ui/src/views/auth/Login.vue
index a3a20428f0b..531250a4ffc 100644
--- a/ui/src/views/auth/Login.vue
+++ b/ui/src/views/auth/Login.vue
@@ -91,6 +91,18 @@
             type="text"
             :placeholder="$t('label.domain')"
             v-model:value="form.domain"
+          >
+            <template #prefix>
+              <project-outlined />
+            </template>
+          </a-input>
+        </a-form-item>
+        <a-form-item ref="project" name="project" v-if="$config.displayProjectFieldOnLogin">
+          <a-input
+            size="large"
+            type="text"
+            :placeholder="$t('label.project')"
+            v-model:value="form.project"
           >
             <template #prefix>
               <block-outlined />
@@ -230,7 +242,8 @@ export default {
         loginType: 0
       },
       server: '',
-      forgotPasswordEnabled: false
+      forgotPasswordEnabled: false,
+      project: null
     }
   },
   created () {
@@ -255,7 +268,8 @@ export default {
       this.form = reactive({
         server: (this.server.apiHost || '') + this.server.apiBase,
         username: this.$route.query?.username || '',
-        domain: this.$route.query?.domain || ''
+        domain: this.$route.query?.domain || '',
+        project: null
       })
       this.rules = reactive({})
       this.setRules()
@@ -447,7 +461,7 @@ export default {
           })
       })
     },
-    loginSuccess (res) {
+    async loginSuccess (res) {
       this.$notification.destroy()
       this.$store.commit('SET_COUNT_NOTIFY', 0)
       if (store.getters.twoFaEnabled === true && store.getters.twoFaProvider !== '' && store.getters.twoFaProvider !== undefined) {
@@ -456,9 +470,33 @@ export default {
         this.$router.push({ path: '/setup2FA' }).catch(() => {})
       } else {
         this.$store.commit('SET_LOGIN_FLAG', true)
+        const values = toRaw(this.form)
+        if (values.project) {
+          await this.getProject(values.project)
+          this.$store.dispatch('ProjectView', this.project.id)
+          this.$store.dispatch('SetProject', this.project)
+          this.$store.dispatch('ToggleTheme', this.project.id === undefined ? 'light' : 'dark')
+        }
         this.$router.push({ path: '/dashboard' }).catch(() => {})
       }
     },
+    getProject (projectName) {
+      return new Promise((resolve, reject) => {
+        api('listProjects', {
+          response: 'json',
+          domainId: this.selectedDomain,
+          details: 'min'
+        }).then((response) => {
+          const projects = response.listprojectsresponse.project
+          this.project = projects.filter(project => project.name === projectName)?.[0] || null
+          resolve(this.project)
+        }).catch((error) => {
+          this.$notifyError(error)
+        }).finally(() => {
+          this.loading = false
+        })
+      })
+    },
     requestFailed (err) {
       if (err && err.response && err.response.data && err.response.data.loginresponse) {
         const error = err.response.data.loginresponse.errorcode + ': ' + err.response.data.loginresponse.errortext

From 935c568082c933b69279e750e4d4e374c3dc44c1 Mon Sep 17 00:00:00 2001
From: nvazquez <nicovazquez90@gmail.com>
Date: Thu, 24 Jul 2025 13:33:30 -0300
Subject: [PATCH 60/94] Merge fix for UI

---
 ui/src/views/auth/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/auth/Login.vue b/ui/src/views/auth/Login.vue
index 531250a4ffc..24065f47b1a 100644
--- a/ui/src/views/auth/Login.vue
+++ b/ui/src/views/auth/Login.vue
@@ -482,7 +482,7 @@ export default {
     },
     getProject (projectName) {
       return new Promise((resolve, reject) => {
-        api('listProjects', {
+        getAPI('listProjects', {
           response: 'json',
           domainId: this.selectedDomain,
           details: 'min'

From eeb4d55e890386409aa7cbacfd63da86341732f1 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:18:35 +0530
Subject: [PATCH 61/94] polish: Fix some inconsistencies in object names and
 messages (#10856)

* Replace ACL list with ACL and related changes to the json files in public/locales

* Replace ACL list with ACL and related changes to network.js, VpcTab.vue and AclRulesTab.vue

* Replace Export ACLs with Export ACL rules

* standardize the term user data everywhere. fix the placeholder in register user data form.

* Convert resource names in main menu and action buttons to Title case

* Use special icon for sharedfs instance and prefix for sharedfs volumes

* Give custom icon precedence over shared fs icon

* Fixed some issues with public/locale files

* Revert sharedfsvm changes

* Added label.add.acl.name to en.json which was incorrectly removed

* replace all *userdata* labels to *user.data* in public json files.

* remove redundant labels label.user.data.l2 and label.replace.acl.list

* Update ui/src/views/offering/AddNetworkOffering.vue

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

* user data -> User Data in cmd and response

* fix more Title case on action buttons and labels.

---------

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../user/userdata/RegisterUserDataCmd.java    |  18 +-
 .../api/response/UserDataResponse.java        |  22 +-
 ui/public/locales/ar.json                     |  24 +-
 ui/public/locales/ca.json                     |  22 +-
 ui/public/locales/de_DE.json                  |  26 +-
 ui/public/locales/el_GR.json                  |  51 +-
 ui/public/locales/en.json                     | 783 +++++++++---------
 ui/public/locales/es.json                     |  24 +-
 ui/public/locales/fr_FR.json                  |  24 +-
 ui/public/locales/hi.json                     |   4 +-
 ui/public/locales/hu.json                     |  26 +-
 ui/public/locales/it_IT.json                  |  24 +-
 ui/public/locales/ja_JP.json                  |  24 +-
 ui/public/locales/ko_KR.json                  |  24 +-
 ui/public/locales/nb_NO.json                  |  24 +-
 ui/public/locales/nl_NL.json                  |  24 +-
 ui/public/locales/pl.json                     |  24 +-
 ui/public/locales/pt_BR.json                  |  24 +-
 ui/public/locales/ru_RU.json                  |  24 +-
 ui/public/locales/zh_CN.json                  |  24 +-
 ui/src/components/view/InfoCard.vue           |   2 +-
 ui/src/config/section/account.js              |   2 +-
 ui/src/config/section/compute.js              |   6 +-
 ui/src/config/section/network.js              |  21 +-
 ui/src/views/compute/AutoScaleVmProfile.vue   |  14 +-
 .../views/compute/CreateAutoScaleVmGroup.vue  |  14 +-
 ui/src/views/compute/DeployVM.vue             |  14 +-
 ui/src/views/compute/DeployVnfAppliance.vue   |  14 +-
 ui/src/views/compute/EditVM.vue               |   2 +-
 ui/src/views/compute/RegisterUserData.vue     |   8 +-
 ui/src/views/compute/ResetUserData.vue        |  14 +-
 .../compute/wizard/UserDataSelection.vue      |   4 +-
 ui/src/views/image/RegisterOrUploadIso.vue    |   4 +-
 .../views/image/RegisterOrUploadTemplate.vue  |   4 +-
 ui/src/views/image/UpdateISO.vue              |   4 +-
 ui/src/views/image/UpdateTemplate.vue         |   4 +-
 .../{AclListRulesTab.vue => AclRulesTab.vue}  |   2 +-
 ui/src/views/network/VpcTab.vue               |   8 +-
 ui/src/views/offering/AddNetworkOffering.vue  |   2 +-
 39 files changed, 674 insertions(+), 709 deletions(-)
 rename ui/src/views/network/{AclListRulesTab.vue => AclRulesTab.vue} (99%)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
index 41d865d678c..4588d734847 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
@@ -43,7 +43,7 @@ import com.cloud.network.NetworkModel;
 import com.cloud.user.UserData;
 
 @APICommand(name = "registerUserData",
-        description = "Register a new userdata.",
+        description = "Register a new User Data.",
         since = "4.18",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false,
@@ -56,33 +56,33 @@ public class RegisterUserDataCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the userdata")
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the User Data")
     private String name;
 
     //Owner information
-    @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the userdata. Must be used with domainId.")
+    @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the User Data. Must be used with domainId.")
     private String accountName;
 
     @Parameter(name = ApiConstants.DOMAIN_ID,
             type = CommandType.UUID,
             entityType = DomainResponse.class,
-            description = "an optional domainId for the userdata. If the account parameter is used, domainId must also be used.")
+            description = "an optional domainId for the User Data. If the account parameter is used, domainId must also be used.")
     private Long domainId;
 
-    @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the userdata")
+    @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the User Data")
     private Long projectId;
 
     @Parameter(name = ApiConstants.USER_DATA,
             type = CommandType.STRING,
             required = true,
-            description = "Base64 encoded userdata content. " +
+            description = "Base64 encoded User Data content. " +
                     "Using HTTP GET (via querystring), you can send up to 4KB of data after base64 encoding. " +
-                    "Using HTTP POST (via POST body), you can send up to 1MB of data after base64 encoding. " +
-                    "You also need to change vm.userdata.max.length value",
+                    "Using HTTP POST (via POST body), you can send up to 32KB of data after base64 encoding, " +
+                    "which can be increased upto 1MB using the vm.userdata.max.length setting",
             length = 1048576)
     private String userData;
 
-    @Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in userdata content")
+    @Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the User Data content")
     private String params;
 
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
index 2dfc66fa7d5..ce344596aeb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
@@ -27,41 +27,41 @@ import org.apache.cloudstack.api.EntityReference;
 public class UserDataResponse extends BaseResponseWithAnnotations implements ControlledEntityResponse {
 
     @SerializedName(ApiConstants.ID)
-    @Param(description = "ID of the ssh keypair")
+    @Param(description = "ID of the User Data")
     private String id;
 
     @SerializedName(ApiConstants.NAME)
-    @Param(description = "Name of the userdata")
+    @Param(description = "Name of the User Data")
     private String name;
 
-    @SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the userdata")
+    @SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the User Data")
     private String accountId;
 
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the userdata")
+    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the User Data")
     private String accountName;
 
     @SerializedName(ApiConstants.PROJECT_ID)
-    @Param(description = "the project id of the userdata", since = "4.19.1")
+    @Param(description = "the project id of the User Data", since = "4.19.1")
     private String projectId;
 
     @SerializedName(ApiConstants.PROJECT)
-    @Param(description = "the project name of the userdata", since = "4.19.1")
+    @Param(description = "the project name of the User Data", since = "4.19.1")
     private String projectName;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the userdata owner")
+    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the User Data owner")
     private String domainId;
 
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the userdata owner")
+    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the User Data owner")
     private String domain;
 
     @SerializedName(ApiConstants.DOMAIN_PATH)
-    @Param(description = "path of the domain to which the userdata owner belongs", since = "4.19.2.0")
+    @Param(description = "path of the domain to which the User Data owner belongs", since = "4.19.2.0")
     private String domainPath;
 
-    @SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded userdata content")
+    @SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded User Data content")
     private String userData;
 
-    @SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in userdata")
+    @SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in the User Data")
     private String params;
 
     public UserDataResponse() {
diff --git a/ui/public/locales/ar.json b/ui/public/locales/ar.json
index 20499c63e04..e8e4db66cb5 100644
--- a/ui/public/locales/ar.json
+++ b/ui/public/locales/ar.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Account-Specific",
 "label.accounts": "Accounts",
 "label.accounttype": "Account Type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Name",
+"label.acl.rule.name": "ACL Name",
 "label.acquire.new.ip": "Acquire New IP",
 "label.acquire.new.secondary.ip": "Acquire new secondary IP",
 "label.action": "Action",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Active Sessions",
 "label.add": "Add",
 "label.add.account": "Add Account",
-"label.add.acl": "\u0625\u0636\u0627\u0641\u0629 ACL",
-"label.add.acl.list": "Add ACL List",
+"label.add.acl.rule": "\u0625\u0636\u0627\u0641\u0629 ACL",
+"label.add.acl": "Add ACL",
 "label.add.affinity.group": "Add new affinity group",
 "label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
 "label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Add IP Range",
 "label.add.isolated.network": "Add Isolated Network",
 "label.add.ldap.account": "Add LDAP account",
-"label.add.list.name": "ACL List Name",
+"label.add.acl.name": "ACL Name",
 "label.add.more": "Add More",
 "label.add.netscaler.device": "Add Netscaler device",
 "label.add.network": "Add Network",
 "label.add.network.acl": "\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL",
-"label.add.network.acl.list": "Add Network ACL List",
+"label.add.network.acl": "Add Network ACL",
 "label.add.network.offering": "Add network offering",
 "label.add.new.gateway": "\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629",
 "label.add.new.tier": "\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629",
@@ -334,7 +334,7 @@
 "label.default.use": "Default Use",
 "label.default.view": "\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629",
 "label.delete": "Delete",
-"label.delete.acl.list": "Delete ACL List",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "Delete Affinity Group",
 "label.delete.alerts": "Delete alerts",
 "label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -419,7 +419,7 @@
 "label.dpd": "\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f",
 "label.driver": "Driver",
 "label.edit": "Edit",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.project.details": "\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "Remove VPC offering",
 "label.removing": "Removing",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
 "label.required": "Required",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "User",
-"label.userdata": "Userdata",
-"label.userdatal2": "User Data",
+"label.user.data": "User Data",
 "label.username": "Username",
 "label.users": "Users",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
 "message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
 "message.confirm.attach.disk": "Are you sure you want to attach disk?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
diff --git a/ui/public/locales/ca.json b/ui/public/locales/ca.json
index 30ed3161448..d3e417eb821 100644
--- a/ui/public/locales/ca.json
+++ b/ui/public/locales/ca.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Account-Specific",
 "label.accounts": "Accounts",
 "label.accounttype": "Account Type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Name",
+"label.acl.rule.name": "ACL Name",
 "label.acquire.new.ip": "Acquire New IP",
 "label.acquire.new.secondary.ip": "Acquire new secondary IP",
 "label.action": "Action",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Active Sessions",
 "label.add": "Add",
 "label.add.account": "Add Account",
+"label.add.acl.rule": "Add ACL rule",
 "label.add.acl": "Add ACL",
-"label.add.acl.list": "Add ACL List",
 "label.add.affinity.group": "Add new affinity group",
 "label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
 "label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Add IP Range",
 "label.add.isolated.network": "Add Isolated Network",
 "label.add.ldap.account": "Add LDAP account",
-"label.add.list.name": "ACL List Name",
+"label.add.acl.name": "ACL Name",
 "label.add.more": "Add More",
 "label.add.netscaler.device": "Add Netscaler device",
 "label.add.network": "Add Network",
 "label.add.network.acl": "Add network ACL",
-"label.add.network.acl.list": "Add Network ACL List",
+"label.add.network.acl": "Add Network ACL",
 "label.add.network.offering": "Add network offering",
 "label.add.new.gateway": "Add new gateway",
 "label.add.new.tier": "Add new tier",
@@ -334,7 +334,7 @@
 "label.default.use": "Default Use",
 "label.default.view": "Default View",
 "label.delete": "Delete",
-"label.delete.acl.list": "Delete ACL List",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "Delete Affinity Group",
 "label.delete.alerts": "Delete alerts",
 "label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -419,7 +419,7 @@
 "label.dpd": "Dead Peer Detection",
 "label.driver": "Driver",
 "label.edit": "Edit",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.project.details": "Editar detalls del projecte",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "Remove VPC offering",
 "label.removing": "Esborrant",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
 "label.required": "Required",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "Use HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "User",
-"label.userdata": "Userdata",
-"label.userdatal2": "User Data",
+"label.user.data": "User Data",
 "label.username": "Username",
 "label.users": "Users",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
 "message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
 "message.confirm.attach.disk": "Are you sure you want to attach disk?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
diff --git a/ui/public/locales/de_DE.json b/ui/public/locales/de_DE.json
index c20bf175826..fd29ac3eb54 100644
--- a/ui/public/locales/de_DE.json
+++ b/ui/public/locales/de_DE.json
@@ -26,12 +26,12 @@
 "label.account.specific": "Besonderheiten des Benutzerkontos",
 "label.accounts": "Benutzerkonten",
 "label.accounttype": "Benutzerkontotyp",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL-Kennung",
-"label.acl.list.rules": "ACL-Listenregeln",
+"label.acl.rules": "ACL-Listenregeln",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL-Name",
+"label.acl.rule.name": "ACL-Name",
 "label.acquire.new.ip": "Neue IP erwerben",
 "label.acquire.new.secondary.ip": "Neue sekundäre IP anfordern",
 "label.acquiring.ip": "IP anfordern",
@@ -144,8 +144,8 @@
 "label.activeviewersessions": "Aktive Sitzungen",
 "label.add": "Hinzufügen",
 "label.add.account": "Konto hinzufügen",
-"label.add.acl": "ACL hinzufügen",
-"label.add.acl.list": "ACL-Liste hinzufügen",
+"label.add.acl.rule": "ACL hinzufügen",
+"label.add.acl": "ACL-Liste hinzufügen",
 "label.add.affinity.group": "Neue Affinitätsgruppe hinzufügen",
 "label.add.baremetal.dhcp.device": "Baremetal DHCP-Gerät hinzufügen",
 "label.add.bigswitchbcf.device": "Füge BigSwitch BCF Controller hinzu",
@@ -169,12 +169,12 @@
 "label.add.isolated.network": "Isoliertes Netzwerk hinzufügen",
 "label.add.kubernetes.cluster": "Kubernetes Cluster hinzufügen",
 "label.add.ldap.account": "LDAP-Konto hinzufügen",
-"label.add.list.name": "ACL-Listename",
+"label.add.acl.name": "ACL-Listename",
 "label.add.more": "Mehr hinzufügen",
 "label.add.netscaler.device": "Netscaler-Gerät hinzufügen",
 "label.add.network": "Netzwerk hinzufügen",
 "label.add.network.acl": "Netzwerk-ACL hinzufügen",
-"label.add.network.acl.list": "Netzwerk-ACL-Liste hinzufügen",
+"label.add.network.acl": "Netzwerk-ACL-Liste hinzufügen",
 "label.add.network.offering": "Netzwerkangebot hinzufügen",
 "label.add.new.gateway": "Neues Gateway hinzufügen",
 "label.add.new.tier": "Neue Ebene hinzufügen",
@@ -417,7 +417,7 @@
 "label.default.view": "Standardansicht",
 "label.defaultnetwork": "Standard-Netzwerk",
 "label.delete": "Löschen",
-"label.delete.acl.list": "ACL-Liste ersetzen",
+"label.delete.acl": "ACL-Liste ersetzen",
 "label.delete.affinity.group": "Affinitätsgruppe entfernen",
 "label.delete.alerts": "Alarme löschen",
 "label.delete.backup": "Backup löschen",
@@ -525,7 +525,7 @@
 "label.driver": "Treiber",
 "label.dynamicscalingenabled": "Dynamische Skalierung aktiviert",
 "label.edit": "Bearbeiten",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "ACL-Regel bearbeiten",
 "label.edit.project.details": "Projektdetails bearbeiten",
 "label.edit.role": "Rolle bearbeiten",
@@ -948,7 +948,7 @@
 "label.netscaler.vpx": "NetScaler VPX LoadBalancer",
 "label.network": "Netzwerk",
 "label.network.acl": "Netzwerk-ACL",
-"label.network.acl.lists": "Netzwerk ACL Listen",
+"label.network.acls": "Netzwerk ACL Listen",
 "label.network.addvm": "Netzwerk zur VM hinzufügen",
 "label.network.desc": "Netzwerkbeschreibung",
 "label.network.domain": "Netzwerk-Domain",
@@ -1198,7 +1198,6 @@
 "label.remove.vpc.offering": "VPC-Angebot entfernen",
 "label.removing": "am Entfernen",
 "label.replace.acl": "ACL ersetzen",
-"label.replace.acl.list": "ACL-Liste ersetzen",
 "label.report.bug": "Fehler melden",
 "label.required": "Erforderlich",
 "label.requireshvm": "HVM",
@@ -1492,8 +1491,7 @@
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Benutzer",
 "label.user.conflict": "Konflikt",
-"label.userdata": "Benutzerdaten",
-"label.userdatal2": "Benutzerdaten",
+"label.user.data": "Benutzerdaten",
 "label.username": "Benutzername",
 "label.users": "Benutzer",
 "label.usersource": "Benutzertyp",
@@ -1733,7 +1731,7 @@
 "message.confirm.archive.selected.alerts": "Bitte bestätigen Sie, dass Sie die ausgewählten Alarme archivieren möchten",
 "message.confirm.archive.selected.events": "Bitte bestätigen Sie, dass Sie die ausgewählten Vorgänge archivieren möchten",
 "message.confirm.attach.disk": "Sind Sie sicher, dass Sie eine Platte hinzufügen möchten?",
-"message.confirm.delete.acl.list": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
+"message.confirm.delete.acl": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
 "message.confirm.delete.bigswitchbcf": "Bitte bestätigen Sie, dass Sie diesen BigSwitch BCF Controller löschen möchten",
 "message.confirm.delete.brocadevcs": "Bitte bestätigen Sie, dass Sie Brocade Vcs Switch löschen möchten",
 "message.confirm.delete.ciscoasa1000v": "Bitte bestätigen Sie, dass Sie CiscoASA1000v löschen möchten",
diff --git a/ui/public/locales/el_GR.json b/ui/public/locales/el_GR.json
index d26362907e4..41f42aa537d 100644
--- a/ui/public/locales/el_GR.json
+++ b/ui/public/locales/el_GR.json
@@ -33,10 +33,10 @@
 "label.access.kubernetes.nodes": "Πρόσβαση στους κόμβους Κυβερνητών",
 "label.acl.export": "Εξαγωγή Λίστας Πρόσβασης",
 "label.acl.id": "Αναγνωριστικό Λίστας Πρόσβασης",
-"label.acl.list.rules": "Κανόνες λίστας Πρόσωασης",
+"label.acl.rules": "Κανόνες λίστας Πρόσωασης",
 "label.acl.reason.description": "Εισαγάγετε αιτιολογία για τον κανόνα",
 "label.aclid": "Λίστα πρόσβασης",
-"label.aclname": "Όνομα Λίστας Πρόσβασης",
+"label.acl.rule.name": "Όνομα Λίστας Πρόσβασης",
 "label.acquire.new.ip": "Απόκτηση νέας διεύθυνση IP",
 "label.acquire.new.secondary.ip": "Απόκτηση νέας δευτερεύουσας διεύθυνσης IP",
 "label.acquiring.ip": "Απόδοση IP",
@@ -173,7 +173,7 @@
 "label.action.unmanage.virtualmachine": "Μη διαχείριση εικονικής μηχανής",
 "label.action.update.offering.access": "Ενημέρωση πρόσβασης για προσφορές",
 "label.action.update.resource.count": "Ενημέρωση πλήθους πόρων",
-"label.action.userdata.reset": "Επαναφορά δεδομένων χρήστη",
+"label.action.user.data.reset": "Επαναφορά δεδομένων χρήστη",
 "label.action.vmsnapshot.create": "Λήψη στιγμιότυπου εικονικής μηχανής",
 "label.action.vmsnapshot.delete": "Διαγραφή στιγμιότυπου εικονικής μηχανής",
 "label.action.vmsnapshot.revert": "Επαναφορά στο στιγμιότυπο εικονικής μηχανής",
@@ -183,8 +183,8 @@
 "label.activeviewersessions": "Ενεργές περίοδοι λειτουργίας",
 "label.add": "Προσθήκη",
 "label.add.account": "Προσθήκη λογαριασμού",
-"label.add.acl": "Προσθήκη εγγραφής στην λίστα πρόσβασης",
-"label.add.acl.list": "Προσθήκη λίστας πρόσβασης",
+"label.add.acl.rule": "Προσθήκη εγγραφής στην λίστα πρόσβασης",
+"label.add.acl": "Προσθήκη λίστας πρόσβασης",
 "label.add.affinity.group": "Προσθήκη νέας ομάδας συνάφειας",
 "label.add.baremetal.dhcp.device": "Προσθήκη συσκευής DHCP baremetal",
 "label.add.bigswitchbcf.device": "Προσθήκη ελεγκτή BCF BigSwitch",
@@ -209,12 +209,12 @@
 "label.add.isolated.network": "Προσθήκη απομονωμένου δικτύου",
 "label.add.kubernetes.cluster": "Προσθήκη ομάδας Κυβερνητών",
 "label.add.ldap.account": "Προσθήκη λογαριασμού LDAP",
-"label.add.list.name": "Όνομα λίστας Πρόσβασης",
+"label.add.acl.name": "Όνομα λίστας Πρόσβασης",
 "label.add.more": "Προσθήκη περισσότερων",
 "label.add.netscaler.device": "Προσθήκη συσκευής Netsccaler",
 "label.add.network": "Προσθήκη δικτύου",
 "label.add.network.acl": "Προσθήκη εγγραφής πρόσβασης δικτύου",
-"label.add.network.acl.list": "Προσθήκη λίστας πρόσβασης δικτύου",
+"label.add.network.acl": "Προσθήκη λίστας πρόσβασης δικτύου",
 "label.add.network.offering": "Προσθήκη προσφοράς υπηρεσίας δικτύου",
 "label.add.network.permission": "Προσθήκη δικαιωμάτων δικτύου",
 "label.add.new.gateway": "Προσθήκη νέας πύλης",
@@ -516,7 +516,7 @@
 "label.default.view": "Προεπιλεγμένη προβολή",
 "label.defaultnetwork": "Προεπιλεγμένο δίκτυο",
 "label.delete": "Διαγραφή",
-"label.delete.acl.list": "Διαγραφή λίστας πρόσβασης",
+"label.delete.acl": "Διαγραφή λίστας πρόσβασης",
 "label.delete.affinity.group": "Διαγραφή ομάδας συνάφειας",
 "label.delete.alerts": "Διαγραφή ειδοποιήσεων",
 "label.delete.backup": "Διαγραφή αντιγράφου ασφαλείας",
@@ -649,7 +649,7 @@
 "label.dynamicscalingenabled": "Δυναμική αναπροσαρμογή Ενεργοποίημένη",
 "label.dynamicscalingenabled.tooltip": "Η εικονική μηχανή μπορεί να αναπροσαρμόζεται δυναμικά μόνο αν το πρότυπο, η προσφερόμενη υπηρεσία και οι γενικές ρυθμίσεις έχουν την επιλογή δυναμικής αναπροσαρμογής ενεργοποιήμενη.",
 "label.edit": "Επεξεργασία",
-"label.edit.acl.list": "Επεξεργασία λίστας Πρόσβασης",
+"label.edit.acl": "Επεξεργασία λίστας Πρόσβασης",
 "label.edit.acl.rule": "Επεξεργασία κανόνα Λίστας Πρόσβασης",
 "label.edit.project.details": "Επεξεργασία λεπτομερειών έργου",
 "label.edit.project.role": "Επεξεργασία ρόλου έργου",
@@ -1142,7 +1142,7 @@
 "label.netscaler.vpx": "Εξισορρόπηση φόρτου VPX του NetScaler",
 "label.network": "Δίκτυο",
 "label.network.acl": "ACL δικτύου",
-"label.network.acl.lists": "Λίστες Λίστα Πρόσβασης δικτύου",
+"label.network.acls": "Λίστες Λίστα Πρόσβασης δικτύου",
 "label.network.addvm": "Προσθήκη δικτύου για την εικονική μηχανή",
 "label.network.addvm": "Προσθήκη δικτύου σε εικονική μηχανή",
 "label.network.desc": "Δίκτυο Desc",
@@ -1436,7 +1436,6 @@
 "label.remove.vpc.offering": "Κατάργηση προσφοράς υπηρεσίας Εικον. Ιδιωτ. Νέφους",
 "label.removing": "Αφαίρεση",
 "label.replace.acl": "Αντικατάσταση λίστας Πρόσβασης",
-"label.replace.acl.list": "Αντικατάσταση λίστας Πρόσβασης",
 "label.report.bug": "Θέμα αναφοράς",
 "label.required": "Απαιτείται",
 "label.requireshvm": "HVM",
@@ -1455,7 +1454,7 @@
 "label.reset.config.value": "Επαναφορά στις τιμές προεπιλογής",
 "label.reset.ssh.key.pair": "Επαναφορά ζεύγους κλειδιών SSH",
 "label.reset.to.default": "Επαναφορά στην τιμή προεπιλογής",
-"label.reset.userdata.on.vm": "Επαναφορά δεδομένων χρήστη της εικονικής μηχανής",
+"label.reset.user.data.on.vm": "Επαναφορά δεδομένων χρήστη της εικονικής μηχανής",
 "label.reset.vpn.connection": "Επαναφορά σύνδεσης Εικον. Ιδιωτ. Δικτύου",
 "label.resource": "Πόρος",
 "label.resource.limit.exceeded": "Υπέρβαση ορίου πόρων",
@@ -1811,19 +1810,17 @@
 "label.usenewdiskoffering": "Αντικατάσταση προσφοράς υπηρεσίας δίσκου;",
 "label.user": "Χρήστη",
 "label.user.conflict": "Σύγκρουση",
-"label.user.data": "Δεδομένα χρηστών",
-"label.userdata": "Δεδομένα χρήστη",
-"label.userdata.do.append": "Πρόσθεση δεδομένων χρήστη",
-"label.userdata.do.override": "Παράκαμψη δεδομένων χρήστη",
-"label.userdata.registered": "Εγγεγραμένα δεδομένα χρήστη",
-"label.userdata.text": "Κείμενο δεδομένων χρήστη",
-"label.userdatadetails": "Λεπτομέρειες δεδομένων χρήστη",
-"label.userdataid": "Αναγνωριστικό δεδομένων χρήστη",
-"label.userdatal2": "Δεδομένα χρήστη",
-"label.userdataname": "Όνομα δεδομένων χρήστη",
-"label.userdataparams": "Παράμετροι δεδομένων χρήστη",
-"label.userdatapolicy": "Συνδεμένες πολιτικές δεδομένων χρήστη",
-"label.userdatapolicy.tooltip": "Τα δεδομένα χρήστη που έχουν συνδεθεί στο πρότυπο μπορούν να παρακαμφθούν απο τα δεδομένα χρηστών που ορίστηκαν κατα την δημιουργία της vm. Διαλέξτε την πολιτική παράκαμψης ανάλογα με τις απαιτήσεις.",
+"label.user.data": "Δεδομένα χρήστη",
+"label.user.data.do.append": "Πρόσθεση δεδομένων χρήστη",
+"label.user.data.do.override": "Παράκαμψη δεδομένων χρήστη",
+"label.user.data.registered": "Εγγεγραμένα δεδομένα χρήστη",
+"label.user.data.text": "Κείμενο δεδομένων χρήστη",
+"label.user.data.details": "Λεπτομέρειες δεδομένων χρήστη",
+"label.user.data.id": "Αναγνωριστικό δεδομένων χρήστη",
+"label.user.data.name": "Όνομα δεδομένων χρήστη",
+"label.user.data.params": "Παράμετροι δεδομένων χρήστη",
+"label.user.data.policy": "Συνδεμένες πολιτικές δεδομένων χρήστη",
+"label.user.data.policy.tooltip": "Τα δεδομένα χρήστη που έχουν συνδεθεί στο πρότυπο μπορούν να παρακαμφθούν απο τα δεδομένα χρηστών που ορίστηκαν κατα την δημιουργία της vm. Διαλέξτε την πολιτική παράκαμψης ανάλογα με τις απαιτήσεις.",
 "label.username": "Όνομα χρήστη",
 "label.users": "Χρήστες",
 "label.usersource": "Τύπος χρήστη",
@@ -2116,7 +2113,7 @@
 "message.confirm.attach.disk": "Είστε βέβαιοι ότι θέλετε να επισυνάψετε το δίσκο;",
 "message.confirm.change.offering.for.volume": "Παρακαλώ επιβεβαιώστε ότι επιθυμείτε την αλλαγή της προσφοράς δίσκου για αυτόν τον τόμο",
 "message.confirm.configure.ovs": "Είστε βέβαιοι ότι θέλετε να ρυθμίσετε τις παραμέτρους του Ovs;",
-"message.confirm.delete.acl.list": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη λίστα Λίστα Πρόσβασης;",
+"message.confirm.delete.acl": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη λίστα Λίστα Πρόσβασης;",
 "message.confirm.delete.bigswitchbcf": "Επιβεβαιώστε ότι θέλετε να διαγράψετε αυτόν τον ελεγκτή BigSwitch BCF",
 "message.confirm.delete.brocadevcs": "Επιβεβαιώστε ότι θέλετε να διαγράψετε το εναλλάκτη Brocade Vcs",
 "message.confirm.delete.ciscoasa1000v": "Παρακαλώ επιβεβαιώστε ότι θέλετε να διαγράψετε CiscoASA1000v",
@@ -2350,7 +2347,7 @@
 "message.error.upload.template": "Η αποστολή του προτύπου απέτυχε",
 "message.error.upload.template.description": "Μόνο ένα πρότυπο μπορεί να αποσταλεί κάθε φορά",
 "message.error.url": "Πληκτρολογήστε διεύθυνση URL",
-"message.error.userdata": "Εισάγωγή δεδομένων χρηστών",
+"message.error.user.data": "Εισάγωγή δεδομένων χρηστών",
 "message.error.username": "Εισάγετε το όνομα χρήστη σας",
 "message.error.valid.iops.range": "Εισαγεται ένα σωστό εύρος εργασίων εισαγ./εξαγ ανα δευτ.",
 "message.error.vcenter.datacenter": "Πληκτρολογήστε vCenter Datacenter",
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index cb19eb4bdc4..c36b96cc961 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -1,23 +1,23 @@
 {
 "message.delete.account.not.disabled": "Please disable the account before attempting to delete it.",
-"alert.service.domainrouter": "Domain router",
+"alert.service.domainrouter": "Domain Router",
 "error.dedicate.bgp.peer.failed":"Failed to dedicate BGP peer",
-"error.dedicate.cluster.failed": "Failed to dedicate cluster.",
-"error.dedicate.host.failed": "Failed to dedicate host.",
+"error.dedicate.cluster.failed": "Failed to dedicate Cluster.",
+"error.dedicate.host.failed": "Failed to dedicate Host.",
 "error.dedicate.ipv4.subnet.failed": "Failed to dedicate IPv4 subnet.",
-"error.dedicate.pod.failed": "Failed to dedicate pod.",
-"error.dedicate.zone.failed": "Failed to dedicate zone.",
+"error.dedicate.pod.failed": "Failed to dedicate Pod.",
+"error.dedicate.zone.failed": "Failed to dedicate Zone.",
 "error.empty.counter.operator.threshold": "Either Counter, Operator or Threshold is empty",
 "error.execute.api.failed": "Failed to execute API.",
 "error.fetching.async.job.result": "Error encountered while fetching async job result.",
 "error.form.message": "There are errors in the form. Please fix them.",
 "error.password.not.match": "The password fields do not match",
 "error.release.dedicate.bgp.peer": "Failed to release dedicated BGP peer.",
-"error.release.dedicate.cluster": "Failed to release dedicated cluster.",
+"error.release.dedicate.cluster": "Failed to release dedicated Cluster.",
 "error.release.dedicate.host": "Failed to release dedicated host.",
 "error.release.dedicate.ipv4.subnet": "Failed to release dedicated IPv4 subnet.",
-"error.release.dedicate.pod": "Failed to release dedicated pod.",
-"error.release.dedicate.zone": "Failed to release dedicated zone.",
+"error.release.dedicate.pod": "Failed to release dedicated Pod.",
+"error.release.dedicate.zone": "Failed to release dedicated Zone.",
 "error.unable.to.add.setting.extraconfig": "It is not allowed to add setting for extraconfig. Please update VirtualMachine with extraconfig parameter.",
 "error.unable.to.proceed": "Unable to proceed. Please contact your administrator.",
 "firewall.close": "Firewall",
@@ -30,9 +30,9 @@
 "label.accept.project.invitation": "Accept project invitation",
 "label.access": "Access",
 "label.access.kubernetes.nodes": "Access Kubernetes nodes",
-"label.accesskey": "Access key",
-"label.access.key": "Access key",
-"label.secret.key": "Secret key",
+"label.accesskey": "Access Key",
+"label.access.key": "Access Key",
+"label.secret.key": "Secret Key",
 "label.apikeyaccess": "Api Key Access",
 "label.account": "Account",
 "label.account.and.security.group": "Account - security group",
@@ -42,18 +42,18 @@
 "label.accounts": "Accounts",
 "label.accountstate": "Account state",
 "label.accounttype": "Account type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL list rules",
+"label.acl.rules": "ACL rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL name",
+"label.acl.rule.name": "ACL rule name",
 "label.acquire.new.ip": "Acquire new IP",
 "label.acquire.new.secondary.ip": "Acquire new secondary IP",
 "label.acquiring.ip": "Acquiring IP",
 "label.associated.resource": "Associated resource",
 "label.action": "Action",
-"label.action.attach.disk": "Attach disk",
+"label.action.attach.disk": "Attach Disk",
 "label.action.attach.iso": "Attach ISO",
 "label.action.attach.to.instance": "Attach to Instance",
 "label.action.bulk.delete.egress.firewall.rules": "Bulk delete egress firewall rules",
@@ -63,92 +63,92 @@
 "label.action.bulk.delete.load.balancer.rules": "Bulk delete load balancer rules",
 "label.action.bulk.delete.portforward.rules": "Bulk delete port forward rules",
 "label.action.bulk.delete.routing.firewall.rules": "Bulk remove IPv4 Routing firewall rules",
-"label.action.bulk.delete.snapshots": "Bulk delete snapshots",
+"label.action.bulk.delete.snapshots": "Bulk delete Snapshots",
 "label.action.bulk.delete.templates": "Bulk delete Templates",
 "label.action.bulk.release.public.ip.address": "Bulk release public IP addresses",
 "label.action.cancel.maintenance.mode": "Cancel maintenance mode",
 "label.action.change.password": "Change password",
 "label.action.clear.webhook.deliveries": "Clear deliveries",
 "label.action.delete.webhook.deliveries": "Delete deliveries",
-"label.action.change.primary.storage.scope": "Change primary storage scope",
+"label.action.change.primary.storage.scope": "Change Primary Storage scope",
 "label.action.configure.stickiness": "Stickiness",
 "label.action.copy.iso": "Copy ISO",
 "label.action.copy.snapshot": "Copy Snapshot",
 "label.action.copy.template": "Copy Template",
 "label.action.create.snapshot.from.vmsnapshot": "Create Snapshot from Instance Snapshot",
 "label.action.create.template.from.volume": "Create Template from volume",
-"label.action.create.volume": "Create volume",
+"label.action.create.volume": "Create Volume",
 "label.action.create.volume.add": "Create and Add Volume",
 "label.action.delete.account": "Delete Account",
 "label.action.delete.backup.offering": "Delete backup offering",
-"label.action.delete.cluster": "Delete cluster",
-"label.action.delete.domain": "Delete domain",
-"label.action.delete.egress.firewall": "Delete egress firewall rule",
-"label.action.delete.firewall": "Delete firewall rule",
+"label.action.delete.cluster": "Delete Cluster",
+"label.action.delete.domain": "Delete Domain",
+"label.action.delete.egress.firewall": "Delete Egress Firewall Rule",
+"label.action.delete.firewall": "Delete Firewall Rule",
 "label.action.delete.interface.static.route": "Remove Tungsten Fabric interface static route",
-"label.action.delete.guest.os": "Delete guest os",
-"label.action.delete.guest.os.hypervisor.mapping": "Delete guest os hypervisor mapping",
+"label.action.delete.guest.os": "Delete guest OS",
+"label.action.delete.guest.os.hypervisor.mapping": "Delete guest OS hypervisor mapping",
 "label.action.delete.ip.range": "Delete IP range",
 "label.action.delete.iso": "Delete ISO",
-"label.action.delete.load.balancer": "Delete load balancer rule",
+"label.action.delete.load.balancer": "Delete Load Balancer Rule",
 "label.action.delete.network": "Delete Network",
 "label.action.delete.network.static.route": "Remove Tungsten Fabric Network static route",
 "label.action.delete.network.permission": "Delete Network permission",
-"label.action.delete.node": "Delete node",
+"label.action.delete.node": "Delete Node",
 "label.action.delete.oauth.provider": "Delete OAuth provider",
 "label.action.delete.physical.network": "Delete physical Network",
 "label.action.delete.pod": "Delete Pod",
-"label.action.delete.primary.storage": "Delete primary storage",
+"label.action.delete.primary.storage": "Delete Primary Storage",
 "label.action.delete.routing.firewall.rule": "Delete IPv4 Routing firewall rule",
-"label.action.delete.secondary.storage": "Delete secondary storage",
-"label.action.delete.security.group": "Delete security group",
+"label.action.delete.secondary.storage": "Delete Secondary Storage",
+"label.action.delete.security.group": "Delete Security Group",
 "label.action.delete.snapshot": "Delete Snapshot",
 "label.action.delete.template": "Delete Template",
 "label.action.delete.tungsten.router.table": "Remove Tungsten Fabric route table from Network",
 "label.action.delete.user": "Delete User",
-"label.action.delete.volume": "Delete volume",
-"label.action.delete.zone": "Delete zone",
+"label.action.delete.volume": "Delete Volume",
+"label.action.delete.zone": "Delete Zone",
 "label.action.destroy.instance": "Destroy Instance",
-"label.action.destroy.systemvm": "Destroy system VM",
-"label.action.destroy.volume": "Destroy volume",
-"label.action.detach.disk": "Detach disk",
+"label.action.destroy.systemvm": "Destroy System VM",
+"label.action.destroy.volume": "Destroy Volume",
+"label.action.detach.disk": "Detach Disk",
 "label.action.detach.iso": "Detach ISO",
 "label.action.disable.account": "Disable Account",
-"label.action.disable.cluster": "Disable cluster",
-"label.action.disable.disk.offering": "Disable disk offering",
+"label.action.disable.cluster": "Disable Cluster",
+"label.action.disable.disk.offering": "Disable Disk Offering",
 "label.action.disable.physical.network": "Disable physical Network",
-"label.action.disable.pod": "Disable pod",
+"label.action.disable.pod": "Disable Pod",
 "label.action.disable.role": "Disable Role",
 "label.action.disable.static.nat": "Disable static NAT",
-"label.action.disable.service.offering": "Disable service offering",
-"label.action.disable.system.service.offering": "Disable system service offering",
+"label.action.disable.service.offering": "Disable Service Offering",
+"label.action.disable.system.service.offering": "Disable System Service Offering",
 "label.action.disable.user": "Disable User",
-"label.action.disable.zone": "Disable zone",
+"label.action.disable.zone": "Disable Zone",
 "label.action.download.iso": "Download ISO",
 "label.action.download.snapshot": "Download Snapshot",
 "label.action.download.template": "Download Template",
-"label.action.download.volume": "Download volume",
+"label.action.download.volume": "Download Volume",
 "label.action.edit.account": "Edit Account",
-"label.action.edit.domain": "Edit domain",
+"label.action.edit.domain": "Edit Domain",
 "label.action.edit.instance": "Edit Instance",
 "label.action.edit.iso": "Edit ISO",
 "label.action.edit.nfs.options": "Edit NFS mount options",
 "label.action.edit.template": "Edit Template",
-"label.action.edit.zone": "Edit zone",
+"label.action.edit.zone": "Edit Zone",
 "label.action.enable.two.factor.authentication": "Enabled Two factor authentication",
 "label.action.verify.two.factor.authentication": "Verified Two factor authentication",
 "label.action.enable.account": "Enable Account",
-"label.action.enable.cluster": "Enable cluster",
+"label.action.enable.cluster": "Enable Cluster",
 "label.action.enable.disk.offering": "Enable disk offering",
 "label.action.enable.maintenance.mode": "Enable maintenance mode",
 "label.action.enable.physical.network": "Enable physical Network",
-"label.action.enable.pod": "Enable pod",
+"label.action.enable.pod": "Enable Pod",
 "label.action.enable.role": "Enable Role",
-"label.action.enable.service.offering": "Enable service offering",
-"label.action.enable.system.service.offering": "Enable system service offering",
+"label.action.enable.service.offering": "Enable Service Offering",
+"label.action.enable.system.service.offering": "Enable System Service Offering",
 "label.action.enable.static.nat": "Enable static NAT",
 "label.action.enable.user": "Enable User",
-"label.action.enable.zone": "Enable zone",
+"label.action.enable.zone": "Enable Zone",
 "label.action.expunge.instance": "Expunge Instance",
 "label.action.force.reconnect": "Force reconnect",
 "label.action.generate.keys": "Generate keys",
@@ -164,22 +164,22 @@
 "label.action.iso.share": "Update ISO sharing",
 "label.action.lock.account": "Lock Account",
 "label.action.lock.user": "Lock User",
-"label.action.manage.cluster": "Manage cluster",
-"label.action.migrate.router": "Migrate router",
+"label.action.manage.cluster": "Manage Cluster",
+"label.action.migrate.router": "Migrate Router",
 "label.action.migrate.systemvm": "Migrate System VM",
-"label.action.migrate.systemvm.to.ps": "Migrate System VM to another primary storage",
-"label.action.patch.systemvm": "Patch system VM",
+"label.action.migrate.systemvm.to.ps": "Migrate System VM to another Primary Storage",
+"label.action.patch.systemvm": "Patch System VM",
 "label.action.patch.systemvm.vpc": "Patch System VM - VPC Router",
 "label.action.patch.systemvm.processing": "Patching System VM....",
-"label.action.project.add.account": "Add Account to project",
-"label.action.project.add.user": "Add User to project",
+"label.action.project.add.account": "Add Account to Project",
+"label.action.project.add.user": "Add User to Project",
 "label.action.quota.tariff.create": "Create Quota Tariff",
 "label.action.quota.tariff.edit": "Edit Quota Tariff",
 "label.action.quota.tariff.remove": "Remove Quota Tariff",
 "label.action.reboot.instance": "Reboot Instance",
-"label.action.reboot.router": "Reboot router",
+"label.action.reboot.router": "Reboot Router",
 "label.action.reboot.systemvm": "Reboot System VM",
-"label.action.recover.volume": "Recover volume",
+"label.action.recover.volume": "Recover Volume",
 "label.action.resize.sharedfs": "Resize Shared FileSystem",
 "label.action.restart.sharedfs": "Restart Shared FileSystem",
 "label.action.recurring.snapshot": "Recurring Snapshots",
@@ -189,7 +189,7 @@
 "label.action.release.asnumber": "Release AS Number",
 "label.action.release.ip": "Release IP",
 "label.action.release.reserved.ip": "Release reserved IP",
-"label.action.remove.host": "Remove host",
+"label.action.remove.host": "Remove Host",
 "label.action.remove.logical.router": "Remove Logical Router",
 "label.action.remove.network.policy": "Remove Network Policy",
 "label.action.remove.router.table.from.interface": "Remove Tungsten Fabric route table from interface",
@@ -198,36 +198,36 @@
 "label.action.reserve.ip": "Reserve Public IP",
 "label.action.reset.network.permissions": "Reset Network permissions",
 "label.action.reset.password": "Reset password",
-"label.action.resize.volume": "Resize volume",
+"label.action.resize.volume": "Resize Volume",
 "label.action.revert.snapshot": "Revert to Snapshot",
 "label.action.router.health.checks": "Get health checks result",
-"label.action.run.diagnostics": "Run diagnostics",
+"label.action.run.diagnostics": "Run Diagnostics",
 "label.action.secure.host": "Provision host security keys",
 "label.action.set.as.source.nat.ip": "make source NAT",
 "label.action.setup.2FA.user.auth": "Setup User Two Factor Authentication",
 "label.action.start.sharedfs": "Start Shared FileSystem",
 "label.action.start.instance": "Start Instance",
-"label.action.start.router": "Start router",
-"label.action.start.systemvm": "Start system VM",
+"label.action.start.router": "Start Router",
+"label.action.start.systemvm": "Start System VM",
 "label.action.stop.sharedfs": "Stop Shared FileSystem",
 "label.action.stop.instance": "Stop Instance",
-"label.action.stop.router": "Stop router",
-"label.action.stop.systemvm": "Stop system VM",
+"label.action.stop.router": "Stop Router",
+"label.action.stop.systemvm": "Stop System VM",
 "label.action.take.snapshot": "Take Snapshot",
 "label.action.template.permission": "Update Template permissions",
 "label.action.template.share": "Update Template sharing",
-"label.action.unmanage.cluster": "Unmanage cluster",
+"label.action.unmanage.cluster": "Unmanage Cluster",
 "label.action.unmanage.instance": "Unmanage Instance",
 "label.action.unmanage.instances": "Unmanage Instances",
 "label.action.unmanage.virtualmachine": "Unmanage Instance",
 "label.action.unmanage.volume": "Unmanage Volume",
 "label.action.unmanage.volumes": "Unmanage Volumes",
-"label.action.update.host": "Update host",
+"label.action.update.host": "Update Host",
 "label.action.update.security.groups": "Update security groups",
 "label.action.update.offering.access": "Update offering access",
 "label.action.update.resource.count": "Update resource count",
 "label.action.value": "Action/Value",
-"label.action.userdata.reset": "Reset Userdata",
+"label.action.user.data.reset": "Reset User Data",
 "label.action.vmsnapshot.create": "Take Instance Snapshot",
 "label.action.vmsnapshot.delete": "Delete Instance Snapshot",
 "label.action.vmsnapshot.revert": "Revert to Instance Snapshot",
@@ -238,73 +238,72 @@
 "label.activeviewersessions": "Active sessions",
 "label.add": "Add",
 "label.add.account": "Add Account",
+"label.add.acl.rule": "Add ACL rule",
 "label.add.acl": "Add ACL",
-"label.add.acl.list": "Add ACL list",
-"label.add.affinity.group": "Add new affinity group",
+"label.add.affinity.group": "Add new Affinity Group",
 "label.add.baremetal.dhcp.device": "Add bare metal DHCP device",
-"label.add.bgp.peer": "Add BGP peer",
-"label.add.bigswitchbcf.device": "Add BigSwitch BCF controller",
+"label.add.bgp.peer": "Add BGP Peer",
+"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
 "label.add.brocadevcs.device": "Add Brocade Vcs Switch",
 "label.add.by": "Add by",
 "label.add.certificate": "Add certificate",
 "label.add.ciscoasa1000v": "Add CiscoASA1000v resource",
-"label.add.cluster": "Add cluster",
-"label.add.compute.offering": "Add compute offering",
+"label.add.cluster": "Add Cluster",
+"label.add.compute.offering": "Add Compute Offering",
 "label.add.condition": "Add condition",
-"label.add.disk.offering": "Add disk offering",
-"label.add.domain": "Add domain",
-"label.add.egress.rule": "Add egress rule",
+"label.add.disk.offering": "Add Disk Offering",
+"label.add.domain": "Add Domain",
+"label.add.egress.rule": "Add Egress Rule",
 "label.add.f5.device": "Add F5 device",
-"label.add.firewall": "Add firewall rule",
+"label.add.firewall": "Add Firewall Rule",
 "label.add.firewallrule": "Add Firewall Rule",
-"label.add.guest.network": "Add guest Network",
-"label.add.guest.os": "Add guest os",
+"label.add.guest.network": "Add Guest Network",
+"label.add.guest.os": "Add Guest OS",
 "label.add.guest.os.hypervisor.mapping": "Add guest os hypervisor mapping",
-"label.add.host": "Add host",
-"label.add.ingress.rule": "Add ingress rule",
+"label.add.host": "Add Host",
+"label.add.ingress.rule": "Add Ingress Rule",
 "label.add.intermediate.certificate": "Add intermediate certificate",
 "label.add.internal.lb": "Add internal LB",
-"label.add.ip.range": "Add IP range",
-"label.add.ipv4.subnet": "Add IPv4 subnet for Routed networks",
+"label.add.ip.range": "Add IP Range",
+"label.add.ipv4.subnet": "Add IPv4 Subnet for Routed Networks",
 "label.add.ip.v6.prefix": "Add IPv6 prefix",
-"label.add.isolated.network": "Add isolated Network",
-"label.add.kubernetes.cluster": "Add Kubernetes cluster",
+"label.add.isolated.network": "Add Isolated Network",
+"label.add.kubernetes.cluster": "Add Kubernetes Cluster",
+"label.add.acl.name": "ACL name",
 "label.add.ldap.account": "Add LDAP Account",
-"label.add.list.name": "ACL List name",
 "label.add.logical.router": "Add Logical Router to this Network",
 "label.add.more": "Add more",
-"label.add.netscaler.device": "Add Netscaler device",
+"label.add.netscaler.device": "Add Netscaler Device",
 "label.add.network": "Add Network",
 "label.add.network.acl": "Add Network ACL",
-"label.add.network.acl.list": "Add Network ACL list",
-"label.add.network.offering": "Add Network offering",
+"label.add.network.offering": "Add Network Offering",
 "label.add.network.permission": "Add Network permission",
-"label.add.new.gateway": "Add new gateway",
+"label.add.new.gateway": "Add new Gateway",
 "label.add.new.tier": "Add new Network Tier",
 "label.add.niciranvp.device": "Add Nvp controller",
 "label.add.note": "Add comment",
 "label.add.opendaylight.device": "Add OpenDaylight controller",
 "label.add.pa.device": "Add Palo Alto device",
 "label.add.param": "Add param",
-"label.add.physical.network": "Add physical Network",
-"label.add.pod": "Add pod",
+"label.add.physical.network": "Add Physical Network",
+"label.add.pod": "Add Pod",
 "label.add.prefix": "Add prefix",
 "label.add.policy": "Add policy",
-"label.add.primary.storage": "Add primary storage",
-"label.add.private.gateway": "Add private gateway",
-"label.add.resources": "Add resources",
-"label.add.role": "Add role",
-"label.add.route": "Add route",
-"label.add.router.table.to.instance": "Add router table to this Instance",
-"label.add.routing.policy": "Add routing policy",
-"label.add.rule": "Add rule",
-"label.add.secondary.ip": "Add secondary IP",
-"label.add.secondary.storage": "Add secondary storage",
-"label.add.security.group": "Add security group",
+"label.add.primary.storage": "Add Primary Storage",
+"label.add.private.gateway": "Add Private Gateway",
+"label.add.resources": "Add Resources",
+"label.add.role": "Add Role",
+"label.add.route": "Add Route",
+"label.add.router.table.to.instance": "Add Router Table to this Instance",
+"label.add.routing.policy": "Add Routing Policy",
+"label.add.rule": "Add Rule",
+"label.add.secondary.ip": "Add Secondary IP",
+"label.add.secondary.storage": "Add Secondary Storage",
+"label.add.security.group": "Add Security Group",
 "label.add.setting": "Add setting",
-"label.add.srx.device": "Add SRX device",
-"label.add.static.route": "Add static route",
-"label.add.system.service.offering": "Add system service offering",
+"label.add.srx.device": "Add SRX Device",
+"label.add.static.route": "Add Static Route",
+"label.add.system.service.offering": "Add System Service Offering",
 "label.add.term.then": "Add term",
 "label.add.traffic": "Add traffic",
 "label.add.traffic.type": "Add traffic type",
@@ -328,24 +327,24 @@
 "label.add.upstream.ipv6.routes": "Add upstream IPv6 routes",
 "label.add.vm": "Add Instance",
 "label.add.vms": "Add Instances",
-"label.add.vmware.datacenter": "Add VMware datacenter",
-"label.add.vnmc.device": "Add VNMC device",
+"label.add.vmware.datacenter": "Add VMware Datacenter",
+"label.add.vnmc.device": "Add VNMC Device",
 "label.add.vpc": "Add VPC",
-"label.add.vpc.offering": "Add VPC offering",
-"label.add.vpn.customer.gateway": "Add VPN customer gateway",
-"label.add.vpn.gateway": "Add VPN gateway",
+"label.add.vpc.offering": "Add VPC Offering",
+"label.add.vpn.customer.gateway": "Add VPN Customer Gateway",
+"label.add.vpn.gateway": "Add VPN Gateway",
 "label.add.vpn.user": "Add VPN User",
-"label.add.zone": "Add zone",
+"label.add.zone": "Add Zone",
 "label.adding": "Adding",
 "label.adding.user": "Adding User...",
 "label.address": "Address",
 "label.address.group": "Address group",
-"label.admin": "Domain admin",
+"label.admin": "Domain Admin",
 "label.advanced": "Advanced",
 "label.advanced.mode": "Advanced mode",
 "label.affinity": "Affinity",
-"label.affinity.groups": "Affinity groups",
-"label.affinitygroup": "Affinity group",
+"label.affinity.groups": "Affinity Groups",
+"label.affinitygroup": "Affinity Group",
 "label.agentcount": "Number Of connected agents",
 "label.agent.password": "Agent password",
 "label.agent.username": "Agent username",
@@ -359,7 +358,7 @@
 "label.all": "All",
 "label.all.available.data": "All available data",
 "label.all.ipv6": "All IPv6",
-"label.all.zone": "All zones",
+"label.all.zone": "All Zones",
 "label.allocated": "Allocated",
 "label.allocatedonly": "Allocated",
 "label.allocationstate": "Allocation state",
@@ -428,13 +427,13 @@
 "label.backup.configure.schedule": "Configure Backup Schedule",
 "label.backup.offering.assign": "Assign Instance to backup offering",
 "label.backup.offering.remove": "Remove Instance from backup offering",
-"label.backup.offerings": "Backup offerings",
+"label.backup.offerings": "Backup Offerings",
 "label.backup.repository": "Backup Repository",
 "label.backup.restore": "Restore Instance backup",
-"label.backupofferingid": "Backup offering",
-"label.backupofferingname": "Backup offering",
-"label.backup.repository.add": "Add backup repository",
-"label.backup.repository.remove": "Remove backup repository",
+"label.backupofferingid": "Backup Offering",
+"label.backupofferingname": "Backup Offering",
+"label.backup.repository.add": "Add Backup Repository",
+"label.backup.repository.remove": "Remove Backup Repository",
 "label.balance": "Balance",
 "label.bandwidth": "Bandwidth",
 "label.baremetal.dhcp.devices": "Bare metal DHCP devices",
@@ -464,12 +463,12 @@
 "label.browser": "Browser",
 "label.bucket": "Bucket",
 "label.by.account": "By Account",
-"label.by.domain": "By domain",
+"label.by.domain": "By Domain",
 "label.by.level": "By level",
-"label.by.pod": "By pod",
+"label.by.pod": "By Pod",
 "label.by.state": "By state",
 "label.by.type": "By type",
-"label.by.zone": "By zone",
+"label.by.zone": "By Zone",
 "label.bypassvlanoverlapcheck": "Bypass VLAN id/range overlap",
 "label.cachemode": "Write-cache type",
 "label.cancel": "Cancel",
@@ -536,8 +535,8 @@
 "label.community": "Community",
 "label.complete": "Complete",
 "label.compute": "Compute",
-"label.compute.offerings": "Compute offerings",
-"label.compute.offering.for.sharedfs.instance": "Compute offering for Instance",
+"label.compute.offerings": "Compute Offerings",
+"label.compute.offering.for.sharedfs.instance": "Compute Offering for Instance",
 "label.computeonly.offering": "Compute only disk offering",
 "label.computeonly.offering.tooltip": "Option to specify root disk related information in the compute offering or to directly link a disk offering to the compute offering",
 "label.conditions": "Conditions",
@@ -555,7 +554,7 @@
 "label.confirm.delete.loadbalancer.rules": "Please confirm you wish to delete the selected load balancing rules.",
 "label.confirm.delete.portforward.rules": "Please confirm you wish to delete the selected port-forward rules.",
 "label.confirm.delete.routing.firewall.rules": "Please confirm you wish to delete the selected IPv4 Routing firewall rules",
-"label.confirm.delete.snapshot.zones": "Please confirm you wish to delete the Snapshot in the selected zones.",
+"label.confirm.delete.snapshot.zones": "Please confirm you wish to delete the Snapshot in the selected Zones.",
 "label.confirm.delete.templates": "Please confirm you wish to delete the selected Templates.",
 "label.confirm.delete.tungsten.address.group": "Please confirm that you would like to delete this Address Group",
 "label.confirm.delete.tungsten.firewall.policy": "Please confirm that you would like to delete this Firewall Policy",
@@ -590,11 +589,11 @@
 "label.copyid": "Copy ID",
 "label.copy.password": "Copy password",
 "label.core": "Core",
-"label.core.zone.type": "Core zone type",
+"label.core.zone.type": "Core Zone type",
 "label.counter": "Counter",
 "label.counter.name": "Name of the counter for which the policy will be evaluated",
 "label.cpu": "CPU",
-"label.cpu.sockets": "CPU sockets",
+"label.cpu.sockets": "CPU Sockets",
 "label.cpu.usage.info": "CPU usage information",
 "label.cpuallocated": "CPU allocated for Instances",
 "label.cpuallocatedghz": "CPU allocated",
@@ -609,19 +608,19 @@
 "label.cpuused": "CPU utilized",
 "label.cpuusedghz": "CPU used",
 "label.create": "Create",
-"label.create.instance": "Create cloud server",
+"label.create.instance": "Create Cloud Server",
 "label.create.account": "Create Account",
 "label.create.asnrange": "Create AS Range",
-"label.create.backup": "Start backup",
+"label.create.backup": "Start Backup",
 "label.create.sharedfs": "Create Shared FileSystem",
 "label.create.network": "Create new Network",
 "label.create.nfs.secondary.staging.storage": "Create NFS secondary staging storage",
-"label.create.project": "Create project",
-"label.create.project.role": "Create project role",
+"label.create.project": "Create Project",
+"label.create.project.role": "Create Project Role",
 "label.create.routing.policy": "Create Routing Policy",
 "label.create.site.vpn.connection": "Create site-to-site VPN connection",
 "label.create.site.vpn.gateway": "Create site-to-site VPN gateway",
-"label.create.snapshot.for.volume": "Created Snapshot for volume",
+"label.create.snapshot.for.volume": "Created Snapshot for Volume",
 "label.create.ssh.key.pair": "Create a SSH Key Pair",
 "label.create.template": "Create Template",
 "label.create.tier.aclid.description": "The ACL associated with the Network Tier.",
@@ -642,7 +641,7 @@
 "label.credit": "Credit",
 "label.cron": "Cron expression",
 "label.cron.mode": "Cron mode",
-"label.crosszones": "Cross zones",
+"label.crosszones": "Cross Zones",
 "label.currency": "Currency",
 "label.current": "Current",
 "label.current.storage": "Current storage",
@@ -654,8 +653,8 @@
 "label.daily": "Daily",
 "label.dark.mode": "Dark mode",
 "label.dashboard": "Dashboard",
-"label.data.disk": "Data disk",
-"label.data.disk.offering": "Data disk offering",
+"label.data.disk": "Data Disk",
+"label.data.disk.offering": "Data Disk Offering",
 "label.date": "Date",
 "label.datetime.filter.period": "From <b>{startDate}</b> to <b>{endDate}</b>",
 "label.datetime.filter.starting": "Starting <b>{startDate}</b>.",
@@ -664,19 +663,19 @@
 "label.days": "Days",
 "label.day.of.month": "Day of month",
 "label.day.of.week": "Day of week",
-"label.db.usage.metrics": "DB/Usage server",
+"label.db.usage.metrics": "DB/Usage Server",
 "label.dbislocal": "The db runs locally",
 "label.dc.name": "DC name",
 "label.declare.host.as.degraded": "Declare host as degraded",
 "label.decline.invitation": "Decline invitation",
 "label.dedicate": "Dedicate",
 "label.dedicate.bgp.peer": "Dedicate BGP peer",
-"label.dedicate.cluster": "Dedicate cluster",
-"label.dedicate.host": "Dedicate host",
+"label.dedicate.cluster": "Dedicate Cluster",
+"label.dedicate.host": "Dedicate Host",
 "label.dedicate.ipv4.subnet": "Dedicate IPv4 subnet",
-"label.dedicate.pod": "Dedicate pod",
+"label.dedicate.pod": "Dedicate Pod",
 "label.dedicate.vlan.vni.range": "Dedicate VLAN/VNI range",
-"label.dedicate.zone": "Dedicate zone",
+"label.dedicate.zone": "Dedicate Zone",
 "label.dedicated": "Dedicated",
 "label.dedicated.vlan.vni.ranges": "Dedicated VLAN/VNI ranges",
 "label.dedicatedresources": "Dedicated resources",
@@ -687,7 +686,7 @@
 "label.default.network.guestcidraddress.isolated.network": "Default guest CIDR for Isolated Networks",
 "label.defaultnetwork": "Default Network",
 "label.delete": "Delete",
-"label.delete.acl.list": "Delete ACL list",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "Delete affinity group",
 "label.delete.alerts": "Delete alerts",
 "label.delete.asnrange": "Delete AS Range",
@@ -718,13 +717,13 @@
 "label.delete.portforward.rules": "Delete port forward rules",
 "label.delete.project": "Delete project",
 "label.delete.project.role": "Delete project role",
-"label.delete.role": "Delete role",
-"label.delete.rule": "Delete rule",
-"label.delete.setting": "Delete setting",
+"label.delete.role": "Delete Role",
+"label.delete.rule": "Delete Rule",
+"label.delete.setting": "Delete Setting",
 "label.delete.snapshot.policy": "Delete Snapshot policy",
 "label.delete.srx": "Delete SRX",
 "label.delete.sslcertificate": "Delete SSL certificate",
-"label.delete.tag": "Remove tag",
+"label.delete.tag": "Remove Tag",
 "label.delete.term": "Delete term",
 "label.delete.traffic.type": "Delete traffic type",
 "label.delete.tungsten.address.group": "Delete Address Group",
@@ -754,13 +753,13 @@
 "label.deployasis": "Read Instance settings from OVA",
 "label.deploymentplanner": "Deployment planner",
 "label.desc.db.stats": "Database Statistics",
-"label.desc.importexportinstancewizard": "Import and export Instances to/from an existing VMware or KVM cluster.",
+"label.desc.importexportinstancewizard": "Import and export Instances to/from an existing VMware or KVM Cluster.",
 "label.desc.import.ext.kvm.wizard": "Import Instance from remote KVM host",
 "label.desc.import.local.kvm.wizard": "Import QCOW2 image from Local Storage",
 "label.desc.import.shared.kvm.wizard": "Import QCOW2 image from Shared Storage",
 "label.desc.import.unmanage.volume": "Import and unmanage volume on Storage Pools",
 "label.desc.ingesttinstancewizard": "Ingest instances from an external KVM host",
-"label.desc.importmigratefromvmwarewizard": "Import instances from VMware into a KVM cluster",
+"label.desc.importmigratefromvmwarewizard": "Import instances from VMware into a KVM Cluster",
 "label.desc.usage.stats": "Usage Server Statistics",
 "label.description": "Description",
 "label.destaddressgroupuuid": "Destination Address Group",
@@ -795,16 +794,16 @@
 "label.direction": "Direction",
 "label.disable.autoscale.vmgroup": "Disable AutoScaling Group",
 "label.disable.host": "Disable host",
-"label.disable.network.offering": "Disable Network offering",
+"label.disable.network.offering": "Disable Network Offering",
 "label.disable.provider": "Disable provider",
 "label.disable.storage": "Disable storage pool",
-"label.disable.vpc.offering": "Disable VPC offering",
+"label.disable.vpc.offering": "Disable VPC Offering",
 "label.disable.vpn": "Disable remote access VPN",
 "label.disable.webhook": "Disable Webhook",
 "label.disabled": "Disabled",
 "label.disconnected": "Last disconnected",
 "label.disk": "Disk",
-"label.disk.offerings": "Disk offerings",
+"label.disk.offerings": "Disk Offerings",
 "label.disk.path": "Disk Path",
 "label.disk.tooltip": "Disk Image filename in the selected Storage Pool",
 "label.disk.selection": "Disk selection",
@@ -825,9 +824,9 @@
 "label.diskkbswrite": "Disk write (KiB)",
 "label.diskread": "Disk read",
 "label.diskwrite": "Disk write",
-"label.diskoffering": "Disk offering",
-"label.diskofferingdisplaytext": "Disk offering",
-"label.diskofferingid": "Disk offering",
+"label.diskoffering": "Disk Offering",
+"label.diskofferingdisplaytext": "Disk Offering",
+"label.diskofferingid": "Disk Offering",
 "label.disksize": "Disk size (in GB)",
 "label.disksizeallocated": "Disk allocated",
 "label.disksizeallocatedgb": "Allocated",
@@ -848,7 +847,7 @@
 "label.domain": "Domain",
 "label.domain.id": "Domain ID",
 "label.domain.name": "Domain name",
-"label.domain.router": "Domain router",
+"label.domain.router": "Domain Router",
 "label.domain.suffix": "DNS domain suffix (i.e., xyz.com)",
 "label.domainid": "Domain",
 "label.domainname": "Domain",
@@ -888,15 +887,15 @@
 "label.edge.zone": "Edge Zone",
 "label.edit": "Edit",
 "label.edit.account": "Edit Account",
-"label.edit.acl.list": "Edit ACL list",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.autoscale.vmprofile": "Edit AutoScale Instance Profile",
 "label.edit.project.details": "Edit project details",
 "label.edit.project.role": "Edit project role",
-"label.edit.role": "Edit role",
-"label.edit.rule": "Edit rule",
+"label.edit.role": "Edit Role",
+"label.edit.rule": "Edit Rule",
 "label.edit.secondary.ips": "Edit secondary IPs",
-"label.edit.tags": "Edit tags",
+"label.edit.tags": "Edit Tags",
 "label.edit.traffic.type": "Edit traffic type",
 "label.edit.user": "Edit User",
 "label.egress": "Egress",
@@ -907,11 +906,11 @@
 "label.email": "Email",
 "label.enable.autoscale.vmgroup": "Enable AutoScaling Group",
 "label.enable.host": "Enable Host",
-"label.enable.network.offering": "Enable Network offering",
+"label.enable.network.offering": "Enable Network Offering",
 "label.enable.oauth": "Enable OAuth Login",
 "label.enable.provider": "Enable provider",
-"label.enable.storage": "Enable storage pool",
-"label.enable.vpc.offering": "Enable VPC offering",
+"label.enable.storage": "Enable Storage Pool",
+"label.enable.vpc.offering": "Enable VPC Offering",
 "label.enable.vpn": "Enable remote access VPN",
 "label.enable.webhook": "Enable Webhook",
 "label.enabled": "Enabled",
@@ -996,12 +995,12 @@
 "label.firewall": "Firewall",
 "label.firewall.policy": "Firewall Policy",
 "label.firewallpolicy": "Firewall Policy",
-"label.firewallrule": "Firewall rule",
+"label.firewallrule": "Firewall Rule",
 "label.firewallruleuuid": "Firewall Rule",
 "label.firstname": "First name",
 "label.firstname.lower": "firstname",
 "label.fix.errors": "Fix errors",
-"label.fixed": "Fixed offering",
+"label.fixed": "Fixed Offering",
 "label.for": "for",
 "label.forbidden": "Forbidden",
 "label.forced": "Force",
@@ -1051,7 +1050,7 @@
 "label.guest.netmask": "Guest netmask",
 "label.guest.networks": "Guest Networks",
 "label.guest.os": "Guest OS",
-"label.guest.os.hypervisor.mappings": "Guest OS mappings",
+"label.guest.os.hypervisor.mappings": "Guest OS Mappings",
 "label.guest.start.ip": "Guest start IP",
 "label.guest.traffic": "Guest traffic",
 "label.guestcidraddress": "Guest CIDR",
@@ -1107,7 +1106,7 @@
 "label.hosttags.implicit.description": "The host tags defined by CloudStack Agent",
 "label.hourly": "Hourly",
 "label.hypervisor": "Hypervisor",
-"label.hypervisor.capabilities": "Hypervisor capabilities",
+"label.hypervisor.capabilities": "Hypervisor Capabilities",
 "label.hypervisor.type": "Hypervisor type",
 "label.hypervisors": "Hypervisors",
 "label.hypervisorsnapshotreserve": "Hypervisor Snapshot reserve",
@@ -1129,10 +1128,10 @@
 "label.ikeversion": "IKE version",
 "label.images": "Images",
 "label.imagestoreid": "Secondary Storage",
-"label.import.backup.offering": "Import backup offering",
+"label.import.backup.offering": "Import Backup Offering",
 "label.import.instance": "Import Instance",
-"label.import.offering": "Import offering",
-"label.import.role": "Import role",
+"label.import.offering": "Import Offering",
+"label.import.role": "Import Role",
 "label.import.volume": "Import Volume",
 "label.inactive": "Inactive",
 "label.in.progress": "in progress",
@@ -1146,12 +1145,12 @@
 "label.initial": "Inital",
 "label.initialized": "Initalized",
 "label.insideportprofile": "Inside port profile",
-"label.installwizard.addzoneintro.title": "Let's add a zone",
+"label.installwizard.addzoneintro.title": "Let's add a Zone",
 "label.installwizard.subtitle": "This guide will aid you in setting up your CloudStack™ installation",
 "label.installwizard.title": "Hello and welcome to CloudStack™",
 "label.instance": "Instance",
 "label.instance.conversion.support": "Instance Conversion Supported",
-"label.instance.groups": "Instance groups",
+"label.instance.groups": "Instance Groups",
 "label.instance.name": "Instance name",
 "label.instancename": "Internal name",
 "label.instanceport": "Instance port",
@@ -1273,16 +1272,16 @@
 "label.keyboardtype": "Keyboard type",
 "label.keypair": "SSH key pair",
 "label.keypairs": "SSH key pair(s)",
-"label.kubeconfig.cluster": "Kubernetes cluster config",
+"label.kubeconfig.cluster": "Kubernetes Cluster config",
 "label.kubernetes": "Kubernetes",
-"label.kubernetes.access.details": "The kubernetes nodes can be accessed via ssh using: <br> <code><b> ssh -i [ssh_key] -p [port_number] cloud@[public_ip_address] </b></code> <br><br> where, <br> <code><b>ssh_key:</b></code> points to the ssh private key file corresponding to the key that was associated while creating the Kubernetes cluster. If no ssh key was provided during Kubernetes cluster creation, use the ssh private key of the management server. <br> <code><b>port_number:</b></code> can be obtained from the Port Forwarding Tab (Public Port column)",
-"label.kubernetes.cluster": "Kubernetes cluster",
-"label.kubernetes.cluster.create": "Create Kubernetes cluster",
-"label.kubernetes.cluster.delete": "Delete Kubernetes cluster",
-"label.kubernetes.cluster.scale": "Scale Kubernetes cluster",
-"label.kubernetes.cluster.start": "Start Kubernetes cluster",
-"label.kubernetes.cluster.stop": "Stop Kubernetes cluster",
-"label.kubernetes.cluster.upgrade": "Upgrade Kubernetes cluster",
+"label.kubernetes.access.details": "The kubernetes nodes can be accessed via ssh using: <br> <code><b> ssh -i [ssh_key] -p [port_number] cloud@[public_ip_address] </b></code> <br><br> where, <br> <code><b>ssh_key:</b></code> points to the ssh private key file corresponding to the key that was associated while creating the Kubernetes Cluster. If no ssh key was provided during Kubernetes cluster creation, use the ssh private key of the management server. <br> <code><b>port_number:</b></code> can be obtained from the Port Forwarding Tab (Public Port column)",
+"label.kubernetes.cluster": "Kubernetes Cluster",
+"label.kubernetes.cluster.create": "Create Kubernetes Cluster",
+"label.kubernetes.cluster.delete": "Delete Kubernetes Cluster",
+"label.kubernetes.cluster.scale": "Scale Kubernetes Cluster",
+"label.kubernetes.cluster.start": "Start Kubernetes Cluster",
+"label.kubernetes.cluster.stop": "Stop Kubernetes Cluster",
+"label.kubernetes.cluster.upgrade": "Upgrade Kubernetes Cluster",
 "label.kubernetes.dashboard": "Kubernetes dashboard UI",
 "label.kubernetes.dashboard.create.token": "Create token for Kubernetes dashboard",
 "label.kubernetes.dashboard.create.token.desc": "Since Kubernetes v1.24.0, there is no auto-generation of secret-based service Account token due to security reason. You need to create a service Account and an optional long-lived Bearer Token for the service Account.",
@@ -1312,9 +1311,9 @@
 "label.launch": "Launch",
 "label.launch.vm": "Launch Instance",
 "label.launch.vm.and.stay": "Launch Instance & stay on this page",
-"label.launch.vnf.appliance": "Launch VNF appliance",
-"label.launch.vnf.appliance.and.stay": "Launch VNF appliance & stay on this page",
-"label.launch.zone": "Launch zone",
+"label.launch.vnf.appliance": "Launch VNF Appliance",
+"label.launch.vnf.appliance.and.stay": "Launch VNF Appliance & stay on this page",
+"label.launch.zone": "Launch Zone",
 "label.lb.algorithm.leastconn": "Least connections",
 "label.lb.algorithm.roundrobin": "Round-robin",
 "label.lb.algorithm.source": "Source",
@@ -1327,8 +1326,8 @@
 "label.lbprovider": "Load balancer provider",
 "label.lbruleid": "Load balancer ID",
 "label.lbtype": "Load balancer type",
-"label.ldap.configuration": "LDAP configuration",
-"label.ldap.group.name": "LDAP group",
+"label.ldap.configuration": "LDAP Configuration",
+"label.ldap.group.name": "LDAP Group",
 "label.level": "Level",
 "label.license.agreements": "License agreements",
 "label.limit": "Limit",
@@ -1342,11 +1341,11 @@
 "label.list.ciscoasa1000v": "ASA 1000v",
 "label.list.ciscovnmc": "Cisco VNMC",
 "label.list.nodes": "List nodes",
-"label.list.pods": "List pods",
+"label.list.pods": "List Pods",
 "label.list.services": "List services",
 "label.list.vmware.vcenter.vms": "List VMware Instances",
 "label.livepatch": "Live patch Network's router(s)",
-"label.load.balancer": "Load balancer",
+"label.load.balancer": "Load Balancer",
 "label.loadbalancerinstance": "Assigned Instances",
 "label.loadbalancerrule": "Load balancing rule",
 "label.loadbalancing": "Load balancing",
@@ -1388,8 +1387,8 @@
 "label.managementserverid": "Management server",
 "label.managementservername": "Management server",
 "label.management.ips": "Management IP addresses",
-"label.management.server": "Management server",
-"label.management.servers": "Management servers",
+"label.management.server": "Management Server",
+"label.management.servers": "Management Servers",
 "label.management.server.peers": "Peers",
 "label.managementservers": "Number of management servers",
 "label.matchall": "Match all",
@@ -1402,7 +1401,7 @@
 "label.maxdatavolumeslimit": "Max data volumes limit",
 "label.maxerrorretry": "Max error retry",
 "label.maxguestslimit": "Max guest limit",
-"label.maxhostspercluster": "Max hosts per cluster",
+"label.maxhostspercluster": "Max hosts per Cluster",
 "label.maximum": "Maximum",
 "label.maxinstance": "Max Instances",
 "label.maxiops": "Max IOPS",
@@ -1410,14 +1409,14 @@
 "label.maxmemory": "Max. memory (MiB)",
 "label.maxnetwork": "Max. Networks",
 "label.maxprimarystorage": "Max. primary storage (GiB)",
-"label.maxproject": "Max. projects",
+"label.maxproject": "Max. Projects",
 "label.maxpublicip": "Max. public IPs",
 "label.maxsecondarystorage": "Max. secondary storage (GiB)",
 "label.maxsize": "Maximum size",
 "label.maxsnapshot": "Max. Snapshots",
 "label.maxtemplate": "Max. Templates",
 "label.maxuservm": "Max. User Instances",
-"label.maxvolume": "Max. volumes",
+"label.maxvolume": "Max. Volumes",
 "label.maxvpc": "Max. VPCs",
 "label.may.continue": "You may now continue.",
 "label.mb.memory": "MB memory",
@@ -1437,8 +1436,8 @@
 "label.memoryused": "Used memory",
 "label.memoryusedgb": "Memory used",
 "label.memused": "Memory usage",
-"label.menu.security.groups": "Security groups",
-"label.menu.service.offerings": "Service offerings",
+"label.menu.security.groups": "Security Groups",
+"label.menu.service.offerings": "Service Offerings",
 "label.metadata": "Metadata",
 "label.metadata.description": "Metadata of the Object",
 "label.metadata.upload.description": "Set metadata for the object",
@@ -1450,8 +1449,8 @@
 "label.migrate.instance.to.ps": "Migrate Instance to another primary storage",
 "label.migrate.instance.single.storage": "Migrate all volume(s) of the Instance to a single primary storage",
 "label.migrate.instance.specific.storages": "Migrate volume(s) of the Instance to specific primary storages",
-"label.migrate.systemvm.to": "Migrate system VM to",
-"label.migrate.volume": "Migrate volume",
+"label.migrate.systemvm.to": "Migrate System VM to",
+"label.migrate.volume": "Migrate Volume",
 "message.memory.usage.info.hypervisor.additionals": "The data shown may not reflect the actual memory usage if the Instance does not have the additional hypervisor tools installed",
 "message.memory.usage.info.negative.value": "If the Instance's memory usage cannot be obtained from the hypervisor, the lines for free memory in the raw data graph and memory usage in the percentage graph will be disabled",
 "message.migrate.volume.tooltip": "Volume can be migrated to any suitable storage pool. Admin has to choose the appropriate disk offering to replace, that supports the new storage pool",
@@ -1502,14 +1501,14 @@
 "label.netscaler.vpx": "NetScaler VPX LoadBalancer",
 "label.network": "Network",
 "label.network.acl": "Network ACL",
-"label.network.acl.lists": "Network ACL lists",
+"label.network.acls": "Network ACLs",
 "label.network.addvm": "Add Network to Instance",
 "label.network.desc": "Network desc",
-"label.network.domain": "Network domain",
+"label.network.domain": "Network Domain",
 "label.network.label.display.for.blank.value": "Use default gateway",
 "label.network.name": "Network name",
-"label.network.offering": "Network offering",
-"label.network.offerings": "Network offerings",
+"label.network.offering": "Network Offerings",
+"label.network.offerings": "Network Offerings",
 "label.network.policy": "Network Policy",
 "label.network.restart.required": "Network restart required",
 "label.network.route.table": "Network route table",
@@ -1526,9 +1525,9 @@
 "label.networklimit": "Network limits",
 "label.networkmode": "Network Mode",
 "label.networkname": "Network name",
-"label.networkofferingdisplaytext": "Network offering",
-"label.networkofferingid": "Network offering",
-"label.networkofferingname": "Network offering",
+"label.networkofferingdisplaytext": "Network Offering",
+"label.networkofferingid": "Network Offering",
+"label.networkofferingname": "Network Offering",
 "label.networkrate": "Network rate (Mb/s)",
 "label.networkread": "Network read",
 "label.networks": "Networks",
@@ -1538,9 +1537,9 @@
 "label.never": "Never",
 "label.new": "New",
 "label.new.autoscale.vmgroup": "New AutoScaling Group",
-"label.new.instance.group": "New Instance group",
+"label.new.instance.group": "New Instance Group",
 "label.new.password": "New password",
-"label.new.project": "New project",
+"label.new.project": "New Project",
 "label.new.secondaryip.description": "Enter new secondary IP address",
 "label.new.tag": "New tag",
 "label.new.vm": "New Instance",
@@ -1581,16 +1580,16 @@
 "label.nsx.provider.port": "NSX provider port",
 "label.nsx.provider.username": "NSX provider username",
 "label.nsx.provider.password": "NSX provider password",
-"label.nsx.provider.edgecluster": "NSX provider edge cluster",
+"label.nsx.provider.edgecluster": "NSX provider edge Cluster",
 "label.nsx.provider.tier0gateway": "NSX provider tier-0 gateway",
-"label.nsx.provider.transportzone": "NSX provider transport zone",
+"label.nsx.provider.transportzone": "NSX provider transport Zone",
 "label.nsx.supports.internal.lb": "Enable NSX internal LB service",
 "label.nsx.supports.lb": "Enable NSX LB service",
 "label.num.cpu.cores": "# of CPU cores",
 "label.number": "#Rule",
 "label.numretries": "Number of retries",
 "label.nvpdeviceid": "ID",
-"label.oauth.configuration": "OAuth configuration",
+"label.oauth.configuration": "OAuth Configuration",
 "label.oauth.verification": "OAuth verification",
 "label.ocfs2": "OCFS2",
 "label.object.storage" : "Object Storage",
@@ -1607,7 +1606,7 @@
 "label.of.month": "of month",
 "label.offerha": "Offer HA",
 "label.offeringid": "Offering ID",
-"label.offeringtype": "Compute offering type",
+"label.offeringtype": "Compute Offering type",
 "label.ok": "OK",
 "label.only.end.date.and.time": "Only end date and time",
 "label.only.start.date.and.time": "Only start date and time",
@@ -1677,7 +1676,7 @@
 "label.passwordenabled": "Password enabled",
 "label.path": "Path",
 "label.patp": "Palo Alto threat profile",
-"label.pavr": "Virtual router",
+"label.pavr": "Virtual Router",
 "label.payload": "Payload",
 "label.payloadurl": "Payload URL",
 "label.pcidevice": "GPU",
@@ -1690,7 +1689,7 @@
 "label.peerstate.lastupdated": "Peer State Updated Time",
 "label.pending.jobs": "Pending Jobs",
 "label.per.account": "Per Account",
-"label.per.zone": "Per zone",
+"label.per.zone": "Per Zone",
 "label.percentage": "Percentage",
 "label.perfectforwardsecrecy": "Perfect forward secrecy",
 "label.perform.fresh.checks": "Perform fresh checks",
@@ -1722,7 +1721,7 @@
 "label.powerflex.gateway": "Gateway",
 "label.powerflex.gateway.password": "Gateway password",
 "label.powerflex.gateway.username": "Gateway username",
-"label.powerflex.storage.pool": "Storage pool",
+"label.powerflex.storage.pool": "Storage Pool",
 "label.powerstate": "Power state",
 "label.preferred": "Preferred",
 "label.prefix": "Prefix",
@@ -1739,13 +1738,13 @@
 "label.flashArray.username.tooltip": "The username with edit privileges",
 "label.flashArray.url.tooltip": "URL designating the Flash Array endpoint, formatted as: http[s]://HOSTNAME:PORT?pod=NAME&hostgroup=NAME[&skipTlsValidation=true][&postCopyWaitMs=#][&keyttl=#][&connectTimeoutMs=#][&apiLoginVersion=#][&apiVersion=#] where values in [] are optional.",
 "label.primary": "Primary",
-"label.primary.storage": "Primary storage",
-"label.primary.storage.allocated": "Primary storage allocated",
-"label.primary.storage.used": "Primary storage used",
-"label.primarystoragelimit": "Primary storage limits (GiB)",
-"label.primarystoragetotal": "Primary storage",
+"label.primary.storage": "Primary Storage",
+"label.primary.storage.allocated": "Primary Storage allocated",
+"label.primary.storage.used": "Primary Storage used",
+"label.primarystoragelimit": "Primary Storage limits (GiB)",
+"label.primarystoragetotal": "Primary Storage",
 "label.privatemtu": "Private Interface MTU",
-"label.private.gateway": "Private gateway",
+"label.private.gateway": "Private Gateway",
 "label.private.interface": "Private interface",
 "label.private.registry": "Private registry",
 "label.privateinterface": "Private interface",
@@ -1755,7 +1754,7 @@
 "label.privateport": "Private port",
 "label.profilename": "Profile",
 "label.project": "Project",
-"label.project.invitation": "Project invitations",
+"label.project.invitation": "Project Invitations",
 "label.project.name": "Project name",
 "label.project.owner": "Project owner(s)",
 "label.project.role": "Project role",
@@ -1782,7 +1781,7 @@
 "label.publicmtu": "Public Interface MTU",
 "label.public.interface": "Public interface",
 "label.public.ip": "Public IP address",
-"label.public.ip.addresses": "Public IP addresses",
+"label.public.ip.addresses": "Public IP Addresses",
 "label.public.ips": "Public IP addresses",
 "label.public.lb": "Public LB",
 "label.public.traffic": "Public traffic",
@@ -1863,7 +1862,8 @@
 "label.region": "Region",
 "label.register.oauth": "Register OAuth",
 "label.register.template": "Register Template",
-"label.register.user.data": "Register a userdata",
+"label.register.user.data": "Register User Data",
+"label.register.user.data.details": "Enter the User Data in plain text or in Base64 encoding. Up to 32KB of Base64 encoded User Data can be sent by default. The setting vm.userdata.max.length can be used to increase the limit to upto 1MB.",
 "label.reinstall.vm": "Reinstall Instance",
 "label.reject": "Reject",
 "label.related": "Related",
@@ -1871,11 +1871,11 @@
 "label.release": "Release",
 "label.release.account": "Release from Account",
 "label.release.dedicated.bgp.peer": "Release dedicated BGP peer",
-"label.release.dedicated.cluster": "Release dedicated cluster",
+"label.release.dedicated.cluster": "Release dedicated Cluster",
 "label.release.dedicated.host": "Release dedicated host",
 "label.release.dedicated.ipv4.subnet": "Release dedicated IPv4 subnet",
-"label.release.dedicated.pod": "Release dedicated pod",
-"label.release.dedicated.zone": "Release dedicated zone",
+"label.release.dedicated.pod": "Release dedicated Pod",
+"label.release.dedicated.zone": "Release dedicated Zone",
 "label.releasing.ip": "Releasing IP",
 "label.remote.instances": "Remote Instances",
 "label.remove": "Remove",
@@ -1888,7 +1888,7 @@
 "label.remove.ldap": "Remove LDAP",
 "label.remove.logical.network": "Remove Network from logical router",
 "label.remove.logical.router": "Remove logical router",
-"label.remove.network.offering": "Remove Network offering",
+"label.remove.network.offering": "Remove Network Offering",
 "label.remove.network.route.table": "Remove Tungsten Fabric Network routing table",
 "label.remove.pf": "Remove port forwarding rule",
 "label.remove.policy": "Remove policy",
@@ -1899,15 +1899,14 @@
 "label.remove.rule": "Remove rule",
 "label.remove.ssh.key.pair": "Remove SSH Key pair",
 "label.remove.tungsten.tag": "Remove Tag",
-"label.remove.user.data": "Remove Userdata",
+"label.remove.user.data": "Remove User Data",
 "label.remove.vm.from.lb": "Remove Instance from load balancer rule",
 "label.remove.vmware.datacenter": "Remove VMware Datacenter",
 "label.remove.vpc": "Remove VPC",
-"label.remove.vpc.offering": "Remove VPC offering",
+"label.remove.vpc.offering": "Remove VPC Offering",
 "label.removed": "Removed",
 "label.removing": "Removing",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL list",
 "label.report.bug": "Ask a question or Report an issue",
 "label.request": "Request",
 "label.required": "Required",
@@ -1926,8 +1925,8 @@
 "label.reset.config.value": "Reset to default value",
 "label.reset.ssh.key.pair": "Reset SSH key pair",
 "label.reset.to.default": "Reset to default",
-"label.reset.userdata.on.autoscale.vm.group": "Reset Userdata on AutoScale VM Group",
-"label.reset.userdata.on.vm": "Reset Userdata on Instance",
+"label.reset.user.data.on.autoscale.vm.group": "Reset User Data on AutoScale VM Group",
+"label.reset.user.data.on.vm": "Reset User Data on Instance",
 "label.reset.vpn.connection": "Reset VPN connection",
 "label.resource": "Resource",
 "label.resource.limit.exceeded": "Resource limit exceeded",
@@ -2015,17 +2014,17 @@
 "label.search": "Search",
 "label.secondary.isolated.vlan.type.isolated": "Isolated",
 "label.secondary.isolated.vlan.type.promiscuous": "Promiscuous",
-"label.secondary.storage": "Secondary storage",
-"label.secondary.storage.vm": "Secondary storage VM",
+"label.secondary.storage": "Secondary Storage",
+"label.secondary.storage.vm": "Secondary Storage VM",
 "label.secondaryips": "Secondary IPs",
-"label.secondarystoragelimit": "Secondary storage limits (GiB)",
+"label.secondarystoragelimit": "Secondary Storage limits (GiB)",
 "label.secretkey": "Secret key",
 "label.secured": "Secured",
-"label.security.groups": "Security groups",
-"label.securitygroup": "Security group",
-"label.securitygroupenabled": "Security groups enabled",
+"label.security.groups": "Security Groups",
+"label.securitygroup": "Security Group",
+"label.securitygroupenabled": "Security Groups enabled",
 "label.securitygroups": "Security groups",
-"label.securitygroupsenabled": "Security groups enabled",
+"label.securitygroupsenabled": "Security Groups enabled",
 "label.select": "Select",
 "label.see.more.info.cpu.usage": "See more info about CPU usage",
 "label.see.more.info.memory.usage": "See more info about memory usage",
@@ -2033,18 +2032,18 @@
 "label.see.more.info.disk.usage": "See more info about disk usage",
 "label.see.more.info.shown.charts": "See more info about the shown charts",
 "label.select-view": "Select view",
-"label.select.a.zone": "Select a zone",
+"label.select.a.zone": "Select a Zone",
 "label.select.deployment.infrastructure": "Select deployment infrastructure",
 "label.select.guest.os.type": "Please select the guest OS type",
 "label.select.network": "Select Network",
 "label.select.period": "Select period",
-"label.select.project": "Select project",
-"label.select.projects": "Select projects",
-"label.select.ps": "Select primary storage",
+"label.select.project": "Select Project",
+"label.select.projects": "Select Projects",
+"label.select.ps": "Select Primary Storage",
 "label.select.root.disk": "Select the ROOT disk",
 "label.select.source.vcenter.datacenter": "Select the source VMware vCenter Datacenter",
 "label.select.tier": "Select Network Tier",
-"label.select.zones": "Select zones",
+"label.select.zones": "Select Zones",
 "label.select.2fa.provider": "Select the provider",
 "label.selected.storage": "Selected storage",
 "label.self": "Mine",
@@ -2057,20 +2056,20 @@
 "label.server.certificate": "Server certificate",
 "label.service.connectivity.distributedroutercapabilitycheckbox": "Distributed router",
 "label.service.connectivity.regionlevelvpccapabilitycheckbox": "Region level VPC",
-"label.service.group": "Service group",
+"label.service.group": "Service Group",
 "label.serviceip": "Management IP",
 "label.service.lb.elasticlbcheckbox": "Elastic LB",
 "label.service.lb.inlinemodedropdown": "Mode",
 "label.service.lb.lbisolationdropdown": "LB isolation",
 "label.service.lb.netscaler.servicepackages": "Netscaler service packages",
 "label.service.lb.netscaler.servicepackages.description": "Service package description",
-"label.service.offering": "Service offering",
+"label.service.offering": "Service Offering",
 "label.service.staticnat.associatepublicip": "Associate public IP",
 "label.service.staticnat.elasticipcheckbox": "Elastic IP",
 "label.servicegroupuuid": "Service Group",
 "label.servicelist": "Services",
-"label.serviceofferingid": "Compute offering",
-"label.serviceofferingname": "Compute offering",
+"label.serviceofferingid": "Compute Offering",
+"label.serviceofferingname": "Compute Offering",
 "label.sessions": "Active client sessions",
 "label.set.default.nic": "Set default NIC",
 "label.set.reservation": "Set reservation",
@@ -2139,20 +2138,21 @@
 "label.srctaguuid": "Source Tag",
 "label.srx": "SRX",
 "label.srx.firewall": "Juniper SRX firewall",
-"label.ssh.key.pairs": "SSH key pairs",
+"label.ssh.key.pairs": "SSH Key Pairs",
 "label.uefi.supported": "UEFI supported",
 "label.usediops": "IOPS used",
-"label.userdataid": "Userdata ID",
-"label.userdataname": "Userdata name",
-"label.userdatadetails": "Userdata details",
-"label.userdataparams": "Userdata parameters",
-"label.userdatapolicy": "Userdata link policy",
-"label.userdata.text": "Manual Userdata entry",
-"label.userdata.registered": "Stored Userdata",
-"label.userdata.do.override": "Userdata override",
-"label.userdata.do.append": "Userdata append",
-"label.userdatapolicy.tooltip": "Userdata linked to the Template can be overridden by Userdata provided during Instance deploy. Select the override policy as required.",
+"label.user.data.id": "User Data ID",
+"label.user.data.name": "User Data name",
+"label.user.data.details": "User Data details",
+"label.user.data.params": "User Data parameters",
+"label.user.data.policy": "User Data link policy",
+"label.user.data.text": "Manual User Data entry",
+"label.user.data.registered": "Stored User Data",
+"label.user.data.do.override": "User Data override",
+"label.user.data.do.append": "User Data append",
+"label.user.data.policy.tooltip": "User Data linked to the Template can be overridden by User Data provided during Instance deploy. Select the override policy as required.",
 "label.user.data": "User Data",
+"label.user.data.library": "User Data Library",
 "label.ssh.port": "SSH port",
 "label.sshkeypair": "New SSH key pair",
 "label.sshkeypairs": "SSH key pairs",
@@ -2179,7 +2179,7 @@
 "label.state.reported": "Reported State",
 "label.staticnat": "Static NAT",
 "label.static": "Static",
-"label.static.routes": "Static routes",
+"label.static.routes": "Static Routes",
 "label.status": "Status",
 "label.step.1": "Step 1",
 "label.step.2": "Step 2",
@@ -2205,9 +2205,9 @@
 "label.stopping": "Stopping",
 "label.storage": "Storage",
 "label.storage.migration.required": "Storage migration required",
-"label.storage.tags": "Storage tags",
+"label.storage.tags": "Storage Tags",
 "label.storage.traffic": "Storage traffic",
-"label.storageid": "Primary storage",
+"label.storageid": "Primary Storage",
 "label.storagemotionenabled": "Storage motion enabled",
 "label.storagepolicy": "Storage policy",
 "label.storagepool": "Storage pool",
@@ -2234,12 +2234,12 @@
 "label.supportspublicaccess": "Supports public access",
 "label.supportsstrechedl2subnet": "Supports stretched L2 subnet",
 "label.supportsvmautoscaling": "Supports auto scaling",
-"label.suspend.project": "Suspend project",
+"label.suspend.project": "Suspend Project",
 "label.switch.type": "Switch type",
-"label.sync.storage": "Sync storage pool",
+"label.sync.storage": "Sync Storage Pool",
 "label.system.ip.pool": "System Pool",
-"label.system.offering": "System offering",
-"label.system.offerings": "System offerings",
+"label.system.offering": "System Offering",
+"label.system.offerings": "System Offerings",
 "label.system.service.offering": "System service offering",
 "label.system.vm": "System VM",
 "label.system.vms": "System VMs",
@@ -2269,7 +2269,7 @@
 "label.tariffvalue": "Tariff value",
 "label.tcp": "TCP",
 "label.tcp.proxy": "TCP proxy",
-"label.template": "Select a template",
+"label.template": "Select a Template",
 "label.templatetag": "Tag",
 "label.template.select.existing": "Select an existing template",
 "label.template.temporary.import": "Use a temporary template for import",
@@ -2319,7 +2319,7 @@
 "label.total": "Total",
 "label.total.network": "Total Networks",
 "label.total.vms": "Total Instances",
-"label.total.volume": "Total volumes",
+"label.total.volume": "Total Volumes",
 "label.totalcpu": "Total CPU",
 "label.traffic.label": "Traffic label",
 "label.traffic.types": "Traffic types",
@@ -2408,8 +2408,8 @@
 "label.upload.resource.icon": "Upload icon",
 "label.upload.template.from.local": "Upload Template from local",
 "label.upload.volume": "Upload volume",
-"label.upload.volume.from.local": "Upload volume from local",
-"label.upload.volume.from.url": "Upload volume from URL",
+"label.upload.volume.from.local": "Upload Volume from local",
+"label.upload.volume.from.url": "Upload Volume from URL",
 "label.url": "URL",
 "label.usage.explanation": "Note: Only the usage server that owns the active usage job is shown here.",
 "label.usage": "Usage",
@@ -2435,11 +2435,10 @@
 "label.use.local.timezone": "Use local timezone",
 "label.used": "Used",
 "label.usehttps": "Use HTTPS",
-"label.usenewdiskoffering": "Replace disk offering?",
+"label.usenewdiskoffering": "Replace Disk Offering?",
 "label.user": "User",
 "label.user.conflict": "Conflict",
-"label.userdata": "Userdata",
-"label.userdatal2": "User data",
+"label.user.data": "User Data",
 "label.username": "Username",
 "label.username.tooltip": "The Username for the Host",
 "label.users": "Users",
@@ -2470,11 +2469,11 @@
 "label.viewing": "Viewing",
 "label.virtualmachine": "Instance",
 "label.virtualmachinecount": "Instances Count",
-"label.virtual.machine": "Virtual machine",
-"label.virtual.machines": "Virtual machines",
+"label.virtual.machine": "Virtual Machine",
+"label.virtual.machines": "Virtual Machines",
 "label.virtual.network": "Virtual Network",
 "label.virtual.networking": "Virtual Networking",
-"label.virtual.routers": "Virtual routers",
+"label.virtual.routers": "Virtual Routers",
 "label.virtualmachineid": "Instance ID",
 "label.virtualmachinename": "Instance name",
 "label.virtualsize": "Virtual Size",
@@ -2506,21 +2505,21 @@
 "label.vmwaredcvcenter": "VMware datacenter vCenter",
 "label.vmwarenetworklabel": "VMware traffic label",
 "label.vnf.appliance": "VNF Appliance",
-"label.vnf.appliances": "VNF appliances",
+"label.vnf.appliances": "VNF Appliances",
 "label.vnf.appliance.add": "Add VNF Appliance",
-"label.vnf.appliance.access.methods": "Management access information for this VNF appliance",
-"label.vnf.app.action.destroy": "Destroy VNF appliance",
-"label.vnf.app.action.edit": "Edit VNF appliance",
-"label.vnf.app.action.expunge": "Expunge VNF appliance",
-"label.vnf.app.action.migrate.to.host": "Migrate VNF appliance to another host",
-"label.vnf.app.action.migrate.to.ps": "Migrate VNF appliance to another primary storage",
-"label.vnf.app.action.recover": "Recover VNF appliance",
-"label.vnf.app.action.scale": "Scale VNF appliance",
-"label.vnf.app.action.start": "Start VNF appliance",
-"label.vnf.app.action.stop": "Stop VNF appliance",
-"label.vnf.app.action.reboot": "Reboot VNF appliance",
-"label.vnf.app.action.reinstall": "Reinstall VNF appliance",
-"label.vnf.cidr.list": "CIDR from which access to the VNF appliance’s Management interface should be allowed from",
+"label.vnf.appliance.access.methods": "Management access information for this VNF Appliance",
+"label.vnf.app.action.destroy": "Destroy VNF Appliance",
+"label.vnf.app.action.edit": "Edit VNF Appliance",
+"label.vnf.app.action.expunge": "Expunge VNF Appliance",
+"label.vnf.app.action.migrate.to.host": "Migrate VNF Appliance to another host",
+"label.vnf.app.action.migrate.to.ps": "Migrate VNF Appliance to another primary storage",
+"label.vnf.app.action.recover": "Recover VNF Appliance",
+"label.vnf.app.action.scale": "Scale VNF Appliance",
+"label.vnf.app.action.start": "Start VNF Appliance",
+"label.vnf.app.action.stop": "Stop VNF Appliance",
+"label.vnf.app.action.reboot": "Reboot VNF Appliance",
+"label.vnf.app.action.reinstall": "Reinstall VNF Appliance",
+"label.vnf.cidr.list": "CIDR from which access to the VNF appliance's Management interface should be allowed from",
 "label.vnf.cidr.list.tooltip": "the CIDR list to forward traffic from to the VNF management interface. Multiple entries must be separated by a single comma character (,). The default value is 0.0.0.0/0.",
 "label.vnf.configure.management": "Configure Firewall and Port Forwarding rules for VNF's management interfaces",
 "label.vnf.configure.management.tooltip": "True by default, security group or network rules (source nat and firewall rules) will be configured for VNF management interfaces. False otherwise. Learn what rules are configured at http://docs.cloudstack.apache.org/en/latest/adminguide/networking/vnf_templates_appliances.html#deploying-vnf-appliances",
@@ -2543,7 +2542,7 @@
 "label.vnf.templates": "VNF templates",
 "label.vnf.template.register": "Register VNF template",
 "label.vnmc": "VNMC",
-"label.volgroup": "Volume group",
+"label.volgroup": "Volume Group",
 "label.volume": "Volume",
 "label.volume.empty": "No data volumes attached to this Instance",
 "label.volume.encryption.support": "Volume Encryption Supported",
@@ -2552,7 +2551,7 @@
 "label.volumechecksum": "MD5 checksum",
 "label.volumechecksum.description": "Use the hash that you created at the start of the volume upload procedure.",
 "label.volumefileupload": "Local file",
-"label.volumegroup": "Volume group",
+"label.volumegroup": "Volume Group",
 "label.volumeid": "Volume",
 "label.volumeids": "Volumes to be deleted",
 "label.volumelimit": "Volume limits",
@@ -2563,20 +2562,20 @@
 "label.vpc": "VPC",
 "label.vpcs": "VPCs",
 "label.vpc.id": "VPC ID",
-"label.vpc.offerings": "VPC offerings",
-"label.vpc.virtual.router": "VPC virtual router",
+"label.vpc.offerings": "VPC Offerings",
+"label.vpc.virtual.router": "VPC Virtual Router",
 "label.vpc.restart.required": "VPC restart required",
 "label.vpcid": "VPC",
 "label.vpclimit": "VPC limits",
 "label.vpcname": "VPC",
-"label.vpcoffering": "VPC offering",
-"label.vpcofferingid": "VPC offering",
+"label.vpcoffering": "VPC Offering",
+"label.vpcofferingid": "VPC Offering",
 "label.vpn": "VPN",
 "label.vpn.connection": "VPN connection",
 "label.vpn.gateway": "VPN gateway",
 "label.vpn.users": "VPN Users",
 "label.vpncustomergateway": "IP address of the remote gateway",
-"label.vpncustomergatewayid": "VPN customer gateway",
+"label.vpncustomergatewayid": "VPN Customer Gateway",
 "label.vsmipaddress": "Nexus 1000v IP address",
 "label.vsmpassword": "Nexus 1000v password",
 "label.vsmusername": "Nexus 1000v username",
@@ -2611,7 +2610,7 @@
 "label.xenservertoolsversion61plus": "Original XS Version is 6.1+",
 "label.yes": "Yes",
 "label.yourinstance": "Your Instance",
-"label.your.autoscale.vmgroup": "Your autoscaling group",
+"label.your.autoscale.vmgroup": "Your Autoscaling Group",
 "label.zone": "Zone",
 "label.zone.dedicated": "Zone dedicated",
 "label.zone.details": "Zone details",
@@ -2649,7 +2648,7 @@
 "message.action.delete.autoscale.vmgroup": "Please confirm that you want to delete this autoscaling group.",
 "message.action.delete.backup.offering": "Please confirm that you want to delete this backup offering?",
 "message.action.delete.backup.repository": "Please confirm that you want to delete this backup repository?",
-"message.action.delete.cluster": "Please confirm that you want to delete this cluster.",
+"message.action.delete.cluster": "Please confirm that you want to delete this Cluster.",
 "message.action.delete.domain": "Please confirm that you want to delete this domain.",
 "message.action.delete.external.firewall": "Please confirm that you would like to remove this external firewall. Warning: If you are planning to add back the same external firewall, you must reset usage data on the device.",
 "message.action.delete.external.load.balancer": "Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.",
@@ -2666,7 +2665,7 @@
 "message.action.delete.node": "Please confirm that you want to delete this node.",
 "message.action.delete.oauth.provider": "Please confirm that you want to delete the OAuth provider.",
 "message.action.delete.physical.network": "Please confirm that you want to delete this physical Network.",
-"message.action.delete.pod": "Please confirm that you want to delete this pod.",
+"message.action.delete.pod": "Please confirm that you want to delete this Pod.",
 "message.action.delete.secondary.storage": "Please confirm that you want to delete this secondary storage.",
 "message.action.delete.security.group": "Please confirm that you want to delete this security group.",
 "message.action.delete.snapshot": "Please confirm that you want to delete this Snapshot.",
@@ -2674,7 +2673,7 @@
 "message.action.delete.tungsten.router.table": "Please confirm that you want to remove Route Table from this Network?",
 "message.action.delete.volume": "Please confirm that you want to delete this volume. Note: this will not delete any Snapshots of this volume.",
 "message.action.delete.vpn.user": "Please confirm that you want to delete the VPN user.",
-"message.action.delete.zone": "Please confirm that you want to delete this zone.",
+"message.action.delete.zone": "Please confirm that you want to delete this Zone.",
 "message.action.destroy.sharedfs": "Please confirm that you want to destroy this Shared FileSystem.<br><b>Caution: This will delete all the data of the Shared FileSystem as well.</b>",
 "message.action.destroy.instance": "Please confirm that you want to destroy the Instance.",
 "message.action.destroy.instance.with.backups": "Please confirm that you want to destroy the Instance. There may be backups associated with the Instance which will not be deleted.",
@@ -2682,35 +2681,35 @@
 "message.action.destroy.volume": "Please confirm that you want to destroy the volume.",
 "message.action.disable.2FA.user.auth": "Please confirm that you want to disable User two factor authentication.",
 "message.action.about.mandate.and.disable.2FA.user.auth": "Two factor authentication is mandated for the User, if this is disabled now User will need to setup two factor authentication again during next login. <br><br>Please confirm that you want to disable.",
-"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
+"message.action.disable.cluster": "Please confirm that you want to disable this Cluster.",
 "message.action.disable.disk.offering": "Please confirm that you want to disable this disk offering.",
 "message.action.disable.service.offering": "Please confirm that you want to disable this service offering.",
 "message.action.disable.system.service.offering": "Please confirm that you want to disable this system service offering.",
 "message.action.disable.physical.network": "Please confirm that you want to disable this physical Network.",
-"message.action.disable.pod": "Please confirm that you want to disable this pod.",
+"message.action.disable.pod": "Please confirm that you want to disable this Pod.",
 "message.action.disable.static.nat": "Please confirm that you want to disable static NAT.",
-"message.action.disable.zone": "Please confirm that you want to disable this zone.",
+"message.action.disable.zone": "Please confirm that you want to disable this Zone.",
 "message.action.download.iso": "Please confirm that you want to download this ISO.",
 "message.action.download.snapshot": "Please confirm that you want to download this Snapshot.",
 "message.action.download.template": "Please confirm that you want to download this Template.",
 "message.action.edit.nfs.mount.options": "Changes to NFS mount options will only take affect on cancelling maintenance mode which will cause the storage pool to be remounted on all KVM hosts with the new mount options.",
-"message.action.enable.cluster": "Please confirm that you want to enable this cluster.",
+"message.action.enable.cluster": "Please confirm that you want to enable this Cluster.",
 "message.action.enable.disk.offering": "Please confirm that you want to enable this disk offering.",
 "message.action.enable.service.offering": "Please confirm that you want to enable this service offering.",
 "message.action.enable.system.service.offering": "Please confirm that you want to enable this system service offering.",
 "message.action.enable.physical.network": "Please confirm that you want to enable this physical Network.",
-"message.action.enable.pod": "Please confirm that you want to enable this pod.",
-"message.action.enable.zone": "Please confirm that you want to enable this zone.",
+"message.action.enable.pod": "Please confirm that you want to enable this Pod.",
+"message.action.enable.zone": "Please confirm that you want to enable this Zone.",
 "message.action.expunge.sharedfs": "Please confirm that you want to expunge this Shared FileSystem.",
 "message.action.expunge.instance": "Please confirm that you want to expunge this Instance.",
 "message.action.expunge.instance.with.backups": "Please confirm that you want to expunge this Instance. There may be backups associated with the Instance which will not be deleted.",
 "message.action.host.enable.maintenance.mode": "Enabling maintenance mode will cause a live migration of all running Instances on this host to any available host.",
 "message.action.instance.reset.password": "Please confirm that you want to change the ROOT password for this Instance.",
-"message.action.manage.cluster": "Please confirm that you want to manage the cluster.",
+"message.action.manage.cluster": "Please confirm that you want to manage the Cluster.",
 "message.action.patch.router": "Please confirm that you want to live patch the router. <br> This operation is equivalent updating the router packages and restarting the Network without cleanup.",
 "message.action.patch.systemvm": "Please confirm that you want to patch the System VM.",
-"message.action.primary.storage.scope.cluster": "Please confirm that you want to change the scope from zone to the specified cluster.<br>This operation will update the database and disconnect the storage pool from all hosts that were previously connected to the primary storage and are not part of the specified cluster.",
-"message.action.primary.storage.scope.zone": "Please confirm that you want to change the scope from cluster to zone.<br>This operation will update the database and connect the storage pool to all hosts of the zone running the same hypervisor as set on the storage pool.",
+"message.action.primary.storage.scope.cluster": "Please confirm that you want to change the scope from Zone to the specified Cluster.<br>This operation will update the database and disconnect the storage pool from all hosts that were previously connected to the primary storage and are not part of the specified cluster.",
+"message.action.primary.storage.scope.zone": "Please confirm that you want to change the scope from Cluster to Zone.<br>This operation will update the database and connect the storage pool to all hosts of the zone running the same hypervisor as set on the storage pool.",
 "message.action.primarystorage.enable.maintenance.mode": "Warning: placing the primary storage into maintenance mode will cause all Instances using volumes from it to be stopped.  Do you want to continue?",
 "message.action.quota.tariff.create.error.namerequired": "Please, inform a name for the quota tariff.",
 "message.action.quota.tariff.create.error.usagetyperequired": "Please, select the usage type of the quota tariff.",
@@ -2732,7 +2731,7 @@
 "message.action.revert.snapshot": "Please confirm that you want to revert the owning volume to this Snapshot.",
 "message.action.router.health.checks": "Health checks result will be fetched from router.",
 "message.action.router.health.checks.disabled.warning": "Please enable router health checks.",
-"message.action.scale.kubernetes.cluster.warning": "Please do not manually scale the cluster if cluster auto scaling is enabled.",
+"message.action.scale.kubernetes.cluster.warning": "Please do not manually scale the Cluster if cluster auto scaling is enabled.",
 "message.action.secondary.storage.read.only": "Please confirm that you want to make this secondary storage read only.",
 "message.action.secondary.storage.read.write": "Please confirm that you want to make this secondary storage read write.",
 "message.action.secure.host": "This will restart the host agent and libvirtd process after applying new X509 certificates, please confirm?",
@@ -2745,7 +2744,7 @@
 "message.action.stop.instance": "Please confirm that you want to stop this Instance.",
 "message.action.stop.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.",
 "message.action.stop.systemvm": "Please confirm that you want to stop this system VM.",
-"message.action.unmanage.cluster": "Please confirm that you want to unmanage the cluster.",
+"message.action.unmanage.cluster": "Please confirm that you want to unmanage the Cluster.",
 "message.action.unmanage.instance": "Please confirm that you want to unmanage the Instance.",
 "message.action.unmanage.instances": "Please confirm that you want to unmanage the Instances.",
 "message.action.unmanage.virtualmachine": "Please confirm that you want to unmanage the Instance.",
@@ -2756,7 +2755,7 @@
 "message.add.egress.rule.failed": "Adding new egress rule failed.",
 "message.add.egress.rule.processing": "Adding new egress rule...",
 "message.add.failed": "Adding failed.",
-"message.add.firewall": "Add a firewall to zone",
+"message.add.firewall": "Add a firewall to Zone",
 "message.add.firewall.rule.failed": "Adding new Firewall rule failed",
 "message.add.firewall.rule.processing": "Adding new Firewall rule...",
 "message.add.firewallrule.failed": "Adding Firewall Rule failed",
@@ -2774,22 +2773,22 @@
 "message.remove.ip.v6.firewall.rule.processing": "Removing IPv6 firewall rule...",
 "message.remove.ip.v6.firewall.rule.success": "Removed IPv6 firewall rule",
 "message.add.nsx.controller": "Add NSX Provider",
-"message.add.network": "Add a new network for zone: <b><span id=\"zone_name\"></span></b>",
-"message.add.network.acl.failed": "Adding network ACL list failed.",
-"message.add.network.acl.processing": "Adding network ACL list...",
+"message.add.network": "Add a new network for Zone: <b><span id=\"zone_name\"></span></b>",
+"message.add.network.acl.failed": "Adding network ACL failed.",
+"message.add.network.acl.processing": "Adding network ACL...",
 "message.add.network.failed": "Adding network failed.",
 "message.add.network.processing": "Adding network...",
 "message.add.new.gateway.to.vpc": "Please specify the information to add a new gateway to this VPC.",
 "message.add.physical.network.failed": "Adding physical network failed",
 "message.add.physical.network.processing": "Adding a new physical network...",
-"message.add.pod": "Add a new pod for zone <b><span id=\"add_pod_zone_name\"></span></b>",
-"message.add.pod.during.zone.creation": "Each zone must contain one or more pods. We will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.",
+"message.add.pod": "Add a new Pod for Zone <b><span id=\"add_pod_zone_name\"></span></b>",
+"message.add.pod.during.zone.creation": "Each Zone must contain one or more Pods. We will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.",
 "message.add.port.forward.failed": "Adding new port forwarding rule failed.",
 "message.add.port.forward.processing": "Adding new port forwarding rule...",
 "message.add.private.gateway.failed": "Adding private gateway failed.",
 "message.add.private.gateway.processing": "Adding private gateway...",
 "message.add.resource.description": "Add infrastructure resources",
-"message.add.resource.hint": "Add infrastructure resources - pods, clusters, primary/secondary storages.",
+"message.add.resource.hint": "Add infrastructure resources - Pods, Clusters, primary/secondary storages.",
 "message.add.routing.firewall.rule.failed": "Failed to add IPv4 Routing firewall rule",
 "message.add.routing.firewall.rule.processing": "Adding IPv4 Routing firewall rule...",
 "message.add.routing.firewall.rule.success": "Added IPv4 Routing firewall rule",
@@ -2872,7 +2871,7 @@
 "message.confirm.change.offering.for.volume": "Please confirm that you want to change disk offering for the volume",
 "message.confirm.change.service.offering.for.sharedfs": "Please confirm that you want to change the service offering for the Shared FileSystem.",
 "message.confirm.configure.ovs": "Are you sure you want to configure Ovs?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller.",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch.",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v.",
@@ -2921,7 +2920,7 @@
 "message.cpu.usage.info": "The CPU usage percentage can exceed 100% if the Instance has more than 1 vCPU or when CPU Cap is not enabled. This behavior happens according to the hypervisor being used (e.g: in KVM), due to how they account the stats",
 "message.create.bucket.failed": "Failed to create bucket.",
 "message.create.bucket.processing": "Bucket creation in progress",
-"message.create.compute.offering": "Compute offering created",
+"message.create.compute.offering": "Compute Offering created",
 "message.create.sharedfs.failed": "Failed to create Shared FileSystem.",
 "message.create.sharedfs.processing": "Shared FileSystem creation in progress.",
 "message.create.tungsten.public.network": "Create Tungsten-Fabric public Network",
@@ -2933,7 +2932,7 @@
 "message.create.snapshot.from.vmsnapshot.progress": "Snapshot creation in progress",
 "message.create.template.failed": "Failed to create template.",
 "message.create.template.processing": "Template creation in progress",
-"message.create.volume.failed": "Failed to create volume.",
+"message.create.volume.failed": "Failed to create Volume.",
 "message.create.volume.processing": "Volume creation in progress",
 "message.create.vpc.offering": "VPC offering created.",
 "message.create.vpn.customer.gateway.failed": "VPN customer gateway creation failed.",
@@ -2943,23 +2942,23 @@
 "message.creating.autoscale.scaledown.policy": "Creating ScaleDown policy",
 "message.creating.autoscale.scaleup.conditions": "Creating ScaleUp conditions",
 "message.creating.autoscale.scaleup.policy": "Creating ScaleUp policy",
-"message.creating.cluster": "Creating cluster",
+"message.creating.cluster": "Creating Cluster",
 "message.creating.guest.network": "Creating guest Network",
 "message.creating.physical.networks": "Creating physical Networks",
-"message.creating.pod": "Creating pod",
+"message.creating.pod": "Creating Pod",
 "message.creating.primary.storage": "Creating primary storage",
 "message.creating.secondary.storage": "Creating secondary storage",
-"message.creating.zone": "Creating zone",
+"message.creating.zone": "Creating Zone",
 "message.data.migration": "Data migration",
 "message.data.migration.progress": "Data migration between image stores",
 "message.datacenter.description": "Name of the datacenter on vCenter.",
 "message.datastore.description": "Name of the datastore on vCenter.",
-"message.dedicate.zone": "Dedicating zone",
+"message.dedicate.zone": "Dedicating Zone",
 "message.dedicated.zone.released": "Zone dedication released.",
-"message.dedicating.cluster": "Dedicating cluster...",
+"message.dedicating.cluster": "Dedicating Cluster...",
 "message.dedicating.host": "Dedicating host...",
-"message.dedicating.pod": "Dedicating pod...",
-"message.dedicating.zone": "Dedicating zone...",
+"message.dedicating.pod": "Dedicating Pod...",
+"message.dedicating.zone": "Dedicating Zone...",
 "message.delete.account.confirm": "Please confirm that you want to delete this account by entering the name of the account below.",
 "message.delete.account.failed": "Delete account failed",
 "message.delete.account.processing": "Deleting account",
@@ -2998,27 +2997,27 @@
 "message.deployasis": "Selected Template is Deploy As-Is i.e., the Instance is deployed by importing an OVA with vApps directly into vCenter. Root disk(s) resize is allowed only on stopped Instances for such Templates.",
 "message.desc.advanced.zone": "This is recommended and allows more sophisticated Network topologies. This Network model provides the most flexibility in defining guest Networks and providing custom Network offerings such as firewall, VPN, or load balancer support.",
 "message.desc.basic.zone": "Provide a single Network where each Instance is assigned an IP directly from the Network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).",
-"message.desc.core.zone": "Core Zones are intended for Datacenter based deployments and allow the full range of Networking and other functionality in Apache CloudStack. Core zones have a number of prerequisites and rely on the presence of shared storage and helper Instances.",
-"message.desc.edge.zone": "Edge Zones are lightweight zones, designed for deploying in edge computing scenarios. They are limited in functionality but have far fewer prerequisites than core zones.<br><br>Please refer to the Apache CloudStack documentation for more information on Zone Types<br><a href='http://docs.cloudstack.apache.org/en/latest/installguide/configuration.html#adding-a-zone'>http://docs.cloudstack.apache.org/en/latest/installguide/configuration.html#adding-a-zone</a>",
-"message.desc.cluster": "Each pod must contain one or more clusters. We will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.",
+"message.desc.core.zone": "Core Zones are intended for Datacenter based deployments and allow the full range of Networking and other functionality in Apache CloudStack. Core Zones have a number of prerequisites and rely on the presence of shared storage and helper Instances.",
+"message.desc.edge.zone": "Edge Zones are lightweight Zones, designed for deploying in edge computing scenarios. They are limited in functionality but have far fewer prerequisites than core zones.<br><br>Please refer to the Apache CloudStack documentation for more information on Zone Types<br><a href='http://docs.cloudstack.apache.org/en/latest/installguide/configuration.html#adding-a-zone'>http://docs.cloudstack.apache.org/en/latest/installguide/configuration.html#adding-a-zone</a>",
+"message.desc.cluster": "Each Pod must contain one or more Clusters. We will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.",
 "message.desc.create.ssh.key.pair": "Please fill in the following data to create or register a ssh key pair.<br><br>(1) If public key is set, CloudStack will register the public key. You can use it through your private key.<br><br>(2) If public key is not set, CloudStack will create a new SSH key pair. In this case, please copy and save the private key. CloudStack will not keep it.<br>",
 "message.desc.created.ssh.key.pair": "Created a SSH key pair.",
-"message.desc.host": "Each cluster must contain at least one host (computer) for guest Instances to run on. We will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.",
+"message.desc.host": "Each Cluster must contain at least one host (computer) for guest Instances to run on. We will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.",
 "message.desc.importingestinstancewizard": "This feature only applies to libvirt based KVM instances. Only Stopped instances can be ingested",
 "message.desc.import.ext.kvm.wizard": "Import libvirt domain from External KVM Host not managed by CloudStack",
 "message.desc.import.local.kvm.wizard": "Import QCOW2 image from Local Storage of selected KVM Host",
 "message.desc.import.shared.kvm.wizard": "Import QCOW2 image from selected Primary Storage Pool",
 "message.desc.import.unmanage.volume": "Please choose a storage pool that you want to import or unmanage volumes. The storage pool should be in Up status. <br>This feature only supports KVM.",
 "message.desc.importexportinstancewizard": "By choosing to manage an Instance, CloudStack takes over the orchestration of that Instance. Unmanaging an Instance removes CloudStack ability to manage it. In both cases, the Instance is left running and no changes are done to the VM on the hypervisor.<br><br>For KVM, managing a VM is an experimental feature.",
-"message.desc.importmigratefromvmwarewizard": "By selecting an existing or external VMware Datacenter and an instance to import, CloudStack migrates the selected instance from VMware to KVM on a conversion host using virt-v2v and imports it into a KVM cluster",
-"message.desc.primary.storage": "Each cluster must contain one or more primary storage servers. We will add the first one now. Primary storage contains the disk volumes for all the Instances running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.",
+"message.desc.importmigratefromvmwarewizard": "By selecting an existing or external VMware Datacenter and an instance to import, CloudStack migrates the selected instance from VMware to KVM on a conversion host using virt-v2v and imports it into a KVM Cluster",
+"message.desc.primary.storage": "Each Cluster must contain one or more primary storage servers. We will add the first one now. Primary storage contains the disk volumes for all the Instances running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.",
 "message.desc.reset.ssh.key.pair": "Please specify a ssh key pair that you would like to add to this Instance.",
-"message.desc.secondary.storage": "Each zone must have at least one NFS or secondary storage server. We will add the first one now. Secondary storage stores Instance Templates, ISO images, and Instance disk volume Snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.",
-"message.desc.register.user.data": "Please fill in the following data to register a User data.",
+"message.desc.secondary.storage": "Each Zone must have at least one NFS or secondary storage server. We will add the first one now. Secondary storage stores Instance Templates, ISO images, and Instance disk volume Snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.",
+"message.desc.register.user.data": "Please fill in the following to register new User Data.",
 "message.desc.registered.user.data": "Registered a User Data.",
-"message.desc.zone": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
-"message.desc.zone.edge": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. An edge zone consists of one or more hosts (each of which provides local storage as primary storage servers). Only shared and L2 Networks can be deployed in such zones and functionalities that require secondary storages are not supported.",
-"message.drs.plan.description": "The maximum number of live migrations allowed for DRS. Configure DRS under the settings tab before generating a plan or to enable automatic DRS for the cluster.",
+"message.desc.zone": "A Zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more Pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
+"message.desc.zone.edge": "A Zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. An edge zone consists of one or more hosts (each of which provides local storage as primary storage servers). Only shared and L2 Networks can be deployed in such zones and functionalities that require secondary storages are not supported.",
+"message.drs.plan.description": "The maximum number of live migrations allowed for DRS. Configure DRS under the settings tab before generating a plan or to enable automatic DRS for the Cluster.",
 "message.drs.plan.executed": "DRS plan executed successfully.",
 "message.zone.edge.local.storage": "Local storage will be used by default for User Instances and virtual routers",
 "message.detach.disk": "Are you sure you want to detach this disk?",
@@ -3076,8 +3075,8 @@
 "message.error.cidr": "CIDR is required",
 "message.error.cidr.or.cidrsize": "CIDR or cidr size is required",
 "message.error.cloudian.console": "Single-Sign-On failed for Cloudian management console. Please ask your administrator to fix integration issues.",
-"message.error.cluster.description": "Please enter Kubernetes cluster description.",
-"message.error.cluster.name": "Please enter cluster name.",
+"message.error.cluster.description": "Please enter Kubernetes Cluster description.",
+"message.error.cluster.name": "Please enter Cluster name.",
 "message.error.confirm.password": "Please confirm new password.",
 "message.error.confirm.text": "Please enter the confirmation text",
 "message.error.current.password": "Please enter current password.",
@@ -3118,7 +3117,7 @@
 "message.error.ipv6.address": "Please enter a valid IP v6 address.",
 "message.error.ipv6.gateway": "Please enter IpV6 Gateway",
 "message.error.ipv6.gateway.format": "Please enter a valid IPv6 Gateway.",
-"message.error.kubecluster.name": "Please enter Kubernetes cluster name.",
+"message.error.kubecluster.name": "Please enter Kubernetes Cluster name.",
 "message.error.kuberversion": "Please enter Kubernetes semantic version.",
 "message.error.limit.value": "The value must not be less than",
 "message.error.loading.setting": "There was an error loading these settings.",
@@ -3152,7 +3151,7 @@
 "message.error.remove.vm.schedule": "Removing Instance Schedule failed",
 "message.error.required.input": "Please enter input",
 "message.error.reset.config": "Unable to reset config to default value",
-"message.error.retrieve.kubeconfig": "Unable to retrieve Kubernetes cluster config",
+"message.error.retrieve.kubeconfig": "Unable to retrieve Kubernetes Cluster config",
 "message.error.routing.policy.term": "Community need to have the following format number:number",
 "message.error.s3nfs.path": "Please enter S3 NFS Path",
 "message.error.s3nfs.server": "Please enter S3 NFS Server",
@@ -3170,11 +3169,11 @@
 "message.error.secret.key": "Please enter secret key.",
 "message.error.select": "Please select option.",
 "message.error.select.domain.to.dedicate": "Please select domain to dedicate to.",
-"message.error.select.zone.type": "Please select zone type below.",
+"message.error.select.zone.type": "Please select Zone type below.",
 "message.error.server": "Please enter server.",
-"message.error.serviceoffering.for.cluster": "Please select service offering for Kubernetes cluster.",
+"message.error.serviceoffering.for.cluster": "Please select service offering for Kubernetes Cluster.",
 "message.error.size": "Please enter size in GB.",
-"message.error.size.for.cluster": "Please enter size for Kubernetes cluster.",
+"message.error.size.for.cluster": "Please enter size for Kubernetes Cluster.",
 "message.error.smb.password": "Please enter SMB password.",
 "message.error.smb.username": "Please enter SMB username.",
 "message.error.specify.stickiness.method": "Please specify a stickiness method",
@@ -3192,7 +3191,7 @@
 "message.error.upload.template": "Template upload failed.",
 "message.error.upload.template.description": "Only one Template can be uploaded at a time.",
 "message.error.url": "Please enter URL.",
-"message.error.userdata": "Please enter Userdata",
+"message.error.user.data": "Please enter the User Data",
 "message.error.username": "Enter your username.",
 "message.error.valid.iops.range": "Please enter a valid IOPS range.",
 "message.error.vcenter.datacenter": "Please enter vCenter datacenter.",
@@ -3200,16 +3199,16 @@
 "message.error.vcenter.host": "Please enter vCenter host.",
 "message.error.vcenter.password": "Please enter vCenter password.",
 "message.error.vcenter.username": "Please enter vCenter username.",
-"message.error.version.for.cluster": "Please select Kubernetes version for Kubernetes cluster.",
+"message.error.version.for.cluster": "Please select Kubernetes version for Kubernetes Cluster.",
 "message.error.vlan.range": "Please enter a valid VLAN/VNI range.",
 "message.error.volume.name": "Please enter volume name.",
 "message.error.volume": "Please enter volume.",
 "message.error.volume.group": "Please enter volume group.",
-"message.error.zone": "Please select a zone.",
-"message.error.zone.combined": "All zones cannot be combined with any other zone.",
-"message.error.zone.for.cluster": "Please select zone for Kubernetes cluster.",
-"message.error.zone.name": "Please enter zone name.",
-"message.error.zone.type": "Please select zone type.",
+"message.error.zone": "Please select a Zone.",
+"message.error.zone.combined": "All Zones cannot be combined with any other zone.",
+"message.error.zone.for.cluster": "Please select Zone for Kubernetes Cluster.",
+"message.error.zone.name": "Please enter Zone name.",
+"message.error.zone.type": "Please select Zone type.",
 "message.error.linstor.resourcegroup": "Please enter the Linstor Resource-Group.",
 "message.error.fixed.offering.kvm": "It's not possible to scale up Instances that utilize KVM hypervisor with a fixed compute offering.",
 "message.error.create.webhook.local.account": "Account must be provided for creating a Webhook with Local scope.",
@@ -3233,8 +3232,8 @@
 "message.import.volume": "Please specify the domain, account or project name. <br>If not set, the volume will be imported for the caller.",
 "message.info.cloudian.console": "Cloudian Management Console should open in another window.",
 "message.installwizard.cloudstack.helptext.website": " * Project website:\t ",
-"message.infra.setup.nsx.description": "This zone must contain an NSX provider because the isolation method is NSX",
-"message.infra.setup.tungsten.description": "This zone must contain a Tungsten-Fabric provider because the isolation method is TF",
+"message.infra.setup.nsx.description": "This Zone must contain an NSX provider because the isolation method is NSX",
+"message.infra.setup.tungsten.description": "This Zone must contain a Tungsten-Fabric provider because the isolation method is TF",
 "message.installwizard.cloudstack.helptext.document": " * Documentation:\t ",
 "message.installwizard.cloudstack.helptext.header": "\nYou can find more information about Apache CloudStack™ on the pages listed below.\n",
 "message.installwizard.cloudstack.helptext.issues": " * Report issues:\t ",
@@ -3242,20 +3241,20 @@
 "message.installwizard.cloudstack.helptext.releasenotes": " * Release notes:\t ",
 "message.installwizard.cloudstack.helptext.survey": " * Take the survey:\t ",
 "message.installwizard.copy.whatiscloudstack": "CloudStack™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the Network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.\n\nExtending beyond individual Instance images running on commodity hardware, CloudStack™ provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications.",
-"message.installwizard.tooltip.addpod.name": "A name for the pod.",
+"message.installwizard.tooltip.addpod.name": "A name for the Pod.",
 "message.installwizard.tooltip.addpod.reservedsystemendip": "This is the IP range in the private Network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.",
-"message.installwizard.tooltip.addpod.reservedsystemgateway": "The gateway for the hosts in that pod.",
+"message.installwizard.tooltip.addpod.reservedsystemgateway": "The gateway for the hosts in that Pod.",
 "message.installwizard.tooltip.addpod.reservedsystemstartip": "This is the IP range in the private Network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.",
-"message.installwizard.tooltip.configureguesttraffic.guestendip": "The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.",
+"message.installwizard.tooltip.configureguesttraffic.guestendip": "The range of IP addresses that will be available for allocation to guests in this Zone. If one NIC is used, these IPs should be in the same CIDR as the Pod CIDR.",
 "message.installwizard.tooltip.configureguesttraffic.guestgateway": "The gateway that the guests should use.",
 "message.installwizard.tooltip.configureguesttraffic.guestnetmask": "The netmask in use on the subnet that the guests should use.",
-"message.installwizard.tooltip.configureguesttraffic.gueststartip": "The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.",
+"message.installwizard.tooltip.configureguesttraffic.gueststartip": "The range of IP addresses that will be available for allocation to guests in this Zone. If one NIC is used, these IPs should be in the same CIDR as the Pod CIDR.",
 "message.installwizard.tooltip.nsx.provider.hostname": "NSX Provider hostname / IP address not provided",
 "message.installwizard.tooltip.nsx.provider.username": "NSX Provider username not provided",
 "message.installwizard.tooltip.nsx.provider.password": "NSX Provider password not provided",
-"message.installwizard.tooltip.nsx.provider.edgecluster": "NSX Provider edge cluster information not provided",
+"message.installwizard.tooltip.nsx.provider.edgecluster": "NSX Provider edge Cluster information not provided",
 "message.installwizard.tooltip.nsx.provider.tier0gateway": "NSX Provider tier-0 gateway information not provided",
-"message.installwizard.tooltip.nsx.provider.transportZone": "NSX Provider transport zone information not provided",
+"message.installwizard.tooltip.nsx.provider.transportZone": "NSX Provider transport Zone information not provided",
 "message.installwizard.tooltip.tungsten.provider.gateway": "Tungsten provider gateway is required",
 "message.installwizard.tooltip.tungsten.provider.hostname": "Tungsten provider hostname is required",
 "message.installwizard.tooltip.tungsten.provider.introspectport": "Tungsten provider introspect port is required",
@@ -3271,14 +3270,14 @@
 "message.ip.v6.prefix.delete": "IPv6 prefix deleted",
 "message.iso.arch": "Please select an ISO architecture",
 "message.iso.desc": "Disc image containing data or bootable media for OS.",
-"message.kubeconfig.cluster.not.available": "Kubernetes cluster kubeconfig not available currently.",
-"message.kubernetes.cluster.delete": "Please confirm that you want to destroy the cluster.",
-"message.kubernetes.cluster.scale": "Please select desired cluster configuration.",
-"message.kubernetes.cluster.start": "Please confirm that you want to start the cluster.",
-"message.kubernetes.cluster.stop": "Please confirm that you want to stop the cluster.",
+"message.kubeconfig.cluster.not.available": "Kubernetes Cluster kubeconfig not available currently.",
+"message.kubernetes.cluster.delete": "Please confirm that you want to destroy the Cluster.",
+"message.kubernetes.cluster.scale": "Please select desired Cluster configuration.",
+"message.kubernetes.cluster.start": "Please confirm that you want to start the Cluster.",
+"message.kubernetes.cluster.stop": "Please confirm that you want to stop the Cluster.",
 "message.kubernetes.cluster.upgrade": "Please select new Kubernetes version.",
 "message.kubernetes.version.delete": "Please confirm that you want to delete this Kubernetes version.",
-"message.l2.network.unsupported.for.nsx": "L2 networks aren't supported for NSX enabled zones",
+"message.l2.network.unsupported.for.nsx": "L2 networks aren't supported for NSX enabled Zones",
 "message.launch.zone": "Zone is ready to launch; please proceed to the next step.",
 "message.launch.zone.description": "Zone is ready to launch; please proceed to the next step.",
 "message.launch.zone.hint": "Configure Network components and traffic including IP addresses.",
@@ -3303,8 +3302,8 @@
 "message.lock.user": "Please confirm that you want to lock the User \"{user}\". By locking this User, they will no longer be able to manage their cloud resources. Existing resources can still be accessed.",
 "message.lock.user.success": "Successfully locked User \"{user}\"",
 "message.login.failed": "Login Failed",
-"message.migrate.instance.host.auto.assign": "Host for the Instance will be automatically chosen based on the suitability within the same cluster",
-"message.migrate.instance.to.host": "Please confirm that you want to migrate this Instance to another host. When migration is between hosts of different clusters volume(s) of the Instance may get migrated to suitable storage pools.",
+"message.migrate.instance.host.auto.assign": "Host for the Instance will be automatically chosen based on the suitability within the same Cluster",
+"message.migrate.instance.to.host": "Please confirm that you want to migrate this Instance to another host. When migration is between hosts of different Clusters volume(s) of the Instance may get migrated to suitable storage pools.",
 "message.migrate.instance.to.ps": "Please confirm that you want to migrate this Instance to another primary storage.",
 "message.migrate.resource.to.ss": "Please confirm that you want to migrate this resource to another secondary storage.",
 "message.migrate.router.confirm": "Please confirm the host you wish to migrate the router to:",
@@ -3354,11 +3353,11 @@
 "message.path": "Path : ",
 "message.path.description": "NFS: exported path from the server. VMFS: /datacenter name/datastore name. SharedMountPoint: path where primary storage is mounted, such as /mnt/primary.",
 "message.please.confirm.remove.ssh.key.pair": "Please confirm that you want to remove this SSH key pair.",
-"message.please.confirm.remove.user.data": "Please confirm that you want to remove this Userdata",
+"message.please.confirm.remove.user.data": "Please confirm that you want to remove this User Data",
 "message.please.enter.valid.value": "Please enter a valid value.",
 "message.please.enter.value": "Please enter values.",
 "message.please.wait.while.autoscale.vmgroup.is.being.created": "Please wait while your AutoScaling Group is being created; this may take a while...",
-"message.please.wait.while.zone.is.being.created": "Please wait while your zone is being created; this may take a while...",
+"message.please.wait.while.zone.is.being.created": "Please wait while your Zone is being created; this may take a while...",
 "message.pod.dedicated": "Pod dedicated.",
 "message.pod.dedication.released": "Pod dedication released.",
 "message.prepare.for.shutdown": "Please confirm that you would like to prep this Management server for shutdown. It will not accept any new Async Jobs but will NOT terminate after there are no pending jobs.",
@@ -3374,10 +3373,10 @@
 "message.recover.vm": "Please confirm that you would like to recover this Instance.",
 "message.reinstall.vm": "NOTE: Proceed with caution. This will cause the Instance to be reinstalled from the Template; data on the root disk will be lost. Extra data volumes, if any, will not be touched.",
 "message.release.ip.failed": "Failed to release IP",
-"message.releasing.dedicated.cluster": "Releasing dedicated cluster...",
+"message.releasing.dedicated.cluster": "Releasing dedicated Cluster...",
 "message.releasing.dedicated.host": "Releasing dedicated host...",
-"message.releasing.dedicated.pod": "Releasing dedicated pod...",
-"message.releasing.dedicated.zone": "Releasing dedicated zone...",
+"message.releasing.dedicated.pod": "Releasing dedicated Pod...",
+"message.releasing.dedicated.zone": "Releasing dedicated Zone...",
 "message.remove.annotation": "Are you sure you want to delete the comment?",
 "message.remove.egress.rule.failed": "Removing egress rule failed",
 "message.remove.egress.rule.processing": "Deleting egress rule...",
@@ -3423,7 +3422,7 @@
 "message.scaleup.policy.continue": "Please add at least a condition to ScaleUp policy to continue",
 "message.scaleup.policy.duration.continue": "Please input a valid duration to ScaleUp policy to continue",
 "message.scaleup.policy.name.continue": "Please input a name to ScaleUp policy to continue",
-"message.select.a.zone": "A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.",
+"message.select.a.zone": "A Zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.",
 "message.select.affinity.groups": "Please select any affinity groups you want this Instance to belong to:",
 "message.select.bgp.peers": "Please select / deselect the BGP peers associated to the network or VPC:",
 "message.select.deselect.desired.options": "Please select / deselect the desired options",
@@ -3431,28 +3430,28 @@
 "message.select.destination.image.stores": "Please select Image Store(s) to which data is to be migrated to",
 "message.select.disk.offering": "Please select a disk offering for disk",
 "message.select.end.date.and.time": "Select an end date & time.",
-"message.select.kvm.host.instance.conversion": "(Optional) Select a KVM host in the zone to perform the instance conversion through virt-v2v",
-"message.select.kvm.host.instance.import": "(Optional) Select a KVM host in the cluster to perform the importing of the converted instance",
+"message.select.kvm.host.instance.conversion": "(Optional) Select a KVM host in the Zone to perform the instance conversion through virt-v2v",
+"message.select.kvm.host.instance.import": "(Optional) Select a KVM host in the Cluster to perform the importing of the converted instance",
 "message.select.load.balancer.rule": "Please select a load balancer rule for your AutoScale Instance group.",
 "message.select.migration.policy": "Please select a migration policy.",
 "message.select.nic.network": "Please select a Network for NIC",
 "message.select.security.groups": "Please select security group(s) for your new Instance.",
 "message.select.start.date.and.time": "Select a start date & time.",
 "message.select.temporary.storage.instance.conversion": "(Optional) Select a Storage temporary destination for the converted disks through virt-v2v",
-"message.select.zone.description": "Select type of zone basic/advanced.",
-"message.select.zone.hint": "This is the type of zone deployment that you want to use. Basic zone: provides a single Network where each Instance is assigned an IP directly from the Network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering). Advanced zone: For more sophisticated Network topologies. This Network model provides the most flexibility in defining guest Networks and providing custom Network offerings such as firewall, VPN, or load balancer support.",
+"message.select.zone.description": "Select type of Zone basic/advanced.",
+"message.select.zone.hint": "This is the type of Zone deployment that you want to use. Basic zone: provides a single Network where each Instance is assigned an IP directly from the Network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering). Advanced zone: For more sophisticated Network topologies. This Network model provides the most flexibility in defining guest Networks and providing custom Network offerings such as firewall, VPN, or load balancer support.",
 "message.server": "Server : ",
 "message.server.description": "NFS, iSCSI, or PreSetup: IP address or DNS name of the storage device. VMWare PreSetup: IP address or DNS name of the vCenter server. Linstor: http(s) url of the linstor-controller.",
 "message.set.default.nic": "Please confirm that you would like to make this NIC the default for this Instance.",
 "message.set.default.nic.manual": "Please manually update the default NIC on the Instance now.",
 "message.setting.updated": "Setting Updated:",
 "message.setting.update.delay": "The new value will take effect within 30 seconds.",
-"message.setup.physical.network.during.zone.creation": "When adding a zone, you need to set up one or more physical networks. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined. Add or remove one or more traffic types onto each physical network.",
-"message.setup.physical.network.during.zone.creation.basic": "When adding a basic zone, you can set up one physical Network, which corresponds to a NIC on the hypervisor. The Network carries several types of traffic.<br/><br/>You may also <strong>add</strong> other traffic types onto the physical Network.",
+"message.setup.physical.network.during.zone.creation": "When adding a Zone, you need to set up one or more physical networks. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined. Add or remove one or more traffic types onto each physical network.",
+"message.setup.physical.network.during.zone.creation.basic": "When adding a basic Zone, you can set up one physical Network, which corresponds to a NIC on the hypervisor. The Network carries several types of traffic.<br/><br/>You may also <strong>add</strong> other traffic types onto the physical Network.",
 "message.shared.network.offering.warning": "Domain admins and regular Users can only create shared Networks from Network offering with the setting specifyvlan=false. Please contact an administrator to create a Network offering if this list is empty.",
-"message.shared.network.unsupported.for.nsx": "Shared networks aren't supported for NSX enabled zones",
+"message.shared.network.unsupported.for.nsx": "Shared networks aren't supported for NSX enabled Zones",
 "message.shutdown.triggered": "A shutdown has been triggered. CloudStack will not accept new jobs",
-"message.snapshot.additional.zones": "Snapshots will always be created in its native zone - %x, here you can select additional zone(s) where it will be copied to at creation time",
+"message.snapshot.additional.zones": "Snapshots will always be created in its native Zone - %x, here you can select additional zone(s) where it will be copied to at creation time",
 "message.sourcenatip.change.warning": "WARNING: Changing the sourcenat IP address of the network will cause connectivity downtime for the Instances with NICs in the Network.",
 "message.sourcenatip.change.inhibited": "Changing the sourcenat to this IP of the Network to this address is inhibited as firewall rules are defined for it. This can include port forwarding or load balancing rules.\n - If this is an Isolated Network, please use updateNetwork/click the edit button.\n - If this is a VPC, first clear all other rules for this address.",
 "message.specify.tag.key": "Please specify a tag key.",
@@ -3474,7 +3473,7 @@
 "message.success.add.kuberversion": "Successfully added Kubernetes version",
 "message.success.add.logical.router": "Successfully added Logical Router",
 "message.success.add.network": "Successfully added Network",
-"message.success.add.network.acl": "Successfully added Network ACL list",
+"message.success.add.network.acl": "Successfully added Network ACL",
 "message.success.add.network.static.route": "Successfully added Network Static Route",
 "message.success.add.network.permissions": "Successfully added Network permissions",
 "message.success.add.physical.network": "Successfully added Physical Network",
@@ -3518,7 +3517,7 @@
 "message.success.create.internallb": "Successfully created Internal Load Balancer",
 "message.success.create.isolated.network": "Successfully created isolated Network",
 "message.success.create.keypair": "Successfully created SSH key pair",
-"message.success.create.kubernetes.cluter": "Successfully created Kubernetes cluster",
+"message.success.create.kubernetes.cluter": "Successfully created Kubernetes Cluster",
 "message.success.create.l2.network": "Successfully created L2 Network",
 "message.success.create.snapshot.from.vmsnapshot": "Successfully created Snapshot from Instance Snapshot",
 "message.success.create.template": "Successfully created Template",
@@ -3560,7 +3559,7 @@
 "message.success.register.iso": "Successfully registered ISO",
 "message.success.register.keypair": "Successfully registered SSH key pair",
 "message.success.register.template": "Successfully registered Template",
-"message.success.register.user.data": "Successfully registered Userdata",
+"message.success.register.user.data": "Successfully registered User Data",
 "message.success.release.ip": "Successfully released IP",
 "message.success.release.dedicated.bgp.peer": "Successfully released dedicated BGP peer",
 "message.success.release.dedicated.ipv4.subnet": "Successfully released dedicated IPv4 subnet",
@@ -3583,7 +3582,7 @@
 "message.success.remove.tungsten.routing.policy": "Successfully removed Tungsten-Fabric Routing Policy from Network",
 "message.success.reset.network.permissions": "Successfully reset Network Permissions",
 "message.success.resize.volume": "Successfully resized volume",
-"message.success.scale.kubernetes": "Successfully scaled Kubernetes cluster",
+"message.success.scale.kubernetes": "Successfully scaled Kubernetes Cluster",
 "message.success.unmanage.instance": "Successfully unmanaged Instance",
 "message.success.unmanage.volume": "Successfully unmanaged Volume",
 "message.success.update.account": "Successfully updated Account",
@@ -3598,7 +3597,7 @@
 "message.success.update.network": "Successfully updated Network",
 "message.success.update.template": "Successfully updated Template",
 "message.success.update.user": "Successfully updated User",
-"message.success.upgrade.kubernetes": "Successfully upgraded Kubernetes cluster",
+"message.success.upgrade.kubernetes": "Successfully upgraded Kubernetes Cluster",
 "message.success.upload": "Successfully uploaded",
 "message.success.upload.description": "This ISO file has been uploaded. Please check its status in the Templates menu.",
 "message.success.upload.icon": "Successfully uploaded icon for ",
@@ -3613,9 +3612,9 @@
 "message.template.import.vm.temporary": "If a temporary Template is used, the reset Instance operation will not work after importing it.",
 "message.template.iso": "Please select a Template or ISO to continue.",
 "message.template.type.change.warning": "WARNING: Changing the Template type to SYSTEM will disable further changes to the Template.",
-"message.tooltip.reserved.system.netmask": "The Network prefix that defines the pod subnet. Uses CIDR notation.",
+"message.tooltip.reserved.system.netmask": "The Network prefix that defines the Pod subnet. Uses CIDR notation.",
 "message.traffic.type.deleted": "Successfully deleted traffic type",
-"message.traffic.type.to.basic.zone": "traffic type to basic zone",
+"message.traffic.type.to.basic.zone": "traffic type to basic Zone",
 "message.trigger.shutdown": "Please confirm that you would like to trigger a shutdown on this Management server. It will not accept any new Async Jobs and will terminate after there are no pending jobs.",
 "message.type.values.to.add": "Please add additional values by typing them in",
 "message.update.autoscale.policy.failed": "Failed to update autoscale policy",
@@ -3714,11 +3713,11 @@
 "message.warn.change.primary.storage.scope": "This feature is tested and supported for the following configurations:<br>KVM - NFS/Ceph - DefaultPrimary<br>VMware - NFS - DefaultPrimary<br>*There might be extra steps involved to make it work for other configurations.",
 "message.warn.filetype": "jpg, jpeg, png, bmp and svg are the only supported image formats.",
 "message.warn.importing.instance.without.nic": "WARNING: This Instance is being imported without NICs and many Network resources will not be available. Consider creating a NIC via vCenter before importing or as soon as the Instance is imported.",
-"message.warn.zone.mtu.update": "Please note that this limit won't affect pre-existing Network’s MTU settings",
+"message.warn.zone.mtu.update": "Please note that this limit won't affect pre-existing Network's MTU settings",
 "message.webhook.deliveries.time.filter": "Webhook deliveries list can be filtered based on date-time. Select 'Custom' for specifying start and end date range.",
 "message.zone.creation.complete": "Zone creation complete.",
-"message.zone.detail.description": "Populate zone details.",
-"message.zone.detail.hint": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
+"message.zone.detail.description": "Populate Zone details.",
+"message.zone.detail.hint": "A Zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more Pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
 "message.validate.min": "Please enter a value greater than or equal to {0}.",
 "message.action.delete.object.storage": "Please confirm that you want to delete this Object Store",
 "message.bgp.peers.null": "Please note, if no BGP peers are selected, the VR will connect to <br> (1) dedicated BGP peers the owner can access, if the owner has dedicated BGP peers and account setting use.system.bgp.peers is set to false; <br> (2) all BGP peers the owner can access, otherwise.<br>",
diff --git a/ui/public/locales/es.json b/ui/public/locales/es.json
index ae4fa19f033..ab57c951531 100644
--- a/ui/public/locales/es.json
+++ b/ui/public/locales/es.json
@@ -14,12 +14,12 @@
 "label.account.specific": "espec\u00edficas de la cuenta",
 "label.accounts": "Cuentas",
 "label.accounttype": "Tipo de Cuenta",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ID de ACL",
-"label.acl.list.rules": "Lista de Reglas ACL",
+"label.acl.rules": "Lista de Reglas ACL",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "Nombre de ACL",
+"label.acl.rule.name": "Nombre de ACL",
 "label.acquire.new.ip": "Adquirir nueva IP",
 "label.acquire.new.secondary.ip": "Adquirir nueva IP secundaria",
 "label.action": "Acci\u00f3n",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Sesiones activas",
 "label.add": "Agregar",
 "label.add.account": "A\u00f1adir Cuenta",
-"label.add.acl": "Agregar ACL",
-"label.add.acl.list": "Agregar Lista ACL",
+"label.add.acl.rule": "Agregar ACL",
+"label.add.acl": "Agregar Lista ACL",
 "label.add.affinity.group": "Agregar un nuevo grupo de afinidad",
 "label.add.baremetal.dhcp.device": "Agregar dispositivo DHCP Baremetal",
 "label.add.bigswitchbcf.device": "Agregar Controlador BigSwitch BCF",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "A\u00f1adir Rango IP",
 "label.add.isolated.network": "Agregar Red Aislada",
 "label.add.ldap.account": "Agregar cuenta LDAP",
-"label.add.list.name": "Nombre de la Lista ACL",
+"label.add.acl.name": "Nombre de la Lista ACL",
 "label.add.more": "A\u00f1adir m\u00e1s",
 "label.add.netscaler.device": "Agregar dispositivo Netscaler",
 "label.add.network": "Agregar Red",
 "label.add.network.acl": "Agregar ACL de Red",
-"label.add.network.acl.list": "Agregar Lista ACL de Red",
+"label.add.network.acl": "Agregar Lista ACL de Red",
 "label.add.network.offering": "Agregar Oferta de Red",
 "label.add.new.gateway": "Agregar nuevo gateway",
 "label.add.new.tier": "Agregar un nuevo tier",
@@ -344,7 +344,7 @@
 "label.default.use": "Uso por defecto",
 "label.default.view": "Vista Por Defecto",
 "label.delete": "Eliminar",
-"label.delete.acl.list": "Borrar Lista ACL",
+"label.delete.acl": "Borrar Lista ACL",
 "label.delete.affinity.group": "Borrar Grupo de Afinidad",
 "label.delete.alerts": "Eliminar alertas",
 "label.delete.bigswitchbcf": "Remover Controlador BigSwitch BCF",
@@ -431,7 +431,7 @@
 "label.driver": "Controlador",
 "label.dynamicscalingenabled": "Escalado din\u00e1mico habilitado",
 "label.edit": "Editar",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Editar regla ACL",
 "label.edit.project.details": "Editar detalles de proyecto",
 "label.edit.role": "Editar Rol",
@@ -947,7 +947,6 @@
 "label.remove.vpc.offering": "Quitar Oferta VPC",
 "label.removing": "Quitando..",
 "label.replace.acl": "Reemplazar ACL",
-"label.replace.acl.list": "Reemplazar Lista ACL",
 "label.report.bug": "Reportar un Error",
 "label.required": "Requerido",
 "label.requireshvm": "HVM",
@@ -1180,8 +1179,7 @@
 "label.usehttps": "Use HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Usuario",
-"label.userdata": "DatosUsuario",
-"label.userdatal2": "Datos de Usuario",
+"label.user.data": "DatosUsuario",
 "label.username": "Nombre de usuario",
 "label.users": "Usuarios",
 "label.utilization": "Utilisation",
@@ -1361,7 +1359,7 @@
 "message.confirm.archive.selected.alerts": "Por favor confirme que desea archivar las alertas seleccionadas",
 "message.confirm.archive.selected.events": "Por favor confirme que desea archivar los eventos seleccionados",
 "message.confirm.attach.disk": "\u00bf Est\u00e1 seguro que desea conectar el disco?",
-"message.confirm.delete.acl.list": "\u00bfEsta seguro que desea borrar esta lista de ACL?",
+"message.confirm.delete.acl": "\u00bfEsta seguro que desea borrar esta lista de ACL?",
 "message.confirm.delete.bigswitchbcf": "Por favor confirme que desa borrar este Controlador BigSwitch BCF",
 "message.confirm.delete.brocadevcs": "Por favor confirme que desa borrar este Switch Brocade Vcs",
 "message.confirm.delete.ciscoasa1000v": "Por favor confirme que desea borrar CiscoASA1000v",
diff --git a/ui/public/locales/fr_FR.json b/ui/public/locales/fr_FR.json
index 48a0560f176..424f4749aa3 100644
--- a/ui/public/locales/fr_FR.json
+++ b/ui/public/locales/fr_FR.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Sp\u00e9cifique au compte",
 "label.accounts": "Comptes",
 "label.accounttype": "Type Compte",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ID ACL",
-"label.acl.list.rules": "Liste r\u00e8gles ACL",
+"label.acl.rules": "Liste r\u00e8gles ACL",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "Nom ACL",
+"label.acl.rule.name": "Nom ACL",
 "label.acquire.new.ip": "Acqu\u00e9rir nouvelle adr. IP",
 "label.acquire.new.secondary.ip": "Acqu\u00e9rir nouvelle IP secondaire",
 "label.action": "Action",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Sessions actives",
 "label.add": "Ajouter",
 "label.add.account": "Ajouter un compte",
-"label.add.acl": "Ajouter r\u00e8gle ACL",
-"label.add.acl.list": "Ajouter Liste ACL",
+"label.add.acl.rule": "Ajouter r\u00e8gle ACL",
+"label.add.acl": "Ajouter Liste ACL",
 "label.add.affinity.group": "Ajouter nouveau groupe d'affinit\u00e9",
 "label.add.baremetal.dhcp.device": "Ajouter un DHCP Baremetal",
 "label.add.bigswitchbcf.device": "Ajouter un contr\u00f4leur BigSwitch BCF",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Ajouter une plage IP",
 "label.add.isolated.network": "Ajouter un r\u00e9seau isol\u00e9",
 "label.add.ldap.account": "Ajouter un compte LDAP",
-"label.add.list.name": "Nom Liste ACL",
+"label.add.acl.name": "Nom Liste ACL",
 "label.add.more": "Ajouter plus",
 "label.add.netscaler.device": "Ajouter un Netscaler",
 "label.add.network": "Ajouter un r\u00e9seau",
 "label.add.network.acl": "Ajouter une r\u00e8gle d'acc\u00e8s r\u00e9seau ACL",
-"label.add.network.acl.list": "Ajouter Liste ACL r\u00e9seau",
+"label.add.network.acl": "Ajouter Liste ACL r\u00e9seau",
 "label.add.network.offering": "Ajouter Offre R\u00e9seau",
 "label.add.new.gateway": "Ajouter une nouvelle passerelle",
 "label.add.new.tier": "Ajouter un nouveau tiers",
@@ -334,7 +334,7 @@
 "label.default.use": "Utilisation par d\u00e9faut",
 "label.default.view": "Vue par d\u00e9faut",
 "label.delete": "Supprimer",
-"label.delete.acl.list": "Supprimer Liste ACL",
+"label.delete.acl": "Supprimer Liste ACL",
 "label.delete.affinity.group": "Supprimer le groupe d'affinit\u00e9",
 "label.delete.alerts": "Supprimer alertes",
 "label.delete.bigswitchbcf": "Supprimer contr\u00f4leur BigSwitch BCF",
@@ -419,7 +419,7 @@
 "label.dpd": "D\u00e9tection de pair mort",
 "label.driver": "Pilote",
 "label.edit": "Modifier",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Modifier r\u00e8gle ACL",
 "label.edit.project.details": "Modifier les d\u00e9tails du projet",
 "label.edit.role": "\u00c9diter R\u00f4le",
@@ -926,7 +926,6 @@
 "label.remove.vpc.offering": "Supprimer offre VPC",
 "label.removing": "Suppression",
 "label.replace.acl": "Remplacer ACL",
-"label.replace.acl.list": "Remplacer Liste ACL",
 "label.required": "Requis",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Mise \u00e0 jour n\u00e9cessaire",
@@ -1152,8 +1151,7 @@
 "label.usehttps": "Utiliser HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Utilisateur",
-"label.userdata": "Donn\u00e9es Utilisateur",
-"label.userdatal2": "Donn\u00e9es utilisateur",
+"label.user.data": "Donn\u00e9es Utilisateur",
 "label.username": "Identifiant",
 "label.users": "Utilisateurs",
 "label.utilization": "Utilisation",
@@ -1331,7 +1329,7 @@
 "message.confirm.archive.selected.alerts": "Confirmer l'archivage des alertes s\u00e9lectionn\u00e9es",
 "message.confirm.archive.selected.events": "Confirmez l'archivage des \u00e9v\u00e9nements s\u00e9lectionn\u00e9s",
 "message.confirm.attach.disk": "Confirmer le rattachement de ce disque ?",
-"message.confirm.delete.acl.list": "Confirmer la suppression de cette liste ACL ?",
+"message.confirm.delete.acl": "Confirmer la suppression de cette liste ACL ?",
 "message.confirm.delete.bigswitchbcf": "Confirmer que vous voulez supprimer ce contr\u00f4leur BigSwitch BCF",
 "message.confirm.delete.brocadevcs": "Confirmer la suppression du switch Brocade Vcs",
 "message.confirm.delete.ciscoasa1000v": "Confirmez la suppression du CiscoASA1000v",
diff --git a/ui/public/locales/hi.json b/ui/public/locales/hi.json
index 055909360b5..9d7440b9262 100644
--- a/ui/public/locales/hi.json
+++ b/ui/public/locales/hi.json
@@ -6,7 +6,7 @@
 "label.accounts": "लेखा",
 "label.accounttype": "खाता प्रकार",
 "label.aclid": "ACL",
-"label.aclname": "ACL नाम",
+"label.acl.rule.name": "ACL नाम",
 "label.actions": "क्रियाएँ",
 "label.add": "जोड़ें",
 "label.adding": "जोड़ना",
@@ -410,7 +410,7 @@
 "label.usageunit": "Unit",
 "label.usehttps": "HTTPS का उपयोग करें",
 "label.user": "उपयोगकर्ता",
-"label.userdata": "Userdata",
+"label.user.data": "User Data",
 "label.username": "उपयोगकर्ता नाम",
 "label.users": "उपयोगकर्ता",
 "label.uuid": "ID",
diff --git a/ui/public/locales/hu.json b/ui/public/locales/hu.json
index 48275ce81fc..ae58379d343 100644
--- a/ui/public/locales/hu.json
+++ b/ui/public/locales/hu.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Sz\u00e1mla-specifikus",
 "label.accounts": "Sz\u00e1ml\u00e1k",
 "label.accounttype": "Sz\u00e1mla t\u00edpus",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL n\u00e9v",
+"label.acl.rule.name": "ACL n\u00e9v",
 "label.acquire.new.ip": "\u00daj IP c\u00edm beszerz\u00e9se",
 "label.acquire.new.secondary.ip": "\u00daj m\u00e1sodlagos IP c\u00edm beszerz\u00e9se",
 "label.action": "M\u0171velet",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Akt\u00edv munkamenetek",
 "label.add": "Felv\u00e9tel",
 "label.add.account": "Sz\u00e1mla felv\u00e9tele",
-"label.add.acl": "ACL felv\u00e9tele",
-"label.add.acl.list": "ACL lista felv\u00e9tele",
+"label.add.acl.rule": "ACL felv\u00e9tele",
+"label.add.acl": "ACL Lista felv\u00e9tele",
 "label.add.affinity.group": "\u00daj affin\u00edt\u00e1si csoport felv\u00e9tele",
 "label.add.baremetal.dhcp.device": "Baremetal DHCP eszk\u00f6z felv\u00e9tele",
 "label.add.bigswitchbcf.device": "BigSwitch BCF vez\u00e9rl\u0151 felv\u00e9tele",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "IP c\u00edmtartom\u00e1ny felv\u00e9tele",
 "label.add.isolated.network": "Izol\u00e1lt h\u00e1l\u00f3zat felv\u00e9tele",
 "label.add.ldap.account": "LDAP hozz\u00e1f\u00e9r\u00e9s felv\u00e9tele",
-"label.add.list.name": "ACL lista n\u00e9v",
+"label.add.acl.name": "ACL Lista n\u00e9v",
 "label.add.more": "Tov\u00e1bbi felv\u00e9tele",
 "label.add.netscaler.device": "Netscaler eszk\u00f6z felv\u00e9tele",
 "label.add.network": "H\u00e1l\u00f3zat felv\u00e9tele",
 "label.add.network.acl": "H\u00e1l\u00f3zati ACL felv\u00e9tele",
-"label.add.network.acl.list": "H\u00e1l\u00f3zati ACL lista felv\u00e9tele",
+"label.add.network.acl": "H\u00e1l\u00f3zati ACL Lista felv\u00e9tele",
 "label.add.network.offering": "H\u00e1l\u00f3zati aj\u00e1nlat felv\u00e9tele",
 "label.add.new.gateway": "\u00daj \u00e1tj\u00e1r\u00f3 felv\u00e9tele",
 "label.add.new.tier": "\u00daj r\u00e9teg felv\u00e9tele",
@@ -334,7 +334,7 @@
 "label.default.use": "Alap\u00e9rtelmezett haszn\u00e1lat",
 "label.default.view": "Alap\u00e9rtelmezett n\u00e9zet",
 "label.delete": "T\u00f6rl\u00e9s",
-"label.delete.acl.list": "ACL lista t\u00f6rl\u00e9se",
+"label.delete.acl": "ACL Lista t\u00f6rl\u00e9se",
 "label.delete.affinity.group": "Affin\u00edt\u00e1si csoport t\u00f6rl\u00e9se",
 "label.delete.alerts": "T\u00f6rl\u00e9s riaszt\u00e1sok",
 "label.delete.bigswitchbcf": "BigSwitch BCF vez\u00e9rl\u0151 elt\u00e1vol\u00edt\u00e1sa",
@@ -419,7 +419,7 @@
 "label.driver": "Driver",
 "label.dynamicscalingenabled": "dinamikus m\u00e9retez\u00e9s enged\u00e9lyezve",
 "label.edit": "Szerkeszt\u00e9s",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "ACL szab\u00e1ly szerkeszt\u00e9se",
 "label.edit.project.details": "Projekt r\u00e9szletek szerkeszt\u00e9se",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "VPC aj\u00e1nlat t\u00f6rl\u00e9se",
 "label.removing": "T\u00f6rl\u00e9s",
 "label.replace.acl": "ACL csere",
-"label.replace.acl.list": "ACL lista cser\u00e9je",
 "label.required": "Sz\u00fcks\u00e9ges",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Friss\u00edt\u00e9st ig\u00e9nyel",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "HTTPS haszn\u00e1lata",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Felhaszn\u00e1l\u00f3",
-"label.userdata": "Felhaszn\u00e1l\u00f3 adat",
-"label.userdatal2": "Felhaszn\u00e1l\u00f3i adat",
+"label.user.data": "Felhaszn\u00e1l\u00f3 adat",
 "label.username": "Felhaszn\u00e1l\u00f3n\u00e9v",
 "label.users": "Felhaszn\u00e1l\u00f3k",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Er\u0151s\u00edtsd meg, hogy le akarod archiv\u00e1lni a kiv\u00e1lasztott riaszt\u00e1sokat!",
 "message.confirm.archive.selected.events": "Er\u0151s\u00edtsd meg, hogy archiv\u00e1lni szeretn\u00e9d a kiv\u00e1lasztott esem\u00e9nyeket!",
 "message.confirm.attach.disk": "Biztosan csatolni szeretn\u00e9d a merevlemezt?",
-"message.confirm.delete.acl.list": "Biztosan t\u00f6r\u00f6lni akarod ezt a ACL list\u00e1t?",
+"message.confirm.delete.acl": "Biztosan t\u00f6r\u00f6lni akarod ezt a ACL List\u00e1t?",
 "message.confirm.delete.bigswitchbcf": "Er\u0151s\u00edtsd meg, hogy t\u00f6r\u00f6lni szeretn\u00e9d ezt a BigSwitch BCF vez\u00e9rl\u0151t!",
 "message.confirm.delete.brocadevcs": "Er\u0151s\u00edtsd meg, hogy t\u00f6r\u00f6lni szeretn\u00e9d a Brocade Vcs Switch-et",
 "message.confirm.delete.ciscoasa1000v": "Er\u0151s\u00edtsd meg, hogy t\u00f6r\u00f6lni akarod a CiscoASA1000v-t",
@@ -1354,7 +1352,7 @@
 "message.confirm.remove.selected.events": "Er\u0151s\u00edtsd meg, hogy t\u00f6r\u00f6lni szeretn\u00e9d a kiv\u00e1lasztott esem\u00e9nyeket",
 "message.confirm.remove.vmware.datacenter": "Er\u0151s\u00edtsd meg, hogy el akarod t\u00e1vol\u00edtani a VMware adatk\u00f6zpontot!",
 "message.confirm.remove.vpc.offering": "Biztos vagy abban, hogy t\u00f6r\u00f6lni akarod ezt a VPC aj\u00e1nlatot?",
-"message.confirm.replace.acl.new.one": "Le akarod cser\u00e9lni ez ACL list\u00e1t egy \u00fajjal?",
+"message.confirm.replace.acl.new.one": "Le akarod cser\u00e9lni ez ACL List\u00e1t egy \u00fajjal?",
 "message.confirm.scale.up.router.vm": "Biztosan fel akarod m\u00e9retezni a router VM-et?",
 "message.confirm.scale.up.system.vm": "Biztosan fel akarod m\u00e9retezni a rendszer VM-et?",
 "message.confirm.start.lb.vm": "Er\u0151s\u00edtsd meg, hogy el akarod ind\u00edtani az LB VM-et!",
diff --git a/ui/public/locales/it_IT.json b/ui/public/locales/it_IT.json
index 844763eba3a..a2907b71f23 100644
--- a/ui/public/locales/it_IT.json
+++ b/ui/public/locales/it_IT.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Specifico dell'Account",
 "label.accounts": "Utenti",
 "label.accounttype": "Account Type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Name",
+"label.acl.rule.name": "ACL Name",
 "label.acquire.new.ip": "Acquisizione nuovo indirizzo IP",
 "label.acquire.new.secondary.ip": "Acquisizione nuovo IP secondario",
 "label.action": "Action",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Sessioni Attive",
 "label.add": "Add",
 "label.add.account": "Aggiungi un Account",
-"label.add.acl": "Aggiungere ACL",
-"label.add.acl.list": "Add ACL List",
+"label.add.acl.rule": "Aggiungere ACL",
+"label.add.acl": "Add ACL",
 "label.add.affinity.group": "Aggiungere un nuovo gruppo di affinit\u00e0",
 "label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
 "label.add.bigswitchbcf.device": "Aggiungere Controller BigSwitch BCF",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Aggiungere un IP Range",
 "label.add.isolated.network": "Add Isolated Network",
 "label.add.ldap.account": "Aggiungi un account LDAP",
-"label.add.list.name": "ACL List Name",
+"label.add.acl.name": "ACL Name",
 "label.add.more": "Add More",
 "label.add.netscaler.device": "Aggiungere device Netscaler",
 "label.add.network": "Aggiungere una Rete",
 "label.add.network.acl": "Aggiungere le ACL di rete",
-"label.add.network.acl.list": "Add Network ACL List",
+"label.add.network.acl": "Add Network ACL",
 "label.add.network.offering": "Aggiungere offerta di rete",
 "label.add.new.gateway": "Aggiungere un nuovo gateway",
 "label.add.new.tier": "Aggiungere un nuovo livello",
@@ -334,7 +334,7 @@
 "label.default.use": "Default Use",
 "label.default.view": "Vista di default",
 "label.delete": "Cancellare",
-"label.delete.acl.list": "Delete ACL List",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "Cancellare Gruppo di Affinit\u00e0",
 "label.delete.alerts": "Cancella allarmi",
 "label.delete.bigswitchbcf": "Rimuovere Controller BigSwitch BCF",
@@ -419,7 +419,7 @@
 "label.dpd": "Dead Peer Detection",
 "label.driver": "Driver",
 "label.edit": "Modifica",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.project.details": "Modificare i dettagli del progetto",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "Remove VPC offering",
 "label.removing": "Rimozione",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
 "label.required": "Required",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "Utilizzare HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "User",
-"label.userdata": "Userdata",
-"label.userdatal2": "User Data",
+"label.user.data": "User Data",
 "label.username": "Username",
 "label.users": "Users",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
 "message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
 "message.confirm.attach.disk": "Are you sure you want to attach disk?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
diff --git a/ui/public/locales/ja_JP.json b/ui/public/locales/ja_JP.json
index 8357b9d49a2..3ab374a2a06 100644
--- a/ui/public/locales/ja_JP.json
+++ b/ui/public/locales/ja_JP.json
@@ -58,11 +58,11 @@
   "label.access.kubernetes.nodes": "Kubernetesノードに接続",
   "label.acl.export": "エクスポートACLs",
   "label.acl.id": "ACL ID",
-  "label.acl.list.rules": "ACLルールのリスト",
+  "label.acl.rules": "ACLルールのリスト",
   "label.acl.reason.description": "ACLルールの理由を入力してください。",
   "label.acl.replaced": "ACLが置き換えられました",
   "label.aclid": "ACL",
-  "label.aclname": "ACL名",
+  "label.acl.rule.name": "ACL名",
   "label.acltotal": "ネットワークACL合計",
   "label.acquire.new.ip": "新しいIPアドレスの取得",
   "label.acquire.new.secondary.ip": "セカンダリIPアドレスの取得",
@@ -298,8 +298,8 @@
   "label.add.account": "アカウント追加",
   "label.add.accounts": "アカウント追加",
   "label.add.accounts.to": "アカウントの追加先:",
-  "label.add.acl": "ACL追加",
-  "label.add.acl.list": "ACL一覧追加",
+  "label.add.acl.rule": "ACL追加",
+  "label.add.acl": "ACL一覧追加",
   "label.add.affinity.group": "新しいアフィニティグループ追加",
   "label.add.baremetal.dhcp.device": "ベアメタルDHCPデバイス追加",
   "label.add.baremetal.rack.configuration": "ベアメタルラック設定追加",
@@ -333,14 +333,14 @@
   "label.add.l2.guest.network": "L2ゲストネットワーク追加",
   "label.add.ldap.account": "LDAPアカウント追加",
   "label.add.ldap.list.users": "LDAPユーザー一覧",
-  "label.add.list.name": "ACL一覧名",
+  "label.add.acl.name": "ACL一覧名",
   "label.add.load.balancer": "ロードバランサー追加",
   "label.add.management.ip.range": "マネージメントIP範囲追加",
   "label.add.more": "その他の項目追加",
   "label.add.netscaler.device": "NetScalerデバイス追加",
   "label.add.network": "ネットワーク追加",
   "label.add.network.acl": "ネットワークACL追加",
-  "label.add.network.acl.list": "ネットワークACL一覧追加",
+  "label.add.network.acl": "ネットワークACL一覧追加",
   "label.add.network.device": "ネットワークデバイス追加",
   "label.add.network.offering": "ネットワークオファリング追加",
   "label.add.new.f5": "新しいF5追加",
@@ -718,7 +718,7 @@
   "label.default.view": "デフォルトビュー",
   "label.defaultnetwork": "デフォルトネットワーク",
   "label.delete": "削除",
-  "label.delete.acl.list": "ACL一覧削除",
+  "label.delete.acl": "ACL一覧削除",
   "label.delete.affinity.group": "アフィニティグループ削除",
   "label.delete.alerts": "アラート削除",
   "label.delete.backup": "バックアップ削除",
@@ -872,7 +872,7 @@
   "label.dynamicscalingenabled": "ダイナミックスケーリング有効",
   "label.dynamicscalingenabled.tooltip": "テンプレート、サービスオファリング、およびグローバル設定で動的スケーリングが有効になっている場合にのみ、VMは動的にスケーリングできます。",
   "label.edit": "編集",
-  "label.edit.acl.list": "ACL一覧編集",
+  "label.edit.acl": "ACL一覧編集",
   "label.edit.acl.rule": "ACLルール編集",
   "label.edit.affinity.group": "アフィニティグループ編集",
   "label.edit.lb.rule": "LBルール編集",
@@ -1498,7 +1498,7 @@
   "label.netscaler.vpx": "NetScaler VPXロードバランサー",
   "label.network": "ネットワーク",
   "label.network.acl": "ネットワークACL",
-  "label.network.acl.lists": "ネットワークACL一覧",
+  "label.network.acls": "ネットワークACL一覧",
   "label.network.acls": "ネットワークACL",
   "label.network.addvm": "VMへのネットワーク追加",
   "label.network.desc": "ネットワークの説明",
@@ -1871,7 +1871,6 @@
   "label.removing": "削除しています",
   "label.removing.user": "ユーザーを削除しています",
   "label.replace.acl": "ACLの置き換え",
-  "label.replace.acl.list": "ACL一覧の置き換え",
   "label.report.bug": "問題レポート",
   "label.required": "必須です",
   "label.requireshvm": "HVM",
@@ -2321,8 +2320,7 @@
   "label.user.details": "ユーザーの詳細",
   "label.user.source": "ソース",
   "label.user.vm": "ユーザーVM",
-  "label.userdata": "ユーザーデータ",
-  "label.userdatal2": "ユーザーデータ",
+  "label.user.data": "ユーザーデータ",
   "label.username": "ユーザー名",
   "label.users": "ユーザー",
   "label.usersource": "ユーザータイプ",
@@ -2727,7 +2725,7 @@
   "message.confirm.dedicate.host.domain.account": "このホストをドメイン/アカウント専用に設定してもよろしいですか？",
   "message.confirm.dedicate.pod.domain.account": "このポッドをドメイン/アカウント専用に設定してもよろしいですか？",
   "message.confirm.dedicate.zone": "このゾーンをドメイン/アカウント専用に設定してもよろしいですか？",
-  "message.confirm.delete.acl.list": "このACL一覧を削除してもよろしいですか？",
+  "message.confirm.delete.acl": "このACL一覧を削除してもよろしいですか？",
   "message.confirm.delete.alert": "このアラートを削除してもよろしいですか？",
   "message.confirm.delete.baremetal.rack.configuration": "ベアメタルラック設定を削除してもよろしいですか？",
   "message.confirm.delete.bigswitchbcf": "このBigSwitchBCFコントローラーを削除してもよろしいですか？",
diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json
index f1fab4b584c..cc9683633be 100644
--- a/ui/public/locales/ko_KR.json
+++ b/ui/public/locales/ko_KR.json
@@ -32,10 +32,10 @@
 "label.accounttype": "\uacc4\uc815 \uc720\ud615",
 "label.acl.export": "ACL \ub0b4\ubcf4\ub0b4\uae30",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL \ubaa9\ub85d \uaddc\uce59",
+"label.acl.rules": "ACL \ubaa9\ub85d \uaddc\uce59",
 "label.acl.reason.description": "ACL \uaddc\uce59 \ub4a4\uc5d0 \uc124\uba85\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
 "label.aclid": "ACL",
-"label.aclname": "ACL \uc774\ub984",
+"label.acl.rule.name": "ACL \uc774\ub984",
 "label.acquire.new.ip": "\uc0c8 IP \uc8fc\uc18c \uac00\uc838\uc624\uae30",
 "label.acquire.new.secondary.ip": "\uc0c8 \ubcf4\uc870 IP \uc8fc\uc18c \uac00\uc838\uc624\uae30",
 "label.acquiring.ip": "IP \uac00\uc838\uc624\uae30",
@@ -153,8 +153,8 @@
 "label.activeviewersessions": "\ud65c\uc131 \uc138\uc158",
 "label.add": "\ucd94\uac00",
 "label.add.account": "\uacc4\uc815 \ucd94\uac00",
-"label.add.acl": "\uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00",
-"label.add.acl.list": "ACL \ubaa9\ub85d \ucd94\uac00",
+"label.add.acl.rule": "\uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00",
+"label.add.acl": "ACL \ubaa9\ub85d \ucd94\uac00",
 "label.add.affinity.group": "\uc0c8 Affinity \uadf8\ub8f9 \ucd94\uac00",
 "label.add.baremetal.dhcp.device": "Baremetal DHCP \uc7a5\uce58 \ucd94\uac00",
 "label.add.bigswitchbcf.device": "BigSwitch BCF \ucee8\ud2b8\ub864\ub7ec \ucd94\uac00",
@@ -178,12 +178,12 @@
 "label.add.isolated.network": "isolated \ub124\ud2b8\uc6cc\ud06c \ucd94\uac00",
 "label.add.kubernetes.cluster": "\ucfe0\ubc84\ub124\ud14c\uc2a4 \ud074\ub7ec\uc2a4\ud130 \ucd94\uac00",
 "label.add.ldap.account": "LDAP \uacc4\uc815 \ucd94\uac00",
-"label.add.list.name": "ACL \ubaa9\ub85d \uc774\ub984",
+"label.add.acl.name": "ACL \ubaa9\ub85d \uc774\ub984",
 "label.add.more": "\ub2e4\ub978 \ud56d\ubaa9 \ucd94\uac00",
 "label.add.netscaler.device": "Netscaler \uc7a5\uce58 \ucd94\uac00",
 "label.add.network": "\ub124\ud2b8\uc6cc\ud06c \ucd94\uac00",
 "label.add.network.acl": "\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00",
-"label.add.network.acl.list": "\ub124\ud2b8\uc6cc\ud06c ACL \ubaa9\ub85d \ucd94\uac00",
+"label.add.network.acl": "\ub124\ud2b8\uc6cc\ud06c ACL \ubaa9\ub85d \ucd94\uac00",
 "label.add.network.offering": "\ub124\ud2b8\uc6cc\ud06c \uc624\ud37c\ub9c1 \ucd94\uac00",
 "label.add.new.gateway": "\uc0c8 \uac8c\uc774\ud2b8\uc6e8\uc774 \ucd94\uac00\ud558\uae30",
 "label.add.new.tier": "\uc0c8 \uc11c\ube0c\ub137 \ucd94\uac00",
@@ -436,7 +436,7 @@
 "label.default.view": "\uae30\ubcf8 \ubcf4\uae30",
 "label.defaultnetwork": "\uae30\ubcf8 \ub124\ud2b8\uc6cc\ud06c",
 "label.delete": "\uc0ad\uc81c",
-"label.delete.acl.list": "ACL \ubaa9\ub85d \uc0ad\uc81c",
+"label.delete.acl": "ACL \ubaa9\ub85d \uc0ad\uc81c",
 "label.delete.affinity.group": "Affinity \uadf8\ub8f9 \uc0ad\uc81c",
 "label.delete.alerts": "\uc54c\ub9bc \uc0ad\uc81c",
 "label.delete.backup": "\ubc31\uc5c5 \uc0ad\uc81c",
@@ -549,7 +549,7 @@
 "label.dpd": "Dead \ud53c\uc5b4 \uac10\uc9c0",
 "label.driver": "\ub4dc\ub77c\uc774\ubc84",
 "label.edit": "\ud3b8\uc9d1",
-"label.edit.acl.list": "ACL \ubaa9\ub85d \ud3b8\uc9d1",
+"label.edit.acl": "ACL \ubaa9\ub85d \ud3b8\uc9d1",
 "label.edit.acl.rule": "ACL \uaddc\uce59 \ud3b8\uc9d1",
 "label.edit.project.details": "\ud504\ub85c\uc81d\ud2b8 \uc0c1\uc138 \ud3b8\uc9d1",
 "label.edit.project.role": "\ud504\ub85c\uc81d\ud2b8 \uc5ed\ud560 \ud3b8\uc9d1",
@@ -985,7 +985,7 @@
 "label.netscaler.vpx": "NetScaler VPX \ub85c\ub4dc\ubc38\ub7f0\uc11c",
 "label.network": "\ub124\ud2b8\uc6cc\ud06c",
 "label.network.acl": "\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL)",
-"label.network.acl.lists": "Network ACL \ubaa9\ub85d",
+"label.network.acls": "Network ACL \ubaa9\ub85d",
 "label.network.addvm": "VM\uc5d0 \ub124\ud2b8\uc6cc\ud06c \ucd94\uac00",
 "label.network.desc": "\ub124\ud2b8\uc6cc\ud06c \uc124\uba85",
 "label.network.domain": "\ub124\ud2b8\uc6cc\ud06c \ub3c4\uba54\uc778",
@@ -1251,7 +1251,6 @@
 "label.remove.vpc.offering": "VPC \uc624\ud37c\ub9c1 \uc0ad\uc81c",
 "label.removing": "\uc0ad\uc81c\ud558\ub294 \uc911...",
 "label.replace.acl": "ACL \uad50\uccb4",
-"label.replace.acl.list": "ACL \ubaa9\ub85d \uad50\uccb4",
 "label.report.bug": "\uc774\uc288 \ub9ac\ud3ec\ud2b8",
 "label.required": "\ud544\uc218 \uc0ac\ud56d",
 "label.requireshvm": "HVM",
@@ -1560,8 +1559,7 @@
 "label.usenewdiskoffering": "\ub514\uc2a4\ud06c \uc624\ud37c\ub9c1\uc744 \ubcc0\uacbd\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "label.user": "\uc0ac\uc6a9\uc790",
 "label.user.conflict": "\ucda9\ub3cc",
-"label.userdata": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130",
-"label.userdatal2": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130",
+"label.user.data": "\uc0ac\uc6a9\uc790 \ub370\uc774\ud130",
 "label.username": "\uc0ac\uc6a9\uc790 \uc774\ub984",
 "label.users": "\uc0ac\uc6a9\uc790",
 "label.usersource": "\uc0ac\uc6a9\uc790 \uc720\ud615",
@@ -1818,7 +1816,7 @@
 "message.confirm.archive.selected.events": "\uc120\ud0dd\ud55c \uc774\ubca4\ud2b8\ub97c \ubcf4\uad00\ud560 \uac83\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.",
 "message.confirm.attach.disk": "\ub514\uc2a4\ud06c\ub97c \uc5f0\uacb0 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "message.confirm.configure.ovs": "Ovs\ub97c \uad6c\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"message.confirm.delete.acl.list": "\uc774 ACL \ubaa9\ub85d\uc744 \uc0ad\uc81c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+"message.confirm.delete.acl": "\uc774 ACL \ubaa9\ub85d\uc744 \uc0ad\uc81c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "message.confirm.delete.bigswitchbcf": "\uc774 BigSwitch BCF \ucee8\ud2b8\ub864\ub7ec\ub97c \uc0ad\uc81c\ud560 \uac83\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.",
 "message.confirm.delete.brocadevcs": "Brocade Vcs \uc2a4\uc704\uce58\ub97c \uc0ad\uc81c\ud560 \uac83\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.",
 "message.confirm.delete.ciscoasa1000v": "CiscoASA1000\uc744 \uc0ad\uc81c\ud560 \uac83\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.",
diff --git a/ui/public/locales/nb_NO.json b/ui/public/locales/nb_NO.json
index ec51f7415d3..586d1fc5b25 100644
--- a/ui/public/locales/nb_NO.json
+++ b/ui/public/locales/nb_NO.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Kontospesifikk",
 "label.accounts": "Kontoer",
 "label.accounttype": "Kontotype",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL Liste Regler",
+"label.acl.rules": "ACL Liste Regler",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Navn",
+"label.acl.rule.name": "ACL Navn",
 "label.acquire.new.ip": "Tilegne ny IP",
 "label.acquire.new.secondary.ip": "Tilegne ny sekund\u00e6r IP",
 "label.action": "Handling",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Aktive sesjoner",
 "label.add": "Legg til",
 "label.add.account": "Legg til konto",
-"label.add.acl": "Legg til ACL",
-"label.add.acl.list": "Legg til ACL liste",
+"label.add.acl.rule": "Legg til ACL",
+"label.add.acl": "Legg til ACL liste",
 "label.add.affinity.group": "Legg til affinitetsgruppe",
 "label.add.baremetal.dhcp.device": "Legg Til Barmetall DHCP Enhet",
 "label.add.bigswitchbcf.device": "Legg til BigSwitch BCF kontroller",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Legg til IP-rekke",
 "label.add.isolated.network": "Legg Til Isolert Nettverk",
 "label.add.ldap.account": "Legg til LDAP-konto",
-"label.add.list.name": "ACL listenavn",
+"label.add.acl.name": "ACL listenavn",
 "label.add.more": "Legg til mer",
 "label.add.netscaler.device": "Legg til Netscaler enhet",
 "label.add.network": "Legg til nettverk",
 "label.add.network.acl": "Legg til nettverk ACL",
-"label.add.network.acl.list": "Legg til nettverk ACL liste",
+"label.add.network.acl": "Legg til nettverk ACL liste",
 "label.add.network.offering": "Legg til nettverkstilbud",
 "label.add.new.gateway": "Legg til ny gateway",
 "label.add.new.tier": "Legg til ny gren",
@@ -334,7 +334,7 @@
 "label.default.use": "Standard bruk",
 "label.default.view": "Standardvisning",
 "label.delete": "Slett",
-"label.delete.acl.list": "Slett ACL liste",
+"label.delete.acl": "Slett ACL liste",
 "label.delete.affinity.group": "Slett affinitetsgruppe",
 "label.delete.alerts": "Slette varsler",
 "label.delete.bigswitchbcf": "Fjern BigSwitch BCF-kontroller",
@@ -419,7 +419,7 @@
 "label.dpd": "D\u00f8d endepunkt-deteksjon",
 "label.driver": "Driver",
 "label.edit": "Editer",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Endre ACL regel",
 "label.edit.project.details": "Editer prosjektdetaljer",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "Fjern VPC tilbud",
 "label.removing": "Fjerner",
 "label.replace.acl": "Erstatt ACL",
-"label.replace.acl.list": "Erstatt ACL Liste",
 "label.required": "P\u00e5krevd",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Krever oppgradering",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "Bruk HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Bruker",
-"label.userdata": "Brukerdata",
-"label.userdatal2": "Brukerdata",
+"label.user.data": "Brukerdata",
 "label.username": "Brukernavn",
 "label.users": "Brukere",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Vennligst bekreft at du \u00f8nsker \u00e5 arkivere valgte varsler",
 "message.confirm.archive.selected.events": "Vennligst bekreft at du vil arkivere valgte hendelser",
 "message.confirm.attach.disk": "Er du sikker p\u00e5 at du vil tildele disk?",
-"message.confirm.delete.acl.list": "Er du sikker p\u00e5 at du \u00f8nsker \u00e5 slette denne ACL listen?",
+"message.confirm.delete.acl": "Er du sikker p\u00e5 at du \u00f8nsker \u00e5 slette denne ACL listen?",
 "message.confirm.delete.bigswitchbcf": "Vennligst bekreft at du \u00f8nsker \u00e5 slette denne BigSwitch BCF Controlleren?",
 "message.confirm.delete.brocadevcs": "Vennligst bekreft at du vil slette denne Brocade Vcs svitsjen",
 "message.confirm.delete.ciscoasa1000v": "Vennligst bekreft at du vil slette CiscoASA1000v",
diff --git a/ui/public/locales/nl_NL.json b/ui/public/locales/nl_NL.json
index 6bd1bf67159..15b1bbb1394 100644
--- a/ui/public/locales/nl_NL.json
+++ b/ui/public/locales/nl_NL.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Account-specifiek",
 "label.accounts": "Accounts",
 "label.accounttype": "Account type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL lijst regels",
+"label.acl.rules": "ACL lijst regels",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL naam",
+"label.acl.rule.name": "ACL naam",
 "label.acquire.new.ip": "Bemachtig nieuw IP",
 "label.acquire.new.secondary.ip": "Verkrijg nieuw secundair IP",
 "label.action": "Actie",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Actieve Sessies",
 "label.add": "Voeg toe",
 "label.add.account": "Voeg Account toe",
-"label.add.acl": "Voeg ACL toe",
-"label.add.acl.list": "voeg een ACL lijst toe",
+"label.add.acl.rule": "Voeg ACL toe",
+"label.add.acl": "voeg een ACL lijst toe",
 "label.add.affinity.group": "Nieuwe affinity groep toevoegen",
 "label.add.baremetal.dhcp.device": "Voeg Baremetal DHCP Apparaat toe",
 "label.add.bigswitchbcf.device": "Voeg eenBigSwitch BCF controller toe",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Voeg IP range toe",
 "label.add.isolated.network": "Geisoleerd Netwerk Toevoegen",
 "label.add.ldap.account": "Voeg LDAP account toe",
-"label.add.list.name": "ACL lijst naam",
+"label.add.acl.name": "ACL lijst naam",
 "label.add.more": "Voeg meer toe",
 "label.add.netscaler.device": "Voeg Netscaler apparaat toe",
 "label.add.network": "Voeg Netwerk toe",
 "label.add.network.acl": "Voeg netwerk ACL toe",
-"label.add.network.acl.list": "voeg netwerk ACL lijst toe",
+"label.add.network.acl": "voeg netwerk ACL lijst toe",
 "label.add.network.offering": "Voeg netwerk aanbieding toe",
 "label.add.new.gateway": "Voeg nieuwe gateway toe",
 "label.add.new.tier": "Voeg nieuwe Tier toe",
@@ -334,7 +334,7 @@
 "label.default.use": "Standaard Gebruik",
 "label.default.view": "Standaard Weergave",
 "label.delete": "Verwijder",
-"label.delete.acl.list": "verwijder ACL lijst",
+"label.delete.acl": "verwijder ACL lijst",
 "label.delete.affinity.group": "Verwijder Affinity Groep",
 "label.delete.alerts": "Verwijder waarschuwingen",
 "label.delete.bigswitchbcf": "Verwijder BigSwitch BCF Controller",
@@ -420,7 +420,7 @@
 "label.driver": "Driver",
 "label.dynamicscalingenabled": "Dynamisch schalen ingeschakeld\n",
 "label.edit": "Wijzig",
-"label.edit.acl.list": "Verander een ACL lijst",
+"label.edit.acl": "Verander een ACL lijst",
 "label.edit.acl.rule": "wijzig ACL regel",
 "label.edit.project.details": "Wijzig project details",
 "label.edit.role": "Edit Role",
@@ -925,7 +925,6 @@
 "label.remove.vpc.offering": "VPC aanbieding verwijderen",
 "label.removing": "Verwijderen",
 "label.replace.acl": "vervang ACL",
-"label.replace.acl.list": "vervang ACL lijst",
 "label.required": "Vereist",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Upgrade Benodigd",
@@ -1151,8 +1150,7 @@
 "label.usehttps": "Gebruik HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "Gebruiker",
-"label.userdata": "Gebruikers gegevens",
-"label.userdatal2": "Gebruiker Data",
+"label.user.data": "Gebruiker Data",
 "label.username": "Gebruikersnaam",
 "label.users": "Gebruikers",
 "label.utilization": "Utilisation",
@@ -1330,7 +1328,7 @@
 "message.confirm.archive.selected.alerts": "bevestig dat u de geselecteerde meldingen wilt archiveren, alstublieft",
 "message.confirm.archive.selected.events": "bevestig dat u de geselecteerde gebeurtenissen wilt archiveren, alstublieft",
 "message.confirm.attach.disk": "Weet U zeker dat U een disk wilt koppelen?",
-"message.confirm.delete.acl.list": "Weet U zeker dat U dit ACL wilt verwijderen?",
+"message.confirm.delete.acl": "Weet U zeker dat U dit ACL wilt verwijderen?",
 "message.confirm.delete.bigswitchbcf": "bevestig dat u deze BigSwitch BCF Controller wilt verwijderen, alstublieft",
 "message.confirm.delete.brocadevcs": "bevestigd dat Brocade Vcs Switch wilt verwijderen, altublieft",
 "message.confirm.delete.ciscoasa1000v": "bevestig dat u CiscoASA100v wilt verwijderen, alstublieft",
diff --git a/ui/public/locales/pl.json b/ui/public/locales/pl.json
index 6077da5928e..fbbbf612bc1 100644
--- a/ui/public/locales/pl.json
+++ b/ui/public/locales/pl.json
@@ -14,12 +14,12 @@
 "label.account.specific": "Account-Specific",
 "label.accounts": "Konta",
 "label.accounttype": "Account Type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Name",
+"label.acl.rule.name": "ACL Name",
 "label.acquire.new.ip": "Acquire New IP",
 "label.acquire.new.secondary.ip": "Acquire new secondary IP",
 "label.action": "Action",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "Active Sessions",
 "label.add": "Dodaj",
 "label.add.account": "Dodaj konto",
-"label.add.acl": "Dodaj ACL",
-"label.add.acl.list": "Add ACL List",
+"label.add.acl.rule": "Dodaj ACL",
+"label.add.acl": "Add ACL rule List",
 "label.add.affinity.group": "Add new affinity group",
 "label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
 "label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "Add IP Range",
 "label.add.isolated.network": "Add Isolated Network",
 "label.add.ldap.account": "Add LDAP account",
-"label.add.list.name": "ACL List Name",
+"label.add.acl.name": "ACL Name",
 "label.add.more": "Dodaj wi\u0119cej",
 "label.add.netscaler.device": "Add Netscaler device",
 "label.add.network": "Dodaj sie\u0107",
 "label.add.network.acl": "Add network ACL",
-"label.add.network.acl.list": "Add Network ACL List",
+"label.add.network.acl": "Add Network ACL",
 "label.add.network.offering": "Add network offering",
 "label.add.new.gateway": "Add new gateway",
 "label.add.new.tier": "Add new tier",
@@ -334,7 +334,7 @@
 "label.default.use": "Default Use",
 "label.default.view": "Widok domy\u015blny",
 "label.delete": "Usu\u0144",
-"label.delete.acl.list": "Delete ACL List",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "Delete Affinity Group",
 "label.delete.alerts": "Delete alerts",
 "label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -419,7 +419,7 @@
 "label.dpd": "Dead Peer Detection",
 "label.driver": "Driver",
 "label.edit": "Edytuj",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.project.details": "Zmie\u0144 szczeg\u00f3\u0142y projektu",
 "label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
 "label.remove.vpc.offering": "Remove VPC offering",
 "label.removing": "Usuwanie",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
 "label.required": "Wymagane",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
 "label.usehttps": "Use HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "U\u017cytkowni",
-"label.userdata": "Userdata",
-"label.userdatal2": "User Data",
+"label.user.data": "User Data",
 "label.username": "Nazwa u\u017cytkownika",
 "label.users": "U\u017cytkownicy",
 "label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
 "message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
 "message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
 "message.confirm.attach.disk": "Are you sure you want to attach disk?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json
index 307c7e8a1ae..4d95b341ab4 100644
--- a/ui/public/locales/pt_BR.json
+++ b/ui/public/locales/pt_BR.json
@@ -33,10 +33,10 @@
 "label.accounttype": "Tipo de conta",
 "label.acl.export": "Exportar ACLs",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "Lista de regras de ACL",
+"label.acl.rules": "Lista de regras de ACL",
 "label.acl.reason.description": "Motivo para se utilizar a regra.",
 "label.aclid": "ACL",
-"label.aclname": "Nome da ACL",
+"label.acl.rule.name": "Nome da ACL",
 "label.acquire.new.ip": "Adquirir novo IP",
 "label.acquire.new.secondary.ip": "Adquira um novo IP secund\u00e1rio",
 "label.acquiring.ip": "Obtendo IP",
@@ -168,8 +168,8 @@
 "label.activeviewersessions": "Sess\u00f5es ativas",
 "label.add": "Adicionar",
 "label.add.account": "Adicionar conta",
-"label.add.acl": "Adicionar ACL",
-"label.add.acl.list": "Adiciona lista ACL",
+"label.add.acl.rule": "Adicionar ACL",
+"label.add.acl": "Adiciona lista ACL",
 "label.add.affinity.group": "Adicionar um grupo de afinidade",
 "label.add.baremetal.dhcp.device": "Adicionar dispositivo DHCP baremetal",
 "label.add.bigswitchbcf.device": "Adicionar controlador BigSwitch BCF",
@@ -193,12 +193,12 @@
 "label.add.isolated.network": "Adiciona rede isolada",
 "label.add.kubernetes.cluster": "Adicionar cluster Kubernetes",
 "label.add.ldap.account": "Adicionar conta LDAP",
-"label.add.list.name": "Nome da lista ACL",
+"label.add.acl.name": "Nome da lista ACL",
 "label.add.more": "Adicionar mais",
 "label.add.netscaler.device": "Adicionar dispositivo Netscaler",
 "label.add.network": "Adicionar rede",
 "label.add.network.acl": "Adicione ACL de rede",
-"label.add.network.acl.list": "Adicionar lista de ACL de rede",
+"label.add.network.acl": "Adicionar lista de ACL de rede",
 "label.add.network.offering": "Adicionar oferta de rede",
 "label.add.new.gateway": "Adicionar novo gateway",
 "label.add.new.tier": "Adicionar nova camada",
@@ -480,7 +480,7 @@
 "label.default.view": "Visualiza\u00e7\u00e3o padr\u00e3o",
 "label.defaultnetwork": "Rede padr\u00e3o",
 "label.delete": "Remover",
-"label.delete.acl.list": "Apagar lista ACL",
+"label.delete.acl": "Apagar lista ACL",
 "label.delete.affinity.group": "Apagar grupo de afinidade",
 "label.delete.alerts": "Remover alertas",
 "label.delete.backup": "Apagar backup",
@@ -607,7 +607,7 @@
 "label.dynamicscalingenabled": "Escalonamento din\u00e2mico habilitado",
 "label.dynamicscalingenabled.tooltip": "VM s\u00f3 pode ser dinamicamente escalonada quando o escalonamento din\u00e2mico estiver habilitado no template, oferta de computa\u00e7\u00e3o e nas configura\u00e7\u00e3oes globais",
 "label.edit": "Editar",
-"label.edit.acl.list": "Editar lista ACL",
+"label.edit.acl": "Editar lista ACL",
 "label.edit.acl.rule": "Editar regra ACL",
 "label.edit.project.details": "Editar detalhes do projeto",
 "label.edit.project.role": "Editar fun\u00e7\u00e3o do projeto",
@@ -1064,7 +1064,7 @@
 "label.netscaler.vpx": "NetScaler VPX LoadBalancer",
 "label.network": "Rede",
 "label.network.acl": "ACL de rede",
-"label.network.acl.lists": "Lista de redes ACL",
+"label.network.acls": "Lista de redes ACL",
 "label.network.addvm": "Adicionar rede para VM",
 "label.network.desc": "Descri\u00e7\u00e3o de rede",
 "label.network.domain": "Dom\u00ednio de rede",
@@ -1352,7 +1352,6 @@
 "label.removed": "Removido",
 "label.removing": "Removendo",
 "label.replace.acl": "Substituir ACL",
-"label.replace.acl.list": "Substituir lista ACL",
 "label.report.bug": "Reportar um problema",
 "label.required": "Obrigat\u00f3rio",
 "label.requireshvm": "HVM",
@@ -1697,8 +1696,7 @@
 "label.usenewdiskoffering": "Substituir a oferta de disco?",
 "label.user": "Usu\u00e1rio",
 "label.user.conflict": "Conflito",
-"label.userdata": "Dados de usu\u00e1rio",
-"label.userdatal2": "Dados de usu\u00e1rio",
+"label.user.data": "Dados de usu\u00e1rio",
 "label.username": "Nome de usu\u00e1rio",
 "label.users": "Usu\u00e1rios",
 "label.usersource": "Tipo de usu\u00e1rio",
@@ -1974,7 +1972,7 @@
 "message.confirm.archive.selected.events": "Por favor confirme que voc\u00ea deseja arquivar os eventos selecionados",
 "message.confirm.attach.disk": "Voc\u00ea tem certeza que deseja conectar este disco?",
 "message.confirm.configure.ovs": "Voc\u00ea tem certeza de que quer configurar os Ovs?",
-"message.confirm.delete.acl.list": "Voc\u00ea tem certeza que deseja apagar esta lista ACL?",
+"message.confirm.delete.acl": "Voc\u00ea tem certeza que deseja apagar esta lista ACL?",
 "message.confirm.delete.bigswitchbcf": "Por favor, confirme que voc\u00ea deseja deletar este controlador BigSwitch BCF",
 "message.confirm.delete.brocadevcs": "Por favor confirme que voc\u00ea deseja remover o switch Brocade Vcs",
 "message.confirm.delete.ciscoasa1000v": "Favor confirmar que voc\u00ea deseja apagar este CiscoASA1000v",
diff --git a/ui/public/locales/ru_RU.json b/ui/public/locales/ru_RU.json
index 46d70081f1b..4fb3788bc51 100644
--- a/ui/public/locales/ru_RU.json
+++ b/ui/public/locales/ru_RU.json
@@ -14,12 +14,12 @@
 "label.account.specific": "\u0421\u043f\u0435\u0446\u0438\u0444\u0438\u043a\u0430 \u0430\u043a\u043a\u0430\u0443\u043d\u043d\u0442\u0430",
 "label.accounts": "\u0423\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",
 "label.accounttype": "Account Type",
-"label.acl.export": "Export ACLs",
+"label.acl.export": "Export ACL rules",
 "label.acl.id": "ACL ID",
-"label.acl.list.rules": "ACL List Rules",
+"label.acl.rules": "ACL Rules",
 "label.acl.reason.description": "Enter the reason behind an ACL rule.",
 "label.aclid": "ACL",
-"label.aclname": "ACL Name",
+"label.acl.rule.name": "ACL Name",
 "label.acquire.new.ip": "\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 IP",
 "label.acquire.new.secondary.ip": "\u0417\u0430\u043f\u0440\u043e\u0441\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441",
 "label.action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
@@ -119,8 +119,8 @@
 "label.activeviewersessions": "\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u0435\u0441\u0441\u0438\u0438",
 "label.add": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c",
 "label.add.account": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c",
-"label.add.acl": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c ACL",
-"label.add.acl.list": "Add ACL List",
+"label.add.acl.rule": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c ACL",
+"label.add.acl": "Add ACL",
 "label.add.affinity.group": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u0443\u044e affinity group",
 "label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
 "label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
 "label.add.ip.range": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0430\u0434\u0440\u0435\u0441\u043e\u0432",
 "label.add.isolated.network": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u0443\u044e \u0441\u0435\u0442\u044c",
 "label.add.ldap.account": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c LDAP \u0430\u043a\u043a\u0430\u0443\u043d\u0442",
-"label.add.list.name": "ACL List Name",
+"label.add.acl.name": "ACL Name",
 "label.add.more": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0447\u0442\u043e-\u0442\u043e \u0435\u0449\u0435",
 "label.add.netscaler.device": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c Netscaler \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e",
 "label.add.network": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u044c",
 "label.add.network.acl": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u0435\u0432\u0443\u044e ACL",
-"label.add.network.acl.list": "Add Network ACL List",
+"label.add.network.acl": "Add Network ACL",
 "label.add.network.offering": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u0435\u0432\u044b\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044b",
 "label.add.new.gateway": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0448\u043b\u044e\u0437",
 "label.add.new.tier": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 Tier",
@@ -334,7 +334,7 @@
 "label.default.use": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
 "label.default.view": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439 \u0432\u0438\u0434",
 "label.delete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
-"label.delete.acl.list": "Delete ACL List",
+"label.delete.acl": "Delete ACL",
 "label.delete.affinity.group": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c affinity group",
 "label.delete.alerts": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u0432\u043e\u0433\u0438",
 "label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -418,7 +418,7 @@
 "label.dpd": "Dead Peer Detection",
 "label.driver": "Driver",
 "label.edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-"label.edit.acl.list": "Edit ACL List",
+"label.edit.acl": "Edit ACL",
 "label.edit.acl.rule": "Edit ACL rule",
 "label.edit.project.details": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u0438 \u043f\u0440\u043e\u0435\u043a\u0442\u0430",
 "label.edit.role": "Edit Role",
@@ -923,7 +923,6 @@
 "label.remove.vpc.offering": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0441\u043b\u0443\u0433\u0443 VPC",
 "label.removing": "\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
 "label.required": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f",
 "label.requireshvm": "HVM",
 "label.requiresupgrade": "Requires Upgrade",
@@ -1149,8 +1148,7 @@
 "label.usehttps": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 HTTPS",
 "label.usenewdiskoffering": "Replace disk offering?",
 "label.user": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
-"label.userdata": "Userdata",
-"label.userdatal2": "User Data",
+"label.user.data": "User Data",
 "label.username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
 "label.users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
 "label.utilization": "Utilisation",
@@ -1328,7 +1326,7 @@
 "message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
 "message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
 "message.confirm.attach.disk": "Are you sure you want to attach disk?",
-"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
+"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
 "message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
diff --git a/ui/public/locales/zh_CN.json b/ui/public/locales/zh_CN.json
index fc3a456a8fb..d09f960edf5 100644
--- a/ui/public/locales/zh_CN.json
+++ b/ui/public/locales/zh_CN.json
@@ -66,12 +66,12 @@
 
   "label.acl.export": "\u5BFC\u51FA ACL \u89C4\u5219",
   "label.acl.id": "ACL \u6807\u8BC6\u7801",
-  "label.acl.list.rules": "ACL\u5217\u8868\u7B56\u7565",
+  "label.acl.rules": "ACL\u5217\u8868\u7B56\u7565",
   "label.acl.reason.description": "\u8F93\u5165\u5B9A\u4E49 ACL \u7B56\u7565\u7684\u539F\u56E0\u3002",
   "label.acl.replaced": "ACL \u5DF2\u66FF\u6362",
 
   "label.aclid": "\u8BBF\u95EE\u63A7\u5236\uFF08ACL\uFF09",
-  "label.aclname": "ACL \u540D\u79F0",
+  "label.acl.rule.name": "ACL \u540D\u79F0",
   "label.acltotal": "\u7F51\u7EDC ACL \u603B\u6570",
   "label.acquire.new.ip": "\u83B7\u53D6\u65B0 IP \u5730\u5740",
   "label.acquire.new.secondary.ip": "\u83B7\u53D6\u65B0\u4E8C\u7EA7 IP \u5730\u5740",
@@ -336,8 +336,8 @@
   "label.add.account": "\u6DFB\u52A0\u5E10\u6237",
   "label.add.accounts": "\u6DFB\u52A0\u5E10\u6237",
   "label.add.accounts.to": "\u6DFB\u52A0\u5E10\u6237\u81F3",
-  "label.add.acl": "\u6DFB\u52A0 ACL",
-  "label.add.acl.list": "\u6DFB\u52A0 ACL \u5217\u8868",
+  "label.add.acl.rule": "\u6DFB\u52A0 ACL",
+  "label.add.acl": "\u6DFB\u52A0 ACL \u5217\u8868",
   "label.add.affinity.group": "\u6DFB\u52A0\u65B0\u5173\u8054\u6027\u7EC4",
 
   "label.add.baremetal.dhcp.device": "\u6DFB\u52A0\u88F8\u673A DHCP \u8BBE\u5907",
@@ -381,7 +381,7 @@
     "label.add.l2.guest.network": "\u6DFB\u52A0 L2 \u6765\u5BBE\u7F51\u7EDC",
   "label.add.ldap.account": "\u6DFB\u52A0 LDAP \u8D26\u6237",
   "label.add.ldap.list.users": "\u5217\u51FA LDAP \u7528\u6237",
-  "label.add.list.name": "ACL \u5217\u8868\u540D\u79F0",
+  "label.add.acl.name": "ACL \u5217\u8868\u540D\u79F0",
   "label.add.load.balancer": "\u6DFB\u52A0\u8D1F\u8F7D\u5747\u8861\u5668",
 
   "label.add.management.ip.range": "\u6DFB\u52A0\u7BA1\u7406 IP \u5730\u5740\u8303\u56F4",
@@ -389,7 +389,7 @@
   "label.add.netscaler.device": "\u6DFB\u52A0 Netscaler \u8BBE\u5907",
   "label.add.network": "\u6DFB\u52A0\u7F51\u7EDC",
   "label.add.network.acl": "\u6DFB\u52A0\u7F51\u7EDC ACL",
-  "label.add.network.acl.list": "\u6DFB\u52A0\u7F51\u7EDC ACL \u5217\u8868",
+  "label.add.network.acl": "\u6DFB\u52A0\u7F51\u7EDC ACL \u5217\u8868",
   "label.add.network.device": "\u6DFB\u52A0\u7F51\u7EDC\u8BBE\u5907",
   "label.add.network.offering": "\u6DFB\u52A0\u7F51\u7EDC\u65B9\u6848",
 
@@ -829,7 +829,7 @@
   "label.defaultnetwork": "\u9ED8\u8BA4\u7F51\u7EDC",
 
   "label.delete": "\u5220\u9664",
-  "label.delete.acl.list": "\u5220\u9664 ACL \u5217\u8868",
+  "label.delete.acl": "\u5220\u9664 ACL \u5217\u8868",
   "label.delete.affinity.group": "\u5220\u9664\u5173\u8054\u6027\u7EC4",
   "label.delete.alerts": "\u5220\u9664\u8B66\u62A5",
   "label.delete.backup": "\u5220\u9664\u5907\u4EFD",
@@ -1007,7 +1007,7 @@
   "label.computeonly.offering.tooltip": "\u5728\u8BA1\u7B97\u65B9\u6848\u4E2D\u6307\u5B9A\u4E0E\u6839\u78C1\u76D8\u76F8\u5173\u7684\u4FE1\u606F\u6216\u5C06\u78C1\u76D8\u65B9\u6848\u76F4\u63A5\u94FE\u63A5\u5230\u8BA1\u7B97\u65B9\u6848\u7684\u9009\u9879",
 
   "label.edit": "\u7F16\u8F91",
-  "label.edit.acl.list": "\u7F16\u8F91 ACL \u5217\u8868",
+  "label.edit.acl": "\u7F16\u8F91 ACL \u5217\u8868",
   "label.edit.acl.rule": "\u7F16\u8F91 ACL \u89C4\u5219",
   "label.edit.affinity.group": "\u7F16\u8F91\u5173\u8054\u6027\u7EC4",
   "label.edit.lb.rule": "\u7F16\u8F91\u8D1F\u8F7D\u5747\u8861\u5668\u89C4\u5219",
@@ -1717,7 +1717,7 @@
   "label.netscaler.vpx": "NetScaler VPX \u8D1F\u8F7D\u5747\u8861\u5668",
   "label.network": "\u7F51\u7EDC",
   "label.network.acl": "\u7F51\u7EDC ACL",
-  "label.network.acl.lists": "\u7F51\u7EDC ACL \u5217\u8868",
+  "label.network.acls": "\u7F51\u7EDC ACL \u5217\u8868",
   "label.network.acls": "\u7F51\u7EDC ACL",
   "label.network.addvm": "\u5C06\u7F51\u7EDC\u6DFB\u52A0\u5230\u865A\u62DF\u673A",
   "label.network.desc": "\u7F51\u7EDC\u63CF\u8FF0",
@@ -2136,7 +2136,6 @@
   "label.removing.user": "\u6B63\u5728\u5220\u9664\u7528\u6237",
 
   "label.replace.acl": "\u66FF\u6362 ACL",
-  "label.replace.acl.list": "\u66FF\u6362 ACL \u5217\u8868",
   "label.report.bug": "\u62A5\u544A\u95EE\u9898",
 
   "label.required": "\u5FC5\u586B\u9879",
@@ -2666,8 +2665,7 @@
   "label.user.details": "\u7528\u6237\u8BE6\u60C5",
   "label.user.source": "\u6765\u6E90",
   "label.user.vm": "\u7528\u6237\u865A\u62DF\u673A",
-  "label.userdata": "\u7528\u6237\u6570\u636E",
-  "label.userdatal2": "\u7528\u6237\u6570\u636E",
+  "label.user.data": "\u7528\u6237\u6570\u636E",
   "label.username": "\u7528\u6237\u540D",
   "label.users": "\u7528\u6237",
   "label.usersource": "\u7528\u6237\u7C7B\u578B",
@@ -3129,7 +3127,7 @@
   "message.confirm.dedicate.pod.domain.account": "\u662F\u5426\u786E\u5B9E\u8981\u5C06\u6B64\u63D0\u4F9B\u70B9\u4E13\u7528\u4E8E\u57DF/\u5E10\u6237\uFF1F",
   "message.confirm.dedicate.zone": "\u662F\u5426\u8981\u5C06\u6B64\u8D44\u6E90\u57DF\u4E13\u7528\u4E8E\u57DF/\u5E10\u6237\uFF1F",
 
-  "message.confirm.delete.acl.list": "\u662F\u5426\u786E\u5B9E\u8981\u5220\u9664\u6B64 ACL \u5217\u8868\uFF1F",
+  "message.confirm.delete.acl": "\u662F\u5426\u786E\u5B9E\u8981\u5220\u9664\u6B64 ACL \u5217\u8868\uFF1F",
   "message.confirm.delete.alert": "\u662F\u5426\u786E\u5B9E\u8981\u5220\u9664\u6B64\u8B66\u62A5\uFF1F",
   "message.confirm.delete.baremetal.rack.configuration": "\u8BF7\u786E\u8BA4\u60A8\u786E\u5B9E\u8981\u5220\u9664 Baremetal Rack \u914D\u7F6E",
   "message.confirm.delete.bigswitchbcf": "\u8BF7\u786E\u8BA4\u60A8\u786E\u5B9E\u8981\u5220\u9664\u6B64 BigSwitch BCF \u63A7\u5236\u5668",
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index d467665ed5f..1769d1329bb 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -666,7 +666,7 @@
               </div>
             </div>
             <div class="resource-detail-item" v-if="resource.userdataname">
-              <div class="resource-detail-item__label">{{ $t('label.userdata') }}</div>
+              <div class="resource-detail-item__label">{{ $t('label.user.data') }}</div>
               <div class="resource-detail-item__details">
                 <solution-outlined />
                 <router-link v-if="!isStatic && $router.resolve('/userdata/' + resource.userdataid).matched[0].redirect !== '/exception/404'" :to="{ path: '/userdata/' + resource.userdataid }">{{ resource.userdataname || resource.userdataid }}</router-link>
diff --git a/ui/src/config/section/account.js b/ui/src/config/section/account.js
index 86dd909a0e3..63c802281b9 100644
--- a/ui/src/config/section/account.js
+++ b/ui/src/config/section/account.js
@@ -55,7 +55,7 @@ export default {
     param: 'account'
   }, {
     name: 'userdata',
-    title: 'label.userdata',
+    title: 'label.user.data',
     param: 'account'
   }, {
     name: 'template',
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index b6a72b82f91..3b483c19b74 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -397,7 +397,7 @@ export default {
         {
           api: 'resetUserDataForVirtualMachine',
           icon: 'solution-outlined',
-          label: 'label.reset.userdata.on.vm',
+          label: 'label.reset.user.data.on.vm',
           message: 'message.desc.reset.userdata',
           docHelp: 'adminguide/virtual_machines.html#resetting-userdata',
           dataView: true,
@@ -909,7 +909,7 @@ export default {
     },
     {
       name: 'userdata',
-      title: 'label.user.data',
+      title: 'label.user.data.library',
       icon: 'solution-outlined',
       docHelp: 'adminguide/virtual_machines.html#user-data-and-meta-data',
       permission: ['listUserData'],
@@ -948,7 +948,7 @@ export default {
           api: 'registerUserData',
           icon: 'plus-outlined',
           label: 'label.register.user.data',
-          docHelp: 'adminguide/virtual_machines.html#creating-the-ssh-keypair',
+          docHelp: 'adminguide/virtual_machines.html#user-data-and-meta-data',
           listView: true,
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/RegisterUserData.vue')))
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 4e58c7a4cd8..30aae3a8deb 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -182,7 +182,7 @@ export default {
         {
           api: 'replaceNetworkACLList',
           icon: 'swap-outlined',
-          label: 'label.replace.acl.list',
+          label: 'label.replace.acl',
           message: 'message.confirm.replace.acl.new.one',
           docHelp: 'adminguide/networking_and_traffic.html#configuring-network-access-control-list',
           dataView: true,
@@ -698,7 +698,7 @@ export default {
         {
           api: 'resetUserDataForVirtualMachine',
           icon: 'solution-outlined',
-          label: 'label.reset.userdata.on.vm',
+          label: 'label.reset.user.data.on.vm',
           message: 'message.desc.reset.userdata',
           docHelp: 'adminguide/virtual_machines.html#resetting-userdata',
           dataView: true,
@@ -965,7 +965,7 @@ export default {
         {
           api: 'replaceNetworkACLList',
           icon: 'swap-outlined',
-          label: 'label.replace.acl.list',
+          label: 'label.replace.acl',
           message: 'message.confirm.replace.acl.new.one',
           docHelp: 'adminguide/networking_and_traffic.html#acl-on-private-gateway',
           dataView: true,
@@ -1062,10 +1062,9 @@ export default {
     },
     {
       name: 'acllist',
-      title: 'label.network.acl.lists',
+      title: 'label.network.acls',
       icon: 'bars-outlined',
       docHelp: 'adminguide/networking_and_traffic.html#configuring-network-access-control-list',
-      hidden: true,
       permission: ['listNetworkACLLists'],
       columns: ['name', 'description', 'id'],
       details: ['name', 'description', 'id'],
@@ -1073,15 +1072,15 @@ export default {
         name: 'details',
         component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
       }, {
-        name: 'acl.list.rules',
-        component: shallowRef(defineAsyncComponent(() => import('@/views/network/AclListRulesTab.vue'))),
+        name: 'acl.rules',
+        component: shallowRef(defineAsyncComponent(() => import('@/views/network/AclRulesTab.vue'))),
         show: () => true
       }],
       actions: [
         {
           api: 'createNetworkACLList',
           icon: 'plus-outlined',
-          label: 'label.add.acl.list',
+          label: 'label.add.acl',
           docHelp: 'adminguide/networking_and_traffic.html#creating-acl-lists',
           listView: true,
           args: ['name', 'description', 'vpcid']
@@ -1089,15 +1088,15 @@ export default {
         {
           api: 'updateNetworkACLList',
           icon: 'edit-outlined',
-          label: 'label.edit.acl.list',
+          label: 'label.edit.acl',
           dataView: true,
           args: ['name', 'description']
         },
         {
           api: 'deleteNetworkACLList',
           icon: 'delete-outlined',
-          label: 'label.delete.acl.list',
-          message: 'message.confirm.delete.acl.list',
+          label: 'label.delete.acl',
+          message: 'message.confirm.delete.acl',
           dataView: true
         }
       ]
diff --git a/ui/src/views/compute/AutoScaleVmProfile.vue b/ui/src/views/compute/AutoScaleVmProfile.vue
index 208fa6a881e..20a87065cf4 100644
--- a/ui/src/views/compute/AutoScaleVmProfile.vue
+++ b/ui/src/views/compute/AutoScaleVmProfile.vue
@@ -76,7 +76,7 @@
       <div class="form" v-if="userdataid">
         <div class="form__item">
           <div class="form__label">
-            <tooltip-label :title="$t('label.userdataid')"/>
+            <tooltip-label :title="$t('label.user.data.id')"/>
           </div>
           {{ userdataid }}
         </div>
@@ -84,7 +84,7 @@
       <div class="form" v-if="userdataname">
         <div class="form__item">
           <div class="form__label">
-            <tooltip-label :title="$t('label.userdataname')"/>
+            <tooltip-label :title="$t('label.user.data.name')"/>
           </div>
           {{ userdataname }}
         </div>
@@ -92,7 +92,7 @@
       <div class="form" v-if="userdatadetails">
         <div class="form__item">
           <div class="form__label">
-            <tooltip-label :title="$t('label.userdatadetails')"/>
+            <tooltip-label :title="$t('label.user.data.details')"/>
           </div>
           {{ userdatadetails }}
         </div>
@@ -100,7 +100,7 @@
       <div class="form" v-if="userdatapolicy">
         <div class="form__item">
           <div class="form__label">
-            <tooltip-label :title="$t('label.userdatapolicy')"/>
+            <tooltip-label :title="$t('label.user.data.policy')"/>
           </div>
           {{ userdatapolicy }}
         </div>
@@ -108,7 +108,7 @@
       <div class="form">
         <div class="form__item">
           <div class="form__label">
-            <tooltip-label :title="$t('label.userdata')" :tooltip="createAutoScaleVmProfileApiParams.userdata.description"/>
+            <tooltip-label :title="$t('label.user.data')" :tooltip="createAutoScaleVmProfileApiParams.userdata.description"/>
           </div>
           <a-textarea v-model:value="userdata" rows="5" :disabled="true">
           </a-textarea>
@@ -124,7 +124,7 @@
         <div class="form__item">
           <a-button ref="submit" :disabled="!('updateAutoScaleVmProfile' in $store.getters.apis) || resource.state !== 'DISABLED'" type="primary" @click="showUpdateUserDataForm = true">
             <template #icon><solution-outlined /></template>
-            {{ $t('label.reset.userdata.on.autoscale.vm.group') }}
+            {{ $t('label.reset.user.data.on.autoscale.vm.group') }}
           </a-button>
         </div>
       </div>
@@ -291,7 +291,7 @@
 
     <a-modal
       :visible="showUpdateUserDataForm"
-      :title="$t('label.reset.userdata.on.autoscale.vm.group')"
+      :title="$t('label.reset.user.data.on.autoscale.vm.group')"
       :closable="true"
       :maskClosable="false"
       :footer="null"
diff --git a/ui/src/views/compute/CreateAutoScaleVmGroup.vue b/ui/src/views/compute/CreateAutoScaleVmGroup.vue
index 4113c118dce..47fd3f0ed45 100644
--- a/ui/src/views/compute/CreateAutoScaleVmGroup.vue
+++ b/ui/src/views/compute/CreateAutoScaleVmGroup.vue
@@ -764,7 +764,7 @@
                     </a-form-item>
                     <a-form-item>
                       <template #label>
-                        <tooltip-label :title="$t('label.userdata')" :tooltip="createAutoScaleVmProfileApiParams.userdata.description"/>
+                        <tooltip-label :title="$t('label.user.data')" :tooltip="createAutoScaleVmProfileApiParams.userdata.description"/>
                       </template>
                       <a-card>
                         <div v-if="this.template && this.template.userdataid">
@@ -792,11 +792,11 @@
                         </div><br/><br/>
                         <div v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE' || userdataDefaultOverridePolicy === 'APPEND' || !userdataDefaultOverridePolicy">
                           <span v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE'" >
-                            {{ $t('label.userdata.do.override') }}
+                            {{ $t('label.user.data.do.override') }}
                             <a-switch v-model:checked="doUserdataOverride" style="margin-left: 10px"/>
                           </span>
                           <span v-if="userdataDefaultOverridePolicy === 'APPEND'">
-                            {{ $t('label.userdata.do.append') }}
+                            {{ $t('label.user.data.do.append') }}
                             <a-switch v-model:checked="doUserdataAppend" style="margin-left: 10px"/>
                           </span>
                           <a-step
@@ -1248,11 +1248,11 @@ export default {
       userDataValues: {},
       templateUserDataCols: [
         {
-          title: this.$t('label.userdata'),
+          title: this.$t('label.user.data'),
           dataIndex: 'userdata'
         },
         {
-          title: this.$t('label.userdatapolicy'),
+          title: this.$t('label.user.data.policy'),
           dataIndex: 'userdataoverridepolicy'
         }
       ],
@@ -1434,11 +1434,11 @@ export default {
       let tabList = []
       tabList = [{
         key: 'userdataregistered',
-        tab: this.$t('label.userdata.registered')
+        tab: this.$t('label.user.data.registered')
       },
       {
         key: 'userdatatext',
-        tab: this.$t('label.userdata.text')
+        tab: this.$t('label.user.data.text')
       }]
       return tabList
     },
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index d61c9e08ea9..1420a648255 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -603,7 +603,7 @@
                           @change="val => { dynamicscalingenabled = val }"/>
                       </a-form-item>
                     </a-form-item>
-                    <a-form-item :label="$t('label.userdata')">
+                    <a-form-item :label="$t('label.user.data')">
                       <a-card>
                         <div v-if="this.template && this.template.userdataid">
                           <a-text type="primary">
@@ -657,11 +657,11 @@
                         </div><br/><br/>
                         <div v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE' || userdataDefaultOverridePolicy === 'APPEND' || !userdataDefaultOverridePolicy">
                           <span v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE'" >
-                            {{ $t('label.userdata.do.override') }}
+                            {{ $t('label.user.data.do.override') }}
                             <a-switch v-model:checked="doUserdataOverride" style="margin-left: 10px"/>
                           </span>
                           <span v-if="userdataDefaultOverridePolicy === 'APPEND'">
-                            {{ $t('label.userdata.do.append') }}
+                            {{ $t('label.user.data.do.append') }}
                             <a-switch v-model:checked="doUserdataAppend" style="margin-left: 10px"/>
                           </span>
                           <a-step
@@ -1040,11 +1040,11 @@ export default {
       userDataValues: {},
       templateUserDataCols: [
         {
-          title: this.$t('label.userdata'),
+          title: this.$t('label.user.data'),
           dataIndex: 'userdata'
         },
         {
-          title: this.$t('label.userdatapolicy'),
+          title: this.$t('label.user.data.policy'),
           dataIndex: 'userdataoverridepolicy'
         }
       ],
@@ -1393,11 +1393,11 @@ export default {
       let tabList = []
       tabList = [{
         key: 'userdataregistered',
-        tab: this.$t('label.userdata.registered')
+        tab: this.$t('label.user.data.registered')
       },
       {
         key: 'userdatatext',
-        tab: this.$t('label.userdata.text')
+        tab: this.$t('label.user.data.text')
       }]
 
       return tabList
diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue
index b7e797ee57c..5e447131bc9 100644
--- a/ui/src/views/compute/DeployVnfAppliance.vue
+++ b/ui/src/views/compute/DeployVnfAppliance.vue
@@ -564,7 +564,7 @@
                           @change="val => { dynamicscalingenabled = val }"/>
                       </a-form-item>
                     </a-form-item>
-                    <a-form-item :label="$t('label.userdata')">
+                    <a-form-item :label="$t('label.user.data')">
                       <a-card>
                         <div v-if="this.template && this.template.userdataid">
                           <a-text type="primary">
@@ -618,11 +618,11 @@
                         </div><br/><br/>
                         <div v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE' || userdataDefaultOverridePolicy === 'APPEND' || !userdataDefaultOverridePolicy">
                           <span v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE'" >
-                            {{ $t('label.userdata.do.override') }}
+                            {{ $t('label.user.data.do.override') }}
                             <a-switch v-model:checked="doUserdataOverride" style="margin-left: 10px"/>
                           </span>
                           <span v-if="userdataDefaultOverridePolicy === 'APPEND'">
-                            {{ $t('label.userdata.do.append') }}
+                            {{ $t('label.user.data.do.append') }}
                             <a-switch v-model:checked="doUserdataAppend" style="margin-left: 10px"/>
                           </span>
                           <a-step
@@ -1015,11 +1015,11 @@ export default {
       userDataValues: {},
       templateUserDataCols: [
         {
-          title: this.$t('label.userdata'),
+          title: this.$t('label.user.data'),
           dataIndex: 'userdata'
         },
         {
-          title: this.$t('label.userdatapolicy'),
+          title: this.$t('label.user.data.policy'),
           dataIndex: 'userdataoverridepolicy'
         }
       ],
@@ -1291,11 +1291,11 @@ export default {
       let tabList = []
       tabList = [{
         key: 'userdataregistered',
-        tab: this.$t('label.userdata.registered')
+        tab: this.$t('label.user.data.registered')
       },
       {
         key: 'userdatatext',
-        tab: this.$t('label.userdata.text')
+        tab: this.$t('label.user.data.text')
       }]
 
       return tabList
diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue
index 834e11c3773..b534045f4bf 100644
--- a/ui/src/views/compute/EditVM.vue
+++ b/ui/src/views/compute/EditVM.vue
@@ -86,7 +86,7 @@
       </a-form-item>
       <a-form-item v-if="userDataEnabled">
         <template #label>
-          <tooltip-label :title="$t('label.userdata')" :tooltip="apiParams.userdata.description"/>
+          <tooltip-label :title="$t('label.user.data')" :tooltip="apiParams.userdata.description"/>
         </template>
         <a-textarea v-model:value="form.userdata">
         </a-textarea>
diff --git a/ui/src/views/compute/RegisterUserData.vue b/ui/src/views/compute/RegisterUserData.vue
index 8e6311fdf9a..3fb54962f2b 100644
--- a/ui/src/views/compute/RegisterUserData.vue
+++ b/ui/src/views/compute/RegisterUserData.vue
@@ -37,18 +37,18 @@
         </a-form-item>
         <a-form-item name="userdata" ref="userdata">
           <template #label>
-            <tooltip-label :title="$t('label.userdata')" :tooltip="apiParams.userdata.description"/>
+            <tooltip-label :title="$t('label.user.data')" :tooltip="$t('label.register.user.data.details')"/>
           </template>
           <a-textarea
             v-model:value="form.userdata"
-            :placeholder="apiParams.userdata.description"/>
+            :placeholder="$t('label.register.user.data.details')"/>
         </a-form-item>
         <a-form-item name="isbase64" ref="isbase64" :label="$t('label.is.base64.encoded')">
           <a-checkbox v-model:checked="form.isbase64"></a-checkbox>
         </a-form-item>
         <a-form-item name="params" ref="params">
           <template #label>
-            <tooltip-label :title="$t('label.userdataparams')" :tooltip="apiParams.params.description"/>
+            <tooltip-label :title="$t('label.user.data.params')" :tooltip="apiParams.params.description"/>
           </template>
           <a-select
             mode="tags"
@@ -155,7 +155,7 @@ export default {
       })
       this.rules = reactive({
         name: [{ required: true, message: this.$t('message.error.name') }],
-        userdata: [{ required: true, message: this.$t('message.error.userdata') }]
+        userdata: [{ required: true, message: this.$t('message.error.user.data') }]
       })
     },
     fetchData () {
diff --git a/ui/src/views/compute/ResetUserData.vue b/ui/src/views/compute/ResetUserData.vue
index 6c57d13dc21..8849db5dcca 100644
--- a/ui/src/views/compute/ResetUserData.vue
+++ b/ui/src/views/compute/ResetUserData.vue
@@ -52,11 +52,11 @@
       </div>
       <div v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE' || userdataDefaultOverridePolicy === 'APPEND' || !userdataDefaultOverridePolicy">
         <span v-if="userdataDefaultOverridePolicy === 'ALLOWOVERRIDE'" >
-          {{ $t('label.userdata.do.override') }}
+          {{ $t('label.user.data.do.override') }}
           <a-switch v-model:checked="doUserdataOverride" style="margin-left: 10px"/>
         </span>
         <span v-if="userdataDefaultOverridePolicy === 'APPEND'">
-          {{ $t('label.userdata.do.append') }}
+          {{ $t('label.user.data.do.append') }}
           <a-switch v-model:checked="doUserdataAppend" style="margin-left: 10px"/>
         </span>
         <a-step>
@@ -198,11 +198,11 @@ export default {
       userDataValues: {},
       templateUserDataCols: [
         {
-          title: this.$t('label.userdata'),
+          title: this.$t('label.user.data'),
           dataIndex: 'userdata'
         },
         {
-          title: this.$t('label.userdatapolicy'),
+          title: this.$t('label.user.data.policy'),
           dataIndex: 'userdataoverridepolicy'
         }
       ],
@@ -282,11 +282,11 @@ export default {
     loadUserdataTabList () {
       this.userdataTabList = [{
         key: 'userdataregistered',
-        tab: this.$t('label.userdata.registered')
+        tab: this.$t('label.user.data.registered')
       },
       {
         key: 'userdatatext',
-        tab: this.$t('label.userdata.text')
+        tab: this.$t('label.user.data.text')
       }]
     },
     onUserdataTabChange (key, type) {
@@ -368,7 +368,7 @@ export default {
 
       api(resetUserDataApiName, args, httpMethod, data).then(json => {
         this.$message.success({
-          content: `${this.$t('label.action.userdata.reset')} - ${this.$t('label.success')}`,
+          content: `${this.$t('label.action.user.data.reset')} - ${this.$t('label.success')}`,
           duration: 2
         })
         this.$emit('refresh-data')
diff --git a/ui/src/views/compute/wizard/UserDataSelection.vue b/ui/src/views/compute/wizard/UserDataSelection.vue
index 74e3a3be400..0b8fdc06952 100644
--- a/ui/src/views/compute/wizard/UserDataSelection.vue
+++ b/ui/src/views/compute/wizard/UserDataSelection.vue
@@ -33,7 +33,7 @@
       :scroll="{ y: 225 }"
     >
       <template #headerCell="{ column }">
-        <template v-if="column.key === 'name'"><solution-outlined /> {{ $t('label.userdata') }}</template>
+        <template v-if="column.key === 'name'"><solution-outlined /> {{ $t('label.user.data') }}</template>
         <template v-if="column.key === 'account'"><user-outlined /> {{ $t('label.account') }}</template>
         <template v-if="column.key === 'domain'"><block-outlined /> {{ $t('label.domain') }}</template>
       </template>
@@ -81,7 +81,7 @@ export default {
         {
           key: 'name',
           dataIndex: 'name',
-          title: this.$t('label.userdata'),
+          title: this.$t('label.user.data'),
           width: '40%'
         },
         {
diff --git a/ui/src/views/image/RegisterOrUploadIso.vue b/ui/src/views/image/RegisterOrUploadIso.vue
index 6c26f08b581..871a8482e99 100644
--- a/ui/src/views/image/RegisterOrUploadIso.vue
+++ b/ui/src/views/image/RegisterOrUploadIso.vue
@@ -218,7 +218,7 @@
               name="userdataid"
               ref="userdataid">
               <template #label>
-                <tooltip-label :title="$t('label.userdata')" :tooltip="linkUserDataParams.userdataid.description"/>
+                <tooltip-label :title="$t('label.user.data')" :tooltip="linkUserDataParams.userdataid.description"/>
               </template>
               <a-select
                 showSearch
@@ -238,7 +238,7 @@
           <a-col :md="24" :lg="12">
             <a-form-item ref="userdatapolicy" name="userdatapolicy">
               <template #label>
-                <tooltip-label :title="$t('label.userdatapolicy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
+                <tooltip-label :title="$t('label.user.data.policy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
               </template>
               <a-select
                 showSearch
diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue
index 74ad9270721..c3f812773be 100644
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@@ -377,7 +377,7 @@
               name="userdataid"
               ref="userdataid">
               <template #label>
-                <tooltip-label :title="$t('label.userdata')" :tooltip="linkUserDataParams.userdataid.description"/>
+                <tooltip-label :title="$t('label.user.data')" :tooltip="linkUserDataParams.userdataid.description"/>
               </template>
               <a-select
                 showSearch
@@ -397,7 +397,7 @@
           <a-col :md="24" :lg="12">
             <a-form-item ref="userdatapolicy" name="userdatapolicy">
               <template #label>
-                <tooltip-label :title="$t('label.userdatapolicy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
+                <tooltip-label :title="$t('label.user.data.policy')" :tooltip="linkUserDataParams.userdatapolicy.description"/>
               </template>
               <a-select
                 showSearch
diff --git a/ui/src/views/image/UpdateISO.vue b/ui/src/views/image/UpdateISO.vue
index 00e1cc536c2..5d198331dfc 100644
--- a/ui/src/views/image/UpdateISO.vue
+++ b/ui/src/views/image/UpdateISO.vue
@@ -79,7 +79,7 @@
             <a-form-item
               name="userdataid"
               ref="userdataid"
-              :label="$t('label.userdata')">
+              :label="$t('label.user.data')">
               <a-select
                 showSearch
                 optionFilterProp="label"
@@ -98,7 +98,7 @@
           <a-col :md="24" :lg="12">
             <a-form-item ref="userdatapolicy" name="userdatapolicy">
               <template #label>
-                <tooltip-label :title="$t('label.userdatapolicy')" :tooltip="$t('label.userdatapolicy.tooltip')"/>
+                <tooltip-label :title="$t('label.user.data.policy')" :tooltip="$t('label.user.data.policy.tooltip')"/>
               </template>
               <a-select
                 showSearch
diff --git a/ui/src/views/image/UpdateTemplate.vue b/ui/src/views/image/UpdateTemplate.vue
index 3a7a5a3f640..7db402cdd5b 100644
--- a/ui/src/views/image/UpdateTemplate.vue
+++ b/ui/src/views/image/UpdateTemplate.vue
@@ -109,7 +109,7 @@
             <a-form-item
               name="userdataid"
               ref="userdataid"
-              :label="$t('label.userdata')">
+              :label="$t('label.user.data')">
               <a-select
                 showSearch
                 optionFilterProp="label"
@@ -128,7 +128,7 @@
           <a-col :md="24" :lg="12">
             <a-form-item ref="userdatapolicy" name="userdatapolicy">
               <template #label>
-                <tooltip-label :title="$t('label.userdatapolicy')" :tooltip="$t('label.userdatapolicy.tooltip')"/>
+                <tooltip-label :title="$t('label.user.data.policy')" :tooltip="$t('label.user.data.policy.tooltip')"/>
               </template>
               <a-select
                 showSearch
diff --git a/ui/src/views/network/AclListRulesTab.vue b/ui/src/views/network/AclRulesTab.vue
similarity index 99%
rename from ui/src/views/network/AclListRulesTab.vue
rename to ui/src/views/network/AclRulesTab.vue
index e01e61289e5..c77a928370e 100644
--- a/ui/src/views/network/AclListRulesTab.vue
+++ b/ui/src/views/network/AclRulesTab.vue
@@ -25,7 +25,7 @@
         :disabled="!('createNetworkACL' in $store.getters.apis)"
         @click="openAddRuleModal">
         <template #icon><plus-outlined /></template>
-        {{ $t('label.add') }} {{ $t('label.aclid') }}
+        {{ $t('label.add.acl.rule') }}
       </a-button>
 
       <a-button type="dashed" @click="exportAclList" style="width: 100%">
diff --git a/ui/src/views/network/VpcTab.vue b/ui/src/views/network/VpcTab.vue
index 5c0838ff7e0..e4a1513adbd 100644
--- a/ui/src/views/network/VpcTab.vue
+++ b/ui/src/views/network/VpcTab.vue
@@ -34,14 +34,14 @@
       <a-tab-pane :tab="$t('label.public.ips')" key="ip" v-if="'listPublicIpAddresses' in $store.getters.apis">
         <IpAddressesTab :resource="resource" :loading="loading" />
       </a-tab-pane>
-      <a-tab-pane :tab="$t('label.network.acl.lists')" key="acl" v-if="'listNetworkACLLists' in $store.getters.apis">
+      <a-tab-pane :tab="$t('label.network.acls')" key="acl" v-if="'listNetworkACLLists' in $store.getters.apis">
         <a-button
           type="dashed"
           style="width: 100%"
           :disabled="!('createNetworkACLList' in $store.getters.apis)"
           @click="() => handleOpenModals('networkAcl')">
           <template #icon><plus-circle-outlined /></template>
-          {{ $t('label.add.network.acl.list') }}
+          {{ $t('label.add.network.acl') }}
         </a-button>
         <a-table
           class="table"
@@ -76,7 +76,7 @@
         </a-pagination>
         <a-modal
           :visible="modals.networkAcl"
-          :title="$t('label.add.acl.list')"
+          :title="$t('label.add.acl')"
           :footer="null"
           :maskClosable="false"
           :closable="true"
@@ -89,7 +89,7 @@
             @finish="handleNetworkAclFormSubmit"
             v-ctrl-enter="handleNetworkAclFormSubmit"
            >
-            <a-form-item :label="$t('label.add.list.name')" ref="name" name="name">
+            <a-form-item :label="$t('label.add.acl.name')" ref="name" name="name">
               <a-input
                 v-model:value="form.name"
                 v-focus="true"></a-input>
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 2ee2f61cf0d..fcdd4f3d176 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -190,7 +190,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-form-item name="userdatal2" ref="userdatal2" :label="$t('label.userdatal2')" v-if="guestType === 'l2'">
+        <a-form-item name="userdatal2" ref="userdatal2" :label="$t('label.user.data')" v-if="guestType === 'l2'">
           <a-switch v-model:checked="form.userdatal2" />
         </a-form-item>
         <a-row :gutter="12">

From a51a04efc2bff6e6842efd3e46e60cd7abb95ab9 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Fri, 25 Jul 2025 04:00:42 -0300
Subject: [PATCH 62/94] [Vmware to KVM Migration] Preserve boot type and boot
 mode of instances to be migrated (#10975)

* [Vmware to KVM Migration] Preserve boot type and boot mode of instances to be migrated

* Restore end of line

* Extract lines to new method

* Address review comments
---
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java       |  8 ++++++++
 ui/src/components/view/InfoCard.vue                  | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index 03c0ad06dc9..4de494bb554 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -1188,6 +1188,8 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
             allDetails.put(VmDetailConstants.KVM_VNC_PASSWORD, unmanagedInstance.getVncPassword());
         }
 
+        addImportingVMBootTypeAndModeDetails(unmanagedInstance.getBootType(), unmanagedInstance.getBootMode(), allDetails);
+
         VirtualMachine.PowerState powerState = VirtualMachine.PowerState.PowerOff;
         if (unmanagedInstance.getPowerState().equals(UnmanagedInstanceTO.PowerState.PowerOn)) {
             powerState = VirtualMachine.PowerState.PowerOn;
@@ -1259,6 +1261,12 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
         return userVm;
     }
 
+    private void addImportingVMBootTypeAndModeDetails(String bootType, String bootMode, Map<String, String> allDetails) {
+        if (StringUtils.isNotBlank(bootType) && bootType.equalsIgnoreCase("uefi") && StringUtils.isNotBlank(bootMode)) {
+            allDetails.put("UEFI", bootMode);
+        }
+    }
+
     private HashMap<String, UnmanagedInstanceTO> getUnmanagedInstancesForHost(HostVO host, String instanceName, List<String> managedVms) {
         HashMap<String, UnmanagedInstanceTO> unmanagedInstances = new HashMap<>();
         if (host.isInMaintenanceStates()) {
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 1769d1329bb..fc8f59f71a3 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -732,6 +732,18 @@
                 <span v-else>{{ resource.webhookname || resource.webhookid }}</span>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.boottype">
+              <div class="resource-detail-item__label">{{ $t('label.boottype') }}</div>
+              <div class="resource-detail-item__details">
+                <span>{{ resource.boottype }}</span>
+              </div>
+            </div>
+            <div class="resource-detail-item" v-if="resource.bootmode">
+              <div class="resource-detail-item__label">{{ $t('label.bootmode') }}</div>
+              <div class="resource-detail-item__details">
+                <span>{{ resource.bootmode }}</span>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="resource.managementserverid">
               <div class="resource-detail-item__label">{{ $t('label.management.servers') }}</div>
               <div class="resource-detail-item__details">

From 074f75838e493a803905943ff252ffff0d68e601 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:23:52 +1000
Subject: [PATCH 63/94] Fix pre-commit warnings for deprecated stage names
 (#11276)

---
 .pre-commit-config.yaml |  6 +++---
 requirements-dev.txt    | 18 ++++++++++++++++++
 requirements.txt        |  2 --
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 requirements-dev.txt

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 85bba502116..901d3f02bc1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 ---
-default_stages: [commit, push]
+default_stages: [pre-commit, pre-push]
 default_language_version:
   # force all unspecified Python hooks to run python3
   python: python3
-minimum_pre_commit_version: "2.17.0"
+minimum_pre_commit_version: "3.2.0"
 repos:
   - repo: meta
     hooks:
@@ -32,7 +32,7 @@ repos:
         name: run gitleaks
         description: detect hardcoded secrets
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       #- id: check-added-large-files
       - id: check-case-conflict
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 00000000000..99ad3943160
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,18 @@
+# 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.
+
+pre-commit
diff --git a/requirements.txt b/requirements.txt
index 96f8c9c1e70..9711afad3d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,5 @@
 
 # Marvin dependencies are installed via its bundle
 
-pre-commit
-
 # Install the SolidFire SDK for Python
 solidfire-sdk-python

From ae5010370476c6f6d19f816a5cb95813c4a2e7ef Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Fri, 25 Jul 2025 14:43:33 +0530
Subject: [PATCH 64/94] Config 'vm.network.nic.max.secondary.ipaddresses' -
 Sync default value (and value if not set) to 10 as per the config description
 and default value in parseInt of the config (#11256)

---
 .../src/main/resources/META-INF/db/schema-42010to42100.sql    | 4 ++++
 server/src/main/java/com/cloud/configuration/Config.java      | 2 +-
 .../src/main/java/com/cloud/network/NetworkServiceImpl.java   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index b9ce11c327f..cc6c4c6ae05 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -23,6 +23,10 @@
 ALTER TABLE `cloud`.`backup_schedule` ADD COLUMN `max_backups` int(8) default NULL COMMENT 'maximum number of backups to maintain';
 ALTER TABLE `cloud`.`backups` ADD COLUMN `backup_interval_type` int(5) COMMENT 'type of backup, e.g. manual, recurring - hourly, daily, weekly or monthly';
 
+-- Update default value for the config 'vm.network.nic.max.secondary.ipaddresses' (and value to default value if value is null)
+UPDATE `cloud`.`configuration` SET default_value = '10' WHERE name = 'vm.network.nic.max.secondary.ipaddresses';
+UPDATE `cloud`.`configuration` SET value = '10' WHERE name = 'vm.network.nic.max.secondary.ipaddresses' AND value IS NULL;
+
 -- Add console_endpoint_creator_address column to cloud.console_session table
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.console_session', 'console_endpoint_creator_address', 'VARCHAR(45)');
 
diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java
index d35bfac501f..01cf6df882d 100644
--- a/server/src/main/java/com/cloud/configuration/Config.java
+++ b/server/src/main/java/com/cloud/configuration/Config.java
@@ -395,7 +395,7 @@ public enum Config {
             null),
     MaxNumberOfSecondaryIPsPerNIC(
             "Network", ManagementServer.class, Integer.class,
-            "vm.network.nic.max.secondary.ipaddresses", "256",
+            "vm.network.nic.max.secondary.ipaddresses", "10",
             "Specify the number of secondary ip addresses per nic per vm. Default value 10 is used, if not specified.", null),
 
     EnableServiceMonitoring(
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index ea1bc5c7510..bd3a3975eac 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -910,7 +910,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
             throw new InvalidParameterValueException("Invalid network id is given");
         }
 
-        int maxAllowedIpsPerNic = NumbersUtil.parseInt(_configDao.getValue(Config.MaxNumberOfSecondaryIPsPerNIC.key()), 10);
+        int maxAllowedIpsPerNic = NumbersUtil.parseInt(_configDao.getValue(Config.MaxNumberOfSecondaryIPsPerNIC.key()), Integer.parseInt(Config.MaxNumberOfSecondaryIPsPerNIC.getDefaultValue()));
         Long nicWiseIpCount = _nicSecondaryIpDao.countByNicId(nicId);
         if (nicWiseIpCount.intValue() >= maxAllowedIpsPerNic) {
             logger.error("Maximum Number of Ips \"vm.network.nic.max.secondary.ipaddresses = \"{} per Nic has been crossed for the nic {}.", maxAllowedIpsPerNic, nicVO);

From 75a2b3cc54cf6fadda3e137c2cd7f5b8a502803e Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Fri, 25 Jul 2025 14:47:14 +0530
Subject: [PATCH 65/94] Validate qcow2 file during import operation (#11264)

---
 .../cloud/agent/api/CheckVolumeAnswer.java    | 15 +++-
 .../agent/api/CopyRemoteVolumeAnswer.java     | 15 +++-
 .../LibvirtCheckVolumeCommandWrapper.java     | 79 +++++++++++++++----
 ...LibvirtCopyRemoteVolumeCommandWrapper.java | 76 +++++++++++++++---
 ...virtGetVolumesOnStorageCommandWrapper.java | 66 ++++++++++------
 .../LibvirtResizeVolumeCommandWrapper.java    | 19 +----
 .../kvm/storage/KVMPhysicalDisk.java          | 33 ++++++++
 .../vm/UnmanagedVMsManagerImpl.java           | 37 ++++++++-
 8 files changed, 265 insertions(+), 75 deletions(-)

diff --git a/core/src/main/java/com/cloud/agent/api/CheckVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckVolumeAnswer.java
index 5a32ab59a7a..07b7e102df9 100644
--- a/core/src/main/java/com/cloud/agent/api/CheckVolumeAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/CheckVolumeAnswer.java
@@ -17,22 +17,33 @@
 
 package com.cloud.agent.api;
 
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
+
+import java.util.Map;
+
 public class CheckVolumeAnswer extends Answer {
 
     private long size;
+    private Map<VolumeOnStorageTO.Detail, String> volumeDetails;
 
     CheckVolumeAnswer() {
     }
 
-    public CheckVolumeAnswer(CheckVolumeCommand cmd, String details, long size) {
-        super(cmd, true, details);
+    public CheckVolumeAnswer(CheckVolumeCommand cmd, final boolean success, String details, long size,
+                             Map<VolumeOnStorageTO.Detail, String> volumeDetails) {
+        super(cmd, success, details);
         this.size = size;
+        this.volumeDetails = volumeDetails;
     }
 
     public long getSize() {
         return size;
     }
 
+    public Map<VolumeOnStorageTO.Detail, String> getVolumeDetails() {
+        return volumeDetails;
+    }
+
     public String getString() {
         return "CheckVolumeAnswer [size=" + size + "]";
     }
diff --git a/core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeAnswer.java b/core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeAnswer.java
index e79005be71b..4aec0b26581 100644
--- a/core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeAnswer.java
@@ -17,21 +17,28 @@
 
 package com.cloud.agent.api;
 
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
+
+import java.util.Map;
+
 public class CopyRemoteVolumeAnswer extends Answer {
 
     private String remoteIp;
     private String filename;
 
     private long size;
+    private Map<VolumeOnStorageTO.Detail, String> volumeDetails;
 
     CopyRemoteVolumeAnswer() {
     }
 
-    public CopyRemoteVolumeAnswer(CopyRemoteVolumeCommand cmd, String details, String filename, long size) {
-        super(cmd, true, details);
+    public CopyRemoteVolumeAnswer(CopyRemoteVolumeCommand cmd, final boolean success, String details, String filename, long size,
+                                  Map<VolumeOnStorageTO.Detail, String> volumeDetails) {
+        super(cmd, success, details);
         this.remoteIp = cmd.getRemoteIp();
         this.filename = filename;
         this.size = size;
+        this.volumeDetails = volumeDetails;
     }
 
     public String getRemoteIp() {
@@ -54,6 +61,10 @@ public class CopyRemoteVolumeAnswer extends Answer {
         return size;
     }
 
+    public Map<VolumeOnStorageTO.Detail, String> getVolumeDetails() {
+        return volumeDetails;
+    }
+
     public String getString() {
         return "CopyRemoteVolumeAnswer [remoteIp=" + remoteIp + "]";
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java
index 8b0a5aab461..2caf8da2914 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java
@@ -31,18 +31,25 @@ import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.storage.Storage;
 import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
 import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.libvirt.LibvirtException;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @ResourceWrapper(handles = CheckVolumeCommand.class)
 public final class LibvirtCheckVolumeCommandWrapper extends CommandWrapper<CheckVolumeCommand, Answer, LibvirtComputingResource> {
 
     private static final Logger s_logger = Logger.getLogger(LibvirtCheckVolumeCommandWrapper.class);
+    private static final List<Storage.StoragePoolType> STORAGE_POOL_TYPES_SUPPORTED = Arrays.asList(Storage.StoragePoolType.Filesystem, Storage.StoragePoolType.NetworkFilesystem);
 
     @Override
     public Answer execute(final CheckVolumeCommand command, final LibvirtComputingResource libvirtComputingResource) {
@@ -53,34 +60,76 @@ public final class LibvirtCheckVolumeCommandWrapper extends CommandWrapper<Check
         KVMStoragePool pool = poolMgr.getStoragePool(storageFilerTO.getType(), storageFilerTO.getUuid());
 
         try {
-            if (storageFilerTO.getType() == Storage.StoragePoolType.Filesystem ||
-                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem) {
+            if (STORAGE_POOL_TYPES_SUPPORTED.contains(storageFilerTO.getType())) {
                 final KVMPhysicalDisk vol = pool.getPhysicalDisk(srcFile);
                 final String path = vol.getPath();
-                long size = getVirtualSizeFromFile(path);
-                return  new CheckVolumeAnswer(command, "", size);
+                try {
+                    KVMPhysicalDisk.checkQcow2File(path);
+                } catch (final CloudRuntimeException e) {
+                    return new CheckVolumeAnswer(command, false, "", 0, getVolumeDetails(pool, vol));
+                }
+
+                long size = KVMPhysicalDisk.getVirtualSizeFromFile(path);
+                return new CheckVolumeAnswer(command, true, "", size, getVolumeDetails(pool, vol));
             } else {
                 return new Answer(command, false, "Unsupported Storage Pool");
             }
-
         } catch (final Exception e) {
-            s_logger.error("Error while locating disk: "+ e.getMessage());
+            s_logger.error("Error while checking the disk: " + e.getMessage());
             return new Answer(command, false, result);
         }
     }
 
-    private long getVirtualSizeFromFile(String path) {
+    private Map<VolumeOnStorageTO.Detail, String> getVolumeDetails(KVMStoragePool pool, KVMPhysicalDisk disk) {
+        Map<String, String> info = getDiskFileInfo(pool, disk, true);
+        if (MapUtils.isEmpty(info)) {
+            return null;
+        }
+
+        Map<VolumeOnStorageTO.Detail, String> volumeDetails = new HashMap<>();
+
+        String backingFilePath = info.get(QemuImg.BACKING_FILE);
+        if (StringUtils.isNotBlank(backingFilePath)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.BACKING_FILE, backingFilePath);
+        }
+        String backingFileFormat = info.get(QemuImg.BACKING_FILE_FORMAT);
+        if (StringUtils.isNotBlank(backingFileFormat)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.BACKING_FILE_FORMAT, backingFileFormat);
+        }
+        String clusterSize = info.get(QemuImg.CLUSTER_SIZE);
+        if (StringUtils.isNotBlank(clusterSize)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.CLUSTER_SIZE, clusterSize);
+        }
+        String fileFormat = info.get(QemuImg.FILE_FORMAT);
+        if (StringUtils.isNotBlank(fileFormat)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.FILE_FORMAT, fileFormat);
+        }
+        String encrypted = info.get(QemuImg.ENCRYPTED);
+        if (StringUtils.isNotBlank(encrypted) && encrypted.equalsIgnoreCase("yes")) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.IS_ENCRYPTED, String.valueOf(Boolean.TRUE));
+        }
+        Boolean isLocked = isDiskFileLocked(pool, disk);
+        volumeDetails.put(VolumeOnStorageTO.Detail.IS_LOCKED, String.valueOf(isLocked));
+
+        return volumeDetails;
+    }
+
+    private Map<String, String> getDiskFileInfo(KVMStoragePool pool, KVMPhysicalDisk disk, boolean secure) {
+        if (!STORAGE_POOL_TYPES_SUPPORTED.contains(pool.getType())) {
+            return new HashMap<>(); // unknown
+        }
         try {
             QemuImg qemu = new QemuImg(0);
-            QemuImgFile qemuFile = new QemuImgFile(path);
-            Map<String, String> info = qemu.info(qemuFile);
-            if (info.containsKey(QemuImg.VIRTUAL_SIZE)) {
-                return Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
-            } else {
-                throw new CloudRuntimeException("Unable to determine virtual size of volume at path " + path);
-            }
+            QemuImgFile qemuFile = new QemuImgFile(disk.getPath(), disk.getFormat());
+            return qemu.info(qemuFile, secure);
         } catch (QemuImgException | LibvirtException ex) {
-            throw new CloudRuntimeException("Error when inspecting volume at path " + path, ex);
+            logger.error("Failed to get info of disk file: " + ex.getMessage());
+            return null;
         }
     }
+
+    private boolean isDiskFileLocked(KVMStoragePool pool, KVMPhysicalDisk disk) {
+        Map<String, String> info = getDiskFileInfo(pool, disk, false);
+        return info == null;
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyRemoteVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyRemoteVolumeCommandWrapper.java
index a5e1716da2e..6edf5cbd906 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyRemoteVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyRemoteVolumeCommandWrapper.java
@@ -31,18 +31,25 @@ import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.storage.Storage;
 import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
 import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.libvirt.LibvirtException;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @ResourceWrapper(handles = CopyRemoteVolumeCommand.class)
 public final class LibvirtCopyRemoteVolumeCommandWrapper extends CommandWrapper<CopyRemoteVolumeCommand, Answer, LibvirtComputingResource> {
 
     private static final Logger s_logger = Logger.getLogger(LibvirtCopyRemoteVolumeCommandWrapper.class);
+    private static final List<Storage.StoragePoolType> STORAGE_POOL_TYPES_SUPPORTED = Arrays.asList(Storage.StoragePoolType.Filesystem, Storage.StoragePoolType.NetworkFilesystem);
 
     @Override
     public Answer execute(final CopyRemoteVolumeCommand command, final LibvirtComputingResource libvirtComputingResource) {
@@ -58,14 +65,19 @@ public final class LibvirtCopyRemoteVolumeCommandWrapper extends CommandWrapper<
         int timeoutInSecs = command.getWait();
 
         try {
-            if (storageFilerTO.getType() == Storage.StoragePoolType.Filesystem ||
-                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem) {
+            if (STORAGE_POOL_TYPES_SUPPORTED.contains(storageFilerTO.getType())) {
                 String filename = libvirtComputingResource.copyVolume(srcIp, username, password, dstPath, srcFile, tmpPath, timeoutInSecs);
                 s_logger.debug("Volume " + srcFile + " copy successful, copied to file: " + filename);
                 final KVMPhysicalDisk vol = pool.getPhysicalDisk(filename);
                 final String path = vol.getPath();
-                long size = getVirtualSizeFromFile(path);
-                return new CopyRemoteVolumeAnswer(command, "", filename, size);
+                try {
+                    KVMPhysicalDisk.checkQcow2File(path);
+                } catch (final CloudRuntimeException e) {
+                    return new CopyRemoteVolumeAnswer(command, false, "", filename, 0, getVolumeDetails(pool, vol));
+                }
+
+                long size = KVMPhysicalDisk.getVirtualSizeFromFile(path);
+                return new CopyRemoteVolumeAnswer(command, true, "", filename, size, getVolumeDetails(pool, vol));
             } else {
                 String msg = "Unsupported storage pool type: " + storageFilerTO.getType().toString() + ", only local and NFS pools are supported";
                 return new Answer(command, false, msg);
@@ -77,18 +89,56 @@ public final class LibvirtCopyRemoteVolumeCommandWrapper extends CommandWrapper<
         }
     }
 
-    private long getVirtualSizeFromFile(String path) {
+    private Map<VolumeOnStorageTO.Detail, String> getVolumeDetails(KVMStoragePool pool, KVMPhysicalDisk disk) {
+        Map<String, String> info = getDiskFileInfo(pool, disk, true);
+        if (MapUtils.isEmpty(info)) {
+            return null;
+        }
+
+        Map<VolumeOnStorageTO.Detail, String> volumeDetails = new HashMap<>();
+
+        String backingFilePath = info.get(QemuImg.BACKING_FILE);
+        if (StringUtils.isNotBlank(backingFilePath)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.BACKING_FILE, backingFilePath);
+        }
+        String backingFileFormat = info.get(QemuImg.BACKING_FILE_FORMAT);
+        if (StringUtils.isNotBlank(backingFileFormat)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.BACKING_FILE_FORMAT, backingFileFormat);
+        }
+        String clusterSize = info.get(QemuImg.CLUSTER_SIZE);
+        if (StringUtils.isNotBlank(clusterSize)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.CLUSTER_SIZE, clusterSize);
+        }
+        String fileFormat = info.get(QemuImg.FILE_FORMAT);
+        if (StringUtils.isNotBlank(fileFormat)) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.FILE_FORMAT, fileFormat);
+        }
+        String encrypted = info.get(QemuImg.ENCRYPTED);
+        if (StringUtils.isNotBlank(encrypted) && encrypted.equalsIgnoreCase("yes")) {
+            volumeDetails.put(VolumeOnStorageTO.Detail.IS_ENCRYPTED, String.valueOf(Boolean.TRUE));
+        }
+        Boolean isLocked = isDiskFileLocked(pool, disk);
+        volumeDetails.put(VolumeOnStorageTO.Detail.IS_LOCKED, String.valueOf(isLocked));
+
+        return volumeDetails;
+    }
+
+    private Map<String, String> getDiskFileInfo(KVMStoragePool pool, KVMPhysicalDisk disk, boolean secure) {
+        if (!STORAGE_POOL_TYPES_SUPPORTED.contains(pool.getType())) {
+            return new HashMap<>(); // unknown
+        }
         try {
             QemuImg qemu = new QemuImg(0);
-            QemuImgFile qemuFile = new QemuImgFile(path);
-            Map<String, String> info = qemu.info(qemuFile);
-            if (info.containsKey(QemuImg.VIRTUAL_SIZE)) {
-                return Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
-            } else {
-                throw new CloudRuntimeException("Unable to determine virtual size of volume at path " + path);
-            }
+            QemuImgFile qemuFile = new QemuImgFile(disk.getPath(), disk.getFormat());
+            return qemu.info(qemuFile, secure);
         } catch (QemuImgException | LibvirtException ex) {
-            throw new CloudRuntimeException("Error when inspecting volume at path " + path, ex);
+            logger.error("Failed to get info of disk file: " + ex.getMessage());
+            return null;
         }
     }
+
+    private boolean isDiskFileLocked(KVMStoragePool pool, KVMPhysicalDisk disk) {
+        Map<String, String> info = getDiskFileInfo(pool, disk, false);
+        return info == null;
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java
index 821a80f5cca..6facf169602 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java
@@ -36,6 +36,7 @@ import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
 import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.libvirt.LibvirtException;
 
@@ -91,37 +92,46 @@ public final class LibvirtGetVolumesOnStorageCommandWrapper extends CommandWrapp
             if (disk.getQemuEncryptFormat() != null) {
                 volumeOnStorageTO.setQemuEncryptFormat(disk.getQemuEncryptFormat().toString());
             }
-            String backingFilePath = info.get(QemuImg.BACKING_FILE);
-            if (StringUtils.isNotBlank(backingFilePath)) {
-                volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE, backingFilePath);
-            }
-            String backingFileFormat = info.get(QemuImg.BACKING_FILE_FORMAT);
-            if (StringUtils.isNotBlank(backingFileFormat)) {
-                volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE_FORMAT, backingFileFormat);
-            }
-            String clusterSize = info.get(QemuImg.CLUSTER_SIZE);
-            if (StringUtils.isNotBlank(clusterSize)) {
-                volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.CLUSTER_SIZE, clusterSize);
-            }
             String fileFormat = info.get(QemuImg.FILE_FORMAT);
-            if (StringUtils.isNotBlank(fileFormat)) {
-                if (!fileFormat.equalsIgnoreCase(disk.getFormat().toString())) {
-                    return new GetVolumesOnStorageAnswer(command, false, String.format("The file format is %s, but expected to be %s", fileFormat, disk.getFormat()));
-                }
-                volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.FILE_FORMAT, fileFormat);
+            if (StringUtils.isNotBlank(fileFormat) && !fileFormat.equalsIgnoreCase(disk.getFormat().toString())) {
+                return new GetVolumesOnStorageAnswer(command, false, String.format("The file format is %s, but expected to be %s", fileFormat, disk.getFormat()));
             }
-            String encrypted = info.get(QemuImg.ENCRYPTED);
-            if (StringUtils.isNotBlank(encrypted) && encrypted.equalsIgnoreCase("yes")) {
-                volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.IS_ENCRYPTED, String.valueOf(Boolean.TRUE));
-            }
-            Boolean isLocked = isDiskFileLocked(storagePool, disk);
-            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.IS_LOCKED, String.valueOf(isLocked));
+            addDetailsToVolumeOnStorageTO(volumeOnStorageTO, info, storagePool, disk);
 
             volumes.add(volumeOnStorageTO);
         }
         return new GetVolumesOnStorageAnswer(command, volumes);
     }
 
+    private void addDetailsToVolumeOnStorageTO(VolumeOnStorageTO volumeOnStorageTO, final Map<String, String> info, final KVMStoragePool storagePool, final KVMPhysicalDisk disk) {
+        if (MapUtils.isEmpty(info)) {
+            return;
+        }
+
+        String backingFilePath = info.get(QemuImg.BACKING_FILE);
+        if (StringUtils.isNotBlank(backingFilePath)) {
+            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE, backingFilePath);
+        }
+        String backingFileFormat = info.get(QemuImg.BACKING_FILE_FORMAT);
+        if (StringUtils.isNotBlank(backingFileFormat)) {
+            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.BACKING_FILE_FORMAT, backingFileFormat);
+        }
+        String clusterSize = info.get(QemuImg.CLUSTER_SIZE);
+        if (StringUtils.isNotBlank(clusterSize)) {
+            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.CLUSTER_SIZE, clusterSize);
+        }
+        String fileFormat = info.get(QemuImg.FILE_FORMAT);
+        if (StringUtils.isNotBlank(fileFormat)) {
+            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.FILE_FORMAT, fileFormat);
+        }
+        String encrypted = info.get(QemuImg.ENCRYPTED);
+        if (StringUtils.isNotBlank(encrypted) && encrypted.equalsIgnoreCase("yes")) {
+            volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.IS_ENCRYPTED, String.valueOf(Boolean.TRUE));
+        }
+        Boolean isLocked = isDiskFileLocked(storagePool, disk);
+        volumeOnStorageTO.addDetail(VolumeOnStorageTO.Detail.IS_LOCKED, String.valueOf(isLocked));
+    }
+
     private GetVolumesOnStorageAnswer addAllVolumes(final GetVolumesOnStorageCommand command, final KVMStoragePool storagePool, String keyword) {
         List<VolumeOnStorageTO> volumes = new ArrayList<>();
 
@@ -134,11 +144,21 @@ public final class LibvirtGetVolumesOnStorageCommandWrapper extends CommandWrapp
             if (!isDiskFormatSupported(disk)) {
                 continue;
             }
+            Map<String, String> info = getDiskFileInfo(storagePool, disk, true);
+            if (info == null) {
+                continue;
+            }
             VolumeOnStorageTO volumeOnStorageTO = new VolumeOnStorageTO(Hypervisor.HypervisorType.KVM, disk.getName(), disk.getName(), disk.getPath(),
                     disk.getFormat().toString(), disk.getSize(), disk.getVirtualSize());
             if (disk.getQemuEncryptFormat() != null) {
                 volumeOnStorageTO.setQemuEncryptFormat(disk.getQemuEncryptFormat().toString());
             }
+            String fileFormat = info.get(QemuImg.FILE_FORMAT);
+            if (StringUtils.isNotBlank(fileFormat) && !fileFormat.equalsIgnoreCase(disk.getFormat().toString())) {
+                continue;
+            }
+            addDetailsToVolumeOnStorageTO(volumeOnStorageTO, info, storagePool, disk);
+
             volumes.add(volumeOnStorageTO);
         }
         return new GetVolumesOnStorageAnswer(command, volumes);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
index 4f1ad728b5d..aa1a0f41f1b 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import com.cloud.hypervisor.kvm.storage.ScaleIOStorageAdaptor;
 import org.apache.cloudstack.utils.cryptsetup.KeyFile;
@@ -33,7 +32,6 @@ import org.apache.cloudstack.utils.qemu.QemuImageOptions;
 import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
-import org.apache.cloudstack.utils.qemu.QemuImgFile;
 import org.apache.cloudstack.utils.qemu.QemuObject;
 import org.apache.log4j.Logger;
 import org.libvirt.Connect;
@@ -102,7 +100,7 @@ public final class LibvirtResizeVolumeCommandWrapper extends CommandWrapper<Resi
                 newSize = ScaleIOStorageAdaptor.getUsableBytesFromRawBytes(newSize);
             } else if (spool.getType().equals(StoragePoolType.PowerFlex)) {
                 // PowerFlex RAW/LUKS is already resized, we just notify the domain based on new size (considering LUKS overhead)
-                newSize = getVirtualSizeFromFile(path);
+                newSize = KVMPhysicalDisk.getVirtualSizeFromFile(path);
             }
 
             if (pool.getType() != StoragePoolType.RBD && pool.getType() != StoragePoolType.Linstor && pool.getType() != StoragePoolType.PowerFlex) {
@@ -216,21 +214,6 @@ public final class LibvirtResizeVolumeCommandWrapper extends CommandWrapper<Resi
         }
     }
 
-    private long getVirtualSizeFromFile(String path) {
-        try {
-            QemuImg qemu = new QemuImg(0);
-            QemuImgFile qemuFile = new QemuImgFile(path);
-            Map<String, String> info = qemu.info(qemuFile);
-            if (info.containsKey(QemuImg.VIRTUAL_SIZE)) {
-                return Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
-            } else {
-                throw new CloudRuntimeException("Unable to determine virtual size of volume at path " + path);
-            }
-        } catch (QemuImgException | LibvirtException ex) {
-            throw new CloudRuntimeException("Error when inspecting volume at path " + path, ex);
-        }
-    }
-
     private Answer handleMultipathSCSIResize(ResizeVolumeCommand command, KVMStoragePool pool) {
         ((MultipathSCSIPool)pool).resize(command.getPath(), command.getInstanceName(), command.getNewSize());
         return new ResizeVolumeAnswer(command, true, "");
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
index 9d9a6415e27..c43f5101fbe 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
@@ -16,13 +16,21 @@
 // under the License.
 package com.cloud.hypervisor.kvm.storage;
 
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.storage.formatinspector.Qcow2Inspector;
+import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
+import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+import org.apache.cloudstack.utils.qemu.QemuImgException;
+import org.apache.cloudstack.utils.qemu.QemuImgFile;
 import org.apache.cloudstack.utils.qemu.QemuObject;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.libvirt.LibvirtException;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class KVMPhysicalDisk {
     private String path;
@@ -71,6 +79,31 @@ public class KVMPhysicalDisk {
         return hostIp;
     }
 
+    public static long getVirtualSizeFromFile(String path) {
+        try {
+            QemuImg qemu = new QemuImg(0);
+            QemuImgFile qemuFile = new QemuImgFile(path);
+            Map<String, String> info = qemu.info(qemuFile);
+            if (info.containsKey(QemuImg.VIRTUAL_SIZE)) {
+                return Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
+            } else {
+                throw new CloudRuntimeException("Unable to determine virtual size of volume at path " + path);
+            }
+        } catch (QemuImgException | LibvirtException ex) {
+            throw new CloudRuntimeException("Error when inspecting volume at path " + path, ex);
+        }
+    }
+
+    public static void checkQcow2File(String path) {
+        if (ImageStoreUtil.isCorrectExtension(path, "qcow2")) {
+            try {
+                Qcow2Inspector.validateQcow2File(path);
+            } catch (RuntimeException e) {
+                throw new CloudRuntimeException("The volume file at path " + path + " is not a valid QCOW2. Error: " + e.getMessage());
+            }
+        }
+    }
+
     private PhysicalDiskFormat format;
     private long size;
     private long virtualSize;
diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index abb0e6b63c5..df87aff276d 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -170,6 +170,7 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -812,7 +813,8 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
             throw new CloudRuntimeException("Error while copying volume of remote instance: " + answer.getDetails());
         }
         CopyRemoteVolumeAnswer copyRemoteVolumeAnswer = (CopyRemoteVolumeAnswer) answer;
-        if(!copyRemoteVolumeAnswer.getResult()) {
+        checkVolume(copyRemoteVolumeAnswer.getVolumeDetails());
+        if (!copyRemoteVolumeAnswer.getResult()) {
             throw new CloudRuntimeException("Unable to copy volume of remote instance");
         }
         diskProfile.setSize(copyRemoteVolumeAnswer.getSize());
@@ -2653,7 +2655,13 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
             throw new CloudRuntimeException("Disk not found or is invalid");
         }
         CheckVolumeAnswer checkVolumeAnswer = (CheckVolumeAnswer) answer;
-        if(!checkVolumeAnswer.getResult()) {
+        try {
+            checkVolume(checkVolumeAnswer.getVolumeDetails());
+        } catch (CloudRuntimeException e) {
+            cleanupFailedImportVM(userVm);
+            throw e;
+        }
+        if (!checkVolumeAnswer.getResult()) {
             cleanupFailedImportVM(userVm);
             throw new CloudRuntimeException("Disk not found or is invalid");
         }
@@ -2679,6 +2687,31 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
         return userVm;
     }
 
+    private void checkVolume(Map<VolumeOnStorageTO.Detail, String> volumeDetails) {
+        if (MapUtils.isEmpty(volumeDetails)) {
+            return;
+        }
+
+        if (volumeDetails.containsKey(VolumeOnStorageTO.Detail.IS_LOCKED)) {
+            String isLocked = volumeDetails.get(VolumeOnStorageTO.Detail.IS_LOCKED);
+            if (Boolean.parseBoolean(isLocked)) {
+                logFailureAndThrowException("Locked volume cannot be imported or unmanaged.");
+            }
+        }
+        if (volumeDetails.containsKey(VolumeOnStorageTO.Detail.IS_ENCRYPTED)) {
+            String isEncrypted = volumeDetails.get(VolumeOnStorageTO.Detail.IS_ENCRYPTED);
+            if (Boolean.parseBoolean(isEncrypted)) {
+                logFailureAndThrowException("Encrypted volume cannot be imported or unmanaged.");
+            }
+        }
+        if (volumeDetails.containsKey(VolumeOnStorageTO.Detail.BACKING_FILE)) {
+            String backingFile = volumeDetails.get(VolumeOnStorageTO.Detail.BACKING_FILE);
+            if (StringUtils.isNotBlank(backingFile)) {
+                logFailureAndThrowException("Volume with backing file cannot be imported or unmanaged.");
+            }
+        }
+    }
+
     private NetworkVO getDefaultNetwork(DataCenter zone, Account owner, boolean selectAny) throws InsufficientCapacityException, ResourceAllocationException {
         NetworkVO defaultNetwork = null;
 

From 0d4147f3f63f7a32efebddc29b6d9067a0438891 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Fri, 25 Jul 2025 05:56:42 -0400
Subject: [PATCH 66/94] Netris Network Plugin Integration with CloudStack
 (#10458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Netris Plugin introduces Netris as a network service provider in CloudStack to be able to create and manage Virtual Private Clouds (VPCs) in CloudStack, being able to orchestrate the following network functionalities:

- Network segmentation with Netris-VXLAN isolation method
- Routing between "public" IP and network segments with an ACS ROUTED mode offering
- SourceNAT, DNAT, 1:1 NAT between "public" IP and network segments with an ACS NATTED mode offering
- Routing between VPC network segments (tiers in ACS nomenclature)
- Access Lists (ACLs) between VPC tiers and "public" network (TCP, UDP, ICMP) both as global egress rules and "public" IP specific ingress rules.
- ACLs between VPC network tiers (TCP, UDP, ICMP)
- External load balancing – between VPC network tiers and "public" IP
- Internal load balancing – between VPC network tiers
- CloudStack Virtual Router services (DHCP, DNS, UserData, Password Injection, etc…)
---
 .../cloud/agent/api/to/FirewallRuleTO.java    |    2 +-
 .../agent/api/to/PortForwardingRuleTO.java    |    4 -
 .../configuration/ConfigurationService.java   |   16 +
 .../main/java/com/cloud/event/EventTypes.java |    2 +
 .../java/com/cloud/network/IpAddress.java     |    1 +
 .../main/java/com/cloud/network/Network.java  |    1 +
 .../main/java/com/cloud/network/Networks.java |    3 +-
 .../cloud/network/SDNProviderNetworkRule.java |  358 +++
 .../cloud/network/Site2SiteVpnConnection.java |    2 +-
 .../cloud/network/element/NetworkElement.java |    9 +
 .../PortForwardingServiceProvider.java        |   28 +
 .../cloud/network/element/VpcProvider.java    |    4 +
 .../com/cloud/network/guru/NetworkGuru.java   |    4 +
 .../cloud/network/netris/NetrisLbBackend.java |   41 +
 .../network/netris/NetrisNetworkRule.java     |  108 +
 .../cloud/network/netris/NetrisProvider.java  |   30 +
 .../cloud/network/netris/NetrisService.java   |  310 +++
 .../com/cloud/network/vpc/StaticRoute.java    |    5 +-
 .../cloud/network/vpc/StaticRouteProfile.java |   22 +-
 .../com/cloud/network/vpc/VpcOffering.java    |    4 +-
 .../network/vpc/VpcProvisioningService.java   |    2 +-
 .../com/cloud/network/vpc/VpcService.java     |    2 +-
 .../com/cloud/offering/NetworkOffering.java   |    6 +-
 .../apache/cloudstack/api/ApiConstants.java   |   11 +
 .../network/CreateNetworkOfferingCmd.java     |   56 +-
 .../admin/vlan/CreateVlanIpRangeCmd.java      |   13 +-
 .../admin/vpc/CreateVPCOfferingCmd.java       |   56 +-
 .../address/ListPublicIpAddressesCmd.java     |    7 +
 .../user/vpc/CreateStaticRouteCmd.java        |   53 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java |   14 +-
 .../api/response/AsyncJobResponse.java        |    9 -
 .../ClusterDrsPlanMigrationResponse.java      |   12 +-
 .../api/response/IPAddressResponse.java       |    8 +
 .../api/response/NetworkResponse.java         |   16 -
 .../api/response/StaticRouteResponse.java     |   24 +-
 .../api/response/SystemVmResponse.java        |    8 -
 .../api/response/VlanIpRangeResponse.java     |   10 +-
 .../cloudstack/api/response/ZoneResponse.java |   13 +
 client/pom.xml                                |    5 +
 .../api/CheckS2SVpnConnectionsAnswer.java     |    1 -
 .../agent/api/SetupGuestNetworkCommand.java   |    9 +
 .../facade/SetGuestNetworkConfigItem.java     |    1 +
 .../virtualnetwork/model/GuestNetwork.java    |    9 +
 .../agent/transport/ArrayTypeAdaptor.java     |   12 +-
 .../cloud/agent/transport/ResponseTest.java   |   46 +
 deps/install-non-oss.sh                       |    3 +
 .../service/NetworkOrchestrationService.java  |    3 +
 .../configuration/ConfigurationManager.java   |    5 +-
 .../java/com/cloud/network/addr/PublicIp.java |    4 +
 .../com/cloud/network/rules/RulesManager.java |    2 +
 .../cloud/network/vpc/NetworkACLManager.java  |    2 +-
 .../com/cloud/network/vpc/VpcManager.java     |   16 +
 .../orchestration/NetworkOrchestrator.java    |   70 +-
 .../main/java/com/cloud/dc/dao/VlanDao.java   |    2 +
 .../java/com/cloud/dc/dao/VlanDaoImpl.java    |   27 +
 .../cloud/network/dao/IPAddressDaoImpl.java   |    1 +
 .../com/cloud/network/dao/IPAddressVO.java    |   12 +
 .../cloud/network/dao/NetrisProviderDao.java  |   24 +
 .../network/dao/NetrisProviderDaoImpl.java    |   52 +
 .../cloud/network/dao/RemoteAccessVpnDao.java |    2 +
 .../network/dao/RemoteAccessVpnDaoImpl.java   |    7 +
 .../network/dao/Site2SiteVpnGatewayDao.java   |    2 +
 .../dao/Site2SiteVpnGatewayDaoImpl.java       |    8 +
 .../network/element/NetrisProviderVO.java     |  265 +++
 .../com/cloud/network/vpc/StaticRouteVO.java  |   35 +-
 .../com/cloud/network/vpc/VpcOfferingVO.java  |   11 -
 .../vpc/dao/VpcOfferingServiceMapDao.java     |    5 +
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java |   19 +
 .../network/vpc/dao/VpcServiceMapDaoImpl.java |   11 +-
 .../cloud/offerings/NetworkOfferingVO.java    |   24 -
 .../main/java/com/cloud/vm/dao/NicDao.java    |    4 +
 .../java/com/cloud/vm/dao/NicDaoImpl.java     |   20 +
 ...spring-engine-schema-core-daos-context.xml |    1 +
 .../META-INF/db/schema-42010to42100.sql       |   37 +
 .../db/views/cloud.network_offering_view.sql  |    2 -
 .../db/views/cloud.vpc_offering_view.sql      |    1 -
 .../kvm/resource/BridgeVifDriver.java         |   12 +-
 .../network/element/CiscoNexusVSMElement.java |    1 -
 .../cluster/KubernetesClusterManagerImpl.java |    1 -
 .../metrics/MetricsServiceImpl.java           |    2 +-
 .../response/HostMetricsResponse.java         |   10 -
 .../ManagementServerMetricsResponse.java      |   17 -
 .../management/ContrailManagerImpl.java       |    6 +-
 plugins/network-elements/netris/pom.xml       |   44 +
 .../cloudstack/StartupNetrisCommand.java      |   26 +
 .../AddOrUpdateNetrisStaticRouteCommand.java  |   48 +
 .../agent/api/CreateNetrisACLCommand.java     |  119 +
 .../agent/api/CreateNetrisVnetCommand.java    |   84 +
 .../agent/api/CreateNetrisVpcCommand.java     |   31 +
 .../api/CreateOrUpdateNetrisACLCommand.java   |  119 +
 ...OrUpdateNetrisLoadBalancerRuleCommand.java |   90 +
 .../api/CreateOrUpdateNetrisNatCommand.java   |  148 ++
 .../agent/api/DeleteNetrisACLCommand.java     |   46 +
 .../DeleteNetrisLoadBalancerRuleCommand.java  |   52 +
 .../agent/api/DeleteNetrisNatRuleCommand.java |   72 +
 .../api/DeleteNetrisStaticRouteCommand.java   |   23 +
 .../agent/api/DeleteNetrisVnetCommand.java    |   51 +
 .../agent/api/DeleteNetrisVpcCommand.java     |   30 +
 .../api/ListNetrisStaticRoutesAnswer.java     |   36 +
 .../api/ListNetrisStaticRoutesCommand.java    |   23 +
 .../cloudstack/agent/api/NetrisAnswer.java    |   30 +
 .../cloudstack/agent/api/NetrisCommand.java   |   70 +
 .../agent/api/ReleaseNatIpCommand.java        |   30 +
 .../api/SetupNetrisPublicRangeCommand.java    |   37 +
 .../agent/api/UpdateNetrisVnetCommand.java    |   51 +
 .../agent/api/UpdateNetrisVpcCommand.java     |   32 +
 .../api/command/AddNetrisProviderCmd.java     |  126 ++
 .../api/command/DeleteNetrisProviderCmd.java  |   86 +
 .../api/command/ListNetrisProvidersCmd.java   |   73 +
 .../api/response/NetrisProviderResponse.java  |  135 ++
 .../cloudstack/resource/NetrisPortGroup.java  |   30 +
 .../cloudstack/resource/NetrisResource.java   |  441 ++++
 .../resource/NetrisResourceObjectUtils.java   |  103 +
 .../cloudstack/service/NetrisApiClient.java   |  100 +
 .../service/NetrisApiClientImpl.java          | 2000 +++++++++++++++++
 .../cloudstack/service/NetrisElement.java     |  820 +++++++
 .../service/NetrisGuestNetworkGuru.java       |  346 +++
 .../service/NetrisProviderService.java        |   32 +
 .../service/NetrisProviderServiceImpl.java    |  217 ++
 .../service/NetrisPublicNetworkGuru.java      |  144 ++
 .../cloudstack/service/NetrisServiceImpl.java |  556 +++++
 .../spring-netris-core-managers-context.xml   |   31 +
 .../cloudstack/netris/module.properties       |   21 +
 .../netris/spring-netris-context.xml          |   41 +
 ...dOrUpdateNetrisStaticRouteCommandTest.java |   91 +
 .../agent/api/CreateNetrisACLCommandTest.java |  144 ++
 .../api/CreateNetrisVnetCommandTest.java      |   95 +
 .../agent/api/CreateNetrisVpcCommandTest.java |   63 +
 ...dateNetrisLoadBalancerRuleCommandTest.java |  139 ++
 .../CreateOrUpdateNetrisNatCommandTest.java   |  145 ++
 .../agent/api/DeleteNetrisACLCommandTest.java |  103 +
 ...leteNetrisLoadBalancerRuleCommandTest.java |   98 +
 .../api/DeleteNetrisNatRuleCommandTest.java   |   94 +
 .../api/DeleteNetrisVnetCommandTest.java      |   83 +
 .../agent/api/DeleteNetrisVpcCommandTest.java |   64 +
 .../agent/api/ReleaseNatIpCommandTest.java    |   80 +
 .../SetupNetrisPublicRangeCommandTest.java    |   63 +
 .../api/UpdateNetrisVnetCommandTest.java      |  105 +
 .../agent/api/UpdateNetrisVpcCommandTest.java |   93 +
 .../api/command/AddNetrisProviderCmdTest.java |  122 +
 .../command/DeleteNetrisProviderCmdTest.java  |  101 +
 .../command/ListNetrisProvidersCmdTest.java   |  104 +
 .../NetrisResourceObjectUtilsTest.java        |  109 +
 .../resource/NetrisResourceTest.java          |  141 ++
 .../service/NetrisApiClientImplTest.java      |  103 +
 .../cloudstack/service/NetrisElementTest.java |  141 ++
 .../service/NetrisGuestNetworkGuruTest.java   |  230 ++
 .../NetrisProviderServiceImplTest.java        |  220 ++
 .../service/NetrisPublicNetworkGuruTest.java  |  225 ++
 .../service/NetrisServiceImplTest.java        |   33 +
 .../api/command/DeleteNsxControllerCmd.java   |    3 +-
 .../cloudstack/resource/NsxNetworkRule.java   |  353 +--
 .../cloudstack/service/NsxApiClient.java      |   13 +-
 .../apache/cloudstack/service/NsxElement.java |  138 +-
 .../service/NsxGuestNetworkGuru.java          |    9 -
 .../service/NsxPublicNetworkGuru.java         |   18 +-
 .../cloudstack/service/NsxServiceImpl.java    |   17 +-
 .../cloudstack/service/NsxApiClientTest.java  |    6 +-
 .../cloudstack/service/NsxElementTest.java    |   42 +-
 .../service/NsxPublicNetworkGuruTest.java     |   10 +-
 .../ConfigTungstenFabricServiceCmd.java       |    1 -
 plugins/pom.xml                               |    1 +
 pom.xml                                       |    2 +-
 .../java/com/cloud/api/ApiResponseHelper.java |   92 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java  |   23 +-
 .../api/query/dao/VpcOfferingJoinDaoImpl.java |    9 +-
 .../api/query/vo/NetworkOfferingJoinVO.java   |   20 -
 .../cloud/api/query/vo/VpcOfferingJoinVO.java |    8 -
 .../api/response/ApiResponseSerializer.java   |    4 +-
 .../ConfigurationManagerImpl.java             |   97 +-
 .../deploy/DeploymentPlanningManagerImpl.java |    2 +-
 .../cloud/network/IpAddressManagerImpl.java   |   88 +
 .../com/cloud/network/NetworkModelImpl.java   |    9 +-
 .../com/cloud/network/NetworkServiceImpl.java |   58 +-
 .../cloud/network/SDNProviderOpObject.java    |    8 +-
 .../network/as/AutoScaleManagerImpl.java      |   14 +-
 .../network/element/VirtualRouterElement.java |    1 -
 .../guru/ExternalGuestNetworkGuru.java        |    5 +-
 .../cloud/network/guru/GuestNetworkGuru.java  |   20 +-
 .../cloud/network/guru/PublicNetworkGuru.java |   14 +-
 .../lb/LoadBalancingRulesManagerImpl.java     |   15 +
 .../network/router/CommandSetupHelper.java    |   11 +-
 .../network/router/NetworkHelperImpl.java     |   14 +-
 .../network/router/NicProfileHelperImpl.java  |    4 +-
 .../VirtualNetworkApplianceManagerImpl.java   |    8 +
 ...VpcVirtualNetworkApplianceManagerImpl.java |   20 +-
 .../cloud/network/rules/RulesManagerImpl.java |   35 +-
 .../network/vpc/NetworkACLManagerImpl.java    |   11 +-
 .../network/vpc/NetworkACLServiceImpl.java    |   11 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java |  557 ++++-
 .../vpn/RemoteAccessVpnManagerImpl.java       |   72 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java  |   76 +-
 .../cloud/server/ConfigurationServerImpl.java |   69 +-
 .../cloud/server/ManagementServerImpl.java    |   36 +-
 .../RouterDeploymentDefinition.java           |   19 +-
 .../RouterDeploymentDefinitionBuilder.java    |    4 +
 .../VpcRouterDeploymentDefinition.java        |    6 +-
 .../ConfigurationManagerImplTest.java         |    4 +
 .../cloud/network/NetworkModelImplTest.java   |    8 +-
 .../network/as/AutoScaleManagerImplTest.java  |   16 +-
 .../network/lb/UpdateLoadBalancerTest.java    |    7 +-
 .../vpc/MockConfigurationManagerImpl.java     |    4 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java  |    6 +
 .../dao/MockVpcOfferingServiceMapDaoImpl.java |   11 +
 .../RouterDeploymentDefinitionTest.java       |    3 +
 .../VpcRouterDeploymentDefinitionTest.java    |    3 +
 .../CreateNetworkOfferingTest.java            |   20 +-
 .../service/NetrisServiceMockTest.java        |  134 ++
 .../test/resources/createNetworkOffering.xml  |    2 +
 systemvm/debian/opt/cloud/bin/configure.py    |   38 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py |  112 +-
 systemvm/debian/opt/cloud/bin/cs/CsConfig.py  |    3 +
 systemvm/debian/opt/cloud/bin/cs/CsDatabag.py |    7 +
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py    |    4 +-
 .../debian/opt/cloud/bin/cs/CsGuestNetwork.py |   10 +-
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py   |   21 +
 .../opt/cloud/bin/cs/CsVpcGuestNetwork.py     |   15 +-
 .../debian/opt/cloud/bin/passwd_server_ip.py  |   13 +-
 .../component/test_project_usage.py           |   25 +-
 test/integration/component/test_vpn_users.py  |  118 +-
 test/integration/smoke/test_usage.py          |   12 +-
 tools/apidoc/gen_toc.py                       |    1 +
 ui/public/locales/en.json                     |   32 +-
 ui/src/components/CheckBoxSelectPair.vue      |    8 +-
 ui/src/components/view/InfoCard.vue           |    2 +-
 ui/src/config/section/infra/phynetworks.js    |    2 +-
 ui/src/config/section/network.js              |    3 +-
 ui/src/views/AutogenView.vue                  |    4 -
 .../views/infra/network/IpRangesTabPublic.vue |   21 +
 .../infra/network/ServiceProvidersTab.vue     |   45 +-
 .../views/infra/network/TrafficTypesTab.vue   |    2 +-
 .../views/infra/zone/IpAddressRangeForm.vue   |   20 +-
 .../views/infra/zone/PhysicalNetworksTab.vue  |    2 +-
 ui/src/views/infra/zone/ZoneWizard.vue        |    2 +-
 .../views/infra/zone/ZoneWizardLaunchZone.vue |   73 +-
 .../infra/zone/ZoneWizardNetworkSetupStep.vue |   90 +-
 .../ZoneWizardPhysicalNetworkSetupStep.vue    |    1 +
 ui/src/views/network/IpAddressesTab.vue       |   22 +-
 ui/src/views/network/LoadBalancing.vue        |   41 +-
 ui/src/views/network/PublicIpResource.vue     |   31 +-
 ui/src/views/network/StaticRoutesTab.vue      |  130 +-
 ui/src/views/network/VpcTab.vue               |  133 +-
 ui/src/views/network/VpcTiersTab.vue          |    6 +-
 ui/src/views/network/VpnDetails.vue           |  164 +-
 ui/src/views/offering/AddNetworkOffering.vue  |  156 +-
 ui/src/views/offering/AddVpcOffering.vue      |  100 +-
 .../java/com/cloud/utils/net/NetUtils.java    |   34 +
 .../java/com/cloud/utils/LogUtilsTest.java    |    2 +-
 .../com/cloud/utils/net/NetUtilsTest.java     |   19 +
 249 files changed, 14202 insertions(+), 1259 deletions(-)
 create mode 100644 api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java
 create mode 100644 api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java
 create mode 100644 api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java
 create mode 100644 api/src/main/java/com/cloud/network/netris/NetrisProvider.java
 create mode 100644 api/src/main/java/com/cloud/network/netris/NetrisService.java
 create mode 100644 core/src/test/java/com/cloud/agent/transport/ResponseTest.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java
 create mode 100644 plugins/network-elements/netris/pom.xml
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java
 create mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
 create mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml
 create mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/module.properties
 create mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java
 create mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java
 rename plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java => server/src/main/java/com/cloud/network/SDNProviderOpObject.java (94%)
 create mode 100644 server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java

diff --git a/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
index 25c75001a3c..69350815be3 100644
--- a/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -47,7 +47,7 @@ public class FirewallRuleTO implements InternalIdentity {
     int[] srcPortRange;
     boolean revoked;
     boolean alreadyAdded;
-    private List<String> sourceCidrList;
+    protected List<String> sourceCidrList;
     private List<String> destCidrList;
     FirewallRule.Purpose purpose;
     private Integer icmpType;
diff --git a/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java
index d43625c09a9..91f337c5f55 100644
--- a/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java
@@ -21,8 +21,6 @@ import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.utils.net.NetUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.List;
-
 /**
  * PortForwardingRuleTO specifies one port forwarding rule.
  *
@@ -32,8 +30,6 @@ public class PortForwardingRuleTO extends FirewallRuleTO {
     String dstIp;
     int[] dstPortRange;
 
-    List<String> sourceCidrList;
-
     protected PortForwardingRuleTO() {
         super();
     }
diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java
index 13a44ef05b0..32e31519ea7 100644
--- a/api/src/main/java/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/main/java/com/cloud/configuration/ConfigurationService.java
@@ -17,7 +17,11 @@
 package com.cloud.configuration;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
+import com.cloud.network.Network;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.config.ResetCfgCmd;
 import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateGuestNetworkIpv6PrefixCmd;
@@ -373,4 +377,16 @@ public interface ConfigurationService {
     List<? extends PortableIp> listPortableIps(long id);
 
     Boolean isAccountAllowedToCreateOfferingsWithTags(IsAccountAllowedToCreateOfferingsWithTagsCmd cmd);
+
+    public static final Map<String, String> ProviderDetailKeyMap = Map.of(
+            Network.Provider.Nsx.getName(), ApiConstants.NSX_DETAIL_KEY,
+            Network.Provider.Netris.getName(), ApiConstants.NETRIS_DETAIL_KEY
+    );
+
+    public static boolean IsIpRangeForProvider(Network.Provider provider) {
+        if (Objects.isNull(provider)) {
+            return false;
+        }
+        return ProviderDetailKeyMap.containsKey(provider.getName());
+    }
 }
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index 27f507d3a75..1eb1998850f 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -499,6 +499,8 @@ public class EventTypes {
 
     public static final String EVENT_ZONE_VLAN_ASSIGN = "ZONE.VLAN.ASSIGN";
     public static final String EVENT_ZONE_VLAN_RELEASE = "ZONE.VLAN.RELEASE";
+    public static final String EVENT_ZONE_VXLAN_ASSIGN = "ZONE.VXLAN.ASSIGN";
+    public static final String EVENT_ZONE_VXLAN_RELEASE = "ZONE.VXLAN.RELEASE";
 
     // Projects
     public static final String EVENT_PROJECT_CREATE = "PROJECT.CREATE";
diff --git a/api/src/main/java/com/cloud/network/IpAddress.java b/api/src/main/java/com/cloud/network/IpAddress.java
index ae1af450577..70d652b54e9 100644
--- a/api/src/main/java/com/cloud/network/IpAddress.java
+++ b/api/src/main/java/com/cloud/network/IpAddress.java
@@ -99,4 +99,5 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity,
 
     boolean isForSystemVms();
 
+    boolean isForRouter();
 }
diff --git a/api/src/main/java/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java
index d3bc5005cb7..dc94932e31f 100644
--- a/api/src/main/java/com/cloud/network/Network.java
+++ b/api/src/main/java/com/cloud/network/Network.java
@@ -206,6 +206,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
         public static final Provider Tungsten = new Provider("Tungsten", false);
 
         public static final Provider Nsx = new Provider("Nsx", false);
+        public static final Provider Netris = new Provider("Netris", false);
 
         private final String name;
         private final boolean isExternal;
diff --git a/api/src/main/java/com/cloud/network/Networks.java b/api/src/main/java/com/cloud/network/Networks.java
index dfa0ddb84ca..9f06a044111 100644
--- a/api/src/main/java/com/cloud/network/Networks.java
+++ b/api/src/main/java/com/cloud/network/Networks.java
@@ -129,7 +129,8 @@ public class Networks {
         UnDecided(null, null),
         OpenDaylight("opendaylight", String.class),
         TUNGSTEN("tf", String.class),
-        NSX("nsx", String.class);
+        NSX("nsx", String.class),
+        Netris("netris", String.class);
 
         private final String scheme;
         private final Class<?> type;
diff --git a/api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java b/api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java
new file mode 100644
index 00000000000..a22db4287dc
--- /dev/null
+++ b/api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java
@@ -0,0 +1,358 @@
+// 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.
+package com.cloud.network;
+
+import java.util.List;
+
+public class SDNProviderNetworkRule {
+
+    protected long domainId;
+    protected long accountId;
+    protected long zoneId;
+    protected Long networkResourceId;
+    protected String networkResourceName;
+    protected boolean isVpcResource;
+    protected long vmId;
+    protected long ruleId;
+    protected String publicIp;
+    protected String vmIp;
+    protected String publicPort;
+    protected String privatePort;
+    protected String protocol;
+    protected String algorithm;
+    protected List<String> sourceCidrList;
+    protected List<String> destinationCidrList;
+    protected Integer icmpCode;
+
+    protected Integer icmpType;
+    protected String trafficType;
+    protected Network.Service service;
+
+    public long getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(long domainId) {
+        this.domainId = domainId;
+    }
+
+    public long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(long accountId) {
+        this.accountId = accountId;
+    }
+
+    public long getZoneId() {
+        return zoneId;
+    }
+
+    public void setZoneId(long zoneId) {
+        this.zoneId = zoneId;
+    }
+
+    public Long getNetworkResourceId() {
+        return networkResourceId;
+    }
+
+    public void setNetworkResourceId(Long networkResourceId) {
+        this.networkResourceId = networkResourceId;
+    }
+
+    public String getNetworkResourceName() {
+        return networkResourceName;
+    }
+
+    public void setNetworkResourceName(String networkResourceName) {
+        this.networkResourceName = networkResourceName;
+    }
+
+    public boolean isVpcResource() {
+        return isVpcResource;
+    }
+
+    public void setVpcResource(boolean vpcResource) {
+        isVpcResource = vpcResource;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(long vmId) {
+        this.vmId = vmId;
+    }
+
+    public long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getPublicIp() {
+        return publicIp;
+    }
+
+    public void setPublicIp(String publicIp) {
+        this.publicIp = publicIp;
+    }
+
+    public String getVmIp() {
+        return vmIp;
+    }
+
+    public void setVmIp(String vmIp) {
+        this.vmIp = vmIp;
+    }
+
+    public String getPublicPort() {
+        return publicPort;
+    }
+
+    public void setPublicPort(String publicPort) {
+        this.publicPort = publicPort;
+    }
+
+    public String getPrivatePort() {
+        return privatePort;
+    }
+
+    public void setPrivatePort(String privatePort) {
+        this.privatePort = privatePort;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    public void setAlgorithm(String algorithm) {
+        this.algorithm = algorithm;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public Network.Service getService() {
+        return service;
+    }
+
+    public void setService(Network.Service service) {
+        this.service = service;
+    }
+
+    public Integer getIcmpCode() {
+        return icmpCode;
+    }
+
+    public void setIcmpCode(Integer icmpCode) {
+        this.icmpCode = icmpCode;
+    }
+
+    public Integer getIcmpType() {
+        return icmpType;
+    }
+
+    public void setIcmpType(Integer icmpType) {
+        this.icmpType = icmpType;
+    }
+
+    public List<String> getSourceCidrList() {
+        return sourceCidrList;
+    }
+
+    public void setSourceCidrList(List<String> sourceCidrList) {
+        this.sourceCidrList = sourceCidrList;
+    }
+
+    public List<String> getDestinationCidrList() {
+        return destinationCidrList;
+    }
+
+    public void setDestinationCidrList(List<String> destinationCidrList) {
+        this.destinationCidrList = destinationCidrList;
+    }
+
+    public String getTrafficType() {
+        return trafficType;
+    }
+
+    public void setTrafficType(String trafficType) {
+        this.trafficType = trafficType;
+    }
+
+    public static class Builder {
+        public long domainId;
+        public long accountId;
+        public long zoneId;
+        public Long networkResourceId;
+        public String networkResourceName;
+        public boolean isVpcResource;
+        public long vmId;
+
+        public long ruleId;
+        public String publicIp;
+        public String vmIp;
+        public String publicPort;
+        public String privatePort;
+        public String protocol;
+        public String algorithm;
+        public List<String> sourceCidrList;
+        public List<String> destinationCidrList;
+        public String trafficType;
+        public Integer icmpType;
+        public Integer icmpCode;
+        public Network.Service service;
+
+        public Builder() {
+            // Default constructor
+        }
+
+        public Builder setDomainId(long domainId) {
+            this.domainId = domainId;
+            return this;
+        }
+
+        public Builder setAccountId(long accountId) {
+            this.accountId = accountId;
+            return this;
+        }
+
+        public Builder setZoneId(long zoneId) {
+            this.zoneId = zoneId;
+            return this;
+        }
+
+        public Builder setNetworkResourceId(Long networkResourceId) {
+            this.networkResourceId = networkResourceId;
+            return this;
+        }
+
+        public Builder setNetworkResourceName(String networkResourceName) {
+            this.networkResourceName = networkResourceName;
+            return this;
+        }
+
+        public Builder setVpcResource(boolean isVpcResource) {
+            this.isVpcResource = isVpcResource;
+            return this;
+        }
+
+
+        public Builder setVmId(long vmId) {
+            this.vmId = vmId;
+            return this;
+        }
+
+        public Builder setRuleId(long ruleId) {
+            this.ruleId = ruleId;
+            return this;
+        }
+
+        public Builder setPublicIp(String publicIp) {
+            this.publicIp = publicIp;
+            return this;
+        }
+
+        public Builder setVmIp(String vmIp) {
+            this.vmIp = vmIp;
+            return this;
+        }
+
+        public Builder setPublicPort(String publicPort) {
+            this.publicPort = publicPort;
+            return this;
+        }
+
+        public Builder setPrivatePort(String privatePort) {
+            this.privatePort = privatePort;
+            return this;
+        }
+
+        public Builder setProtocol(String protocol) {
+            this.protocol = protocol;
+            return this;
+        }
+
+        public Builder setAlgorithm(String algorithm) {
+            this.algorithm = algorithm;
+            return this;
+        }
+
+        public Builder setTrafficType(String trafficType) {
+            this.trafficType = trafficType;
+            return this;
+        }
+
+        public Builder setIcmpType(Integer icmpType) {
+            this.icmpType = icmpType;
+            return this;
+        }
+
+        public Builder setIcmpCode(Integer icmpCode) {
+            this.icmpCode = icmpCode;
+            return this;
+        }
+
+        public Builder setSourceCidrList(List<String> sourceCidrList) {
+            this.sourceCidrList = sourceCidrList;
+            return this;
+        }
+
+        public Builder setDestinationCidrList(List<String> destinationCidrList) {
+            this.destinationCidrList = destinationCidrList;
+            return this;
+        }
+
+        public Builder setService(Network.Service service) {
+            this.service = service;
+            return this;
+        }
+
+        public SDNProviderNetworkRule build() {
+            SDNProviderNetworkRule rule = new SDNProviderNetworkRule();
+            rule.setDomainId(this.domainId);
+            rule.setAccountId(this.accountId);
+            rule.setZoneId(this.zoneId);
+            rule.setNetworkResourceId(this.networkResourceId);
+            rule.setNetworkResourceName(this.networkResourceName);
+            rule.setVpcResource(this.isVpcResource);
+            rule.setVmId(this.vmId);
+            rule.setVmIp(this.vmIp);
+            rule.setPublicIp(this.publicIp);
+            rule.setPublicPort(this.publicPort);
+            rule.setPrivatePort(this.privatePort);
+            rule.setProtocol(this.protocol);
+            rule.setRuleId(this.ruleId);
+            rule.setAlgorithm(this.algorithm);
+            rule.setIcmpType(this.icmpType);
+            rule.setIcmpCode(this.icmpCode);
+            rule.setSourceCidrList(this.sourceCidrList);
+            rule.setDestinationCidrList(this.destinationCidrList);
+            rule.setTrafficType(this.trafficType);
+            rule.setService(service);
+            return rule;
+        }
+    }
+}
diff --git a/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java b/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java
index 994df875f7d..51036abe060 100644
--- a/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java
+++ b/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 
 public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity, Displayable {
     enum State {
-        Pending, Connecting, Connected, Disconnected, Error,
+        Pending, Connecting, Connected, Disconnected, Error, Removed
     }
 
     @Override
diff --git a/api/src/main/java/com/cloud/network/element/NetworkElement.java b/api/src/main/java/com/cloud/network/element/NetworkElement.java
index fa67575edd3..cb0fc2fca98 100644
--- a/api/src/main/java/com/cloud/network/element/NetworkElement.java
+++ b/api/src/main/java/com/cloud/network/element/NetworkElement.java
@@ -23,6 +23,7 @@ import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Capability;
 import com.cloud.network.Network.Provider;
@@ -87,6 +88,14 @@ public interface NetworkElement extends Adapter {
     boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException,
         ResourceUnavailableException;
 
+    /**
+     * Release IP from the network provider if reserved
+     * @param ipAddress
+     */
+    default boolean releaseIp(IpAddress ipAddress) {
+        return true;
+    }
+
     /**
      * The network is being shutdown.
      * @param network
diff --git a/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java b/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java
index e99bc2fd416..8dcc8b6d0a4 100644
--- a/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java
+++ b/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java
@@ -17,12 +17,40 @@
 package com.cloud.network.element;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Network;
+import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.network.vpc.NetworkACLItem;
 
 public interface PortForwardingServiceProvider extends NetworkElement, IpDeployingRequester {
+
+    static String getPublicPortRange(PortForwardingRule rule) {
+        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
+                String.valueOf(rule.getSourcePortStart()) :
+                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
+    }
+
+    static String getPrivatePFPortRange(PortForwardingRule rule) {
+        return rule.getDestinationPortStart() == rule.getDestinationPortEnd() ?
+                String.valueOf(rule.getDestinationPortStart()) :
+                String.valueOf(rule.getDestinationPortStart()).concat("-").concat(String.valueOf(rule.getDestinationPortEnd()));
+    }
+
+    static String getPrivatePortRange(FirewallRule rule) {
+        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
+                String.valueOf(rule.getSourcePortStart()) :
+                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
+    }
+
+    static String getPrivatePortRangeForACLRule(NetworkACLItem rule) {
+        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
+                String.valueOf(rule.getSourcePortStart()) :
+                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
+    }
+
     /**
      * Apply rules
      * @param network
diff --git a/api/src/main/java/com/cloud/network/element/VpcProvider.java b/api/src/main/java/com/cloud/network/element/VpcProvider.java
index 6debd1fbc2d..fe8c8f8612f 100644
--- a/api/src/main/java/com/cloud/network/element/VpcProvider.java
+++ b/api/src/main/java/com/cloud/network/element/VpcProvider.java
@@ -55,4 +55,8 @@ public interface VpcProvider extends NetworkElement {
     boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
 
     boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
+
+    default boolean updateVpc(Vpc vpc, String previousVpcName) {
+        return true;
+    }
 }
diff --git a/api/src/main/java/com/cloud/network/guru/NetworkGuru.java b/api/src/main/java/com/cloud/network/guru/NetworkGuru.java
index 7b81c75ed84..ced664e54a9 100644
--- a/api/src/main/java/com/cloud/network/guru/NetworkGuru.java
+++ b/api/src/main/java/com/cloud/network/guru/NetworkGuru.java
@@ -215,4 +215,8 @@ public interface NetworkGuru extends Adapter {
     default boolean isSlaacV6Only() {
         return true;
     }
+
+    default boolean update(Network network, String prevNetworkName) {
+        return true;
+    }
 }
diff --git a/api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java b/api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java
new file mode 100644
index 00000000000..afc21f7f511
--- /dev/null
+++ b/api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java
@@ -0,0 +1,41 @@
+// 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.
+package com.cloud.network.netris;
+
+public class NetrisLbBackend {
+    private long vmId;
+    private String vmIp;
+    private int port;
+
+    public NetrisLbBackend(long vmId, String vmIp, int port) {
+        this.vmId = vmId;
+        this.vmIp = vmIp;
+        this.port = port;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public String getVmIp() {
+        return vmIp;
+    }
+
+    public int getPort() {
+        return port;
+    }
+}
diff --git a/api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java b/api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java
new file mode 100644
index 00000000000..211517ead49
--- /dev/null
+++ b/api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java
@@ -0,0 +1,108 @@
+// 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.
+package com.cloud.network.netris;
+
+import com.cloud.network.SDNProviderNetworkRule;
+
+
+import java.util.List;
+
+public class NetrisNetworkRule {
+    public enum NetrisRuleAction {
+        PERMIT, DENY
+    }
+
+    private SDNProviderNetworkRule baseRule;
+    private NetrisRuleAction aclAction;
+    private List<NetrisLbBackend> lbBackends;
+    private String lbRuleName;
+    private String lbCidrList;
+    private String reason;
+
+    public NetrisNetworkRule(Builder builder) {
+        this.baseRule = builder.baseRule;
+        this.aclAction = builder.aclAction;
+        this.lbBackends = builder.lbBackends;
+        this.reason = builder.reason;
+        this.lbCidrList = builder.lbCidrList;
+        this.lbRuleName = builder.lbRuleName;
+    }
+
+    public NetrisRuleAction getAclAction() {
+        return aclAction;
+    }
+
+    public List<NetrisLbBackend> getLbBackends() {
+        return lbBackends;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public String getLbCidrList() {return lbCidrList; }
+
+    public String getLbRuleName() { return lbRuleName; }
+
+    public SDNProviderNetworkRule getBaseRule() {
+        return baseRule;
+    }
+
+    // Builder class extending the parent builder
+    public static class Builder {
+        private SDNProviderNetworkRule baseRule;
+        private NetrisRuleAction aclAction;
+        private List<NetrisLbBackend> lbBackends;
+        private String reason;
+        private String lbCidrList;
+        private String lbRuleName;
+
+        public Builder baseRule(SDNProviderNetworkRule baseRule) {
+            this.baseRule = baseRule;
+            return this;
+        }
+
+        public Builder aclAction(NetrisRuleAction aclAction) {
+            this.aclAction = aclAction;
+            return this;
+        }
+
+        public Builder lbBackends(List<NetrisLbBackend> lbBackends) {
+            this.lbBackends = lbBackends;
+            return this;
+        }
+
+        public Builder reason(String reason) {
+            this.reason = reason;
+            return this;
+        }
+
+        public Builder lbCidrList(String lbCidrList) {
+            this.lbCidrList = lbCidrList;
+            return this;
+        }
+
+        public Builder lbRuleName(String lbRuleName) {
+            this.lbRuleName = lbRuleName;
+            return this;
+        }
+
+        public NetrisNetworkRule build() {
+            return new NetrisNetworkRule(this);
+        }
+    }
+}
diff --git a/api/src/main/java/com/cloud/network/netris/NetrisProvider.java b/api/src/main/java/com/cloud/network/netris/NetrisProvider.java
new file mode 100644
index 00000000000..fccf2930e97
--- /dev/null
+++ b/api/src/main/java/com/cloud/network/netris/NetrisProvider.java
@@ -0,0 +1,30 @@
+// 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.
+package com.cloud.network.netris;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface NetrisProvider extends InternalIdentity, Identity {
+    long getZoneId();
+    String getName();
+    String getUrl();
+    String getUsername();
+    String getSiteName();
+    String getTenantName();
+    String getNetrisTag();
+}
diff --git a/api/src/main/java/com/cloud/network/netris/NetrisService.java b/api/src/main/java/com/cloud/network/netris/NetrisService.java
new file mode 100644
index 00000000000..110e9f07105
--- /dev/null
+++ b/api/src/main/java/com/cloud/network/netris/NetrisService.java
@@ -0,0 +1,310 @@
+// 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.
+package com.cloud.network.netris;
+
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.Vpc;
+
+import java.util.List;
+
+/**
+ * Interface for Netris Services that provides methods to manage VPCs, networks,
+ * NAT rules, network rules, and static routes in an SDN (Software Defined Networking) environment.
+ */
+
+public interface NetrisService {
+
+    /**
+     * Creates IPAM (IP Address Management) allocations for zone-level public ranges.
+     *
+     * @param zoneId the ID of the zone
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createIPAMAllocationsForZoneLevelPublicRanges(long zoneId);
+
+    /**
+     * Creates a VPC (Virtual Private Cloud) resource.
+     *
+     * @param zoneId           the ID of the zone
+     * @param accountId        the ID of the account
+     * @param domainId         the ID of the domain
+     * @param vpcId            the ID of the VPC
+     * @param vpcName          the name of the VPC
+     * @param sourceNatEnabled true if source NAT is enabled
+     * @param cidr             the CIDR of the VPC
+     * @param isVpcNetwork     true if it is a VPC network
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled, String cidr, boolean isVpcNetwork);
+
+    /**
+     * Updates an existing VPC resource.
+     *
+     * @param zoneId           the ID of the zone
+     * @param accountId        the ID of the account
+     * @param domainId         the ID of the domain
+     * @param vpcId            the ID of the VPC
+     * @param vpcName          the new name of the VPC
+     * @param previousVpcName  the previous name of the VPC
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean updateVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, String previousVpcName);
+
+    /**
+     * Deletes a VPC resource.
+     *
+     * @param zoneId   the ID of the zone
+     * @param accountId the ID of the account
+     * @param domainId the ID of the domain
+     * @param vpc      the VPC to delete
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteVpcResource(long zoneId, long accountId, long domainId, Vpc vpc);
+
+    /**
+     * Creates a virtual network (vNet) resource.
+     *
+     * @param zoneId           the ID of the zone
+     * @param accountId        the ID of the account
+     * @param domainId         the ID of the domain
+     * @param vpcName          the name of the VPC
+     * @param vpcId            the ID of the VPC
+     * @param networkName      the name of the network
+     * @param networkId        the ID of the network
+     * @param cidr             the CIDR of the network
+     * @param globalRouting    true if global routing is enabled
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr, Boolean globalRouting);
+
+    /**
+     * Updates an existing vNet resource.
+     *
+     * @param zoneId          the ID of the zone
+     * @param accountId       the ID of the account
+     * @param domainId        the ID of the domain
+     * @param vpcName         the name of the VPC
+     * @param vpcId           the ID of the VPC
+     * @param networkName     the new name of the network
+     * @param networkId       the ID of the network
+     * @param prevNetworkName the previous name of the network
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean updateVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String prevNetworkName);
+
+    /**
+     * Deletes an existing vNet resource.
+     *
+     * @param zoneId       the ID of the zone
+     * @param accountId    the ID of the account
+     * @param domainId     the ID of the domain
+     * @param vpcName      the name of the VPC
+     * @param vpcId        the ID of the VPC
+     * @param networkName  the name of the network
+     * @param networkId    the ID of the network
+     * @param cidr         the CIDR of the network
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteVnetResource(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr);
+
+    /**
+     * Creates a source NAT rule for a VPC or network.
+     *
+     * @param zoneId          the ID of the zone
+     * @param accountId       the ID of the account
+     * @param domainId        the ID of the domain
+     * @param vpcName         the name of the VPC
+     * @param vpcId           the ID of the VPC
+     * @param networkName     the name of the network
+     * @param networkId       the ID of the network
+     * @param isForVpc        true if the rule applies to a VPC
+     * @param vpcCidr         the VPC CIDR
+     * @param sourceNatIp     the source NAT IP
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createSnatRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName, long networkId, boolean isForVpc, String vpcCidr, String sourceNatIp);
+
+    /**
+     * Creates a port forwarding rule for a VPC or network.
+     *
+     * @param zoneId          the ID of the zone
+     * @param accountId       the ID of the account
+     * @param domainId        the ID of the domain
+     * @param vpcName         the name of the VPC
+     * @param vpcId           the ID of the VPC
+     * @param networkName     the name of the network
+     * @param networkId       the ID of the network
+     * @param isForVpc        true if the rule applies to a VPC
+     * @param vpcCidr         the VPC CIDR
+     * @param networkRule     the network rule to forward
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createPortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName, Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule);
+
+    /**
+     * Deletes a port forwarding rule for a VPC or network.
+     *
+     * @param zoneId          the ID of the zone
+     * @param accountId       the ID of the account
+     * @param domainId        the ID of the domain
+     * @param vpcName         the name of the VPC
+     * @param vpcId           the ID of the VPC
+     * @param networkName     the name of the network
+     * @param networkId       the ID of the network
+     * @param isForVpc        true if the rule applies to a VPC
+     * @param vpcCidr         the VPC CIDR
+     * @param networkRule     the network rule to remove
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deletePortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule);
+
+    /**
+     * Updates the source NAT IP for a specified VPC.
+     *
+     * @param vpc     the VPC to updates
+     * @param address the new source NAT IP address
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
+
+    /**
+     * Creates a static NAT rule for a specific VM.
+     *
+     * @param zoneId             the ID of the zone
+     * @param accountId          the ID of the account
+     * @param domainId           the ID of the domain
+     * @param networkResourceName the name of the network resource
+     * @param networkResourceId  the ID of the network resource
+     * @param isForVpc           true if the rule applies to a VPC
+     * @param vpcCidr            the VPC CIDR
+     * @param staticNatIp        the static NAT IP
+     * @param vmIp               the VM's IP address
+     * @param vmId               the ID of the VM
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String vpcCidr, String staticNatIp, String vmIp, long vmId);
+
+    /**
+     * Deletes a static NAT rule for a specific VM.
+     *
+     * @param zoneId             the ID of the zone
+     * @param accountId          the ID of the account
+     * @param domainId           the ID of the domain
+     * @param networkResourceName the name of the network resource
+     * @param networkResourceId  the ID of the network resource
+     * @param isForVpc           true if the rule applies to a VPC
+     * @param staticNatIp        the static NAT IP
+     * @param vmId               the ID of the VM
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String staticNatIp, long vmId);
+
+    /**
+     * Adds firewall rules to a specific network.
+     *
+     * @param network       the target network
+     * @param firewallRules the list of firewall rules to add
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean addFirewallRules(Network network, List<NetrisNetworkRule> firewallRules);
+
+    /**
+     * Deletes firewall rules from a specific network.
+     *
+     * @param network       the target network
+     * @param firewallRules the list of firewall rules to delete
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteFirewallRules(Network network, List<NetrisNetworkRule> firewallRules);
+
+    /**
+     * Adds or updates a static route for a specific network or VPC.
+     *
+     * @param zoneId             the ID of the zone
+     * @param accountId          the ID of the account
+     * @param domainId           the ID of the domain
+     * @param networkResourceName the name of the network resource
+     * @param networkResourceId  the ID of the network resource
+     * @param isForVpc           true if it is for a VPC
+     * @param prefix             the IP prefix of the route
+     * @param nextHop            the next hop address
+     * @param routeId            the ID of the route
+     * @param updateRoute        true if the route should be updated
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean addOrUpdateStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId, boolean updateRoute);
+
+    /**
+     * Deletes a specific static route for a network or VPC.
+     *
+     * @param zoneId             the ID of the zone
+     * @param accountId          the ID of the account
+     * @param domainId           the ID of the domain
+     * @param networkResourceName the name of the network resource
+     * @param networkResourceId  the ID of the network resource
+     * @param isForVpc           true if it is for a VPC
+     * @param prefix             the IP prefix of the route
+     * @param nextHop            the next hop address
+     * @param routeId            the ID of the route
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId);
+
+    /**
+     * Lists static routes for a specific network or VPC.
+     *
+     * @param zoneId             the ID of the zone
+     * @param accountId          the ID of the account
+     * @param domainId           the ID of the domain
+     * @param networkResourceName the name of the network resource
+     * @param networkResourceId  the ID of the network resource
+     * @param isForVpc           true if it is for a VPC
+     * @param prefix             the IP prefix of the route
+     * @param nextHop            the next hop address
+     * @param routeId            the ID of the route
+     * @return a list of static routes
+     */
+    List<StaticRoute> listStaticRoutes(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId);
+
+    /**
+     * Releases a NAT IP address.
+     *
+     * @param zoneId   the ID of the zone
+     * @param publicIp the public NAT IP to release
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean releaseNatIp(long zoneId, String publicIp);
+
+    /**
+     * Creates or updates a load balancer (LB) rule.
+     *
+     * @param rule the network rule for the load balancer
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean createOrUpdateLbRule(NetrisNetworkRule rule);
+
+    /**
+     * Deletes a load balancer (LB) rule.
+     *
+     * @param rule the network rule to delete
+     * @return true if the operation is successful, false otherwise
+     */
+    boolean deleteLbRule(NetrisNetworkRule rule);
+}
diff --git a/api/src/main/java/com/cloud/network/vpc/StaticRoute.java b/api/src/main/java/com/cloud/network/vpc/StaticRoute.java
index 5707ca14024..739fca328b8 100644
--- a/api/src/main/java/com/cloud/network/vpc/StaticRoute.java
+++ b/api/src/main/java/com/cloud/network/vpc/StaticRoute.java
@@ -25,6 +25,7 @@ public interface StaticRoute extends ControlledEntity, Identity, InternalIdentit
         Staged, // route been created but has never got through network rule conflict detection.  Routes in this state can not be sent to VPC virtual router.
         Add,    // Add means the route has been created and has gone through network rule conflict detection.
         Active, // Route has been sent to the VPC router and reported to be active.
+        Update,
         Revoke,  // Revoke means this route has been revoked. If this route has been sent to the VPC router, the route will be deleted from database.
         Deleting // rule has been revoked and is scheduled for deletion
     }
@@ -32,7 +33,9 @@ public interface StaticRoute extends ControlledEntity, Identity, InternalIdentit
     /**
      * @return
      */
-    long getVpcGatewayId();
+    Long getVpcGatewayId();
+
+    String getNextHop();
 
     /**
      * @return
diff --git a/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java
index cb4849f1f7b..c8fc073911f 100644
--- a/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java
+++ b/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java
@@ -23,7 +23,8 @@ public class StaticRouteProfile implements StaticRoute {
     private String targetCidr;
     private long accountId;
     private long domainId;
-    private long gatewayId;
+    private Long gatewayId;
+    private String nextHop;
     private StaticRoute.State state;
     private long vpcId;
     String vlanTag;
@@ -46,6 +47,18 @@ public class StaticRouteProfile implements StaticRoute {
         ipAddress = gateway.getIp4Address();
     }
 
+    public StaticRouteProfile(StaticRoute staticRoute) {
+        id = staticRoute.getId();
+        uuid = staticRoute.getUuid();
+        targetCidr = staticRoute.getCidr();
+        accountId = staticRoute.getAccountId();
+        domainId = staticRoute.getDomainId();
+        gatewayId = staticRoute.getVpcGatewayId();
+        state = staticRoute.getState();
+        vpcId = staticRoute.getVpcId();
+        gateway = staticRoute.getNextHop();
+    }
+
     @Override
     public long getAccountId() {
         return accountId;
@@ -57,10 +70,15 @@ public class StaticRouteProfile implements StaticRoute {
     }
 
     @Override
-    public long getVpcGatewayId() {
+    public Long getVpcGatewayId() {
         return gatewayId;
     }
 
+    @Override
+    public String getNextHop() {
+        return nextHop;
+    }
+
     @Override
     public String getCidr() {
         return targetCidr;
diff --git a/api/src/main/java/com/cloud/network/vpc/VpcOffering.java b/api/src/main/java/com/cloud/network/vpc/VpcOffering.java
index 38263f59667..17f49bb3652 100644
--- a/api/src/main/java/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/main/java/com/cloud/network/vpc/VpcOffering.java
@@ -32,6 +32,8 @@ public interface VpcOffering extends InternalIdentity, Identity {
     public static final String redundantVPCOfferingName = "Redundant VPC offering";
     public static final String DEFAULT_VPC_NAT_NSX_OFFERING_NAME = "VPC offering with NSX - NAT Mode";
     public static final String DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME = "VPC offering with NSX - Route Mode";
+    public static final String DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME = "VPC offering with Netris - Route Mode";
+    public static final String DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME = "VPC offering with Netris - NAT Mode";
 
     /**
      *
@@ -56,8 +58,6 @@ public interface VpcOffering extends InternalIdentity, Identity {
      */
     boolean isDefault();
 
-    boolean isForNsx();
-
     NetworkOffering.NetworkMode getNetworkMode();
 
     /**
diff --git a/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
index 10f1ddcc12d..97b95339ecf 100644
--- a/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
+++ b/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
@@ -37,7 +37,7 @@ public interface VpcProvisioningService {
     VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
                                   Map<String, List<String>> serviceProviders,
                                   Map serviceCapabilitystList, NetUtils.InternetProtocol internetProtocol,
-                                  Long serviceOfferingId, Boolean forNsx, NetworkOffering.NetworkMode networkMode,
+                                  Long serviceOfferingId, String externalProvider, NetworkOffering.NetworkMode networkMode,
                                   List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state,
                                   NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber);
 
diff --git a/api/src/main/java/com/cloud/network/vpc/VpcService.java b/api/src/main/java/com/cloud/network/vpc/VpcService.java
index 9b7a83c29c1..c1546609d2b 100644
--- a/api/src/main/java/com/cloud/network/vpc/VpcService.java
+++ b/api/src/main/java/com/cloud/network/vpc/VpcService.java
@@ -238,7 +238,7 @@ public interface VpcService {
      * @param cidr
      * @return
      */
-    StaticRoute createStaticRoute(long gatewayId, String cidr) throws NetworkRuleConflictException;
+    StaticRoute createStaticRoute(Long gatewayId, Long vpcId, String nextHop, String cidr) throws NetworkRuleConflictException;
 
     /**
      * Lists static routes based on parameters passed to the call
diff --git a/api/src/main/java/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java
index 7011aea679e..5000a4f8c62 100644
--- a/api/src/main/java/com/cloud/offering/NetworkOffering.java
+++ b/api/src/main/java/com/cloud/offering/NetworkOffering.java
@@ -64,6 +64,8 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
     public static final String DEFAULT_NAT_NSX_OFFERING_FOR_VPC = "DefaultNATNSXNetworkOfferingForVpc";
     public static final String DEFAULT_NAT_NSX_OFFERING_FOR_VPC_WITH_ILB = "DefaultNATNSXNetworkOfferingForVpcWithInternalLB";
     public static final String DEFAULT_ROUTED_NSX_OFFERING_FOR_VPC = "DefaultRoutedNSXNetworkOfferingForVpc";
+    public static final String DEFAULT_ROUTED_NETRIS_OFFERING_FOR_VPC = "DefaultRoutedNetrisNetworkOfferingForVpc";
+    public static final String DEFAULT_NAT_NETRIS_OFFERING_FOR_VPC = "DefaultNATNetrisNetworkOfferingForVpc";
     public static final String DEFAULT_NAT_NSX_OFFERING = "DefaultNATNSXNetworkOffering";
     public static final String DEFAULT_ROUTED_NSX_OFFERING = "DefaultRoutedNSXNetworkOffering";
     public final static String QuickCloudNoServices = "QuickCloudNoServices";
@@ -102,10 +104,6 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
 
     boolean isForVpc();
 
-    boolean isForTungsten();
-
-    boolean isForNsx();
-
     NetworkMode getNetworkMode();
 
     TrafficType getTrafficType();
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 607504835c0..71bd5c9addc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -227,6 +227,7 @@ public class ApiConstants {
     public static final String FORMAT = "format";
     public static final String FOR_VIRTUAL_NETWORK = "forvirtualnetwork";
     public static final String FOR_SYSTEM_VMS = "forsystemvms";
+    public static final String FOR_PROVIDER = "forprovider";
     public static final String FULL_PATH = "fullpath";
     public static final String GATEWAY = "gateway";
     public static final String IP6_GATEWAY = "ip6gateway";
@@ -271,6 +272,7 @@ public class ApiConstants {
     public static final String PREVIOUS_OWNER_ID = "previousownerid";
     public static final String PREVIOUS_OWNER_NAME = "previousownername";
     public static final String NEXT_ACL_RULE_ID = "nextaclruleid";
+    public static final String NEXT_HOP = "nexthop";
     public static final String MOVE_ACL_CONSISTENCY_HASH = "aclconsistencyhash";
     public static final String IMAGE_PATH = "imagepath";
     public static final String INSTANCE_CONVERSION_SUPPORTED = "instanceconversionsupported";
@@ -352,6 +354,8 @@ public class ApiConstants {
     public static final String MIN_CPU_NUMBER = "mincpunumber";
     public static final String MIN_MEMORY = "minmemory";
     public static final String MIGRATION_TYPE = "migrationtype";
+    public static final String MIGRATION_JOB_ID = "migrationjobid";
+    public static final String MIGRATION_JOB_STATUS = "migrationjobstatus";
     public static final String MIGRATIONS = "migrations";
     public static final String MEMORY = "memory";
     public static final String MODE = "mode";
@@ -488,6 +492,7 @@ public class ApiConstants {
     public static final String SIGNATURE = "signature";
     public static final String SIGNATURE_VERSION = "signatureversion";
     public static final String SINCE = "since";
+    public static final String SITE_NAME = "sitename";
     public static final String SIZE = "size";
     public static final String SIZEGB = "sizegb";
     public static final String SNAPSHOT = "snapshot";
@@ -536,6 +541,7 @@ public class ApiConstants {
     public static final String TIMEOUT = "timeout";
     public static final String TIMEZONE = "timezone";
     public static final String TIMEZONEOFFSET = "timezoneoffset";
+    public static final String TENANT_NAME = "tenantname";
     public static final String TOTAL = "total";
     public static final String TOTAL_SUBNETS = "totalsubnets";
     public static final String TYPE = "type";
@@ -912,6 +918,8 @@ public class ApiConstants {
     public static final String NETWORK = "network";
     public static final String VPC_ID = "vpcid";
     public static final String VPC_NAME = "vpcname";
+    public static final String VPC_GATEWAY_ID = "vpcgatewayid";
+    public static final String VPC_GATEWAY_IP = "vpcgatewayip";
     public static final String GATEWAY_ID = "gatewayid";
     public static final String CAN_USE_FOR_DEPLOY = "canusefordeploy";
     public static final String RESOURCE_IDS = "resourceids";
@@ -1207,6 +1215,9 @@ public class ApiConstants {
     public static final String SOURCE_NAT_IP_ID = "sourcenatipaddressid";
     public static final String HAS_RULES = "hasrules";
     public static final String NSX_DETAIL_KEY = "forNsx";
+    public static final String NETRIS_DETAIL_KEY = "forNetris";
+    public static final String NETRIS_TAG = "netristag";
+    public static final String NETRIS_VXLAN_ID = "netrisvxlanid";
     public static final String DISK_PATH = "diskpath";
     public static final String IMPORT_SOURCE = "importsource";
     public static final String TEMP_PATH = "temppath";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index af3db374a7c..51ba6ec02ea 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -140,12 +141,19 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
             description = "true if network offering is meant to be used for VPC, false otherwise.")
     private Boolean forVpc;
 
+    @Deprecated
     @Parameter(name = ApiConstants.FOR_NSX,
             type = CommandType.BOOLEAN,
             description = "true if network offering is meant to be used for NSX, false otherwise.",
             since = "4.20.0")
     private Boolean forNsx;
 
+    @Parameter(name = ApiConstants.PROVIDER,
+            type = CommandType.STRING,
+            description = "Name of the provider providing the service",
+            since = "4.21.0")
+    private String provider;
+
     @Parameter(name = ApiConstants.NSX_SUPPORT_LB,
             type = CommandType.BOOLEAN,
             description = "true if network offering for NSX network offering supports Load balancer service.",
@@ -257,18 +265,38 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
         return serviceOfferingId;
     }
 
+    public boolean isExternalNetworkProvider() {
+        return Arrays.asList("NSX", "Netris").stream()
+                .anyMatch(s -> provider != null && s.equalsIgnoreCase(provider));
+    }
+
+    public boolean isForNsx() {
+        return provider != null && provider.equalsIgnoreCase("NSX");
+    }
+
+    public boolean isForNetris() {
+        return provider != null && provider.equalsIgnoreCase("Netris");
+    }
+
+    public String getProvider() {
+        return provider;
+    }
+
     public List<String> getSupportedServices() {
-        if (!isForNsx()) {
+        if (!isExternalNetworkProvider()) {
             return supportedServices == null ? new ArrayList<String>() : supportedServices;
         } else {
             List<String> services = new ArrayList<>(List.of(
                     Dhcp.getName(),
                     Dns.getName(),
-                    StaticNat.getName(),
-                    SourceNat.getName(),
-                    PortForwarding.getName(),
                     UserData.getName()
             ));
+            if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode())) {
+                services.addAll(Arrays.asList(
+                        StaticNat.getName(),
+                        SourceNat.getName(),
+                        PortForwarding.getName()));
+            }
             if (getNsxSupportsLbService()) {
                 services.add(Lb.getName());
             }
@@ -308,10 +336,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
         return forVpc;
     }
 
-    public boolean isForNsx() {
-        return BooleanUtils.isTrue(forNsx);
-    }
-
     public String getNetworkMode() {
         return networkMode;
     }
@@ -345,7 +369,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
 
     public Map<String, List<String>> getServiceProviders() {
         Map<String, List<String>> serviceProviderMap = new HashMap<>();
-        if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isForNsx()) {
+        if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isExternalNetworkProvider()) {
             Collection servicesCollection = serviceProviderList.values();
             Iterator iter = servicesCollection.iterator();
             while (iter.hasNext()) {
@@ -361,17 +385,16 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
                 providerList.add(provider);
                 serviceProviderMap.put(service, providerList);
             }
-        } else if (Boolean.TRUE.equals(forNsx)) {
-            getServiceProviderMapForNsx(serviceProviderMap);
+        } else if (isExternalNetworkProvider()) {
+            getServiceProviderMapForExternalProvider(serviceProviderMap, Network.Provider.getProvider(provider).getName());
         }
         return serviceProviderMap;
     }
 
-    private void getServiceProviderMapForNsx(Map<String, List<String>> serviceProviderMap) {
+    private void getServiceProviderMapForExternalProvider(Map<String, List<String>> serviceProviderMap, String provider) {
         String routerProvider = Boolean.TRUE.equals(getForVpc()) ? VirtualRouterProvider.Type.VPCVirtualRouter.name() :
                 VirtualRouterProvider.Type.VirtualRouter.name();
-        List<String> unsupportedServices = new ArrayList<>(List.of("Vpn", "SecurityGroup", "Connectivity",
-                "Gateway", "BaremetalPxeService"));
+        List<String> unsupportedServices = new ArrayList<>(List.of("Vpn", "Gateway", "SecurityGroup", "Connectivity", "BaremetalPxeService"));
         List<String> routerSupported = List.of("Dhcp", "Dns", "UserData");
         List<String> allServices = Service.listAllServices().stream().map(Service::getName).collect(Collectors.toList());
         if (routerProvider.equals(VirtualRouterProvider.Type.VPCVirtualRouter.name())) {
@@ -384,8 +407,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
                 continue;
             if (routerSupported.contains(service))
                 serviceProviderMap.put(service, List.of(routerProvider));
-            else
-                serviceProviderMap.put(service, List.of(Network.Provider.Nsx.getName()));
+            else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) || NetworkACL.getName().equalsIgnoreCase(service)) {
+                    serviceProviderMap.put(service, List.of(provider));
+                }
             if (!getNsxSupportsLbService()) {
                 serviceProviderMap.remove(Lb.getName());
             }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
index c0ba99a8233..5cb384925e8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.vlan;
 
+import com.cloud.configuration.ConfigurationService;
+import com.cloud.network.Network;
 import com.cloud.utils.net.NetUtils;
 
 import org.apache.cloudstack.api.APICommand;
@@ -39,7 +41,6 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-import java.util.Objects;
 
 @APICommand(name = "createVlanIpRange", description = "Creates a VLAN IP range.", responseObject = VlanIpRangeResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -114,8 +115,8 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
     @Parameter(name = ApiConstants.FOR_SYSTEM_VMS, type = CommandType.BOOLEAN, description = "true if IP range is set to system vms, false if not")
     private Boolean forSystemVms;
 
-    @Parameter(name = ApiConstants.FOR_NSX, type = CommandType.BOOLEAN, description = "true if the IP range is used for NSX resource", since = "4.20.0")
-    private boolean forNsx;
+    @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, description = "Provider name for which the IP range is reserved for", since = "4.21.0")
+    private String provider;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -157,12 +158,12 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
         return startIp;
     }
 
-    public boolean isForNsx() {
-        return !Objects.isNull(forNsx) && forNsx;
+    public Network.Provider getProvider() {
+        return Network.Provider.getProvider(provider);
     }
 
     public String getVlan() {
-        if ((vlan == null || vlan.isEmpty()) && !isForNsx()) {
+        if ((vlan == null || vlan.isEmpty()) && !ConfigurationService.IsIpRangeForProvider(getProvider())) {
             vlan = "untagged";
         }
         return vlan;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 73b4f5df196..84f4d451460 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.api.command.admin.vpc;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -25,10 +26,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.Network;
 import com.cloud.network.VirtualRouterProvider;
+import com.cloud.offering.NetworkOffering;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.commons.collections.CollectionUtils;
@@ -57,6 +60,7 @@ import static com.cloud.network.Network.Service.SourceNat;
 import static com.cloud.network.Network.Service.PortForwarding;
 import static com.cloud.network.Network.Service.NetworkACL;
 import static com.cloud.network.Network.Service.UserData;
+import static com.cloud.network.Network.Service.Gateway;
 
 @APICommand(name = "createVPCOffering", description = "Creates VPC offering", responseObject = VpcOfferingResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -112,12 +116,19 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
             since = "4.13")
     private List<Long> zoneIds;
 
+    @Deprecated
     @Parameter(name = ApiConstants.FOR_NSX,
             type = CommandType.BOOLEAN,
             description = "true if network offering is meant to be used for NSX, false otherwise.",
             since = "4.20.0")
     private Boolean forNsx;
 
+    @Parameter(name = ApiConstants.PROVIDER,
+            type = CommandType.STRING,
+            description = "Name of the provider providing the service",
+            since = "4.21.0")
+    private String provider;
+
     @Parameter(name = ApiConstants.NSX_SUPPORT_LB,
             type = CommandType.BOOLEAN,
             description = "true if network offering for NSX VPC offering supports Load balancer service.",
@@ -158,20 +169,31 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
         return StringUtils.isEmpty(displayText) ? vpcOfferingName : displayText;
     }
 
+    public boolean isExternalNetworkProvider() {
+        return Arrays.asList("NSX", "Netris").stream()
+                .anyMatch(s -> provider != null && s.equalsIgnoreCase(provider));
+    }
+
     public List<String> getSupportedServices() {
-        if (!isForNsx() && CollectionUtils.isEmpty(supportedServices)) {
+        if (!isExternalNetworkProvider() && CollectionUtils.isEmpty(supportedServices)) {
             throw new InvalidParameterValueException("Supported services needs to be provided");
         }
-        if (isForNsx()) {
+        if (isExternalNetworkProvider()) {
             supportedServices = new ArrayList<>(List.of(
                     Dhcp.getName(),
                     Dns.getName(),
-                    StaticNat.getName(),
-                    SourceNat.getName(),
                     NetworkACL.getName(),
-                    PortForwarding.getName(),
                     UserData.getName()
                     ));
+            if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode())) {
+                supportedServices.addAll(Arrays.asList(
+                        StaticNat.getName(),
+                        SourceNat.getName(),
+                        PortForwarding.getName()));
+            }
+            if (NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode())) {
+                supportedServices.add(Gateway.getName());
+            }
             if (getNsxSupportsLbService()) {
                 supportedServices.add(Lb.getName());
             }
@@ -179,8 +201,8 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
         return supportedServices;
     }
 
-    public boolean isForNsx() {
-        return BooleanUtils.isTrue(forNsx);
+    public String getProvider() {
+        return provider;
     }
 
     public String getNetworkMode() {
@@ -193,7 +215,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
 
     public Map<String, List<String>> getServiceProviders() {
         Map<String, List<String>> serviceProviderMap = new HashMap<>();
-        if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isForNsx()) {
+        if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isExternalNetworkProvider()) {
             Collection<? extends Map<String, String>> servicesCollection = serviceProviderList.values();
             Iterator<? extends Map<String, String>> iter = servicesCollection.iterator();
             while (iter.hasNext()) {
@@ -213,16 +235,18 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
                 providerList.add(provider);
                 serviceProviderMap.put(service, providerList);
             }
-        } else if (Boolean.TRUE.equals(forNsx)) {
-            getServiceProviderMapForNsx(serviceProviderMap);
+        } else if (isExternalNetworkProvider()) {
+            getServiceProviderMapForExternalProvider(serviceProviderMap, Network.Provider.getProvider(provider).getName());
         }
 
         return serviceProviderMap;
     }
 
-    private void getServiceProviderMapForNsx(Map<String, List<String>> serviceProviderMap) {
-        List<String> unsupportedServices = List.of("Vpn", "BaremetalPxeService", "SecurityGroup", "Connectivity",
-                "Gateway", "Firewall");
+    private void getServiceProviderMapForExternalProvider(Map<String, List<String>> serviceProviderMap, String provider) {
+        List<String> unsupportedServices = new ArrayList<>(List.of("Vpn", "BaremetalPxeService", "SecurityGroup", "Connectivity", "Firewall"));
+        if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode())) {
+            unsupportedServices.add("Gateway");
+        }
         List<String> routerSupported = List.of("Dhcp", "Dns", "UserData");
         List<String> allServices = Network.Service.listAllServices().stream().map(Network.Service::getName).collect(Collectors.toList());
         for (String service : allServices) {
@@ -230,8 +254,10 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
                 continue;
             if (routerSupported.contains(service))
                 serviceProviderMap.put(service, List.of(VirtualRouterProvider.Type.VPCVirtualRouter.name()));
-            else
-                serviceProviderMap.put(service, List.of(Network.Provider.Nsx.getName()));
+            else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) ||
+                    Stream.of(NetworkACL.getName(), Gateway.getName()).anyMatch(s -> s.equalsIgnoreCase(service))) {
+                serviceProviderMap.put(service, List.of(provider));
+            }
         }
         if (!getNsxSupportsLbService()) {
             serviceProviderMap.remove(Lb.getName());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index 5760ca3ba1c..357f0c83ed7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -108,6 +108,9 @@ public class ListPublicIpAddressesCmd extends BaseListRetrieveOnlyResourceCountC
     @Parameter(name = ApiConstants.FOR_SYSTEM_VMS, type = CommandType.BOOLEAN, description = "true if range is dedicated for system VMs", since = "4.20.0")
     private Boolean forSystemVMs;
 
+    @Parameter(name = ApiConstants.FOR_PROVIDER, type = CommandType.BOOLEAN, description = "true if range is dedicated for external network provider", since = "4.21.0")
+    private Boolean forProvider;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -183,6 +186,10 @@ public class ListPublicIpAddressesCmd extends BaseListRetrieveOnlyResourceCountC
         return BooleanUtils.isTrue(forSystemVMs);
     }
 
+    public boolean isForProvider() {
+        return BooleanUtils.isTrue(forProvider);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
index b28c02cb800..c4b5e159b5c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
@@ -27,6 +27,7 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.PrivateGatewayResponse;
 import org.apache.cloudstack.api.response.StaticRouteResponse;
+import org.apache.cloudstack.api.response.VpcResponse;
 import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.event.EventTypes;
@@ -45,20 +46,40 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
     @Parameter(name = ApiConstants.GATEWAY_ID,
                type = CommandType.UUID,
                entityType = PrivateGatewayResponse.class,
-               required = true,
-               description = "the gateway id we are creating static route for")
+               description = "the gateway id we are creating static route for. Mutually exclusive with the nexthop parameter")
     private Long gatewayId;
 
+    @Parameter(name = ApiConstants.VPC_ID,
+            type = CommandType.UUID,
+            entityType = VpcResponse.class,
+            description = "the vpc id for which the static route is created. This is required for nexthop parameter",
+            since = "4.21.0")
+    private Long vpcId;
+
+    @Parameter(name = ApiConstants.NEXT_HOP,
+            type = CommandType.STRING,
+            description = "the next hop of static route. Mutually exclusive with the gatewayid parameter",
+            since = "4.21.0")
+    private String nextHop;
+
     @Parameter(name = ApiConstants.CIDR, required = true, type = CommandType.STRING, description = "static route cidr")
     private String cidr;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
-    public long getGatewayId() {
+    public Long getGatewayId() {
         return gatewayId;
     }
 
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public String getNextHop() {
+        return nextHop;
+    }
+
     public String getCidr() {
         return cidr;
     }
@@ -69,7 +90,7 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
     @Override
     public void create() throws ResourceAllocationException {
         try {
-            StaticRoute result = _vpcService.createStaticRoute(getGatewayId(), getCidr());
+            StaticRoute result = _vpcService.createStaticRoute(getGatewayId(), getVpcId(), getNextHop(), getCidr());
             setEntityId(result.getId());
             setEntityUuid(result.getUuid());
         } catch (NetworkRuleConflictException ex) {
@@ -114,11 +135,8 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
 
     @Override
     public long getEntityOwnerId() {
-        VpcGateway gateway = _entityMgr.findById(VpcGateway.class, gatewayId);
-        if (gateway == null) {
-            throw new InvalidParameterValueException("Invalid gateway id is specified");
-        }
-        return _entityMgr.findById(Vpc.class, gateway.getVpcId()).getAccountId();
+        Long vpcId = getSyncObjId();
+        return _entityMgr.findById(Vpc.class, vpcId).getAccountId();
     }
 
     @Override
@@ -128,11 +146,20 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
 
     @Override
     public Long getSyncObjId() {
-        VpcGateway gateway = _entityMgr.findById(VpcGateway.class, gatewayId);
-        if (gateway == null) {
-            throw new InvalidParameterValueException("Invalid id is specified for the gateway");
+        if (gatewayId != null) {
+            VpcGateway gateway = _entityMgr.findById(VpcGateway.class, gatewayId);
+            if (gateway == null) {
+                throw new InvalidParameterValueException("Invalid id is specified for the gateway");
+            }
+            return gateway.getVpcId();
+        } else if (vpcId != null) {
+            Vpc vpc = _entityMgr.findById(Vpc.class, vpcId);
+            if (vpc == null) {
+                throw new InvalidParameterValueException("Invalid vpc id is specified");
+            }
+            return vpc.getId();
         }
-        return gateway.getVpcId();
+        throw new InvalidParameterValueException("One of vpcId or gatewayId must be specified");
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
index 6f31176c4ff..6c3f57b3dfa 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
@@ -28,6 +28,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.IPAddressResponse;
 import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
 import org.apache.cloudstack.api.response.VpcResponse;
 import org.apache.cloudstack.context.CallContext;
@@ -44,9 +45,16 @@ public class CreateVpnGatewayCmd extends BaseAsyncCreateCmd {
                type = CommandType.UUID,
                entityType = VpcResponse.class,
                required = true,
-               description = "public ip address id of the vpn gateway")
+               description = "id of the vpc")
     private Long vpcId;
 
+    @Parameter(name = ApiConstants.IP_ADDRESS_ID,
+            type = CommandType.UUID,
+            entityType = IPAddressResponse.class,
+            description = "the public IP address ID for which VPN gateway is being enabled. By default the source NAT IP or router IP will be used.",
+            since = "4.21.0")
+    private Long ipAddressId;
+
     @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the vpn to the end user or not", since = "4.4", authorized = {RoleType.Admin})
     private Boolean display;
 
@@ -58,6 +66,10 @@ public class CreateVpnGatewayCmd extends BaseAsyncCreateCmd {
         return vpcId;
     }
 
+    public Long getIpAddressId() {
+        return ipAddressId;
+    }
+
     @Deprecated
     public Boolean getDisplay() {
         return display;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java
index 5b47a7a06e4..edbc94bc498 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java
@@ -55,10 +55,6 @@ public class AsyncJobResponse extends BaseResponse {
     @Param(description = "the async command executed")
     private String cmd;
 
-    @SerializedName("jobstatus")
-    @Param(description = "the current job status-should be 0 for PENDING")
-    private Integer jobStatus;
-
     @SerializedName("jobprocstatus")
     @Param(description = "the progress information of the PENDING job")
     private Integer jobProcStatus;
@@ -123,11 +119,6 @@ public class AsyncJobResponse extends BaseResponse {
         this.cmd = cmd;
     }
 
-    @Override
-    public void setJobStatus(Integer jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
     public void setJobProcStatus(Integer jobProcStatus) {
         this.jobProcStatus = jobProcStatus;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ClusterDrsPlanMigrationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterDrsPlanMigrationResponse.java
index 4114c228e26..f399c1260f7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ClusterDrsPlanMigrationResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ClusterDrsPlanMigrationResponse.java
@@ -50,13 +50,13 @@ public class ClusterDrsPlanMigrationResponse extends BaseResponse {
     @Param(description = "Destination host for VM migration")
     String destHostName;
 
-    @SerializedName(ApiConstants.JOB_ID)
+    @SerializedName(ApiConstants.MIGRATION_JOB_ID)
     @Param(description = "id of VM migration async job")
-    private Long jobId;
+    private Long migrationJobId;
 
-    @SerializedName(ApiConstants.JOB_STATUS)
+    @SerializedName(ApiConstants.MIGRATION_JOB_STATUS)
     @Param(description = "Job status of VM migration async job")
-    private JobInfo.Status jobStatus;
+    private JobInfo.Status migrationJobStatus;
 
 
     public ClusterDrsPlanMigrationResponse(String vmId, String vmName, String srcHostId, String srcHostName,
@@ -68,8 +68,8 @@ public class ClusterDrsPlanMigrationResponse extends BaseResponse {
         this.srcHostName = srcHostName;
         this.destHostId = destHostId;
         this.destHostName = destHostName;
-        this.jobId = jobId;
-        this.jobStatus = jobStatus;
+        this.migrationJobId = jobId;
+        this.migrationJobStatus = jobStatus;
         this.setObjectName(ApiConstants.MIGRATIONS);
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
index 0018edc8638..8b0e3cc0201 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -175,6 +175,10 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
     @Param(description="true if range is dedicated for System VMs")
     private boolean forSystemVms;
 
+    @SerializedName(ApiConstants.FOR_PROVIDER)
+    @Param(description="true if range is dedicated for external network providers", since = "4.21.0")
+    private boolean forProvider;
+
     public void setIpAddress(String ipAddress) {
         this.ipAddress = ipAddress;
     }
@@ -332,4 +336,8 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
     public void setForSystemVms(boolean forSystemVms) {
         this.forSystemVms = forSystemVms;
     }
+
+    public void setForProvider(boolean forProvider) {
+        this.forProvider = forProvider;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
index a1ffda72234..d5db8b4dabb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -211,14 +211,6 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     @Param(description = "Name of the VPC to which this network belongs", since = "4.15")
     private String vpcName;
 
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID)
-    @Param(description = "the ID of the Network associated with this network")
-    private String associatedNetworkId;
-
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK)
-    @Param(description = "the name of the Network associated with this network")
-    private String associatedNetworkName;
-
     @SerializedName(ApiConstants.TUNGSTEN_VIRTUAL_ROUTER_UUID)
     @Param(description = "Tungsten-Fabric virtual router the network belongs to")
     private String tungstenVirtualRouterUuid;
@@ -619,14 +611,6 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
         this.vpcName = vpcName;
     }
 
-    public void setAssociatedNetworkId(String associatedNetworkId) {
-        this.associatedNetworkId = associatedNetworkId;
-    }
-
-    public void setAssociatedNetworkName(String associatedNetworkName) {
-        this.associatedNetworkName = associatedNetworkName;
-    }
-
     @Override
     public void setResourceIconResponse(ResourceIconResponse icon) {
         this.icon = icon;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java
index 51f8a130383..9008fce2392 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java
@@ -42,9 +42,17 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     @Param(description = "VPC the static route belongs to")
     private String vpcId;
 
-    @SerializedName(ApiConstants.GATEWAY_ID)
+    @SerializedName(ApiConstants.VPC_GATEWAY_ID)
     @Param(description = "VPC gateway the route is created for")
-    private String gatewayId;
+    private String vpcGatewayId;
+
+    @SerializedName(ApiConstants.VPC_GATEWAY_IP)
+    @Param(description = "IP of VPC gateway the route is created for", since = "4.21.0")
+    private String vpcGatewayIp;
+
+    @SerializedName(ApiConstants.NEXT_HOP)
+    @Param(description = "Next hop of the static route", since = "4.21.0")
+    private String nextHop;
 
     @SerializedName(ApiConstants.CIDR)
     @Param(description = "static route CIDR")
@@ -95,8 +103,16 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
         this.vpcId = vpcId;
     }
 
-    public void setGatewayId(String gatewayId) {
-        this.gatewayId = gatewayId;
+    public void setVpcGatewayId(String vpcGatewayId) {
+        this.vpcGatewayId = vpcGatewayId;
+    }
+
+    public void setVpcGatewayIp(String vpcGatewayIp) {
+        this.vpcGatewayIp = vpcGatewayIp;
+    }
+
+    public void setNextHop(String nextHop) {
+        this.nextHop = nextHop;
     }
 
     public void setCidr(String cidr) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
index be9f14f5060..7b1784fc767 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -38,14 +38,6 @@ public class SystemVmResponse extends BaseResponseWithAnnotations {
     @Param(description = "the system VM type")
     private String systemVmType;
 
-    @SerializedName("jobid")
-    @Param(description = "the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private String jobId;
-
-    @SerializedName("jobstatus")
-    @Param(description = "the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private Integer jobStatus;
-
     @SerializedName("zoneid")
     @Param(description = "the Zone ID for the system VM")
     private String zoneId;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
index 1492c23e882..2be08bb7fcb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
@@ -127,9 +127,9 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
     @Param(description = "indicates whether VLAN IP range is dedicated to system vms or not")
     private Boolean forSystemVms;
 
-    @SerializedName(ApiConstants.FOR_NSX)
-    @Param(description = "indicates whether IP range is dedicated to NSX resources or not")
-    private Boolean forNsx;
+    @SerializedName(ApiConstants.PROVIDER)
+    @Param(description = "indicates to which provider the IP range is dedicated to", since = "4.21.0")
+    private String provider;
 
     public void setId(String id) {
         this.id = id;
@@ -249,7 +249,7 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
         this.ip6Cidr = ip6Cidr;
     }
 
-    public void setForNsx(Boolean forNsx) {
-        this.forNsx = forNsx;
+    public void setProvider(String provider) {
+        this.provider = provider;
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
index 8e9a993bac6..975d9edcca1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -145,10 +145,15 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
     @Param(description = "the type of the zone - core or edge", since = "4.18.0")
     String type;
 
+    @Deprecated(since = "4.21.0")
     @SerializedName(ApiConstants.NSX_ENABLED)
     @Param(description = "true, if zone is NSX enabled", since = "4.20.0")
     private boolean nsxEnabled = false;
 
+    @SerializedName(ApiConstants.PROVIDER)
+    @Param(description = "External network provider if any", since = "4.21.0")
+    private String provider = null;
+
     @SerializedName(ApiConstants.MULTI_ARCH)
     @Param(description = "true, if zone contains clusters and hosts from different CPU architectures", since = "4.20")
     private boolean multiArch;
@@ -381,6 +386,14 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
         return nsxEnabled;
     }
 
+    public String getProvider() {
+        return provider;
+    }
+
+    public void setProvider(String provider) {
+        this.provider = provider;
+    }
+
     @Override
     public void setResourceIconResponse(ResourceIconResponse resourceIconResponse) {
         this.resourceIconResponse = resourceIconResponse;
diff --git a/client/pom.xml b/client/pom.xml
index 60bd34cc334..38a4c405120 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1092,6 +1092,11 @@
                     <artifactId>cloud-plugin-network-nsx</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.cloudstack</groupId>
+                    <artifactId>cloud-plugin-network-netris</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.cloudstack</groupId>
                     <artifactId>cloud-plugin-network-tungsten</artifactId>
diff --git a/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index b299c602dde..351702a048c 100644
--- a/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -25,7 +25,6 @@ import java.util.Map;
 public class CheckS2SVpnConnectionsAnswer extends Answer {
     Map<String, Boolean> ipToConnected;
     Map<String, String> ipToDetail;
-    String details;
 
     protected CheckS2SVpnConnectionsAnswer() {
         ipToConnected = new HashMap<String, Boolean>();
diff --git a/core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java
index 06583f2d0d3..fef0ceed6b8 100644
--- a/core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -36,6 +36,7 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand {
     String routerIpv6Gateway = null;
     String routerIpv6Cidr = null;
     boolean isVrGuestGateway = false;
+    long networkId;
 
     public NicTO getNic() {
         return nic;
@@ -123,4 +124,12 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand {
     public void setVrGuestGateway(boolean vrGuestGateway) {
         isVrGuestGateway = vrGuestGateway;
     }
+
+    public long getNetworkId() {
+        return networkId;
+    }
+
+    public void setNetworkId(long networkId) {
+        this.networkId = networkId;
+    }
 }
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java
index 1a6824ceb7f..57c96ec4bc9 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java
@@ -76,6 +76,7 @@ public class SetGuestNetworkConfigItem extends AbstractConfigItemFacade {
         guestNetwork.setRouterIp6Gateway(command.getRouterIpv6Gateway());
         guestNetwork.setRouterIp6Cidr(command.getRouterIpv6Cidr());
         guestNetwork.setVrGuestGateway(command.isVrGuestGateway());
+        guestNetwork.setNetworkId(command.getNetworkId());
 
         return generateConfigItems(guestNetwork);
     }
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java
index a416b4bc5e4..6bf36d62bf9 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java
@@ -38,6 +38,7 @@ public class GuestNetwork extends ConfigBase {
     private String routerIp6Gateway;
     private String routerIp6Cidr;
     private boolean isVrGuestGateway;
+    long networkId;
 
     private Integer mtu;
 
@@ -211,4 +212,12 @@ public class GuestNetwork extends ConfigBase {
     public void setVrGuestGateway(boolean vrGuestGateway) {
         isVrGuestGateway = vrGuestGateway;
     }
+
+    public long getNetworkId() {
+        return networkId;
+    }
+
+    public void setNetworkId(long networkId) {
+        this.networkId = networkId;
+    }
 }
diff --git a/core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java
index 7229f0903b7..eabcc82040d 100644
--- a/core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java
+++ b/core/src/main/java/com/cloud/agent/transport/ArrayTypeAdaptor.java
@@ -75,13 +75,17 @@ public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerialize
             try {
                 clazz = Class.forName(name);
             } catch (ClassNotFoundException e) {
-                throw new CloudRuntimeException("can't find " + name);
+                throw new JsonParseException("can't find " + name);
             }
             T cmd = (T)_gson.fromJson(entry.getValue(), clazz);
             cmds.add(cmd);
         }
-        Class<?> type = ((Class<?>)typeOfT).getComponentType();
-        T[] ts = (T[])Array.newInstance(type, cmds.size());
-        return cmds.toArray(ts);
+        try {
+            Class<?> type =  Class.forName(typeOfT.getTypeName().replace("[]", ""));
+            T[] ts = (T[])Array.newInstance(type, cmds.size());
+            return cmds.toArray(ts);
+        } catch (ClassNotFoundException e) {
+            throw new CloudRuntimeException("can't find " + typeOfT.getTypeName());
+        }
     }
 }
diff --git a/core/src/test/java/com/cloud/agent/transport/ResponseTest.java b/core/src/test/java/com/cloud/agent/transport/ResponseTest.java
new file mode 100644
index 00000000000..06869b42eb9
--- /dev/null
+++ b/core/src/test/java/com/cloud/agent/transport/ResponseTest.java
@@ -0,0 +1,46 @@
+//
+// 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.
+//
+
+package com.cloud.agent.transport;
+
+import junit.framework.TestCase;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.junit.Assert;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
+
+import com.cloud.agent.transport.Request.Version;
+
+public class ResponseTest extends TestCase {
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    public void testCheckS2SVpnConnectionsAnswer() {
+        logger.info("Testing CheckS2SVpnConnectionsAnswer");
+        String content = "[{\"com.cloud.agent.api.CheckS2SVpnConnectionsAnswer\":{\"ipToConnected\":{\"10.0.53.13\":true}," +
+                "\"ipToDetail\":{\"10.0.53.13\":\"IPsec SA found;Site-to-site VPN have connected\"}," +
+                "\"details\":\"10.0.53.13:0:IPsec SA found;Site-to-site VPN have connected\\u0026\\n\"," +
+                "\"result\":true,\"contextMap\":{},\"wait\":0,\"bypassHostMaintenance\":false}}]";
+        Response response = new Response(Version.v2, 1L, 2L, 3L, 1L, (short)1, content);
+        Answer answer = response.getAnswer();
+        Assert.assertTrue(answer instanceof CheckS2SVpnConnectionsAnswer);
+    }
+
+}
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 56cfc2cba9c..e40946ce312 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -85,4 +85,7 @@ mvn install:install-file -Dfile=juniper-contrail-api-1.0-SNAPSHOT.jar -DgroupId=
 # From https://github.com/radu-todirica/tungsten-api/raw/master/net/juniper/tungsten/juniper-tungsten-api/2.0/juniper-tungsten-api-2.0.jar
 mvn install:install-file -Dfile=juniper-tungsten-api-2.0.jar -DgroupId=net.juniper.tungsten -DartifactId=juniper-tungsten-api -Dversion=2.0 -Dpackaging=jar
 
+# Netris Integration
+mvn install:install-file -Dfile=netris-java-sdk-1.0.0.jar -DgroupId=io.netris -DartifactId=netris-java-sdk -Dversion=1.0.0 -Dpackaging=jar
+
 exit 0
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index 8463d9cee98..adce5f2f8b4 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -112,6 +112,9 @@ public interface NetworkOrchestrationService {
     static final ConfigKey<Boolean> NSX_ENABLED = new ConfigKey<>(Boolean.class, "nsx.plugin.enable", "Advanced", "false",
             "Indicates whether to enable the NSX plugin", false, ConfigKey.Scope.Zone, null);
 
+    ConfigKey<Boolean> NETRIS_ENABLED = new ConfigKey<>(Boolean.class, "netris.plugin.enable", "Advanced", "false",
+            "Indicates whether to enable the Netris plugin", false, ConfigKey.Scope.Zone, null);
+
     List<? extends Network> setupNetwork(Account owner, NetworkOffering offering, DeploymentPlan plan, String name, String displayText, boolean isDefault)
         throws ConcurrentOperationException;
 
diff --git a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
index 5655a0593c8..eebf764289d 100644
--- a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
+++ b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
@@ -223,6 +223,7 @@ public interface ConfigurationManager {
      * @param forVpc
      * @param forTungsten
      * @param forNsx
+     * @param forNetris
      * @param domainIds
      * @param zoneIds
      * @return network offering object
@@ -232,11 +233,11 @@ public interface ConfigurationManager {
                                             Integer networkRate, Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, Network.GuestType type, boolean systemOnly, Long serviceOfferingId,
                                             boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,
                                             Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive, Boolean forVpc,
-                                            Boolean forTungsten, boolean forNsx, NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, final NetUtils.InternetProtocol internetProtocol,
+                                            Boolean forTungsten, boolean forNsx, boolean forNetris, NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, final NetUtils.InternetProtocol internetProtocol,
                                             NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber);
 
     Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, boolean forSystemVms, Long podId, String startIP, String endIP,
-        String vlanGateway, String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr, boolean forNsx)
+        String vlanGateway, String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr, Provider provider)
         throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException;
 
     void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
diff --git a/engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java b/engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java
index d69a72a02c5..7132094ce11 100644
--- a/engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java
+++ b/engine/components-api/src/main/java/com/cloud/network/addr/PublicIp.java
@@ -275,5 +275,9 @@ public class PublicIp implements PublicIpAddress {
         return false;
     }
 
+    @Override
+    public boolean isForRouter() {
+        return _addr.isForRouter();
+    }
 
 }
diff --git a/engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java b/engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java
index 79ffdfdb973..5ba74402a4c 100644
--- a/engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java
+++ b/engine/components-api/src/main/java/com/cloud/network/rules/RulesManager.java
@@ -54,6 +54,8 @@ public interface RulesManager extends RulesService {
 
     boolean disableStaticNat(long ipAddressId, Account caller, long callerUserId, boolean releaseIpIfElastic) throws ResourceUnavailableException;
 
+    boolean applyStaticNatForIp(long sourceIpId, boolean continueOnError, Account caller, boolean forRevoke);
+
     /**
      * @param networkId
      * @param continueOnError
diff --git a/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java b/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java
index de69b894183..b192cd8d71c 100644
--- a/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java
+++ b/engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java
@@ -93,5 +93,5 @@ public interface NetworkACLManager {
 
     boolean applyACLToPrivateGw(PrivateGateway gateway) throws ResourceUnavailableException;
 
-    boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems);
+    boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems, Network.Provider networkProvider);
 }
diff --git a/engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java b/engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java
index 626c4da1bb1..e7f41d079a7 100644
--- a/engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java
+++ b/engine/components-api/src/main/java/com/cloud/network/vpc/VpcManager.java
@@ -195,4 +195,20 @@ public interface VpcManager {
      * @return
      */
     boolean isSrcNatIpRequired(long vpcOfferingId);
+
+    boolean isSrcNatIpRequiredForVpcVr(long vpcOfferingId);
+
+    List<StaticRouteVO> getVpcStaticRoutes(Long vpcId);
+
+    List<StaticRouteProfile> getVpcStaticRoutes(List<? extends StaticRoute> routes);
+
+    boolean isProviderSupportServiceInVpc(long vpcId, Service service, Provider provider);
+
+    IPAddressVO getIpAddressForVpcVr(Vpc vpc, IPAddressVO ipAddress, boolean allocateIpIfNeeded);
+
+    boolean configStaticNatForVpcVr(Vpc vpc, IPAddressVO ipAddress);
+
+    void reconfigStaticNatForVpcVr(Long vpcId);
+
+    boolean applyStaticRouteForVpcVpnIfNeeded(Long vpcId, boolean updateAllVpn) throws ResourceUnavailableException;
 }
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9f8688af8bf..9d07a5c7df6 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -43,6 +43,8 @@ import com.cloud.bgp.BGPService;
 import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.dao.ASNumberDao;
 import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.network.dao.Ipv6GuestPrefixSubnetNetworkMapDao;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -355,9 +357,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
     @Inject
     private NsxProviderDao nsxProviderDao;
     @Inject
+    private NetrisProviderDao netrisProviderDao;
+    @Inject
     private ASNumberDao asNumberDao;
     @Inject
     private BGPService bgpService;
+    @Inject
+    private Ipv6GuestPrefixSubnetNetworkMapDao ipv6GuestPrefixSubnetNetworkMapDao;
 
     @Override
     public List<NetworkGuru> getNetworkGurus() {
@@ -558,27 +564,27 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.QuickCloudNoServices) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, "Offering for QuickCloud with no services", TrafficType.Guest, null, true,
                             Availability.Optional, null, new HashMap<Network.Service, Set<Network.Provider>>(), true, Network.GuestType.Shared, false, null, true, null, true,
-                            false, null, false, null, true, false, false, false, null, null, null, true, null, null, false);
+                            false, null, false, null, true, false, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#2 - SG enabled network offering
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOfferingWithSGService) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "Offering for Shared Security group enabled networks",
                             TrafficType.Guest, null, true, Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true,
-                            null, true, false, null, false, null, true, false, false, false, null, null, null, true, null, null, false);
+                            null, true, false, null, false, null, true, false, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#3 - shared network offering with no SG service
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOffering) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOffering, "Offering for Shared networks", TrafficType.Guest, null, true,
                             Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false, null, false,
-                            null, true, false, false, false, null,null, null, true, null, null, false);
+                            null, true, false, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE, "Offering for Tungsten Shared Security group enabled networks",
                             TrafficType.Guest, null, true, Availability.Optional, null, defaultTungstenSharedSGEnabledNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true,
-                            null, true, false, null, false, null, true, false, true, false, null, null,null, true, null, null, false);
+                            null, true, false, null, false, null, true, false, true, false, false, null, null, null, true, null, null, false);
                     offering.setState(NetworkOffering.State.Enabled);
                     _networkOfferingDao.update(offering.getId(), offering);
                 }
@@ -588,15 +594,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService,
                             "Offering for Isolated networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Required, null,
                             defaultIsolatedSourceNatEnabledNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null,
-                            true, false, false, false, null, null,null, true, null, null, false);
+                            true, false, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#5 - default vpc offering with LB service
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
                             "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null,
-                            defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);
-
+                            defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#6 - default vpc offering with no LB service
@@ -605,14 +610,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                     defaultVPCOffProviders.remove(Service.Lb);
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
                             "Offering for Isolated VPC networks with Source Nat service enabled and LB service disabled", TrafficType.Guest, null, false, Availability.Optional,
-                            null, defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);
+                            null, defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#7 - isolated offering with source nat disabled
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOffering) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOffering, "Offering for Isolated networks with no Source Nat service",
                             TrafficType.Guest, null, true, Availability.Optional, null, defaultIsolatedNetworkOfferingProviders, true, Network.GuestType.Isolated, false, null,
-                            true, null, true, false, null, false, null, true, false, false, false, null, null, null, true, null, null, false);
+                            true, null, true, false, null, false, null, true, false, false, false, false, null, null, null, true, null, null, false);
                 }
 
                 //#8 - network offering with internal lb service
@@ -634,7 +639,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB,
                             "Offering for Isolated VPC networks with Internal Lb support", TrafficType.Guest, null, false, Availability.Optional, null, internalLbOffProviders,
-                            true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, null, null, null, true, null, null, false);
+                            true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false, null, null, null, true, null, null, false);
                     offering.setInternalLb(true);
                     offering.setPublicLb(false);
                     _networkOfferingDao.update(offering.getId(), offering);
@@ -665,7 +670,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedEIPandELBNetworkOffering) == null) {
                     offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedEIPandELBNetworkOffering,
                             "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, null, true, Availability.Optional, null,
-                            netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true, false, false, false, null, null, null, true, null, null, false);
+                            netscalerServiceProviders, true, Network.GuestType.Shared, false, null, true, serviceCapabilityMap, true, false, null, false, null, true, false, false, false, false, null, null, null, true, null, null, false);
                     offering.setDedicatedLB(false);
                     _networkOfferingDao.update(offering.getId(), offering);
                 }
@@ -822,6 +827,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                         if (domainId != null && aclType == ACLType.Domain) {
                             _networksDao.addDomainToNetwork(id, domainId, subdomainAccess == null || subdomainAccess);
                         }
+                        String ipv6Cidr = network.getIp6Cidr();
+                        String ipv6Gateway = network.getIp6Gateway();
+                        if (StringUtils.isNoneBlank(ipv6Cidr, ipv6Gateway)) {
+                            ipv6Service.assignIpv6SubnetToNetwork(ipv6Cidr, networkPersisted.getId());
+                        }
                     }
                 });
                 guru.setup(network, relatedFile);
@@ -1056,7 +1066,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
         return Transaction.execute(new TransactionCallback<NicVO>() {
             @Override
             public NicVO doInTransaction(TransactionStatus status) {
-                NicVO vo = _nicDao.findByIp4AddressAndNetworkId(profile.getIPv4Address(), networkId);
+                NicVO vo = _nicDao.findNonPlaceHolderByIp4AddressAndNetworkId(profile.getIPv4Address(), networkId);
                 if (vo == null) {
                     applyProfileToNic(nic, profile, deviceId);
                     vo = _nicDao.persist(nic);
@@ -1083,10 +1093,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                 return null;
             }
 
-            if (isNicAllocatedForNsxPublicNetworkOnVR(network, profile, vm)) {
+            if (isNicAllocatedForProviderPublicNetworkOnVR(network, profile, vm, Provider.Nsx)) {
                 String guruName = "NsxPublicNetworkGuru";
                 NetworkGuru nsxGuru = AdapterBase.getAdapterByName(networkGurus, guruName);
                 nsxGuru.allocate(network, profile, vm);
+            } else if (isNicAllocatedForProviderPublicNetworkOnVR(network, profile, vm, Provider.Netris)) {
+                String guruName = "NetrisPublicNetworkGuru";
+                NetworkGuru netrisGuru = AdapterBase.getAdapterByName(networkGurus, guruName);
+                netrisGuru.allocate(network, profile, vm);
             }
 
             if (isDefaultNic != null) {
@@ -1149,7 +1163,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
         return new Pair<NicProfile, Integer>(vmNic, Integer.valueOf(deviceId));
     }
 
-    private boolean isNicAllocatedForNsxPublicNetworkOnVR(Network network, NicProfile requested, VirtualMachineProfile vm) {
+    private boolean isNicAllocatedForProviderPublicNetworkOnVR(Network network, NicProfile requested, VirtualMachineProfile vm, Provider provider) {
         if (ObjectUtils.anyNull(network, requested, vm)) {
             return false;
         }
@@ -1159,7 +1173,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
             return false;
         }
         long dataCenterId = vm.getVirtualMachine().getDataCenterId();
-        if (nsxProviderDao.findByZoneId(dataCenterId) == null) {
+        if (Provider.Nsx == provider && nsxProviderDao.findByZoneId(dataCenterId) == null) {
+            return false;
+        } else if (Provider.Netris == provider && netrisProviderDao.findByZoneId(dataCenterId) == null) {
             return false;
         }
 
@@ -1169,14 +1185,16 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
         if (CollectionUtils.isEmpty(ips)) {
             return false;
         }
+
         ips = ips.stream().filter(x -> !x.getAddress().addr().equals(requested.getIPv4Address())).collect(Collectors.toList());
         IPAddressVO ip = ips.get(0);
-        VlanDetailsVO vlanDetail = vlanDetailsDao.findDetail(ip.getVlanId(), ApiConstants.NSX_DETAIL_KEY);
+        String detailKey = Provider.Nsx == provider ? ApiConstants.NSX_DETAIL_KEY : ApiConstants.NETRIS_DETAIL_KEY;
+        VlanDetailsVO vlanDetail = vlanDetailsDao.findDetail(ip.getVlanId(), detailKey);
         if (vlanDetail == null) {
             return false;
         }
-        boolean isForNsx = vlanDetail.getValue().equalsIgnoreCase("true");
-        return isForNsx && !ip.isForSystemVms();
+        boolean isForProvider = vlanDetail.getValue().equalsIgnoreCase("true");
+        return isForProvider && !ip.isForSystemVms();
     }
 
     private void setMtuDetailsInVRNic(final Pair<NetworkVO, VpcVO> networks, Network network, NicVO vo) {
@@ -1694,6 +1712,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                     }
                 }
             }
+            reconfigureAndApplyStaticRouteForVpcVpn(network);
         } finally {
             for (final NetworkElement element : networkElements) {
                 if (element instanceof AggregatedCommandExecutor && providersToImplement.contains(element.getProvider())) {
@@ -1703,6 +1722,17 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
         }
     }
 
+    private void reconfigureAndApplyStaticRouteForVpcVpn(Network network) {
+        if (network.getVpcId() != null) {
+            _vpcMgr.reconfigStaticNatForVpcVr(network.getVpcId());
+            try {
+                _vpcMgr.applyStaticRouteForVpcVpnIfNeeded(network.getVpcId(), true);
+            } catch (ResourceUnavailableException e) {
+                logger.error("Unable to apply static routes for vpc " + network.getVpcId() + " due to " + e.getMessage());
+            }
+        }
+    }
+
     private void implementNetworkElements(final DeployDestination dest, final ReservationContext context, final Network network, final NetworkOffering offering, final List<Provider> providersToImplement)
             throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
         for (NetworkElement element : networkElements) {
@@ -1939,6 +1969,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                                 ip.setOneToOneNat(false);
                                 ip.setAssociatedWithVmId(null);
                                 ip.setVmIp(null);
+                                ip.setForRouter(false);
                                 _ipAddressDao.update(ip.getId(), ip);
                             }
                         }
@@ -3296,6 +3327,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
                 }
             }
         }
+        reconfigureAndApplyStaticRouteForVpcVpn(network);
         return success;
     }
 
@@ -4877,6 +4909,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
         return new ConfigKey<?>[]{NetworkGcWait, NetworkGcInterval, NetworkLockTimeout, DeniedRoutes,
                 GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion,
                 PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled,
-                TUNGSTEN_ENABLED, NSX_ENABLED };
+                TUNGSTEN_ENABLED, NSX_ENABLED, NETRIS_ENABLED };
     }
 }
diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java
index 84f38f05441..a6c267bb189 100644
--- a/engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java
+++ b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDao.java
@@ -64,4 +64,6 @@ public interface VlanDao extends GenericDao<VlanVO, Long> {
     List<VlanVO> listIpv6RangeByZoneIdAndVlanId(long zoneId, String vlanId);
 
     List<VlanVO> listIpv6SupportingVlansByZone(long zoneId);
+
+    List<VlanVO> listVlansForExternalNetworkProvider(long zoneId, String detailKey);
 }
diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java
index 461a9a13b10..d9fad3cad12 100644
--- a/engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.dc.VlanDetailsVO;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -67,6 +68,8 @@ public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao
     protected SearchBuilder<VlanVO> ZoneVlanIp6Search;
     protected SearchBuilder<VlanVO> ZoneIp6Search;
     protected SearchBuilder<VlanVO> ZoneVlansSearch;
+    protected SearchBuilder<VlanVO> ProviderVlanSearch;
+    protected SearchBuilder<VlanDetailsVO> VlanDetailsProviderSearch;
 
     protected SearchBuilder<AccountVlanMapVO> AccountVlanMapSearch;
     protected SearchBuilder<DomainVlanMapVO> DomainVlanMapSearch;
@@ -79,6 +82,8 @@ public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao
     protected DomainVlanMapDao _domainVlanMapDao;
     @Inject
     protected IPAddressDao _ipAddressDao;
+    @Inject
+    protected VlanDetailsDao vlanDetailsDao;
 
     @Override
     public VlanVO findByZoneAndVlanId(long zoneId, String vlanId) {
@@ -277,6 +282,19 @@ public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao
         ZoneVlansSearch.and("zoneId", ZoneVlansSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         ZoneVlansSearch.and("vlan", ZoneVlansSearch.entity().getVlanTag(), SearchCriteria.Op.IN);
         ZoneVlansSearch.done();
+
+        ProviderVlanSearch = createSearchBuilder();
+        ProviderVlanSearch.and("removed", ProviderVlanSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
+        ProviderVlanSearch.and("dataCenterId", ProviderVlanSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        VlanDetailsProviderSearch = vlanDetailsDao.createSearchBuilder();
+        VlanDetailsProviderSearch.and("name", VlanDetailsProviderSearch.entity().getName(), SearchCriteria.Op.EQ);
+        VlanDetailsProviderSearch.and("value", VlanDetailsProviderSearch.entity().getValue(), SearchCriteria.Op.EQ);
+        ProviderVlanSearch.join("VlanDetailsProviderSearch", VlanDetailsProviderSearch, ProviderVlanSearch.entity().getId(),
+                VlanDetailsProviderSearch.entity().getResourceId(), JoinBuilder.JoinType.INNER);
+
+        VlanDetailsProviderSearch.done();
+        ProviderVlanSearch.done();
+
         return result;
     }
 
@@ -434,4 +452,13 @@ public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao
         return listBy(sc);
     }
 
+    @Override
+    public List<VlanVO> listVlansForExternalNetworkProvider(long zoneId, String detailKey) {
+        SearchCriteria<VlanVO> sc = ProviderVlanSearch.create();
+        sc.setParameters("dataCenterId", zoneId);
+        sc.setJoinParameters("VlanDetailsProviderSearch", "name", detailKey);
+        sc.setJoinParameters("VlanDetailsProviderSearch", "value", "true");
+        return search(sc, null);
+    }
+
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java
index 5499d04e3a1..0a5ecd25667 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -197,6 +197,7 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
         address.setSourceNat(false);
         address.setOneToOneNat(false);
         address.setAssociatedWithVmId(null);
+        address.setForRouter(false);
         address.setState(State.Free);
         address.setAssociatedWithNetworkId(null);
         address.setVpcId(null);
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java
index 88e146d2a80..a3a65fdb01b 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java
@@ -117,6 +117,9 @@ public class IPAddressVO implements IpAddress {
     @Column(name = "forsystemvms")
     private boolean forSystemVms = false;
 
+    @Column(name = "for_router")
+    private boolean forRouter = false;
+
     @Column(name= GenericDao.REMOVED_COLUMN)
     private Date removed;
 
@@ -388,4 +391,13 @@ public class IPAddressVO implements IpAddress {
     public boolean isForSystemVms() {
         return forSystemVms;
     }
+
+    @Override
+    public boolean isForRouter() {
+        return forRouter;
+    }
+
+    public void setForRouter(boolean forRouter) {
+        this.forRouter = forRouter;
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDao.java
new file mode 100644
index 00000000000..fe21f72e4db
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDao.java
@@ -0,0 +1,24 @@
+// 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.
+package com.cloud.network.dao;
+
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.utils.db.GenericDao;
+
+public interface NetrisProviderDao extends GenericDao<NetrisProviderVO, Long> {
+    NetrisProviderVO findByZoneId(long zoneId);
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java
new file mode 100644
index 00000000000..86ea04f1db0
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java
@@ -0,0 +1,52 @@
+// 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.
+package com.cloud.network.dao;
+
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.springframework.stereotype.Component;
+
+@Component
+@DB()
+public class NetrisProviderDaoImpl extends GenericDaoBase<NetrisProviderVO, Long> implements NetrisProviderDao {
+
+    final SearchBuilder<NetrisProviderVO> allFieldsSearch;
+
+    public NetrisProviderDaoImpl() {
+        super();
+        allFieldsSearch = createSearchBuilder();
+        allFieldsSearch.and("id", allFieldsSearch.entity().getId(),
+                SearchCriteria.Op.EQ);
+        allFieldsSearch.and("uuid", allFieldsSearch.entity().getUuid(),
+                SearchCriteria.Op.EQ);
+        allFieldsSearch.and("hostname", allFieldsSearch.entity().getUrl(),
+                SearchCriteria.Op.EQ);
+        allFieldsSearch.and("zone_id", allFieldsSearch.entity().getZoneId(),
+                SearchCriteria.Op.EQ);
+        allFieldsSearch.done();
+    }
+
+    @Override
+    public NetrisProviderVO findByZoneId(long zoneId) {
+        SearchCriteria<NetrisProviderVO> sc = allFieldsSearch.create();
+        sc.setParameters("zone_id", zoneId);
+        return findOneBy(sc);
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java
index 8113c06c866..f4120a138ac 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDao.java
@@ -33,4 +33,6 @@ public interface RemoteAccessVpnDao extends GenericDao<RemoteAccessVpnVO, Long>
     List<RemoteAccessVpnVO> findByAccount(Long accountId);
 
     List<RemoteAccessVpnVO> listByNetworkId(Long networkId);
+
+    List<RemoteAccessVpnVO> listByVpcId(Long vpcId);
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
index 484aa6f6631..ccbc60a5562 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
@@ -85,4 +85,11 @@ public class RemoteAccessVpnDaoImpl extends GenericDaoBase<RemoteAccessVpnVO, Lo
         sc.setParameters("networkId", networkId);
         return listBy(sc);
     }
+
+    @Override
+    public List<RemoteAccessVpnVO> listByVpcId(Long vpcId) {
+        SearchCriteria<RemoteAccessVpnVO> sc = AllFieldsSearch.create();
+        sc.setParameters("vpcId", vpcId);
+        return listBy(sc);
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java
index d3fef252f50..3475003c269 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDao.java
@@ -20,4 +20,6 @@ import com.cloud.utils.db.GenericDao;
 
 public interface Site2SiteVpnGatewayDao extends GenericDao<Site2SiteVpnGatewayVO, Long> {
     Site2SiteVpnGatewayVO findByVpcId(long vpcId);
+
+    Site2SiteVpnGatewayVO findByPublicIpAddress(long ipAddressId);
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
index d1fde963217..0aeefe90c29 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
@@ -35,6 +35,7 @@ public class Site2SiteVpnGatewayDaoImpl extends GenericDaoBase<Site2SiteVpnGatew
     protected Site2SiteVpnGatewayDaoImpl() {
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("vpcId", AllFieldsSearch.entity().getVpcId(), SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("ipAddressId", AllFieldsSearch.entity().getAddrId(), SearchCriteria.Op.EQ);
         AllFieldsSearch.done();
     }
 
@@ -44,4 +45,11 @@ public class Site2SiteVpnGatewayDaoImpl extends GenericDaoBase<Site2SiteVpnGatew
         sc.setParameters("vpcId", vpcId);
         return findOneBy(sc);
     }
+
+    @Override
+    public Site2SiteVpnGatewayVO findByPublicIpAddress(long ipAddressId) {
+        SearchCriteria<Site2SiteVpnGatewayVO> sc = AllFieldsSearch.create();
+        sc.setParameters("ipAddressId", ipAddressId);
+        return findOneBy(sc);
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java b/engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java
new file mode 100644
index 00000000000..113678f7b01
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java
@@ -0,0 +1,265 @@
+// 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.
+package com.cloud.network.element;
+
+import com.cloud.network.netris.NetrisProvider;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.UUID;
+
+@Entity
+@Table(name = "netris_providers")
+public class NetrisProviderVO implements NetrisProvider {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    long id;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "zone_id")
+    private long zoneId;
+
+    @Column(name = "host_id")
+    private long hostId;
+
+    @Column(name = "url")
+    private String url;
+
+    @Column(name = "username")
+    private String username;
+
+    @Column(name = "password")
+    private String password;
+
+    @Column(name = "site_name")
+    private String siteName;
+
+    @Column(name = "tenant_name")
+    private String tenantName;
+
+    @Column(name = "netris_tag")
+    private String netrisTag;
+
+    @Column(name = "created")
+    private Date created;
+
+    @Column(name = "removed")
+    private Date removed;
+
+    public NetrisProviderVO() {
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public long getZoneId() {
+        return zoneId;
+    }
+
+    public void setZoneId(long zoneId) {
+        this.zoneId = zoneId;
+    }
+
+    public long getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(long hostId) {
+        this.hostId = hostId;
+    }
+
+    @Override
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    public static final class Builder {
+        private long zoneId;
+        private long hostId;
+        private String name;
+        private String url;
+        private String username;
+        private String password;
+        private String siteName;
+        private String tenantName;
+        private String netrisTag;
+
+        public Builder() {
+            // Default constructor
+        }
+
+        public Builder setZoneId(long zoneId) {
+            this.zoneId = zoneId;
+            return this;
+        }
+
+        public Builder setHostId(long hostId) {
+            this.hostId = hostId;
+            return this;
+        }
+
+        public Builder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder setUrl(String url) {
+            this.url = url;
+            return this;
+        }
+
+        public Builder setUsername(String username) {
+            this.username = username;
+            return this;
+        }
+
+        public Builder setPassword(String password) {
+            this.password = password;
+            return this;
+        }
+
+        public Builder setSiteName(String siteName) {
+            this.siteName = siteName;
+            return this;
+        }
+
+        public Builder setTenantName(String tenantName) {
+            this.tenantName = tenantName;
+            return this;
+        }
+
+        public Builder setNetrisTag(String netrisTag) {
+            this.netrisTag = netrisTag;
+            return this;
+        }
+
+        public NetrisProviderVO build() {
+            NetrisProviderVO provider = new NetrisProviderVO();
+            provider.setZoneId(this.zoneId);
+            provider.setHostId(this.hostId);
+            provider.setUuid(UUID.randomUUID().toString());
+            provider.setName(this.name);
+            provider.setUrl(this.url);
+            provider.setUsername(this.username);
+            provider.setPassword(this.password);
+            provider.setSiteName(this.siteName);
+            provider.setTenantName(this.tenantName);
+            provider.setNetrisTag(this.netrisTag);
+            provider.setCreated(new Date());
+            return provider;
+        }
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java
index 2246bd6eed2..632d96819cd 100644
--- a/engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java
+++ b/engine/schema/src/main/java/com/cloud/network/vpc/StaticRouteVO.java
@@ -27,6 +27,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import com.cloud.utils.db.GenericDao;
 
@@ -42,7 +43,10 @@ public class StaticRouteVO implements StaticRoute {
     String uuid;
 
     @Column(name = "vpc_gateway_id", updatable = false)
-    long vpcGatewayId;
+    Long vpcGatewayId;
+
+    @Column(name = "next_hop")
+    private String nextHop;
 
     @Column(name = "cidr")
     private String cidr;
@@ -67,6 +71,9 @@ public class StaticRouteVO implements StaticRoute {
         uuid = UUID.randomUUID().toString();
     }
 
+    @Transient
+    boolean forVpn = false;
+
     /**
      * @param vpcGatewayId
      * @param cidr
@@ -74,7 +81,7 @@ public class StaticRouteVO implements StaticRoute {
      * @param accountId TODO
      * @param domainId TODO
      */
-    public StaticRouteVO(long vpcGatewayId, String cidr, Long vpcId, long accountId, long domainId) {
+    public StaticRouteVO(Long vpcGatewayId, String cidr, Long vpcId, long accountId, long domainId, String nextHop) {
         super();
         this.vpcGatewayId = vpcGatewayId;
         this.cidr = cidr;
@@ -82,14 +89,32 @@ public class StaticRouteVO implements StaticRoute {
         this.vpcId = vpcId;
         this.accountId = accountId;
         this.domainId = domainId;
+        this.nextHop = nextHop;
         uuid = UUID.randomUUID().toString();
     }
 
+    public StaticRouteVO(String cidr, Long vpcId, long accountId, long domainId, String nextHop, State state, boolean forVpn) {
+        super();
+        this.cidr = cidr;
+        this.state = state;
+        this.vpcId = vpcId;
+        this.accountId = accountId;
+        this.domainId = domainId;
+        this.nextHop = nextHop;
+        uuid = UUID.randomUUID().toString();
+        this.forVpn = forVpn;
+    }
+
     @Override
-    public long getVpcGatewayId() {
+    public Long getVpcGatewayId() {
         return vpcGatewayId;
     }
 
+    @Override
+    public String getNextHop() {
+        return nextHop;
+    }
+
     @Override
     public String getCidr() {
         return cidr;
@@ -145,4 +170,8 @@ public class StaticRouteVO implements StaticRoute {
     public String getName() {
         return null;
     }
+
+    public boolean isForVpn() {
+        return forVpn;
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java b/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java
index 274b9fedecc..9320a37bc96 100644
--- a/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java
+++ b/engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java
@@ -60,9 +60,6 @@ public class VpcOfferingVO implements VpcOffering {
     @Column(name = "default")
     boolean isDefault = false;
 
-    @Column(name = "for_nsx")
-    boolean forNsx = false;
-
     @Column(name = "network_mode")
     NetworkOffering.NetworkMode networkMode;
 
@@ -159,14 +156,6 @@ public class VpcOfferingVO implements VpcOffering {
         return isDefault;
     }
 
-    public boolean isForNsx() {
-        return forNsx;
-    }
-
-    public void setForNsx(boolean forNsx) {
-        this.forNsx = forNsx;
-    }
-
     public NetworkOffering.NetworkMode getNetworkMode() {
         return networkMode;
     }
diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
index 06cfd25e670..020536e97ec 100644
--- a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
+++ b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
@@ -18,6 +18,7 @@ package com.cloud.network.vpc.dao;
 
 import java.util.List;
 
+import com.cloud.network.Network;
 import com.cloud.network.Network.Service;
 import com.cloud.network.vpc.VpcOfferingServiceMapVO;
 import com.cloud.utils.db.GenericDao;
@@ -37,4 +38,8 @@ public interface VpcOfferingServiceMapDao extends GenericDao<VpcOfferingServiceM
 
     VpcOfferingServiceMapVO findByServiceProviderAndOfferingId(String service, String provider, long vpcOfferingId);
 
+    boolean isProviderForVpcOffering(Network.Provider provider, long vpcOfferingId);
+
+    List<VpcOfferingServiceMapVO> listProvidersForServiceForVpcOffering(long vpcOfferingId, Service service);
+
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
index c7400f6edfd..dcb1becf9e8 100644
--- a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
@@ -19,6 +19,7 @@ package com.cloud.network.vpc.dao;
 import java.util.List;
 
 
+import com.cloud.network.Network;
 import org.springframework.stereotype.Component;
 
 import com.cloud.network.Network.Service;
@@ -110,4 +111,22 @@ public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServ
 
         return findOneBy(sc);
     }
+
+    @Override
+    public boolean isProviderForVpcOffering(Network.Provider provider, long vpcOfferingId) {
+        SearchCriteria<VpcOfferingServiceMapVO> sc = AllFieldsSearch.create();
+        sc.setParameters("vpcOffId", vpcOfferingId);
+        sc.setParameters("provider", provider.getName());
+        return findOneBy(sc) != null;
+    }
+
+    @Override
+    public List<VpcOfferingServiceMapVO> listProvidersForServiceForVpcOffering(long vpcOfferingId, Service service) {
+        SearchCriteria<VpcOfferingServiceMapVO> sc = AllFieldsSearch.create();
+
+        sc.setParameters("vpcOffId", vpcOfferingId);
+        sc.setParameters("service", service.getName());
+
+        return customSearch(sc, null);
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
index 753c45fcc78..a5c4c83ff0f 100644
--- a/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
@@ -68,8 +68,15 @@ public class VpcServiceMapDaoImpl extends GenericDaoBase<VpcServiceMapVO, Long>
 
     @Override
     public boolean canProviderSupportServiceInVpc(long vpcId, Service service, Provider provider) {
-        // TODO Auto-generated method stub
-        return false;
+        SearchCriteria<VpcServiceMapVO> sc = AllFieldsSearch.create();
+        sc.setParameters("vpcId", vpcId);
+        sc.setParameters("service", service.getName());
+        sc.setParameters("provider", provider.getName());
+        if (findOneBy(sc) != null) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override
diff --git a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java
index 5cad366945f..904c8e646eb 100644
--- a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java
+++ b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java
@@ -134,12 +134,6 @@ public class NetworkOfferingVO implements NetworkOffering {
     @Column(name = "for_vpc")
     boolean forVpc;
 
-    @Column(name = "for_tungsten")
-    boolean forTungsten = false;
-
-    @Column(name = "for_nsx")
-    boolean forNsx = false;
-
     @Column(name = "network_mode")
     NetworkMode networkMode;
 
@@ -200,24 +194,6 @@ public class NetworkOfferingVO implements NetworkOffering {
         this.forVpc = isForVpc;
     }
 
-    @Override
-    public boolean isForTungsten() {
-        return forTungsten;
-    }
-
-    public void setForTungsten(boolean forTungsten) {
-        this.forTungsten = forTungsten;
-    }
-
-    @Override
-    public boolean isForNsx() {
-        return forNsx;
-    }
-
-    public void setForNsx(boolean forNsx) {
-        this.forNsx = forNsx;
-    }
-
     @Override
     public NetworkMode getNetworkMode() {
         return networkMode;
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
index d34b03c4cb0..70a2558e2d4 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
@@ -46,8 +46,12 @@ public interface NicDao extends GenericDao<NicVO, Long> {
 
     NicVO findByNetworkIdAndTypeIncludingRemoved(long networkId, VirtualMachine.Type vmType);
 
+    NicVO findNonPlaceHolderByNetworkIdAndType(long networkId, VirtualMachine.Type vmType);
+
     NicVO findByIp4AddressAndNetworkId(String ip4Address, long networkId);
 
+    NicVO findNonPlaceHolderByIp4AddressAndNetworkId(String ip4Address, long networkId);
+
     NicVO findByNetworkIdAndMacAddress(long networkId, String mac);
 
     NicVO findDefaultNicForVM(long instanceId);
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
index 7d1af1982ae..3618785c1b8 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
@@ -69,6 +69,7 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ);
         AllFieldsSearch.and("nicid", AllFieldsSearch.entity().getId(), Op.EQ);
         AllFieldsSearch.and("strategy", AllFieldsSearch.entity().getReservationStrategy(), Op.EQ);
+        AllFieldsSearch.and("strategyNEQ", AllFieldsSearch.entity().getReservationStrategy(), Op.NEQ);
         AllFieldsSearch.and("reserverName",AllFieldsSearch.entity().getReserver(),Op.EQ);
         AllFieldsSearch.and("macAddress", AllFieldsSearch.entity().getMacAddress(), Op.EQ);
         AllFieldsSearch.and("deviceid", AllFieldsSearch.entity().getDeviceId(), Op.EQ);
@@ -195,6 +196,15 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         return findByNetworkIdAndTypeInternal(networkId, vmType, true);
     }
 
+    @Override
+    public NicVO findNonPlaceHolderByNetworkIdAndType(long networkId, VirtualMachine.Type vmType) {
+        SearchCriteria<NicVO> sc = AllFieldsSearch.create();
+        sc.setParameters("network", networkId);
+        sc.setParameters("vmType", vmType);
+        sc.setParameters("strategyNEQ", Nic.ReservationStrategy.PlaceHolder.toString());
+        return findOneBy(sc);
+    }
+
     @Override
     public NicVO findByNetworkIdTypeAndGateway(long networkId, VirtualMachine.Type vmType, String gateway) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();
@@ -222,6 +232,16 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         return findOneBy(sc);
     }
 
+    @Override
+    public NicVO findNonPlaceHolderByIp4AddressAndNetworkId(String ip4Address, long networkId) {
+        SearchCriteria<NicVO> sc = AllFieldsSearch.create();
+        sc.setParameters("address", ip4Address);
+        sc.setParameters("network", networkId);
+        sc.setParameters("strategyNEQ", Nic.ReservationStrategy.PlaceHolder.toString());
+        return findOneBy(sc);
+    }
+
+
     @Override
     public NicVO findByNetworkIdAndMacAddress(long networkId, String mac) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 474569f4924..1e144dde8f1 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -138,6 +138,7 @@
   <bean id="objectInDataStoreDaoImpl" class="org.apache.cloudstack.storage.db.ObjectInDataStoreDaoImpl" />
   <bean id="ovsProviderDaoImpl" class="com.cloud.network.dao.OvsProviderDaoImpl" />
   <bean id="nsxControllerDaoImpl" class="com.cloud.network.dao.NsxProviderDaoImpl" />
+  <bean id="netrisProviderDaoImpl" class="com.cloud.network.dao.NetrisProviderDaoImpl" />
   <bean id="tungstenControllerDaoImpl" class="com.cloud.network.dao.TungstenProviderDaoImpl"/>
   <bean id="physicalNetworkDaoImpl" class="com.cloud.network.dao.PhysicalNetworkDaoImpl" />
   <bean id="physicalNetworkIsolationMethodDaoImpl" class="com.cloud.network.dao.PhysicalNetworkIsolationMethodDaoImpl" />
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index cc6c4c6ae05..e2389dc9250 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -238,6 +238,43 @@ CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
     CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
 );
 
+-- Netris Plugin
+CREATE TABLE `cloud`.`netris_providers` (
+                                            `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+                                            `uuid` varchar(40),
+                                            `zone_id` bigint unsigned NOT NULL COMMENT 'Zone ID',
+                                            `host_id` bigint unsigned NOT NULL COMMENT 'Host ID',
+                                            `name` varchar(40),
+                                            `url` varchar(255) NOT NULL,
+                                            `username` varchar(255) NOT NULL,
+                                            `password` varchar(255) NOT NULL,
+                                            `site_name` varchar(255) NOT NULL,
+                                            `tenant_name` varchar(255) NOT NULL,
+                                            `netris_tag` varchar(255) NOT NULL,
+                                            `created` datetime NOT NULL COMMENT 'created date',
+                                            `removed` datetime COMMENT 'removed date if not null',
+                                            PRIMARY KEY (`id`),
+                                            CONSTRAINT `fk_netris_providers__zone_id` FOREIGN KEY `fk_netris_providers__zone_id` (`zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
+                                            INDEX `i_netris_providers__zone_id`(`zone_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Drop the Tungsten and NSX columns from the network offerings (replaced by checking the provider on the ntwk_offering_service_map table)
+ALTER TABLE `cloud`.`network_offerings` DROP COLUMN `for_tungsten`;
+ALTER TABLE `cloud`.`network_offerings` DROP COLUMN `for_nsx`;
+
+-- Drop the Tungsten and NSX columns from the VPC offerings (replaced by checking the provider on the vpc_offering_service_map table)
+ALTER TABLE `cloud`.`vpc_offerings` DROP COLUMN `for_nsx`;
+
+-- Add next_hop to the static_routes table
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.static_routes', 'next_hop', 'varchar(50) COMMENT "next hop of the static route" AFTER `vpc_gateway_id`');
+
+-- Add `for_router` to `user_ip_address` table
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_ip_address', 'for_router', 'tinyint(1) DEFAULT 0 COMMENT "True if the ip address is used by Domain Router to expose services"');
+
+-- Add Netris Autoscaling rules
+INSERT IGNORE INTO `cloud`.`counter` (uuid, provider, source, name, value, created) VALUES (UUID(), 'Netris', 'cpu', 'VM CPU - average percentage', 'vm.cpu.average.percentage', NOW());
+INSERT IGNORE INTO `cloud`.`counter` (uuid, provider, source, name, value, created) VALUES (UUID(), 'Netris', 'memory', 'VM Memory - average percentage', 'vm.memory.average.percentage', NOW());
+
 -- Rename user_vm_details to vm_instance_details
 ALTER TABLE `cloud`.`user_vm_details` RENAME TO `cloud`.`vm_instance_details`;
 ALTER TABLE `cloud`.`vm_instance_details` DROP FOREIGN KEY `fk_user_vm_details__vm_id`;
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql
index 640b2397a46..368566c32b3 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql
@@ -59,8 +59,6 @@ SELECT
     `network_offerings`.`supports_public_access` AS `supports_public_access`,
     `network_offerings`.`supports_vm_autoscaling` AS `supports_vm_autoscaling`,
     `network_offerings`.`for_vpc` AS `for_vpc`,
-    `network_offerings`.`for_tungsten` AS `for_tungsten`,
-    `network_offerings`.`for_nsx` AS `for_nsx`,
     `network_offerings`.`network_mode` AS `network_mode`,
     `network_offerings`.`service_package_id` AS `service_package_id`,
     `network_offerings`.`routing_mode` AS `routing_mode`,
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.vpc_offering_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.vpc_offering_view.sql
index c74d50590de..751d8f91a25 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.vpc_offering_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.vpc_offering_view.sql
@@ -28,7 +28,6 @@ select
     `vpc_offerings`.`display_text` AS `display_text`,
     `vpc_offerings`.`state` AS `state`,
     `vpc_offerings`.`default` AS `default`,
-    `vpc_offerings`.`for_nsx` AS `for_nsx`,
     `vpc_offerings`.`network_mode` AS `network_mode`,
     `vpc_offerings`.`created` AS `created`,
     `vpc_offerings`.`removed` AS `removed`,
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 26b8de53083..52c3de88d93 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
@@ -51,6 +51,10 @@ public class BridgeVifDriver extends VifDriverBase {
     private String _controlCidr = NetUtils.getLinkLocalCIDR();
     private Long libvirtVersion;
 
+    private static boolean isVxlanOrNetris(String protocol) {
+        return protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme()) || protocol.equals(Networks.BroadcastDomainType.Netris.scheme());
+    }
+
     @Override
     public void configure(Map<String, Object> params) throws ConfigurationException {
 
@@ -177,7 +181,7 @@ public class BridgeVifDriver extends VifDriverBase {
 
     protected boolean isBroadcastTypeVlanOrVxlan(final NicTO nic) {
         return nic != null && (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan
-                || nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan);
+                || nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan || nic.getBroadcastType() == Networks.BroadcastDomainType.Netris);
     }
 
     protected boolean isValidProtocolAndVnetId(final String vNetId, final String protocol) {
@@ -284,7 +288,7 @@ public class BridgeVifDriver extends VifDriverBase {
 
     private 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 (nic == null || isVxlanOrNetris(protocol)) {
             // if not found in bridge map, maybe traffic label refers to pif already?
             File pif = new File("/sys/class/net/" + pifKey);
             if (pif.isDirectory()) {
@@ -292,7 +296,7 @@ public class BridgeVifDriver extends VifDriverBase {
             }
         }
         String brName = "";
-        if (protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
+        if (isVxlanOrNetris(protocol)) {
             brName = generateVxnetBrName(nic, vNetId);
         } else {
             brName = generateVnetBrName(nic, vNetId);
@@ -304,7 +308,7 @@ public class BridgeVifDriver extends VifDriverBase {
     private void createVnet(String vnetId, String pif, String brName, String protocol) throws InternalErrorException {
         synchronized (_vnetBridgeMonitor) {
             String script = _modifyVlanPath;
-            if (protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
+            if (isVxlanOrNetris(protocol)) {
                 script = _modifyVxlanPath;
             }
             final Script command = new Script(script, _timeout, logger);
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java
index 2503e0ac7fd..193270cc156 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/element/CiscoNexusVSMElement.java
@@ -24,7 +24,6 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
-
 import com.cloud.api.commands.DeleteCiscoNexusVSMCmd;
 import com.cloud.api.commands.DisableCiscoNexusVSMCmd;
 import com.cloud.api.commands.EnableCiscoNexusVSMCmd;
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 82e486cd103..d95bc0b9784 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
@@ -2646,7 +2646,6 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
                         forVpc, true, false, false);
         if (forNsx) {
             defaultKubernetesServiceNetworkOffering.setNetworkMode(NetworkOffering.NetworkMode.NATTED);
-            defaultKubernetesServiceNetworkOffering.setForNsx(true);
         }
         defaultKubernetesServiceNetworkOffering.setSupportsVmAutoScaling(true);
         defaultKubernetesServiceNetworkOffering.setState(NetworkOffering.State.Enabled);
diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
index 5d88acaa411..93d6afc1df8 100644
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
@@ -701,7 +701,7 @@ public class MetricsServiceImpl extends MutualExclusiveIdsManagerBase implements
             metricsResponse.setCpuTotal(hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
             metricsResponse.setCpuUsed(hostResponse.getCpuUsed(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
             metricsResponse.setCpuAllocated(hostResponse.getCpuAllocated(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
-            metricsResponse.setLoadAverage(hostResponse.getAverageLoad());
+            metricsResponse.setCpuAverageLoad(hostResponse.getAverageLoad());
             metricsResponse.setMemTotal(hostResponse.getMemoryTotal());
             metricsResponse.setMemAllocated(hostResponse.getMemoryAllocated());
             metricsResponse.setMemUsed(hostResponse.getMemoryUsed());
diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
index 8e12d2cbb6d..39d759f333f 100644
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
@@ -52,10 +52,6 @@ public class HostMetricsResponse extends HostResponse {
     @Param(description = "the total cpu allocated in Ghz")
     private String cpuAllocated;
 
-    @SerializedName("cpuloadaverage")
-    @Param(description = "the average cpu load the last minute")
-    private Double loadAverage;
-
     @SerializedName("memorytotalgb")
     @Param(description = "the total memory capacity in GiB")
     private String memTotal;
@@ -132,12 +128,6 @@ public class HostMetricsResponse extends HostResponse {
         }
     }
 
-    public void setLoadAverage(final Double loadAverage) {
-        if (loadAverage != null) {
-            this.loadAverage = loadAverage;
-        }
-    }
-
     public void setCpuAllocated(final String cpuAllocated, final Integer cpuNumber, final Long cpuSpeed) {
         if (cpuAllocated != null && cpuNumber != null && cpuSpeed != null) {
             this.cpuAllocated = String.format("%.2f Ghz", parseCPU(cpuAllocated) * cpuNumber * cpuSpeed / (100.0 * 1000.0));
diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java
index 83c6f3dc7d4..95c3fd09c07 100644
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java
@@ -22,7 +22,6 @@ import org.apache.cloudstack.api.MetricConstants;
 import org.apache.cloudstack.api.response.ManagementServerResponse;
 
 import java.util.Date;
-import java.util.List;
 
 public class ManagementServerMetricsResponse extends ManagementServerResponse {
 
@@ -30,14 +29,6 @@ public class ManagementServerMetricsResponse extends ManagementServerResponse {
     @Param(description = "the number of processors available to the JVM")
     private Integer availableProcessors;
 
-    @SerializedName(MetricConstants.LAST_AGENTS)
-    @Param(description = "the last agents this Management Server is responsible for, before shutdown or preparing for maintenance", since = "4.21.0.0")
-    private List<String> lastAgents;
-
-    @SerializedName(MetricConstants.AGENTS)
-    @Param(description = "the agents this Management Server is responsible for", since = "4.21.0.0")
-    private List<String> agents;
-
     @SerializedName(MetricConstants.AGENT_COUNT)
     @Param(description = "the number of agents this Management Server is responsible for")
     private Integer agentCount;
@@ -130,14 +121,6 @@ public class ManagementServerMetricsResponse extends ManagementServerResponse {
         this.availableProcessors = availableProcessors;
     }
 
-    public void setLastAgents(List<String> lastAgents) {
-        this.lastAgents = lastAgents;
-    }
-
-    public void setAgents(List<String> agents) {
-        this.agents = agents;
-    }
-
     public void setAgentCount(int agentCount) {
         this.agentCount = agentCount;
     }
diff --git a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
index 6da2e216ff8..f360fab0112 100644
--- a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
@@ -217,7 +217,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
         ConfigurationManager configMgr = (ConfigurationManager) _configService;
         NetworkOfferingVO voffer = configMgr.createNetworkOffering(offeringName, offeringDisplayText,
                 TrafficType.Public, null, true, Availability.Optional, null, serviceProviderMap, true,
-                Network.GuestType.Shared, false, null, false, null, true, false, null, true, null, false, false, false, false, null, null, null, true, null, null, false);
+                Network.GuestType.Shared, false, null, false, null, true, false, null, true, null, false, false, false, false, false, null, null, null, true, null, null, false);
         long id = voffer.getId();
         _networkOfferingDao.update(id, voffer);
         return _networkOfferingDao.findById(id);
@@ -252,7 +252,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
         ConfigurationManager configMgr = (ConfigurationManager)_configService;
         NetworkOfferingVO voffer =
                 configMgr.createNetworkOffering(offeringName, offeringDisplayText, TrafficType.Guest, null, false, Availability.Optional, null, serviceProviderMap, true,
-                        Network.GuestType.Isolated, false, null, false, null, false, true, null, true, null, false, offeringName.equals(vpcRouterOfferingName), false, false, null,  null, null, true, null, null, false);
+                        Network.GuestType.Isolated, false, null, false, null, false, true, null, true, null, false, offeringName.equals(vpcRouterOfferingName), false, false, false, null,  null, null, true, null, null, false);
         if (offeringName.equals(vpcRouterOfferingName)) {
             voffer.setInternalLb(true);
         }
@@ -293,7 +293,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
             }
             serviceProviderMap.put(svc, providerSet);
         }
-        vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null, null, null, false, null, null, null, VpcOffering.State.Enabled, null, false);
+        vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null, null, null, null, null, null, null, VpcOffering.State.Enabled, null, false);
         long id = vpcOffer.getId();
         _vpcOffDao.update(id, (VpcOfferingVO)vpcOffer);
         return _vpcOffDao.findById(id);
diff --git a/plugins/network-elements/netris/pom.xml b/plugins/network-elements/netris/pom.xml
new file mode 100644
index 00000000000..b49a92d9c54
--- /dev/null
+++ b/plugins/network-elements/netris/pom.xml
@@ -0,0 +1,44 @@
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cloud-plugin-network-netris</artifactId>
+    <name>Apache CloudStack Plugin - Netris</name>
+
+    <parent>
+        <groupId>org.apache.cloudstack</groupId>
+        <artifactId>cloudstack-plugins</artifactId>
+        <version>4.21.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>io.netris</groupId>
+            <artifactId>netris-java-sdk</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.seancfoley</groupId>
+            <artifactId>ipaddress</artifactId>
+            <version>5.5.1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java
new file mode 100644
index 00000000000..04be93067a6
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java
@@ -0,0 +1,26 @@
+// 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.
+package org.apache.cloudstack;
+
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.host.Host;
+
+public class StartupNetrisCommand extends StartupCommand {
+    public StartupNetrisCommand() {
+        super(Host.Type.L2Networking);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java
new file mode 100644
index 00000000000..392016fc238
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java
@@ -0,0 +1,48 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class AddOrUpdateNetrisStaticRouteCommand extends NetrisCommand {
+    private String prefix;
+    private String nextHop;
+    private Long routeId;
+    private boolean updateRoute;
+
+    public AddOrUpdateNetrisStaticRouteCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, String prefix, String nextHop, Long routeId, boolean updateRoute) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.prefix = prefix;
+        this.nextHop = nextHop;
+        this.routeId = routeId;
+        this.updateRoute = updateRoute;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public String getNextHop() {
+        return nextHop;
+    }
+
+    public Long getRouteId() {
+        return routeId;
+    }
+
+    public boolean isUpdateRoute() {
+        return updateRoute;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java
new file mode 100644
index 00000000000..26c36f696ed
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java
@@ -0,0 +1,119 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.apache.cloudstack.resource.NetrisPortGroup;
+
+public class CreateNetrisACLCommand extends NetrisCommand {
+    private String vpcName;
+    private Long vpcId;
+    private String action;
+    private String destPrefix;
+    private String sourcePrefix;
+    private Integer destPortStart;
+    private Integer destPortEnd;
+    private Integer icmpType;
+    private String protocol;
+    private NetrisPortGroup portGroup;
+    private String netrisAclName;
+    private String reason;
+
+    public CreateNetrisACLCommand(long zoneId, Long accountId, Long domainId, String name, Long id, String vpcName, Long vpcId, boolean isVpc, String action,
+                                  String sourcePrefix, String destPrefix, Integer destPortStart, Integer destPortEnd, String protocol) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.vpcName = vpcName;
+        this.vpcId = vpcId;
+        this.action = action;
+        this.sourcePrefix = sourcePrefix;
+        this.destPrefix = destPrefix;
+        this.destPortStart = destPortStart;
+        this.destPortEnd = destPortEnd;
+        this.protocol = protocol;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public String getDestPrefix() {
+        return destPrefix;
+    }
+
+    public String getSourcePrefix() {
+        return sourcePrefix;
+    }
+
+    public Integer getDestPortStart() {
+        return destPortStart;
+    }
+
+    public Integer getDestPortEnd() {
+        return destPortEnd;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public NetrisPortGroup getPortGroup() {
+        return portGroup;
+    }
+
+    public void setPortGroup(NetrisPortGroup portGroup) {
+        this.portGroup = portGroup;
+    }
+
+    public Integer getIcmpType() {
+        return icmpType;
+    }
+
+    public void setIcmpType(Integer icmpType) {
+        this.icmpType = icmpType;
+    }
+
+    public String getNetrisAclName() {
+        return netrisAclName;
+    }
+
+    public void setNetrisAclName(String netrisAclName) {
+        this.netrisAclName = netrisAclName;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java
new file mode 100644
index 00000000000..e700b3b9d2d
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java
@@ -0,0 +1,84 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class CreateNetrisVnetCommand extends NetrisCommand {
+    private String vpcName;
+    private Long vpcId;
+    private String cidr;
+    private Integer vxlanId;
+    private String gateway;
+    private String netrisTag;
+    private String ipv6Cidr;
+    private Boolean globalRouting;
+
+    public CreateNetrisVnetCommand(Long zoneId, Long accountId, Long domainId, String vpcName, Long vpcId, String vNetName, Long networkId, String cidr, String gateway, boolean isVpc) {
+        super(zoneId, accountId, domainId, vNetName, networkId, isVpc);
+        this.vpcId = vpcId;
+        this.vpcName = vpcName;
+        this.cidr = cidr;
+        this.gateway = gateway;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public String getCidr() {
+        return cidr;
+    }
+
+    public Integer getVxlanId() {
+        return vxlanId;
+    }
+
+    public void setVxlanId(Integer vxlanId) {
+        this.vxlanId = vxlanId;
+    }
+
+    public String getGateway() {
+        return gateway;
+    }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
+
+    public String getIpv6Cidr() {
+        return ipv6Cidr;
+    }
+
+    public void setIpv6Cidr(String ipv6Cidr) {
+        this.ipv6Cidr = ipv6Cidr;
+    }
+
+    public Boolean isGlobalRouting() {
+        return globalRouting;
+    }
+
+    public void setGlobalRouting(Boolean globalRouting) {
+        this.globalRouting = globalRouting;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java
new file mode 100644
index 00000000000..cff25f78287
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java
@@ -0,0 +1,31 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class CreateNetrisVpcCommand extends NetrisCommand {
+
+    private final String cidr;
+
+    public CreateNetrisVpcCommand(long zoneId, long accountId, long domainId, String name, String cidr, long vpcId, boolean isVpc) {
+        super(zoneId, accountId, domainId, name, vpcId, isVpc);
+        this.cidr = cidr;
+    }
+
+    public String getCidr() {
+        return cidr;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java
new file mode 100644
index 00000000000..d3b782de6fb
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java
@@ -0,0 +1,119 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.apache.cloudstack.resource.NetrisPortGroup;
+
+public class CreateOrUpdateNetrisACLCommand extends NetrisCommand {
+    private String vpcName;
+    private Long vpcId;
+    private String action;
+    private String destPrefix;
+    private String sourcePrefix;
+    private Integer destPortStart;
+    private Integer destPortEnd;
+    private Integer icmpType;
+    private String protocol;
+    private NetrisPortGroup portGroup;
+    private String netrisAclName;
+    private String reason;
+
+    public CreateOrUpdateNetrisACLCommand(long zoneId, Long accountId, Long domainId, String name, Long id, String vpcName, Long vpcId, boolean isVpc, String action,
+                                          String sourcePrefix, String destPrefix, Integer destPortStart, Integer destPortEnd, String protocol) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.vpcName = vpcName;
+        this.vpcId = vpcId;
+        this.action = action;
+        this.sourcePrefix = sourcePrefix;
+        this.destPrefix = destPrefix;
+        this.destPortStart = destPortStart;
+        this.destPortEnd = destPortEnd;
+        this.protocol = protocol;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public String getDestPrefix() {
+        return destPrefix;
+    }
+
+    public String getSourcePrefix() {
+        return sourcePrefix;
+    }
+
+    public Integer getDestPortStart() {
+        return destPortStart;
+    }
+
+    public Integer getDestPortEnd() {
+        return destPortEnd;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public NetrisPortGroup getPortGroup() {
+        return portGroup;
+    }
+
+    public void setPortGroup(NetrisPortGroup portGroup) {
+        this.portGroup = portGroup;
+    }
+
+    public Integer getIcmpType() {
+        return icmpType;
+    }
+
+    public void setIcmpType(Integer icmpType) {
+        this.icmpType = icmpType;
+    }
+
+    public String getNetrisAclName() {
+        return netrisAclName;
+    }
+
+    public void setNetrisAclName(String netrisAclName) {
+        this.netrisAclName = netrisAclName;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java
new file mode 100644
index 00000000000..a2a080b33d9
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java
@@ -0,0 +1,90 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.network.netris.NetrisLbBackend;
+
+import java.util.List;
+
+public class CreateOrUpdateNetrisLoadBalancerRuleCommand extends NetrisCommand {
+    private final String publicPort;
+    private final String privatePort;
+    private final String algorithm;
+    private final String protocol;
+    List<NetrisLbBackend> lbBackends;
+    private String publicIp;
+    private final Long lbId;
+    private String cidrList;
+    private String ruleName;
+
+    public CreateOrUpdateNetrisLoadBalancerRuleCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc,
+                                                       List<NetrisLbBackend> lbBackends, long lbId, String publicIp, String publicPort,
+                                                       String privatePort, String algorithm, String protocol) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.lbId = lbId;
+        this.publicIp = publicIp;
+        this.publicPort = publicPort;
+        this.privatePort = privatePort;
+        this.algorithm = algorithm;
+        this.protocol = protocol;
+        this.lbBackends = lbBackends;
+    }
+
+    public String getPublicPort() {
+        return publicPort;
+    }
+
+    public String getPrivatePort() {
+        return privatePort;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public List<NetrisLbBackend> getLbBackends() {
+        return lbBackends;
+    }
+
+    public Long getLbId() {
+        return lbId;
+    }
+
+    public String getPublicIp() {
+        return publicIp;
+    }
+
+    public String getCidrList() {
+        return cidrList;
+    }
+
+    public void setCidrList(String cidrList) {
+        this.cidrList = cidrList;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java
new file mode 100644
index 00000000000..ad1b150be3a
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java
@@ -0,0 +1,148 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class CreateOrUpdateNetrisNatCommand extends NetrisCommand {
+    private String vpcName;
+    private Long vpcId;
+    private String vpcCidr;
+    private String natRuleName;
+    private String natIp;
+    private String natRuleType;
+
+    // Parameters for DNAT
+    private String protocol;
+    private String sourceAddress;
+    private String sourcePort;
+    private String destinationAddress;
+    private String destinationPort;
+    private String state;
+
+    // Parameters for SNAT (Static NAT)
+    private String vmIp;
+
+    public CreateOrUpdateNetrisNatCommand(long zoneId, Long accountId, Long domainId, String vpcName, Long vpcId, String vNetName, Long networkId, boolean isVpc, String vpcCidr) {
+        super(zoneId, accountId, domainId, vNetName, networkId, isVpc);
+        this.vpcName = vpcName;
+        this.vpcId = vpcId;
+        this.vpcCidr = vpcCidr;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public String getNatIp() {
+        return natIp;
+    }
+
+    public void setNatRuleName(String natRuleName) {
+        this.natRuleName = natRuleName;
+    }
+
+    public String getNatRuleName() {
+        return natRuleName;
+    }
+
+    public String getVpcCidr() {
+        return vpcCidr;
+    }
+
+    public void setNatIp(String natIp) {
+        this.natIp = natIp;
+    }
+
+    public String getVmIp() {
+        return vmIp;
+    }
+
+    public void setVmIp(String vmIp) {
+        this.vmIp = vmIp;
+    }
+
+    public String getNatRuleType() {
+        return natRuleType;
+    }
+
+    public void setNatRuleType(String natRuleType) {
+        this.natRuleType = natRuleType;
+    }
+
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+
+    public void setVpcCidr(String vpcCidr) {
+        this.vpcCidr = vpcCidr;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    public String getSourceAddress() {
+        return sourceAddress;
+    }
+
+    public void setSourceAddress(String sourceAddress) {
+        this.sourceAddress = sourceAddress;
+    }
+
+    public String getSourcePort() {
+        return sourcePort;
+    }
+
+    public void setSourcePort(String sourcePort) {
+        this.sourcePort = sourcePort;
+    }
+
+    public String getDestinationAddress() {
+        return destinationAddress;
+    }
+
+    public void setDestinationAddress(String destinationAddress) {
+        this.destinationAddress = destinationAddress;
+    }
+
+    public String getDestinationPort() {
+        return destinationPort;
+    }
+
+    public void setDestinationPort(String destinationPort) {
+        this.destinationPort = destinationPort;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java
new file mode 100644
index 00000000000..e4a4993a257
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java
@@ -0,0 +1,46 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import java.util.List;
+
+public class DeleteNetrisACLCommand extends NetrisCommand {
+    Long vpcId;
+    String vpcName;
+    List<String> aclRuleNames;
+    public DeleteNetrisACLCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, Long vpcId, String vpcName) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.vpcId = vpcId;
+        this.vpcName = vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public List<String> getAclRuleNames() {
+        return aclRuleNames;
+    }
+
+    public void setAclRuleNames(List<String> aclRuleNames) {
+        this.aclRuleNames = aclRuleNames;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java
new file mode 100644
index 00000000000..3ca32c8112c
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java
@@ -0,0 +1,52 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class DeleteNetrisLoadBalancerRuleCommand extends NetrisCommand {
+    private Long lbId;
+    private String ruleName;
+    private String cidrList;
+
+    public DeleteNetrisLoadBalancerRuleCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, Long lbId) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.lbId = lbId;
+    }
+
+    public Long getLbId() {
+        return lbId;
+    }
+
+    public void setLbId(Long lbId) {
+        this.lbId = lbId;
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getCidrList() {
+        return cidrList;
+    }
+
+    public void setCidrList(String cidrList) {
+        this.cidrList = cidrList;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java
new file mode 100644
index 00000000000..b01b2f45192
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java
@@ -0,0 +1,72 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class DeleteNetrisNatRuleCommand extends NetrisCommand {
+
+    private String vpcName;
+    private Long vpcId;
+    private String natRuleType;
+    private String natRuleName;
+    private String natIp;
+
+    public DeleteNetrisNatRuleCommand(long zoneId, Long accountId, Long domainId, String vpcName, Long vpcId, String vNetName, Long networkId, boolean isVpc) {
+        super(zoneId, accountId, domainId, vNetName, networkId, isVpc);
+        this.vpcName = vpcName;
+        this.vpcId = vpcId;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+
+    public String getNatRuleType() {
+        return natRuleType;
+    }
+
+    public void setNatRuleType(String natRuleType) {
+        this.natRuleType = natRuleType;
+    }
+
+    public String getNatRuleName() {
+        return natRuleName;
+    }
+
+    public void setNatRuleName(String natRuleName) {
+        this.natRuleName = natRuleName;
+    }
+
+    public String getNatIp() {
+        return natIp;
+    }
+
+    public void setNatIp(String natIp) {
+        this.natIp = natIp;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java
new file mode 100644
index 00000000000..b531a049b0f
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java
@@ -0,0 +1,23 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class DeleteNetrisStaticRouteCommand extends AddOrUpdateNetrisStaticRouteCommand {
+    public DeleteNetrisStaticRouteCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, String prefix, String nextHop, Long routeId) {
+        super(zoneId, accountId, domainId, name, id, isVpc, prefix, nextHop, routeId, false);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java
new file mode 100644
index 00000000000..240c6c5417c
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java
@@ -0,0 +1,51 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class DeleteNetrisVnetCommand extends NetrisCommand {
+    private String vpcName;
+    private Long vpcId;
+    private final String vNetCidr;
+    private String vNetV6Cidr;
+
+    public DeleteNetrisVnetCommand(long zoneId, long accountId, long domainId, String name, long id, String vpcName, Long vpcId, String vNetCidr, boolean isVpc) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.vpcName = vpcName;
+        this.vpcId = vpcId;
+        this.vNetCidr = vNetCidr;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public String getVNetCidr() {
+        return vNetCidr;
+    }
+
+    public String getvNetV6Cidr() {
+        return vNetV6Cidr;
+    }
+
+    public void setvNetV6Cidr(String vNetV6Cidr) {
+        this.vNetV6Cidr = vNetV6Cidr;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java
new file mode 100644
index 00000000000..d560f0b8cd9
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java
@@ -0,0 +1,30 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class DeleteNetrisVpcCommand extends NetrisCommand {
+    private final String cidr;
+
+    public DeleteNetrisVpcCommand(long zoneId, long accountId, long domainId, String name, String cidr, long vpcId, boolean isVpc) {
+        super(zoneId, accountId, domainId, name, vpcId, isVpc);
+        this.cidr = cidr;
+    }
+
+    public String getCidr() {
+        return cidr;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java
new file mode 100644
index 00000000000..421dc3359b6
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java
@@ -0,0 +1,36 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.agent.api.Command;
+import com.cloud.network.vpc.StaticRoute;
+
+import java.util.List;
+
+public class ListNetrisStaticRoutesAnswer extends NetrisAnswer {
+
+    List<StaticRoute> staticRoutes;
+
+    public ListNetrisStaticRoutesAnswer(final Command command, final List<StaticRoute> staticRoutes) {
+        super(command, true, "OK");
+        this.staticRoutes = staticRoutes;
+    }
+
+    public List<StaticRoute> getStaticRoutes() {
+        return staticRoutes;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java
new file mode 100644
index 00000000000..e116a2386cb
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java
@@ -0,0 +1,23 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class ListNetrisStaticRoutesCommand extends AddOrUpdateNetrisStaticRouteCommand {
+    public ListNetrisStaticRoutesCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, String prefix, String nextHop, Long routeId) {
+        super(zoneId, accountId, domainId, name, id, isVpc, prefix, nextHop, routeId, false);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java
new file mode 100644
index 00000000000..197500a3cce
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java
@@ -0,0 +1,30 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+
+public class NetrisAnswer extends Answer {
+    public NetrisAnswer(final Command command, final boolean success, final String details) {
+        super(command, success, details);
+    }
+
+    public NetrisAnswer(final Command command, final Exception e) {
+        super(command, e);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java
new file mode 100644
index 00000000000..280c7de32d1
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java
@@ -0,0 +1,70 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.agent.api.Command;
+
+public class NetrisCommand extends Command {
+    private final long zoneId;
+    private final Long accountId;
+    private final Long domainId;
+    private String name;
+    private final Long id;
+    private final boolean isVpc;
+
+    public NetrisCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc) {
+        this.zoneId = zoneId;
+        this.accountId = accountId;
+        this.domainId = domainId;
+        this.name = name;
+        this.id = id;
+        this.isVpc = isVpc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public long getZoneId() {
+        return zoneId;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public Long getDomainId() {
+        return domainId;
+    }
+
+    public boolean isVpc() {
+        return isVpc;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java
new file mode 100644
index 00000000000..ac3a4faba4d
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java
@@ -0,0 +1,30 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class ReleaseNatIpCommand extends NetrisCommand {
+    private String natIp;
+
+    public ReleaseNatIpCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc, String natIp) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+        this.natIp = natIp;
+    }
+
+    public String getNatIp() {
+        return natIp;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java
new file mode 100644
index 00000000000..5cbdd96e76a
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java
@@ -0,0 +1,37 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class SetupNetrisPublicRangeCommand extends NetrisCommand {
+
+    private final String superCidr;
+    private final String exactCidr;
+
+    public SetupNetrisPublicRangeCommand(long zoneId, String superCidr, String exactCidr) {
+        super(zoneId, null, null, null, zoneId, false);
+        this.superCidr = superCidr;
+        this.exactCidr = exactCidr;
+    }
+
+    public String getSuperCidr() {
+        return superCidr;
+    }
+
+    public String getExactCidr() {
+        return exactCidr;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java
new file mode 100644
index 00000000000..99a266e15ad
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java
@@ -0,0 +1,51 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class UpdateNetrisVnetCommand extends NetrisCommand{
+    private String prevNetworkName;
+    private String vpcName;
+    private Long vpcId;
+
+    public UpdateNetrisVnetCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+    }
+
+    public String getPrevNetworkName() {
+        return prevNetworkName;
+    }
+
+    public void setPrevNetworkName(String prevNetworkName) {
+        this.prevNetworkName = prevNetworkName;
+    }
+
+    public String getVpcName() {
+        return vpcName;
+    }
+
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java
new file mode 100644
index 00000000000..764d9155a02
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java
@@ -0,0 +1,32 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+public class UpdateNetrisVpcCommand extends NetrisCommand {
+    private String previousVpcName;
+    public UpdateNetrisVpcCommand(long zoneId, Long accountId, Long domainId, String name, Long id, boolean isVpc) {
+        super(zoneId, accountId, domainId, name, id, isVpc);
+    }
+
+    public String getPreviousVpcName() {
+        return previousVpcName;
+    }
+
+    public void setPreviousVpcName(String previousVpcName) {
+        this.previousVpcName = previousVpcName;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java
new file mode 100644
index 00000000000..5cdecc77d3b
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java
@@ -0,0 +1,126 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.network.netris.NetrisProvider;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.service.NetrisProviderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+
+@APICommand(name = AddNetrisProviderCmd.APINAME, description = "Add Netris Provider to CloudStack",
+        responseObject = NetrisProviderResponse.class, requestHasSensitiveInfo = false,
+        responseHasSensitiveInfo = false,
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class AddNetrisProviderCmd extends BaseCmd {
+    public static final String APINAME = "addNetrisProvider";
+    public static final Logger LOGGER = LoggerFactory.getLogger(AddNetrisProviderCmd.class.getName());
+
+    @Inject
+    NetrisProviderService netrisProviderService;
+
+    @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true,
+            description = "the ID of zone")
+    private Long zoneId;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Netris provider name")
+    private String name;
+
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "Netris provider URL")
+    private String url;
+
+    @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Username to login into Netris")
+    private String username;
+
+    @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, required = true, description = "Password to login into Netris")
+    private String password;
+
+    @Parameter(name = ApiConstants.SITE_NAME, type = CommandType.STRING, required = true, description = "Netris Site name")
+    private String siteName;
+
+    @Parameter(name = ApiConstants.TENANT_NAME, type = CommandType.STRING, required = true, description = "Netris Tenant name")
+    private String tenantName;
+
+    @Parameter(name = ApiConstants.NETRIS_TAG, type = CommandType.STRING, required = true, description = "Netris tag for vNets")
+    private String netrisTag;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getZoneId() {
+        return zoneId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        NetrisProvider provider = netrisProviderService.addProvider(this);
+        NetrisProviderResponse response = netrisProviderService.createNetrisProviderResponse(provider);
+        if (response == null)
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Netris provider");
+        else {
+            response.setResponseName(getCommandName());
+            setResponseObject(response);
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccount().getId();
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java
new file mode 100644
index 00000000000..6865e113361
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java
@@ -0,0 +1,86 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.service.NetrisProviderService;
+
+import javax.inject.Inject;
+
+import static org.apache.cloudstack.api.command.DeleteNetrisProviderCmd.APINAME;
+
+@APICommand(name = APINAME, description = "delete Netris Provider to CloudStack",
+        responseObject = NetrisProviderResponse.class, requestHasSensitiveInfo = false,
+        responseHasSensitiveInfo = false,
+        authorized = {RoleType.Admin}, since = "4.21.0")
+public class DeleteNetrisProviderCmd extends BaseCmd {
+    public static final String APINAME = "deleteNetrisProvider";
+
+    @Inject
+    private NetrisProviderService netrisProviderService;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetrisProviderResponse.class,
+            required = true, description = "Netris Provider ID")
+    private Long id;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() { return id; }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        try {
+            boolean deleted = netrisProviderService.deleteNetrisProvider(getId());
+            if (deleted) {
+                SuccessResponse response = new SuccessResponse(getCommandName());
+                response.setResponseName(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to Netris provider from zone");
+            }
+        } catch (InvalidParameterValueException e) {
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
+        } catch (CloudRuntimeException e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return 0;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java
new file mode 100644
index 00000000000..c2f572a46bc
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java
@@ -0,0 +1,73 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.utils.StringUtils;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.service.NetrisProviderService;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@APICommand(name = ListNetrisProvidersCmd.APINAME, description = "list all Netris providers added to CloudStack",
+        responseObject = NetrisProviderResponse.class, requestHasSensitiveInfo = false,
+        responseHasSensitiveInfo = false, since = "4.21.0")
+public class ListNetrisProvidersCmd extends BaseListCmd {
+    public static final String APINAME = "listNetrisProviders";
+
+    @Inject
+    NetrisProviderService netrisProviderService;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+    ///
+    @Parameter(name = ApiConstants.ZONE_ID, description = "ID of the zone",
+            type = CommandType.UUID, entityType = ZoneResponse.class)
+    Long zoneId;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getZoneId() {
+        return zoneId;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        List<BaseResponse> baseResponseList = netrisProviderService.listNetrisProviders(zoneId);
+        List<BaseResponse> pagingList = StringUtils.applyPagination(baseResponseList, this.getStartIndex(), this.getPageSizeVal());
+        ListResponse<BaseResponse> listResponse = new ListResponse<>();
+        listResponse.setResponses(pagingList);
+        listResponse.setResponseName(getCommandName());
+        setResponseObject(listResponse);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java
new file mode 100644
index 00000000000..d130c3a7372
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java
@@ -0,0 +1,135 @@
+// 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.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.network.netris.NetrisProvider;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
+@EntityReference(value = {NetrisProvider.class})
+public class NetrisProviderResponse extends BaseResponse {
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Netris Provider name")
+    private String name;
+
+    @SerializedName(ApiConstants.UUID)
+    @Param(description = "Netris provider uuid")
+    private String uuid;
+
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "Zone ID to which the Netris Provider is associated with")
+    private String zoneId;
+
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "Zone name to which the Netris Provider is associated with")
+    private String zoneName;
+
+    @SerializedName(ApiConstants.HOST_NAME)
+    @Param(description = "Netris Provider hostname or IP address")
+    private String hostname;
+
+    @SerializedName(ApiConstants.PORT)
+    @Param(description = "Netris Provider port")
+    private String port;
+
+    @SerializedName(ApiConstants.SITE_NAME)
+    @Param(description = "Netris Provider site")
+    private String siteName;
+
+    @SerializedName(ApiConstants.TENANT_NAME)
+    @Param(description = "Netris Admin tenant name")
+    private String tenantName;
+
+    @SerializedName(ApiConstants.NETRIS_TAG)
+    @Param(description = "Netris Tag for vNets")
+    private String netrisTag;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getZoneId() {
+        return zoneId;
+    }
+
+    public void setZoneId(String zoneId) {
+        this.zoneId = zoneId;
+    }
+
+    public String getZoneName() {
+        return zoneName;
+    }
+
+    public void setZoneName(String zoneName) {
+        this.zoneName = zoneName;
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public void setHostname(String hostname) {
+        this.hostname = hostname;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java
new file mode 100644
index 00000000000..0f533e011e4
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java
@@ -0,0 +1,30 @@
+// 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.
+package org.apache.cloudstack.resource;
+
+public class NetrisPortGroup {
+    private String ports;
+
+    public NetrisPortGroup() {
+    }
+
+    public NetrisPortGroup(String ports) {
+        this.ports = ports;
+    }
+
+    public String getPorts() { return ports; }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java
new file mode 100644
index 00000000000..4aef6d2d80a
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java
@@ -0,0 +1,441 @@
+// 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.
+package org.apache.cloudstack.resource;
+
+import com.cloud.agent.IAgentControl;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckHealthAnswer;
+import com.cloud.agent.api.CheckHealthCommand;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.PingCommand;
+import com.cloud.agent.api.ReadyAnswer;
+import com.cloud.agent.api.ReadyCommand;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.host.Host;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.resource.ServerResource;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisACLCommand;
+import org.apache.cloudstack.agent.api.AddOrUpdateNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisNatCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisACLCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesAnswer;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesCommand;
+import org.apache.cloudstack.agent.api.NetrisAnswer;
+import org.apache.cloudstack.StartupNetrisCommand;
+import org.apache.cloudstack.agent.api.ReleaseNatIpCommand;
+import org.apache.cloudstack.agent.api.SetupNetrisPublicRangeCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVpcCommand;
+import org.apache.cloudstack.service.NetrisApiClient;
+import org.apache.cloudstack.service.NetrisApiClientImpl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.naming.ConfigurationException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class NetrisResource implements ServerResource {
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    private String name;
+    protected String endpointUrl;
+    protected String username;
+    protected String password;
+    protected String guid;
+    protected String zoneId;
+    protected String siteName;
+    protected String adminTenantName;
+
+    protected NetrisApiClient netrisApiClient;
+
+    @Override
+    public Host.Type getType() {
+        return Host.Type.Routing;
+    }
+
+    @Override
+    public StartupCommand[] initialize() {
+        StartupNetrisCommand sc = new StartupNetrisCommand();
+        sc.setGuid(guid);
+        sc.setName(name);
+        sc.setDataCenter(zoneId);
+        sc.setPod("");
+        sc.setPrivateIpAddress("");
+        sc.setStorageIpAddress("");
+        sc.setVersion("");
+        return new StartupCommand[] {sc};
+    }
+
+    @Override
+    public PingCommand getCurrentStatus(long id) {
+        return null;
+    }
+
+    @Override
+    public Answer executeRequest(Command cmd) {
+        if (cmd instanceof ReadyCommand) {
+            return executeRequest((ReadyCommand) cmd);
+        } else if (cmd instanceof CheckHealthCommand) {
+            return executeRequest((CheckHealthCommand) cmd);
+        } else if (cmd instanceof CreateNetrisVpcCommand) {
+            return executeRequest((CreateNetrisVpcCommand) cmd);
+        } else if (cmd instanceof UpdateNetrisVpcCommand) {
+          return executeRequest((UpdateNetrisVpcCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisVpcCommand) {
+            return executeRequest((DeleteNetrisVpcCommand) cmd);
+        } else if (cmd instanceof CreateNetrisVnetCommand) {
+            return executeRequest((CreateNetrisVnetCommand) cmd);
+        } else if (cmd instanceof UpdateNetrisVnetCommand) {
+          return executeRequest((UpdateNetrisVnetCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisVnetCommand) {
+          return executeRequest((DeleteNetrisVnetCommand) cmd);
+        } else if (cmd instanceof SetupNetrisPublicRangeCommand) {
+            return executeRequest((SetupNetrisPublicRangeCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisNatRuleCommand) {
+            return executeRequest((DeleteNetrisNatRuleCommand) cmd);
+        } else if (cmd instanceof CreateOrUpdateNetrisNatCommand) {
+          return executeRequest((CreateOrUpdateNetrisNatCommand) cmd);
+        } else if (cmd instanceof CreateOrUpdateNetrisACLCommand) {
+            return executeRequest((CreateOrUpdateNetrisACLCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisACLCommand) {
+            return executeRequest((DeleteNetrisACLCommand) cmd);
+        } else if (cmd instanceof ListNetrisStaticRoutesCommand) {
+            return executeRequest((ListNetrisStaticRoutesCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisStaticRouteCommand) {
+            return executeRequest((DeleteNetrisStaticRouteCommand) cmd);
+        } else if (cmd instanceof AddOrUpdateNetrisStaticRouteCommand) {
+            return executeRequest((AddOrUpdateNetrisStaticRouteCommand) cmd);
+        } else if (cmd instanceof ReleaseNatIpCommand) {
+          return executeRequest((ReleaseNatIpCommand) cmd);
+        } else if (cmd instanceof CreateOrUpdateNetrisLoadBalancerRuleCommand) {
+            return executeRequest((CreateOrUpdateNetrisLoadBalancerRuleCommand) cmd);
+        } else if (cmd instanceof DeleteNetrisLoadBalancerRuleCommand) {
+          return executeRequest((DeleteNetrisLoadBalancerRuleCommand) cmd);
+        } else {
+            return Answer.createUnsupportedCommandAnswer(cmd);
+        }
+    }
+
+    @Override
+    public void disconnected() {
+        // Do nothing
+    }
+
+    @Override
+    public IAgentControl getAgentControl() {
+        return null;
+    }
+
+    @Override
+    public void setAgentControl(IAgentControl agentControl) {
+        // Do nothing
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void setConfigParams(Map<String, Object> params) {
+        // Do nothing
+    }
+
+    @Override
+    public Map<String, Object> getConfigParams() {
+        return new HashMap<>();
+    }
+
+    @Override
+    public int getRunLevel() {
+        return 0;
+    }
+
+    @Override
+    public void setRunLevel(int level) {
+
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        endpointUrl = (String) params.get("url");
+        if (endpointUrl == null) {
+            throw new ConfigurationException("Missing Netris provider URL from params: " + params);
+        }
+
+        username = (String) params.get("username");
+        if (username == null) {
+            throw new ConfigurationException("Missing Netris username from params: " + params);
+        }
+
+        password = (String) params.get("password");
+        if (password == null) {
+            throw new ConfigurationException("Missing Netris password from params: " + params);
+        }
+
+        this.name = (String) params.get("name");
+        if (this.name == null) {
+            throw new ConfigurationException("Unable to find name");
+        }
+
+        guid = (String) params.get("guid");
+        if (guid == null) {
+            throw new ConfigurationException("Unable to find the guid");
+        }
+
+        zoneId = (String) params.get("zoneId");
+        if (zoneId == null) {
+            throw new ConfigurationException("Unable to find zone");
+        }
+
+        siteName = (String) params.get("siteName");
+        if (siteName == null) {
+            throw new ConfigurationException("Unable to find the Netris site name");
+        }
+
+        adminTenantName = (String) params.get("tenantName");
+        if (adminTenantName == null) {
+            throw new ConfigurationException("Unable to find the Netris admin tenant name");
+        }
+
+        netrisApiClient = new NetrisApiClientImpl(endpointUrl, username, password, siteName, adminTenantName);
+        return netrisApiClient.isSessionAlive();
+    }
+
+    private Answer executeRequest(ReadyCommand cmd) {
+        return new ReadyAnswer(cmd);
+    }
+
+    private Answer executeRequest(CheckHealthCommand cmd) {
+        return new CheckHealthAnswer(cmd, netrisApiClient.isSessionAlive());
+    }
+
+    private Answer executeRequest(CreateNetrisVpcCommand cmd) {
+        try {
+            boolean result = netrisApiClient.createVpc(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Netris VPC %s creation failed", cmd.getName()));
+            }
+            return new NetrisAnswer(cmd, true, "OK");
+        } catch (CloudRuntimeException e) {
+            String msg = String.format("Error creating Netris VPC: %s", e.getMessage());
+            logger.error(msg, e);
+            return new NetrisAnswer(cmd, new CloudRuntimeException(msg));
+        }
+    }
+
+    private Answer executeRequest(UpdateNetrisVpcCommand cmd) {
+        try {
+            boolean result = netrisApiClient.updateVpc(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Netris VPC %s creation failed", cmd.getName()));
+            }
+            return new NetrisAnswer(cmd, true, "OK");
+        } catch (CloudRuntimeException e) {
+            String msg = String.format("Error creating Netris VPC: %s", e.getMessage());
+            logger.error(msg, e);
+            return new NetrisAnswer(cmd, new CloudRuntimeException(msg));
+        }
+    }
+
+    private Answer executeRequest(CreateNetrisVnetCommand cmd) {
+        try {
+            String vpcName = cmd.getVpcName();
+            boolean result = netrisApiClient.createVnet(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Netris VPC %s creation failed", vpcName));
+            }
+            return new NetrisAnswer(cmd, true, "OK");
+        } catch (CloudRuntimeException e) {
+            String msg = String.format("Error creating Netris VPC: %s", e.getMessage());
+            logger.error(msg, e);
+            return new NetrisAnswer(cmd, new CloudRuntimeException(msg));
+        }
+    }
+
+    private Answer executeRequest(UpdateNetrisVnetCommand cmd) {
+        try {
+            String networkName = cmd.getName();
+            String prevNetworkName = cmd.getPrevNetworkName();
+            boolean result = netrisApiClient.updateVnet(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Failed to update network name from %s to %s", prevNetworkName, networkName));
+            }
+            return new NetrisAnswer(cmd, true, "OK");
+        } catch (CloudRuntimeException e) {
+            String msg = String.format("Error updating Netris vNet: %s", e.getMessage());
+            logger.error(msg, e);
+            return new NetrisAnswer(cmd, new CloudRuntimeException(msg));
+        }
+    }
+
+    private Answer executeRequest(DeleteNetrisVnetCommand cmd) {
+        try {
+            String networkName = cmd.getName();
+            boolean result = netrisApiClient.deleteVnet(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Netris vNet: %s deletion failed", networkName));
+            }
+            return new NetrisAnswer(cmd, true, "OK");
+        } catch (CloudRuntimeException e) {
+            String msg = String.format("Error deleting Netris vNet: %s", e.getMessage());
+            logger.error(msg, e);
+            return new NetrisAnswer(cmd, new CloudRuntimeException(msg));
+        }
+    }
+
+    private Answer executeRequest(DeleteNetrisVpcCommand cmd) {
+        boolean result = netrisApiClient.deleteVpc(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Netris VPC %s deletion failed", cmd.getName()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(SetupNetrisPublicRangeCommand cmd) {
+        boolean result = netrisApiClient.setupZoneLevelPublicRange(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, "Netris Setup for Public Range failed");
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(CreateOrUpdateNetrisNatCommand cmd) {
+        String natRuleType = cmd.getNatRuleType();
+        if ("SNAT".equals(natRuleType)) {
+            boolean result = netrisApiClient.createOrUpdateSNATRule(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Failed to create SNAT rule on Netris for network %s", cmd.getName()));
+            }
+        } else if ("DNAT".equals(natRuleType)) {
+            boolean result = netrisApiClient.createOrUpdateDNATRule(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Failed to create DNAT rule on Netris for network %s", cmd.getName()));
+            }
+        } else if ("STATICNAT".equals(natRuleType)) {
+            boolean result = netrisApiClient.createStaticNatRule(cmd);
+            if (!result) {
+                return new NetrisAnswer(cmd, false, String.format("Failed to create SNAT rule on Netris for network %s", cmd.getName()));
+            }
+        }
+
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(DeleteNetrisNatRuleCommand cmd) {
+        boolean result = netrisApiClient.deleteNatRule(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Netris NAT rule: %s deletion failed", cmd.getNatRuleName()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(CreateOrUpdateNetrisACLCommand cmd) {
+        boolean result = netrisApiClient.addOrUpdateAclRule(cmd, false);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Creation of Netris ACL rule: %s failed", cmd.getNetrisAclName()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(DeleteNetrisACLCommand cmd) {
+        boolean result = netrisApiClient.deleteAclRule(cmd, false);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to delete Netris ACLs: %s", String.join("'", cmd.getAclRuleNames())));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(ListNetrisStaticRoutesCommand cmd) {
+        List<StaticRoute> staticRoutes = netrisApiClient.listStaticRoutes(cmd);
+        return new ListNetrisStaticRoutesAnswer(cmd, staticRoutes);
+    }
+
+    private Answer executeRequest(AddOrUpdateNetrisStaticRouteCommand cmd) {
+        boolean result = netrisApiClient.addOrUpdateStaticRoute(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to add static route for VPC: %s, prefix: %s, nextHop: %s ", cmd.getName(), cmd.getPrefix(), cmd.getNextHop()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(DeleteNetrisStaticRouteCommand cmd) {
+        boolean result = netrisApiClient.deleteStaticRoute(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to add static route for VPC: %s, prefix: %s, nextHop: %s ", cmd.getName(), cmd.getPrefix(), cmd.getNextHop()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(ReleaseNatIpCommand cmd) {
+        boolean result = netrisApiClient.releaseNatIp(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to release NAT IP: %s", cmd.getNatIp()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd) {
+        boolean result = netrisApiClient.createOrUpdateLbRule(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to create Netris LB rule for %s: %s, " +
+                    "for private port: %s and public port: %s", getNetworkType(cmd.isVpc()), cmd.getName(), cmd.getPrivatePort(), cmd.getPublicPort()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private Answer executeRequest(DeleteNetrisLoadBalancerRuleCommand cmd) {
+        boolean result = netrisApiClient.deleteLbRule(cmd);
+        if (!result) {
+            return new NetrisAnswer(cmd, false, String.format("Failed to delete Netris LB rule for %s: %s", getNetworkType(cmd.isVpc()), cmd.getName()));
+        }
+        return new NetrisAnswer(cmd, true, "OK");
+    }
+
+    private String getNetworkType(Boolean isVpc) {
+        if (isVpc) {
+            return "VPC";
+        }
+        return "Network";
+    }
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        return true;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java
new file mode 100644
index 00000000000..164c56cd763
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java
@@ -0,0 +1,103 @@
+// 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.
+package org.apache.cloudstack.resource;
+
+import org.apache.cloudstack.agent.api.NetrisCommand;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.util.Objects;
+
+public class NetrisResourceObjectUtils {
+
+    public enum NetrisObjectType {
+        VPC, IPAM_ALLOCATION, IPAM_SUBNET, VNET, SNAT, STATICNAT, DNAT, STATICROUTE, ACL, LB
+    }
+
+    public static String retrieveNetrisResourceObjectName(NetrisCommand cmd, NetrisObjectType netrisObjectType, String... suffixes) {
+        long zoneId = cmd.getZoneId();
+        Long accountId = cmd.getAccountId();
+        Long domainId = cmd.getDomainId();
+        Long objectId = cmd.getId();
+        String objectName = cmd.getName();
+        boolean isVpc = cmd.isVpc();
+        boolean isZoneLevel = accountId == null && domainId == null;
+
+        StringBuilder stringBuilder = new StringBuilder();
+        if (isZoneLevel) {
+            stringBuilder.append(String.format("Z%s", zoneId));
+        } else {
+            stringBuilder.append(String.format("D%s-A%s-Z%s", domainId, accountId, zoneId));
+        }
+        String prefix = isVpc ? "-V" : "-N";
+        switch (netrisObjectType) {
+            case VPC:
+                if (ArrayUtils.isEmpty(suffixes)) {
+                    stringBuilder.append(String.format("%s%s-%s", prefix, objectId, objectName));
+                } else {
+                    stringBuilder.append(String.format("%s%s", prefix, suffixes[0]));
+                    suffixes = new String[0];
+                }
+                break;
+            case IPAM_ALLOCATION:
+                if (!isZoneLevel) {
+                    stringBuilder.append(String.format("%s%s", prefix, objectId));
+                }
+                break;
+            case IPAM_SUBNET:
+                if (!isZoneLevel) {
+                    if (Objects.nonNull(objectId) && Objects.nonNull(objectName) && !isVpc) {
+                        stringBuilder.append(String.format("-N%s", objectId));
+                    } else {
+                        stringBuilder.append(String.format("-V%s-%s", suffixes[0], suffixes[1]));
+                        return stringBuilder.toString();
+                    }
+                }
+                break;
+            case SNAT:
+                stringBuilder.append(String.format("%s%s-%s", prefix, suffixes[0], "SNAT"));
+                suffixes = new String[0];
+                break;
+            case STATICNAT:
+                stringBuilder.append(String.format("%s%s-VM%s-%s", prefix, suffixes[0], suffixes[1], "STATICNAT"));
+                suffixes = new String[0];
+                break;
+            case DNAT:
+                stringBuilder.append(String.format("%s%s-%s", prefix, suffixes[0], "DNAT"));
+                suffixes = ArrayUtils.subarray(suffixes, 1, suffixes.length);
+                break;
+            case STATICROUTE:
+                stringBuilder.append(String.format("%s%s-%s%s", prefix, suffixes[0], "ROUTE", suffixes[1]));
+                suffixes = new String[0];
+                break;
+            case VNET:
+            case ACL:
+               break;
+            case LB:
+                stringBuilder.append(String.format("%s%s", prefix, objectId));
+                break;
+            default:
+                stringBuilder.append(String.format("-%s", objectName));
+                break;
+        }
+        if (ArrayUtils.isNotEmpty(suffixes)) {
+            for (String suffix : suffixes) {
+                stringBuilder.append(String.format("-%s", suffix));
+            }
+        }
+        return stringBuilder.toString();
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java
new file mode 100644
index 00000000000..4261c6dc961
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java
@@ -0,0 +1,100 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.network.vpc.StaticRoute;
+import io.netris.ApiException;
+import io.netris.model.GetSiteBody;
+import io.netris.model.VPCListing;
+import io.netris.model.response.TenantResponse;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisACLCommand;
+import org.apache.cloudstack.agent.api.AddOrUpdateNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisNatCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisACLCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesCommand;
+import org.apache.cloudstack.agent.api.ReleaseNatIpCommand;
+import org.apache.cloudstack.agent.api.SetupNetrisPublicRangeCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVpcCommand;
+
+import java.util.List;
+
+public interface NetrisApiClient {
+    boolean isSessionAlive();
+    List<GetSiteBody> listSites();
+    List<VPCListing> listVPCs();
+    List<TenantResponse> listTenants() throws ApiException;
+
+    /**
+     * Create a VPC on CloudStack creates the following Netris resources:
+     * - Create a Netris VPC with the VPC name
+     * - Create an IPAM Allocation for the created Netris VPC using the Prefix = VPC CIDR
+     */
+    boolean createVpc(CreateNetrisVpcCommand cmd);
+
+    boolean updateVpc(UpdateNetrisVpcCommand cmd);
+
+    /**
+     * Delete a VPC on CloudStack removes the following Netris resources:
+     * - Delete the IPAM Allocation for the VPC using the Prefix = VPC CIDR
+     * - Delete a Netris VPC with the VPC name
+     */
+    boolean deleteVpc(DeleteNetrisVpcCommand cmd);
+
+    /**
+     * Creation of a VPC network tier creates the following Netris resources:
+     * - Creates a Netris IPAM Subnet for the specified network tier's CIDR
+     * - Creates a Netris vNet
+     */
+    boolean createVnet(CreateNetrisVnetCommand cmd);
+
+    boolean updateVnet(UpdateNetrisVnetCommand cmd);
+
+    /**
+     * Deletion of a VPC network tier deletes the following Netris resources:
+     * - Deletes the Netris IPAM Subnet for the specified network tier's CIDR
+     * - Deletes the Netris vNet
+     */
+    boolean deleteVnet(DeleteNetrisVnetCommand cmd);
+
+    /**
+     * Check and create zone level Netris Public range in the following manner:
+     * - Check the IPAM allocation for the zone super CIDR. In case it doesn't exist, create it
+     * - Check the IPAM subnet for NAT purpose for the range start-end. In case it doesn't exist, create it
+     */
+    boolean setupZoneLevelPublicRange(SetupNetrisPublicRangeCommand cmd);
+    boolean createOrUpdateSNATRule(CreateOrUpdateNetrisNatCommand cmd);
+    boolean createOrUpdateDNATRule(CreateOrUpdateNetrisNatCommand cmd);
+    boolean createStaticNatRule(CreateOrUpdateNetrisNatCommand cmd);
+    boolean deleteNatRule(DeleteNetrisNatRuleCommand cmd);
+    boolean addOrUpdateAclRule(CreateOrUpdateNetrisACLCommand cmd, boolean forLb);
+    boolean deleteAclRule(DeleteNetrisACLCommand cmd, boolean forLb);
+    boolean addOrUpdateStaticRoute(AddOrUpdateNetrisStaticRouteCommand cmd);
+    boolean deleteStaticRoute(DeleteNetrisStaticRouteCommand cmd);
+    List<StaticRoute> listStaticRoutes(ListNetrisStaticRoutesCommand cmd);
+    boolean releaseNatIp(ReleaseNatIpCommand cmd);
+    boolean createOrUpdateLbRule(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd);
+    boolean deleteLbRule(DeleteNetrisLoadBalancerRuleCommand cmd);
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
new file mode 100644
index 00000000000..e54006d2f1c
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
@@ -0,0 +1,2000 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.domain.Domain;
+import com.cloud.network.netris.NetrisLbBackend;
+import com.cloud.network.netris.NetrisNetworkRule;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.StaticRouteVO;
+import com.cloud.user.Account;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.NetUtils;
+import inet.ipaddr.IPAddress;
+import inet.ipaddr.IPAddressString;
+import io.netris.ApiClient;
+import io.netris.ApiException;
+import io.netris.ApiResponse;
+import io.netris.api.v1.AclApi;
+import io.netris.api.v1.AuthenticationApi;
+import io.netris.api.v1.RoutesApi;
+import io.netris.api.v1.SitesApi;
+import io.netris.api.v1.TenantsApi;
+import io.netris.api.v2.IpamApi;
+import io.netris.api.v2.L4LoadBalancerApi;
+import io.netris.api.v2.NatApi;
+import io.netris.api.v2.VNetApi;
+import io.netris.api.v2.VpcApi;
+import io.netris.model.AclAddItem;
+import io.netris.model.AclBodyVpc;
+import io.netris.model.AclDeleteItem;
+import io.netris.model.AclEditItem;
+import io.netris.model.AclGetBody;
+import io.netris.model.AclResponseGetOk;
+import io.netris.model.AllocationBody;
+import io.netris.model.AllocationBodyVpc;
+import io.netris.model.FilterBySites;
+import io.netris.model.FilterByVpc;
+import io.netris.model.GetSiteBody;
+
+import io.netris.model.InlineResponse20015;
+import io.netris.model.InlineResponse20016;
+import io.netris.model.InlineResponse2003;
+import io.netris.model.InlineResponse2004;
+import io.netris.model.InlineResponse2004Data;
+import io.netris.model.IpTree;
+import io.netris.model.IpTreeAllocation;
+import io.netris.model.IpTreeAllocationTenant;
+import io.netris.model.IpTreeSubnet;
+import io.netris.model.IpTreeSubnetSites;
+import io.netris.model.L4LBSite;
+import io.netris.model.L4LbAddItem;
+import io.netris.model.L4LbEditItem;
+import io.netris.model.L4LbTenant;
+import io.netris.model.L4LbVpc;
+import io.netris.model.L4LoadBalancerBackendItem;
+import io.netris.model.L4LoadBalancerItem;
+import io.netris.model.L4lbAddOrUpdateItem;
+import io.netris.model.L4lbresBody;
+import io.netris.model.NatBodySiteSite;
+import io.netris.model.NatBodyVpcVpc;
+import io.netris.model.NatGetBody;
+import io.netris.model.NatPostBody;
+import io.netris.model.NatPutBody;
+import io.netris.model.NatResponseGetOk;
+import io.netris.model.ResAddEditBody;
+import io.netris.model.RoutesBody;
+import io.netris.model.RoutesBodyId;
+import io.netris.model.RoutesBodyVpcVpc;
+import io.netris.model.RoutesGetBody;
+import io.netris.model.RoutesPostBody;
+import io.netris.model.RoutesPutBody;
+import io.netris.model.RoutesResponseGetOk;
+import io.netris.model.SitesResponseOK;
+import io.netris.model.SubnetBody;
+import io.netris.model.SubnetResBody;
+import io.netris.model.VPCAdminTenant;
+import io.netris.model.VPCCreate;
+import io.netris.model.VPCListing;
+import io.netris.model.VPCResource;
+import io.netris.model.VPCResourceIpam;
+import io.netris.model.VPCResponseOK;
+import io.netris.model.VPCResponseObjectOK;
+import io.netris.model.VPCResponseResourceOK;
+import io.netris.model.VnetAddBody;
+import io.netris.model.VnetAddBodyDhcp;
+import io.netris.model.VnetAddBodyDhcpOptionSet;
+import io.netris.model.VnetAddBodyGateways;
+import io.netris.model.VnetAddBodyVpc;
+import io.netris.model.VnetEditBody;
+import io.netris.model.VnetEditBodyDhcp;
+import io.netris.model.VnetEditBodyGateways;
+import io.netris.model.VnetResAddBody;
+import io.netris.model.VnetResDeleteBody;
+import io.netris.model.VnetResListBody;
+import io.netris.model.VnetsBody;
+import io.netris.model.VpcEditResponseOK;
+import io.netris.model.VpcVpcIdBody;
+import io.netris.model.response.AuthResponse;
+import io.netris.model.response.L4LbEditResponse;
+import io.netris.model.response.TenantResponse;
+import io.netris.model.response.TenantsResponse;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisACLCommand;
+import org.apache.cloudstack.agent.api.AddOrUpdateNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisNatCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisACLCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesCommand;
+import org.apache.cloudstack.agent.api.NetrisCommand;
+import org.apache.cloudstack.agent.api.ReleaseNatIpCommand;
+import org.apache.cloudstack.agent.api.SetupNetrisPublicRangeCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVpcCommand;
+import org.apache.cloudstack.resource.NetrisResourceObjectUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+public class NetrisApiClientImpl implements NetrisApiClient {
+
+    private final Logger logger = LogManager.getLogger(getClass());
+    private static final String ANY_IP = "0.0.0.0/0";
+    private static final String[] PROTOCOL_LIST = new String[]{"TCP", "UDP", "ICMP", "ALL"};
+
+    protected ApiClient apiClient;
+
+    protected final int siteId;
+    private final String siteName;
+    protected final int tenantId;
+    private final String tenantName;
+
+    public NetrisApiClientImpl(String endpointBaseUrl, String username, String password, String siteName, String adminTenantName) {
+        try {
+            apiClient = new ApiClient(endpointBaseUrl, username, password, 1L);
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error creating the Netris API Client for %s", endpointBaseUrl), e);
+        }
+        Pair<Integer, String> sitePair = getNetrisSitePair(siteName);
+        Pair<Integer, String> tenantPair = getNetrisTenantPair(adminTenantName);
+        this.siteId = sitePair.first();
+        this.siteName = sitePair.second();
+        this.tenantId = tenantPair.first();
+        this.tenantName = tenantPair.second();
+    }
+
+    private Pair<Integer, String> getNetrisSitePair(String siteName) {
+        List<GetSiteBody> sites = listSites();
+        if (CollectionUtils.isEmpty(sites)) {
+            throw new CloudRuntimeException("There are no Netris sites, please check the Netris endpoint");
+        }
+        List<GetSiteBody> filteredSites = sites.stream().filter(x -> x.getName().equals(siteName)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(filteredSites)) {
+            throw new CloudRuntimeException(String.format("Cannot find a site matching name %s on Netris, please check the Netris endpoint", siteName));
+        }
+        return new Pair<>(filteredSites.get(0).getId(), siteName);
+    }
+
+    private Pair<Integer, String> getNetrisTenantPair(String adminTenantName) {
+        List<TenantResponse> tenants = listTenants();
+        if (CollectionUtils.isEmpty(tenants)) {
+            throw new CloudRuntimeException("There are no Netris tenants, please check the Netris endpoint");
+        }
+        List<TenantResponse> filteredTenants = tenants.stream().filter(x -> x.getName().equals(adminTenantName)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(filteredTenants)) {
+            throw new CloudRuntimeException(String.format("Cannot find a site matching name %s on Netris, please check the Netris endpoint", adminTenantName));
+        }
+        return new Pair<>(filteredTenants.get(0).getId().intValue(), adminTenantName);
+    }
+
+    protected void logAndThrowException(String prefix, ApiException e) throws CloudRuntimeException {
+        String msg = String.format("%s: (%s, %s, %s)", prefix, e.getCode(), e.getMessage(), e.getResponseBody());
+        logger.error(msg, e);
+        throw new CloudRuntimeException(msg);
+    }
+
+    @Override
+    public boolean isSessionAlive() {
+        ApiResponse<AuthResponse> response = null;
+        try {
+            AuthenticationApi api = apiClient.getApiStubForMethod(AuthenticationApi.class);
+            response = api.apiAuthGet();
+        } catch (ApiException e) {
+            logAndThrowException("Error checking the Netris API session is alive", e);
+        }
+        return response != null && response.getStatusCode() == 200;
+    }
+
+    @Override
+    public List<GetSiteBody> listSites() {
+        SitesResponseOK response = null;
+        try {
+            SitesApi api = apiClient.getApiStubForMethod(SitesApi.class);
+            response = api.apiSitesGet();
+        } catch (ApiException e) {
+            logAndThrowException("Error listing Netris Sites", e);
+        }
+        return response != null ? response.getData() : null;
+    }
+
+    @Override
+    public List<VPCListing> listVPCs() {
+        VPCResponseOK response = null;
+        try {
+            VpcApi api = apiClient.getApiStubForMethod(VpcApi.class);
+            response = api.apiV2VpcGet();
+        } catch (ApiException e) {
+            logAndThrowException("Error listing Netris VPCs", e);
+        }
+        return response != null ? response.getData() : null;
+    }
+
+    @Override
+    public List<TenantResponse> listTenants() {
+        ApiResponse<TenantsResponse> response = null;
+        try {
+            TenantsApi api = apiClient.getApiStubForMethod(TenantsApi.class);
+            response = api.apiTenantsGet();
+        } catch (ApiException e) {
+            logAndThrowException("Error listing Netris Tenants", e);
+        }
+        return (response != null && response.getData() != null) ? response.getData().getData() : null;
+    }
+
+    private VPCResponseObjectOK createVpcInternal(String vpcName, int adminTenantId, String adminTenantName) {
+        VPCResponseObjectOK response;
+        logger.debug(String.format("Creating Netris VPC %s", vpcName));
+        try {
+            VpcApi vpcApi = apiClient.getApiStubForMethod(VpcApi.class);
+            VPCCreate body = new VPCCreate();
+            body.setName(vpcName);
+            VPCAdminTenant vpcAdminTenant = new VPCAdminTenant();
+            vpcAdminTenant.setId(adminTenantId);
+            vpcAdminTenant.name(adminTenantName);
+            body.setAdminTenant(vpcAdminTenant);
+            response = vpcApi.apiV2VpcPost(body);
+        } catch (ApiException e) {
+            logAndThrowException("Error creating Netris VPC", e);
+            return null;
+        }
+        return response;
+    }
+
+    private VpcEditResponseOK updateVpcInternal(String vpcName, String prevVpcName, int adminTenantId, String adminTenantName) {
+        VpcEditResponseOK response;
+        logger.debug(String.format("Updating Netris VPC name from %s to %s", prevVpcName, vpcName));
+        try {
+            VPCListing vpcResource = getVpcByNameAndTenant(prevVpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", prevVpcName, tenantId);
+                return null;
+            }
+            VpcApi vpcApi = apiClient.getApiStubForMethod(VpcApi.class);
+            VpcVpcIdBody body = new VpcVpcIdBody();
+            body.setName(vpcName);
+            VPCAdminTenant vpcAdminTenant = new VPCAdminTenant();
+            vpcAdminTenant.setId(adminTenantId);
+            vpcAdminTenant.name(adminTenantName);
+            body.setAdminTenant(vpcAdminTenant);
+            response = vpcApi.apiV2VpcVpcIdPut(body, vpcResource.getId());
+        } catch (ApiException e) {
+            logAndThrowException("Error updating Netris VPC", e);
+            return null;
+        }
+        return response;
+    }
+
+    private InlineResponse2004Data createIpamAllocationInternal(String ipamName, String ipamPrefix, VPCListing vpc) {
+        logger.debug(String.format("Creating Netris IPAM Allocation %s for VPC %s", ipamPrefix, vpc.getName()));
+        try {
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            AllocationBody body = new AllocationBody();
+            AllocationBodyVpc allocationBodyVpc = new AllocationBodyVpc();
+            allocationBodyVpc.setId(vpc.getId());
+            allocationBodyVpc.setName(vpc.getName());
+            body.setVpc(allocationBodyVpc);
+            body.setName(ipamName);
+            body.setPrefix(ipamPrefix);
+            IpTreeAllocationTenant allocationTenant = new IpTreeAllocationTenant();
+            allocationTenant.setId(new BigDecimal(tenantId));
+            allocationTenant.setName(tenantName);
+            body.setTenant(allocationTenant);
+            InlineResponse2004 ipamResponse = ipamApi.apiV2IpamAllocationPost(body);
+            if (ipamResponse == null || !ipamResponse.isIsSuccess()) {
+                String reason = ipamResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris Allocation {} for VPC {} creation failed: {}", ipamPrefix, vpc.getName(), reason);
+                return null;
+            }
+            logger.debug(String.format("Successfully created VPC %s and its IPAM Allocation %s on Netris", vpc.getName(), ipamPrefix));
+            return ipamResponse.getData();
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error creating Netris IPAM Allocation %s for VPC %s", ipamPrefix, vpc.getName()), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean createVpc(CreateNetrisVpcCommand cmd) {
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
+        VPCResponseObjectOK createdVpc = createVpcInternal(netrisVpcName, tenantId, tenantName);
+        if (createdVpc == null || !createdVpc.isIsSuccess()) {
+            String reason = createdVpc == null ? "Empty response" : "Operation failed on Netris";
+            logger.debug("The Netris VPC {} creation failed: {}", cmd.getName(), reason);
+            return false;
+        }
+
+        String netrisIpamAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, cmd.getCidr());
+        String vpcCidr = cmd.getCidr();
+        InlineResponse2004Data createdIpamAllocation = createIpamAllocationInternal(netrisIpamAllocationName, vpcCidr, createdVpc.getData());
+        return createdIpamAllocation != null;
+    }
+
+    @Override
+    public boolean updateVpc(UpdateNetrisVpcCommand cmd) {
+        Long domainId = cmd.getDomainId();
+        Long zoneId = cmd.getZoneId();
+        Long accountId = cmd.getAccountId();
+        Long vpcId = cmd.getId();
+        String prevVpcName = cmd.getPreviousVpcName();
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
+        String netrisPrevVpcName = String.format("D%s-A%s-Z%s-V%s-%s", domainId, accountId, zoneId, vpcId, prevVpcName);
+        VpcEditResponseOK updatedVpc = updateVpcInternal(netrisVpcName, netrisPrevVpcName, tenantId, tenantName);
+        if (updatedVpc == null || !updatedVpc.isIsSuccess()) {
+            String reason = updatedVpc == null ? "Empty response" : "Operation failed on Netris";
+            logger.debug("The update of Netris VPC {} failed: {}", cmd.getPreviousVpcName(), reason);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteNatRule(DeleteNetrisNatRuleCommand cmd) {
+        try {
+            String suffix = getNetrisVpcNameSuffix(cmd.getVpcId(), cmd.getVpcName(), cmd.getId(), cmd.getName(), cmd.isVpc());
+            String vpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffix);
+            VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
+                return false;
+            }
+            String natRuleName = cmd.getNatRuleName();
+            NatGetBody existingNatRule = netrisNatRuleExists(natRuleName);
+            boolean ruleExists = Objects.nonNull(existingNatRule);
+            if (ruleExists) {
+                deleteNatRule(natRuleName, existingNatRule.getId(), vpcResource.getName());
+                if (cmd.getNatRuleType().equals("STATICNAT")) {
+                    String natIp = cmd.getNatIp();
+                    String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), natIp);
+                    deleteNatSubnet(netrisSubnetName, vpcResource.getId(), natIp);
+                }
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Error deleting Netris NAT Rule", e);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean addOrUpdateAclRule(CreateOrUpdateNetrisACLCommand cmd, boolean forLb) {
+        String aclName = cmd.getNetrisAclName();
+        try {
+            AclApi aclApi = apiClient.getApiStubForMethod(AclApi.class);
+            VPCListing vpcResource;
+            String netrisVpcName;
+            if (forLb) {
+                vpcResource = getSystemVpc();
+                netrisVpcName = vpcResource.getName();
+
+            } else {
+                netrisVpcName = getNetrisVpcName(cmd, cmd.getVpcId(), cmd.getVpcName());
+                vpcResource = getNetrisVpcResource(netrisVpcName);
+                if (Objects.isNull(vpcResource)) {
+                    return false;
+                }
+            }
+            AclBodyVpc vpc = new AclBodyVpc().id(vpcResource.getId());
+            List<String> aclNames = List.of(aclName);
+            Pair<Boolean, List<BigDecimal>> resultAndMatchingAclIds = getMatchingAclIds(aclNames, netrisVpcName);
+            List<BigDecimal> aclIdList = resultAndMatchingAclIds.second();
+            if (!aclIdList.isEmpty()) {
+                logger.debug("Netris ACL rule: {} already exists, updating it...", aclName);
+                AclEditItem aclEditItem = getAclEditItem(cmd, aclName, aclIdList.get(0));
+                aclEditItem.setVpc(vpc);
+                try {
+                    aclApi.apiAclPut(aclEditItem);
+                } catch (ApiException e) {
+                    if (e.getResponseBody().contains("This kind of acl already exists")) {
+                        logger.info("Netris ACL rule: {} already exists and doesn't need to be updated", aclName);
+                        return true;
+                    }
+                    throw new CloudRuntimeException("Error updating Netris ACL rule", e);
+                }
+                return true;
+            }
+            AclAddItem aclAddItem = getAclAddItem(cmd, aclName);
+            aclAddItem.setVpc(vpc);
+            aclApi.apiAclPost(aclAddItem);
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to create Netris ACL: %s", cmd.getNetrisAclName()), e);
+        }
+        return true;
+    }
+
+    AclAddItem getAclAddItem(CreateOrUpdateNetrisACLCommand cmd, String aclName) throws ApiException {
+        AclAddItem aclAddItem = new AclAddItem();
+        aclAddItem.setAction(cmd.getAction());
+        aclAddItem.setComment(String.format("ACL rule: %s. %s", cmd.getNetrisAclName(), cmd.getReason()));
+        aclAddItem.setName(aclName);
+        String protocol = cmd.getProtocol();
+        if ("TCP".equals(protocol)) {
+            aclAddItem.setEstablished(new BigDecimal(1));
+        } else {
+            aclAddItem.setReverse("yes");
+        }
+        if (!Arrays.asList(PROTOCOL_LIST).contains(protocol)) {
+            aclAddItem.setProto("ip");
+            aclAddItem.setSrcPortTo(cmd.getIcmpType());
+            // TODO: set proto number: where should the protocol number be set - API sets the protocol number to Src-from & to and Dest-from & to fields
+        } else if ("ICMP".equals(protocol)) {
+            aclAddItem.setProto("icmp");
+            if (cmd.getIcmpType() != -1) {
+                aclAddItem.setIcmpType(cmd.getIcmpType());
+            }
+        } else {
+            aclAddItem.setProto(protocol.toLowerCase(Locale.ROOT));
+        }
+
+        aclAddItem.setDstPortFrom(cmd.getDestPortStart());
+        aclAddItem.setDstPortTo(cmd.getDestPortEnd());
+        aclAddItem.setDstPrefix(cmd.getDestPrefix());
+        aclAddItem.setSrcPrefix(cmd.getSourcePrefix());
+        aclAddItem.setSrcPortFrom(1);
+        aclAddItem.setSrcPortTo(65535);
+        if (NatPutBody.ProtocolEnum.ICMP.name().equalsIgnoreCase(protocol)) {
+            aclAddItem.setIcmpType(cmd.getIcmpType());
+        }
+
+        return aclAddItem;
+    }
+
+    AclEditItem getAclEditItem(CreateOrUpdateNetrisACLCommand cmd, String aclName, BigDecimal aclId) throws ApiException {
+        AclEditItem aclEditItem = new AclEditItem();
+        aclEditItem.setId(aclId);
+        aclEditItem.setAction(cmd.getAction());
+        aclEditItem.setComment(String.format("ACL rule: %s. %s", cmd.getNetrisAclName(), cmd.getReason()));
+        aclEditItem.setName(aclName);
+        String protocol = cmd.getProtocol();
+        if ("TCP".equals(protocol)) {
+            aclEditItem.setEstablished(new BigDecimal(1));
+        } else {
+            aclEditItem.setReverse("yes");
+        }
+        if (!Arrays.asList(PROTOCOL_LIST).contains(protocol)) {
+            aclEditItem.setProto("ip");
+            aclEditItem.setSrcPortTo(cmd.getIcmpType());
+            // TODO: set proto number: where should the protocol number be set - API sets the protocol number to Src-from & to and Dest-from & to fields
+        } else if ("ICMP".equals(protocol)) {
+            aclEditItem.setProto("icmp");
+            if (cmd.getIcmpType() != -1) {
+                aclEditItem.setIcmpType(cmd.getIcmpType());
+            }
+        } else {
+            aclEditItem.setProto(protocol.toLowerCase(Locale.ROOT));
+        }
+
+        aclEditItem.setDstPortFrom(cmd.getDestPortStart());
+        aclEditItem.setDstPortTo(cmd.getDestPortEnd());
+        aclEditItem.setDstPrefix(cmd.getDestPrefix());
+        aclEditItem.setSrcPrefix(cmd.getSourcePrefix());
+        aclEditItem.setSrcPortFrom(1);
+        aclEditItem.setSrcPortTo(65535);
+        if (NatPutBody.ProtocolEnum.ICMP.name().equalsIgnoreCase(protocol)) {
+            aclEditItem.setIcmpType(cmd.getIcmpType());
+        }
+
+        return aclEditItem;
+    }
+
+    @Override
+    public boolean deleteAclRule(DeleteNetrisACLCommand cmd, boolean forLb) {
+        List<String> aclNames = cmd.getAclRuleNames();
+        try {
+            AclApi aclApi = apiClient.getApiStubForMethod(AclApi.class);
+
+            String vpcName;
+            if (!forLb) {
+                String suffix = getNetrisVpcNameSuffix(cmd.getVpcId(), cmd.getVpcName(), cmd.getId(), cmd.getName(), cmd.isVpc());
+                vpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffix);
+            } else {
+                VPCListing vpcResource = getSystemVpc();
+                vpcName = vpcResource.getName();
+            }
+            Pair<Boolean, List<BigDecimal>> resultAndMatchingAclIds = getMatchingAclIds(aclNames, vpcName);
+            Boolean result = resultAndMatchingAclIds.first();
+            List<BigDecimal> matchingAclIds = resultAndMatchingAclIds.second();
+            if (!result) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
+                return false;
+            }
+            if (matchingAclIds.isEmpty()) {
+                logger.warn("There doesn't seem to be any ACLs on Netris matching {}", aclNames.size() > 1 ? String.join(",", aclNames) : aclNames);
+                return true;
+            }
+            AclDeleteItem aclDeleteItem = new AclDeleteItem();
+            aclDeleteItem.setId(matchingAclIds);
+            aclDeleteItem.setTenantsID(String.valueOf(tenantId));
+            aclApi.apiAclDelete(aclDeleteItem);
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to delete Netris ACLs: %s", String.join(",", cmd.getAclRuleNames())), e);
+        }
+        return true;
+    }
+
+    Pair<Boolean, List<BigDecimal>> getMatchingAclIds(List<String> aclNames, String vpcName) {
+        try {
+            AclApi aclApi = apiClient.getApiStubForMethod(AclApi.class);
+            VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
+                return new Pair<>(false, Collections.emptyList());
+            }
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(vpcResource.getId());
+            FilterBySites siteFilter = new FilterBySites();
+            siteFilter.add(siteId);
+            AclResponseGetOk aclGetResponse = aclApi.apiAclGet(siteFilter, vpcFilter);
+            if (aclGetResponse == null || !aclGetResponse.isIsSuccess()) {
+                logger.warn("No ACLs were found to be present for the specific Netris VPC resource {}." +
+                        " Netris ACLs may have been deleted out of band.", vpcName);
+                return new Pair<>(true, Collections.emptyList());
+            }
+            List<AclGetBody> aclList = aclGetResponse.getData();
+            return new Pair<>(true, aclList.stream()
+                    .filter(acl -> aclNames.contains(acl.getName()))
+                    .map(acl -> BigDecimal.valueOf(acl.getId()))
+                    .collect(Collectors.toList()));
+        } catch (ApiException e) {
+            logAndThrowException("Failed to retrieve Netris ACLs", e);
+        }
+        return new Pair<>(true, Collections.emptyList());
+    }
+
+    public boolean addOrUpdateStaticRoute(AddOrUpdateNetrisStaticRouteCommand cmd) {
+        String prefix = cmd.getPrefix();
+        String nextHop = cmd.getNextHop();
+        Long vpcId = cmd.getId();
+        String vpcName = cmd.getName();
+        boolean updateRoute = cmd.isUpdateRoute();
+        try {
+            String vpcSuffix = getNetrisVpcNameSuffix(vpcId, vpcName, null, null, true);
+            String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, vpcSuffix);
+            VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+                return false;
+            }
+
+            String[] suffixes = new String[2];
+            suffixes[0] = vpcId.toString();
+            suffixes[1] = cmd.getRouteId().toString();
+            String staticRouteId = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffixes);
+
+            Pair<Boolean, RoutesGetBody> existingStaticRoute = staticRouteExists(vpcResource.getId(), prefix, null, staticRouteId);
+            if (updateRoute) {
+                if (!existingStaticRoute.first()) {
+                    logger.error("The Netris static route {} does not exist for VPC {}, adding it", prefix, netrisVpcName);
+                    return addStaticRouteInternal(vpcResource, netrisVpcName, prefix, nextHop, staticRouteId);
+                }
+                return updateStaticRouteInternal(existingStaticRoute.second().getId(), netrisVpcName, prefix, nextHop, staticRouteId);
+            } else {
+                if (existingStaticRoute.first()) {
+                    String existingNextHop = existingStaticRoute.second().getNextHop();
+                    if (existingNextHop != null && existingNextHop.equals(nextHop)) {
+                        logger.debug("The Netris static route {} already exists for VPC {}", prefix, netrisVpcName);
+                        return true;
+                    } else {
+                        logger.debug("The Netris static route {} already exists but has different next hop {} for VPC {}", prefix, nextHop, netrisVpcName);
+                        return false;
+                    }
+                }
+                return addStaticRouteInternal(vpcResource, netrisVpcName, prefix, nextHop, staticRouteId);
+            }
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Error adding Netris static route", e);
+        }
+    }
+
+    private boolean addStaticRouteInternal(VPCListing vpcResource, String netrisVpcName, String prefix, String nextHop, String staticRouteId) {
+        try {
+            RoutesApi routesApi = apiClient.getApiStubForMethod(RoutesApi.class);
+            RoutesPostBody routesPostBody = new RoutesPostBody();
+            routesPostBody.setPrefix(prefix);
+            routesPostBody.setNextHop(nextHop);
+            routesPostBody.setSiteId(new BigDecimal(siteId));
+            routesPostBody.setStateStatus(RoutesBody.StateStatusEnum.ACTIVE);
+
+            RoutesBodyVpcVpc vpcBody = new RoutesBodyVpcVpc();
+            vpcBody.setId(vpcResource.getId());
+            vpcBody.setName(vpcResource.getName());
+            vpcBody.setIsDefault(vpcResource.isIsDefault());
+            vpcBody.setIsSystem(vpcResource.isIsSystem());
+            routesPostBody.setVpc(vpcBody);
+
+            routesPostBody.setDescription(staticRouteId);
+            routesPostBody.setStateStatus(RoutesBody.StateStatusEnum.ACTIVE);
+            routesPostBody.setSwitches(Collections.emptyList());
+
+            InlineResponse2004 routeResponse = routesApi.apiRoutesPost(routesPostBody);
+            if (routeResponse == null || !routeResponse.isIsSuccess()) {
+                String reason = routeResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris static route creation failed for netris VPC - {}: {}", netrisVpcName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+        } catch (ApiException e) {
+            logAndThrowException("Error adding Netris static route", e);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean updateStaticRouteInternal(Integer id, String netrisVpcName, String prefix, String nextHop, String staticRouteId) {
+        try {
+            RoutesApi routesApi = apiClient.getApiStubForMethod(RoutesApi.class);
+            RoutesPutBody routesPutBody = new RoutesPutBody();
+            routesPutBody.setId(id);
+            routesPutBody.setPrefix(prefix);
+            routesPutBody.setNextHop(nextHop);
+            routesPutBody.setSiteId(new BigDecimal(siteId));
+            routesPutBody.setStateStatus(RoutesPutBody.StateStatusEnum.ACTIVE);
+
+            routesPutBody.setDescription(staticRouteId);
+            routesPutBody.setSwitches(Collections.emptyList());
+
+            InlineResponse2003 routeResponse = routesApi.apiRoutesPut(routesPutBody);
+            if (routeResponse == null || !routeResponse.isIsSuccess()) {
+                String reason = routeResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("Failed to update Netris static route for netris VPC - {}: {}", netrisVpcName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+        } catch (ApiException e) {
+            logAndThrowException("Error updating Netris static route", e);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteStaticRoute(DeleteNetrisStaticRouteCommand cmd) {
+        Long vpcId = cmd.getId();
+        String vpcName = cmd.getName();
+        String prefix = cmd.getPrefix();
+        String nextHop = cmd.getNextHop();
+        try {
+            String vpcSuffix = getNetrisVpcNameSuffix(vpcId, vpcName, null, null, true);
+            String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, vpcSuffix);
+            VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+                return false;
+            }
+
+            String[] suffixes = new String[2];
+            suffixes[0] = vpcId.toString();
+            suffixes[1] = cmd.getRouteId().toString();
+            String staticRouteId = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffixes);
+            Pair<Boolean, RoutesGetBody> existingStaticRoute = staticRouteExists(vpcResource.getId(), prefix, nextHop, staticRouteId);
+
+            if (Boolean.FALSE.equals(existingStaticRoute.first())) {
+                logger.debug("The Netris static route {} does not exist for VPC {}", prefix, netrisVpcName);
+                return true;
+            }
+            RoutesGetBody existingRoute = existingStaticRoute.second();
+            RoutesApi routesApi = apiClient.getApiStubForMethod(RoutesApi.class);
+            RoutesBodyId id = new RoutesBodyId();
+            id.setId(existingRoute.getId());
+            InlineResponse2003 routeDeleteResponse = routesApi.apiRoutesDelete(id);
+            if (routeDeleteResponse == null || !routeDeleteResponse.isIsSuccess()) {
+                String reason = routeDeleteResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris static route deletion failed for netris VPC - {}: {}", netrisVpcName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+            return true;
+        } catch (ApiException e) {
+            logAndThrowException("Error deleting Netris static route", e);
+        }
+        return false;
+    }
+
+    @Override
+    public List<StaticRoute> listStaticRoutes(ListNetrisStaticRoutesCommand cmd) {
+        Long vpcId = cmd.getId();
+        String vpcName = cmd.getName();
+        String prefix = cmd.getPrefix();
+        String nextHop = cmd.getNextHop();
+        String vpcSuffix = getNetrisVpcNameSuffix(vpcId, vpcName, null, null, true);
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, vpcSuffix);
+        VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+        if (vpcResource == null) {
+            logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+            return new ArrayList<>();
+        }
+
+        List<RoutesGetBody> staticRoutes = listStaticRoutes(vpcResource.getId(), prefix, nextHop);
+        if (CollectionUtils.isEmpty(staticRoutes)) {
+            return new ArrayList<>();
+        }
+        List<StaticRoute> result = new ArrayList<>();
+        for (RoutesGetBody staticRoute : staticRoutes) {
+            // All static routes belong the SYSTEM account, which does not matter
+            result.add(new StaticRouteVO(null, staticRoute.getName(), vpcId, Account.ACCOUNT_ID_SYSTEM, Domain.ROOT_DOMAIN, staticRoute.getNextHop()));
+        }
+        return result;
+    }
+
+    @Override
+    public boolean releaseNatIp(ReleaseNatIpCommand cmd) {
+        String natIp = cmd.getNatIp() + "/32";
+        try {
+            VPCListing systemVpc = getSystemVpc();
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(systemVpc.getId());
+            SubnetResBody subnetResponse = ipamApi.apiV2IpamSubnetsGet(vpcFilter);
+            if (subnetResponse == null || !subnetResponse.isIsSuccess()) {
+                String reason = subnetResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("Failed to retrieve Netris Public NAT IPs due to {}", reason);
+                throw new CloudRuntimeException(reason);
+            }
+            List<IpTreeSubnet> natIps = subnetResponse.getData().stream().filter(ip -> ip.getPrefix().equals(natIp)).collect(Collectors.toList());
+            if (!natIps.isEmpty()) {
+                ipamApi.apiV2IpamTypeIdDelete("subnet", natIps.get(0).getId().intValue());
+            }
+
+        } catch (ApiException e) {
+            logAndThrowException("Failed to release Netris IP", e);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean createOrUpdateLbRule(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd) {
+        boolean isVpc = cmd.isVpc();
+        Long networkResourceId = cmd.getId();
+        String networkResourceName = cmd.getName();
+        Long domainId = cmd.getDomainId();
+        Long accountId = cmd.getAccountId();
+        Long zoneId = cmd.getZoneId();
+        Long lbId = cmd.getLbId();
+        String publicIp = cmd.getPublicIp();
+        List<NetrisLbBackend> lbBackends = cmd.getLbBackends();
+
+        try {
+            String resourcePrefix = isVpc ? "V" : "N";
+            String netrisResourceName = String.format("D%s-A%s-Z%s-%s%s-%s", domainId, accountId, zoneId, resourcePrefix, networkResourceId, networkResourceName);
+            VPCListing vpcResource = getNetrisVpcResource(netrisResourceName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisResourceName, tenantId);
+                return false;
+            }
+            createLBSubnet(cmd, publicIp + "/32", vpcResource.getId());
+
+            String suffix = String.format("LB%s", lbId);
+            String lbName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.LB, suffix);
+            Pair<Boolean, List<BigDecimal>> resultAndMatchingLbId = getMatchingLbRule(lbName, vpcResource.getName());
+            Boolean result = resultAndMatchingLbId.first();
+            List<BigDecimal> matchingLbId = resultAndMatchingLbId.second();
+            if (Boolean.FALSE.equals(result)) {
+                logger.warn("Could not find the Netris LB rule with name {}", lbName);
+            }
+            boolean updateRule = !matchingLbId.isEmpty();
+            L4lbAddOrUpdateItem l4lbAddItem = getL4LbRule(cmd, vpcResource, lbName, publicIp, lbBackends, updateRule);
+            L4LoadBalancerApi loadBalancerApi = apiClient.getApiStubForMethod(L4LoadBalancerApi.class);
+            boolean success;
+            L4LbEditResponse editResponse = null;
+            ResAddEditBody createResponse = null;
+            if (updateRule) {
+                editResponse = loadBalancerApi.apiV2L4lbIdPut((L4LbEditItem) l4lbAddItem, matchingLbId.get(0).intValue());
+                success = editResponse.isIsSuccess();
+            } else {
+                createResponse = loadBalancerApi.apiV2L4lbPost((L4LbAddItem) l4lbAddItem);
+                success = createResponse.isIsSuccess();
+            }
+            if (ObjectUtils.allNull(editResponse, createResponse) || Boolean.FALSE.equals(success)) {
+                throw new CloudRuntimeException(String.format("Failed to %s Netris LB rule", updateRule ? "update" : "create"));
+            }
+            if (Objects.nonNull(cmd.getCidrList()) && !cmd.getCidrList().isEmpty()) {
+                applyAclRulesForLb(cmd, lbName);
+            }
+        } catch (ApiException e) {
+            logAndThrowException("Failed to create Netris load balancer rule", e);
+        }
+        return true;
+    }
+
+    private void applyAclRulesForLb(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd, String lbName) {
+        // Add deny all rule first
+        addOrUpdateAclRule(createNetrisACLRuleCommand(cmd, lbName, "ANY",
+                NetrisNetworkRule.NetrisRuleAction.DENY.name().toLowerCase(Locale.ROOT), 0), true);
+        AtomicInteger cidrIndex = new AtomicInteger(1);
+        for (String cidr : cmd.getCidrList().split(" ")) {
+            try {
+                addOrUpdateAclRule(createNetrisACLRuleCommand(cmd, lbName, cidr,
+                        NetrisNetworkRule.NetrisRuleAction.PERMIT.name().toLowerCase(Locale.ROOT),
+                        cidrIndex.getAndIncrement()), true);
+            } catch (Exception e) {
+                throw new CloudRuntimeException(String.format("Failed to add Netris ACL rule for LB CIDR %s", cidr), e);
+            }
+        }
+    }
+
+    private CreateOrUpdateNetrisACLCommand createNetrisACLRuleCommand(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd, String netrisLbName, String cidr, String action, int index) {
+        Long zoneId = cmd.getZoneId();
+        Long accountId = cmd.getAccountId();
+        Long domainId = cmd.getDomainId();
+        String networkName = null;
+        Long networkId = null;
+        String vpcName = null;
+        Long vpcId = null;
+        boolean isVpc = cmd.isVpc();
+        if (isVpc) {
+            vpcId = cmd.getId();
+            vpcName = cmd.getName();
+        } else {
+            networkName = cmd.getName();
+            networkId = cmd.getId();
+        }
+        String destinationPrefix = cmd.getPublicIp() + "/32";
+        String srcPort = cmd.getPublicPort();
+        String dstPort = cmd.getPublicPort();
+        CreateOrUpdateNetrisACLCommand aclCommand = new CreateOrUpdateNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId,
+                vpcName, vpcId, Objects.nonNull(vpcId), action, NetrisServiceImpl.getPrefix(cidr), NetrisServiceImpl.getPrefix(destinationPrefix),
+                Integer.parseInt(srcPort), Integer.parseInt(dstPort), cmd.getProtocol());
+        String aclName;
+        if (isVpc) {
+            aclName =  String.format("V%s-LBACL%s-%s", vpcId, index, cmd.getRuleName());
+        } else {
+            aclName = String.format("N%s-LBACL%s-%s", networkId, index, cmd.getRuleName());
+        }
+        String netrisAclName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName);
+        aclCommand.setNetrisAclName(netrisAclName);
+        aclCommand.setReason(String.format("ACL Rule for CIDR %s of LB %s ", aclName, netrisLbName));
+        return aclCommand;
+    }
+
+    private L4lbAddOrUpdateItem getL4LbRule(CreateOrUpdateNetrisLoadBalancerRuleCommand cmd, VPCListing vpcResource, String lbName,
+                                            String publicIp, List<NetrisLbBackend> lbBackends, boolean updateRule) {
+        L4lbAddOrUpdateItem l4lbAddItem = updateRule ? new L4LbEditItem() : new L4LbAddItem();
+        try {
+            l4lbAddItem.setName(lbName);
+
+            String protocol = cmd.getProtocol().toUpperCase(Locale.ROOT);
+            if (!Arrays.asList("TCP", "UDP").contains(protocol)) {
+                throw new CloudRuntimeException("Invalid protocol " + protocol);
+            }
+            l4lbAddItem.setProtocol(cmd.getProtocol().toUpperCase(Locale.ROOT));
+            L4LBSite site = new L4LBSite();
+            site.setId(siteId);
+            site.setName(siteName);
+            l4lbAddItem.setSite(site);
+            l4lbAddItem.setSiteID(new BigDecimal(siteId));
+
+            L4LbTenant tenant = new L4LbTenant();
+            tenant.setId(tenantId);
+            tenant.setName(tenantName);
+            l4lbAddItem.setTenant(tenant);
+
+            L4LbVpc vpc = new L4LbVpc();
+            vpc.setId(vpcResource.getId());
+            l4lbAddItem.setVpc(vpc);
+
+            l4lbAddItem.setAutomatic(false);
+            l4lbAddItem.setIpFamily(NetUtils.isIpv4(publicIp) ? L4lbAddOrUpdateItem.IpFamilyEnum.IPv4 : L4lbAddOrUpdateItem.IpFamilyEnum.IPv6);
+            l4lbAddItem.setIp(publicIp);
+            l4lbAddItem.setStatus("enable");
+
+            List<L4LoadBalancerBackendItem> backends = new ArrayList<>();
+            for (NetrisLbBackend backend : lbBackends) {
+                L4LoadBalancerBackendItem backendItem = new L4LoadBalancerBackendItem();
+                backendItem.setIp(backend.getVmIp());
+                backendItem.setPort(backend.getPort());
+                backends.add(backendItem);
+            }
+            l4lbAddItem.setBackend(backends);
+            l4lbAddItem.setPort(Integer.valueOf(cmd.getPublicPort()));
+            l4lbAddItem.setHealthCheck(L4lbAddOrUpdateItem.HealthCheckEnum.NONE);
+        } catch (Exception e) {
+            throw new CloudRuntimeException("Failed to create Netris load balancer rule", e);
+        }
+        return  l4lbAddItem;
+    }
+
+    @Override
+    public boolean deleteLbRule(DeleteNetrisLoadBalancerRuleCommand cmd) {
+        boolean isVpc = cmd.isVpc();
+        String vpcName = null;
+        String networkName = null;
+        Long vpcId = null;
+        Long networkId = null;
+        if (isVpc) {
+            vpcName = cmd.getName();
+            vpcId = cmd.getId();
+        } else {
+            networkName = cmd.getName();
+            networkId = cmd.getId();
+        }
+        Long lbId = cmd.getLbId();
+        String cidrList = cmd.getCidrList();
+        try {
+            String suffix = getNetrisVpcNameSuffix(vpcId, vpcName, networkId, networkName, isVpc);
+            String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffix);
+            suffix = String.format("LB%s", lbId);
+            String lbName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.LB, suffix);
+            Pair<Boolean, List<BigDecimal>> resultAndMatchingLbId = getMatchingLbRule(lbName, netrisVpcName);
+            Boolean result = resultAndMatchingLbId.first();
+            List<BigDecimal> matchingLbId = resultAndMatchingLbId.second();
+            if (!result) {
+                logger.error("Could not find the Netris LB rule with name {}", lbName);
+                return false;
+            }
+            if (matchingLbId.isEmpty()) {
+                logger.warn("There doesn't seem to be any LB rule on Netris matching {}", lbName);
+                return true;
+            }
+
+            L4LoadBalancerApi lbApi = apiClient.getApiStubForMethod(L4LoadBalancerApi.class);
+            lbApi.apiV2L4lbIdDelete(matchingLbId.get(0).intValue());
+            if (Objects.nonNull(cidrList)) {
+                deleteAclRulesForLb(cmd);
+            }
+        } catch (ApiException e) {
+            logAndThrowException("Failed to delete Netris load balancer rule", e);
+        }
+        return true;
+    }
+
+    private void deleteAclRulesForLb(DeleteNetrisLoadBalancerRuleCommand cmd) {
+        // delete the deny rule
+        deleteAclRule(deleteNetrisACLCommand(cmd, 0), true);
+        AtomicInteger cidrIndex = new AtomicInteger(1);
+        for (String cidr : cmd.getCidrList().split(" ")) {
+            try {
+                deleteAclRule(deleteNetrisACLCommand(cmd, cidrIndex.getAndIncrement()), true);
+            } catch (Exception e) {
+                throw new CloudRuntimeException(String.format("Failed to delete Netris ACL rule for LB CIDR %s", cidr), e);
+            }
+        }
+    }
+
+    private DeleteNetrisACLCommand deleteNetrisACLCommand(DeleteNetrisLoadBalancerRuleCommand cmd, int index) {
+        Long zoneId = cmd.getZoneId();
+        Long accountId = cmd.getAccountId();
+        Long domainId = cmd.getDomainId();
+        String networkName = null;
+        Long networkId = null;
+        String vpcName = null;
+        Long vpcId = null;
+        boolean isVpc = cmd.isVpc();
+        if (isVpc) {
+            vpcId = cmd.getId();
+            vpcName = cmd.getName();
+        } else {
+            networkName = cmd.getName();
+            networkId = cmd.getId();
+        }
+        DeleteNetrisACLCommand deleteAclCommand = new DeleteNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId, isVpc, vpcId, vpcName);
+        String aclName;
+        if (isVpc) {
+            aclName =  String.format("V%s-LBACL%s-%s", vpcId, index, cmd.getRuleName());
+        } else {
+            aclName = String.format("N%s-LBACL%s-%s", networkId, index, cmd.getRuleName());
+        }
+        String netrisAclName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName);
+        deleteAclCommand.setAclRuleNames(Collections.singletonList(netrisAclName));
+        return deleteAclCommand;
+    }
+
+    private Pair<Boolean, List<BigDecimal>> getMatchingLbRule(String lbName, String vpcName) {
+        try {
+            VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
+                return new Pair<>(false, Collections.emptyList());
+            }
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(vpcResource.getId());
+            FilterBySites siteFilter = new FilterBySites();
+            siteFilter.add(siteId);
+            L4LoadBalancerApi lbApi = apiClient.getApiStubForMethod(L4LoadBalancerApi.class);
+            L4lbresBody lbGetResponse = lbApi.apiV2L4lbGet(siteFilter, vpcFilter);
+            if (lbGetResponse == null || !lbGetResponse.isIsSuccess()) {
+                logger.warn("No LB rules were found to be present for the specific Netris VPC resource {}." +
+                        " Netris LB rules may have been deleted out of band.", vpcName);
+                return new Pair<>(true, Collections.emptyList());
+            }
+            List<L4LoadBalancerItem> lbList = lbGetResponse.getData();
+            return new Pair<>(true, lbList.stream()
+                    .filter(lb -> lbName.equals(lb.getName()))
+                    .map(acl -> BigDecimal.valueOf(acl.getId()))
+                    .collect(Collectors.toList()));
+        } catch (ApiException e) {
+            logAndThrowException("Failed to retrieve Netris LB rules", e);
+        }
+        return new Pair<>(true, Collections.emptyList());
+    }
+
+    private List<RoutesGetBody> listStaticRoutes(Integer netrisVpcId, String prefix, String nextHop) {
+        try {
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(netrisVpcId);
+            FilterBySites sitesFilter = new FilterBySites();
+            sitesFilter.add(siteId);
+            RoutesApi routesApi = apiClient.getApiStubForMethod(RoutesApi.class);
+            RoutesResponseGetOk routesResponseGetOk = routesApi.apiRoutesGet(sitesFilter, vpcFilter);
+            if (Objects.isNull(routesResponseGetOk) || Boolean.FALSE.equals(routesResponseGetOk.isIsSuccess())) {
+                logger.warn("Failed to retrieve static routes");
+                return null;
+            }
+            List<RoutesGetBody> routesList = routesResponseGetOk.getData();
+            return routesList.stream()
+                    .filter(x -> (Objects.isNull(prefix) || x.getName().equals(prefix)) &&
+                            (Objects.isNull(nextHop) || x.getNextHop().equals(nextHop)))
+                    .collect(Collectors.toList());
+        } catch (ApiException e) {
+            logAndThrowException("Error listing Netris static routes", e);
+        }
+        return null;
+    }
+
+    private Pair<Boolean, RoutesGetBody> staticRouteExists(Integer netrisVpcId, String prefix, String nextHop, String description) {
+        List<RoutesGetBody> staticRoutes = listStaticRoutes(netrisVpcId, prefix, nextHop);
+        if (staticRoutes == null) {
+            return new Pair<>(false, null);
+        }
+        return new Pair<>(!staticRoutes.isEmpty(), staticRoutes.isEmpty() ? null : staticRoutes.get(0));
+    }
+
+    public void deleteNatRule(String natRuleName, Integer snatRuleId, String netrisVpcName) {
+        logger.debug("Deleting NAT rule on Netris: {} for VPC {}", natRuleName, netrisVpcName);
+        try {
+            NatApi natApi = apiClient.getApiStubForMethod(NatApi.class);
+            natApi.apiV2NatIdDelete(snatRuleId);
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to delete NAT rule: %s for VPC: %s", natRuleName, netrisVpcName), e);
+        }
+    }
+
+    private void deleteVpcIpamAllocationInternal(VPCListing vpcResource, String allocationName) {
+        logger.debug("Deleting Netris VPC IPAM Allocation {} for VPC {}", allocationName, vpcResource.getName());
+        try {
+            VpcApi vpcApi = apiClient.getApiStubForMethod(VpcApi.class);
+            VPCResponseResourceOK vpcResourcesResponse = vpcApi.apiV2VpcVpcIdResourcesGet(vpcResource.getId());
+            VPCResourceIpam vpcAllocationResource = getVpcAllocationResource(vpcResourcesResponse, allocationName);
+            if (Objects.isNull(vpcAllocationResource)) {
+                logger.info("No VPC IPAM Allocation found for VPC {}", allocationName);
+                return;
+            }
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            logger.debug("Removing the IPAM allocation {} with ID {}", vpcAllocationResource.getName(), vpcAllocationResource.getId());
+            ipamApi.apiV2IpamTypeIdDelete("allocation", vpcAllocationResource.getId());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error removing IPAM Allocation %s for VPC %s", allocationName, vpcResource.getName()), e);
+        }
+    }
+
+    private VPCResourceIpam getVpcAllocationResource(VPCResponseResourceOK vpcResourcesResponse, String allocationName) {
+        VPCResource resource = vpcResourcesResponse.getData().get(0);
+        List<VPCResourceIpam> vpcAllocations = resource.getAllocation();
+        if (CollectionUtils.isNotEmpty(vpcAllocations)) {
+            vpcAllocations = vpcAllocations.stream().filter(x -> x.getName().equalsIgnoreCase(allocationName)).collect(Collectors.toList());
+            return CollectionUtils.isNotEmpty(vpcAllocations) ? vpcAllocations.get(0) : null;
+        }
+        return null;
+    }
+
+    private VPCListing getVpcByNameAndTenant(String vpcName) {
+        try {
+            List<VPCListing> vpcListings = listVPCs();
+            List<VPCListing> vpcs = vpcListings.stream()
+                    .filter(x -> x.getName().equals(vpcName) && x.getAdminTenant().getId().equals(tenantId))
+                    .collect(Collectors.toList());
+            return vpcs.isEmpty() ? null : vpcs.get(0);
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Error getting VPC %s information: %s", vpcName, e.getMessage()), e);
+        }
+    }
+
+    private VPCResponseObjectOK deleteVpcInternal(VPCListing vpcResource) {
+        try {
+            VpcApi vpcApi = apiClient.getApiStubForMethod(VpcApi.class);
+            logger.debug("Removing the VPC {} with ID {}", vpcResource.getName(), vpcResource.getId());
+            return vpcApi.apiV2VpcVpcIdDelete(vpcResource.getId());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error deleting VPC %s: %s", vpcResource.getName(), e.getResponseBody()), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean deleteVpc(DeleteNetrisVpcCommand cmd) {
+        String suffix = String.valueOf(cmd.getId());
+        String vpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
+        VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
+        if (vpcResource == null) {
+            logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
+            return false;
+        }
+        String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, suffix);
+        NatGetBody existingNatRule = netrisNatRuleExists(snatRuleName);
+        boolean ruleExists = Objects.nonNull(existingNatRule);
+        if (ruleExists) {
+            deleteNatRule(snatRuleName, existingNatRule.getId(), vpcResource.getName());
+        }
+
+        String vpcAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, cmd.getCidr());
+        deleteVpcIpamAllocationInternal(vpcResource, vpcAllocationName);
+        VPCResponseObjectOK response = deleteVpcInternal(vpcResource);
+        return response != null && response.isIsSuccess();
+    }
+
+    @Override
+    public boolean createVnet(CreateNetrisVnetCommand cmd) {
+        String vpcName = cmd.getVpcName();
+        Long vpcId = cmd.getVpcId();
+        String networkName = cmd.getName();
+        Long networkId = cmd.getId();
+        String vnetCidr = cmd.getCidr();
+        Integer vxlanId = cmd.getVxlanId();
+        String netrisTag = cmd.getNetrisTag();
+        String netmask = vnetCidr.split("/")[1];
+        String netrisGateway = cmd.getGateway() + "/" + netmask;
+        String netrisV6Cidr = cmd.getIpv6Cidr();
+        boolean isVpc = cmd.isVpc();
+        Boolean isGlobalRouting = cmd.isGlobalRouting();
+
+        try {
+            String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
+            VPCListing associatedVpc = getNetrisVpcResource(netrisVpcName);
+            if (associatedVpc == null) {
+                logger.error("Failed to find Netris VPC with name: {}, to create the corresponding vNet for network {}", netrisVpcName, networkName);
+                return false;
+            }
+
+            String vNetName;
+            if (isVpc) {
+                vNetName = String.format("V%s-N%s-%s", vpcId, networkId, networkName);
+            } else {
+                vNetName = String.format("N%s-%s", networkId, networkName);
+            }
+            String netrisVnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VNET, vNetName) ;
+            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetCidr) ;
+
+            createIpamSubnetInternal(netrisSubnetName, vnetCidr, SubnetBody.PurposeEnum.COMMON, associatedVpc, isGlobalRouting);
+            if (Objects.nonNull(netrisV6Cidr)) {
+                String netrisV6IpamAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, netrisV6Cidr);
+                String netrisV6SubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET,  String.valueOf(cmd.getVpcId()), netrisV6Cidr) ;
+                BigDecimal ipamAllocationId = getIpamAllocationIdByPrefixAndVpc(netrisV6Cidr, associatedVpc);
+                if (ipamAllocationId == null) {
+                    InlineResponse2004Data createdIpamAllocation = createIpamAllocationInternal(netrisV6IpamAllocationName, netrisV6Cidr, associatedVpc);
+                    if (Objects.isNull(createdIpamAllocation)) {
+                        throw new CloudRuntimeException(String.format("Failed to create Netris IPAM Allocation %s for VPC %s", netrisV6IpamAllocationName, netrisVpcName));
+                    }
+                }
+                createIpamSubnetInternal(netrisV6SubnetName, netrisV6Cidr, SubnetBody.PurposeEnum.COMMON, associatedVpc, isGlobalRouting);
+            }
+            logger.debug("Successfully created IPAM Subnet {} for network {} on Netris", netrisSubnetName, networkName);
+
+            VnetResAddBody vnetResponse = createVnetInternal(associatedVpc, netrisVnetName, netrisGateway, netrisV6Cidr, vxlanId, netrisTag);
+            if (vnetResponse == null || !vnetResponse.isIsSuccess()) {
+                String reason = vnetResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris vNet creation {} failed: {}", vNetName, reason);
+                return false;
+            }
+        } catch (ApiException e) {
+            throw new CloudRuntimeException(String.format("Failed to create Netris vNet %s", networkName), e);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean updateVnet(UpdateNetrisVnetCommand cmd) {
+        String networkName = cmd.getName();
+        Long networkId = cmd.getId();
+        String prevNetworkName = cmd.getPrevNetworkName();
+        String vpcName = cmd.getVpcName();
+        Long vpcId = cmd.getVpcId();
+        boolean isVpc = cmd.isVpc();
+
+        String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
+        VPCListing associatedVpc = getNetrisVpcResource(netrisVpcName);
+        if (associatedVpc == null) {
+            logger.error("Failed to find Netris VPC with name: {}, to create the corresponding vNet for network {}", netrisVpcName, networkName);
+            return false;
+        }
+
+        String vNetName;
+        String prevVnetName;
+        if (isVpc) {
+            vNetName = String.format("V%s-N%s-%s", vpcId, networkId, networkName);
+            prevVnetName = String.format("V%s-N%s-%s", vpcId, networkId, prevNetworkName);
+        } else {
+            vNetName = String.format("N%s-%s", networkId, networkName);
+            prevVnetName = String.format("N%s-%s", networkId, prevNetworkName);
+        }
+        String netrisVnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VNET, vNetName) ;
+        String prevNetrisVnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VNET, prevVnetName) ;
+
+        VnetResAddBody response = updateVnetInternal(associatedVpc, netrisVnetName, prevNetrisVnetName);
+        if (response == null || !response.isIsSuccess()) {
+            String reason = response == null ? "Empty response" : "Operation failed on Netris";
+            logger.debug("Netris vNet: {} update failed: {}", vNetName, reason);
+            return false;
+        }
+        return true;
+    }
+
+    private VnetResAddBody updateVnetInternal(VPCListing associatedVpc, String netrisVnetName, String prevVnetName) {
+        logger.debug("Updating Netris vNet name from {} to {} ", netrisVnetName, prevVnetName);
+        try {
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(associatedVpc.getId());
+            FilterBySites siteFilter = new FilterBySites();
+            siteFilter.add(siteId);
+            List<VnetsBody> vnetsList = getVnets(associatedVpc, prevVnetName, siteFilter, vpcFilter);
+            if (CollectionUtils.isEmpty(vnetsList)) {
+                String errorMsg = String.format("Could not find vNet with name: %s", prevVnetName);
+                logger.error(errorMsg);
+                throw new CloudRuntimeException(errorMsg);
+            }
+            VnetsBody vnetsBody = vnetsList.get(0);
+
+            VnetEditBody vnetBody = new VnetEditBody();
+
+            vnetBody.setCustomAnycastMac(vnetBody.getCustomAnycastMac());
+
+            VnetEditBodyGateways gatewayV4 = new VnetEditBodyGateways();
+            gatewayV4.prefix(vnetsBody.getGateways().get(0).getPrefix());
+            gatewayV4.setDhcpEnabled(false);
+            VnetEditBodyDhcp dhcp = new VnetEditBodyDhcp();
+            dhcp.setEnd("");
+            dhcp.setStart("");
+            dhcp.setOptionSet(new VnetAddBodyDhcpOptionSet());
+            gatewayV4.setDhcp(dhcp);
+            List<VnetEditBodyGateways> gatewaysList = new ArrayList<>();
+            gatewaysList.add(gatewayV4);
+
+            if (vnetsBody.getGateways().size() > 1 && Objects.nonNull(vnetsBody.getGateways().get(1))) {
+                String netrisV6Gateway = vnetsBody.getGateways().get(1).getPrefix();
+                VnetEditBodyGateways gatewayV6 = new VnetEditBodyGateways();
+                gatewayV6.prefix(netrisV6Gateway);
+                gatewayV6.setDhcpEnabled(false);
+                gatewayV6.setDhcp(dhcp);
+                gatewaysList.add(gatewayV6);
+            }
+
+            vnetBody.setGateways(gatewaysList);
+            vnetBody.setGuestTenants(new ArrayList<>());
+            vnetBody.setL3vpn(false);
+            vnetBody.setName(netrisVnetName);
+            vnetBody.setNativeVlan(0);
+            vnetBody.setVxlanID(vnetsBody.getVxlanID());
+            vnetBody.setPorts(new ArrayList<>());
+
+            IpTreeSubnetSites subnetSites = new IpTreeSubnetSites();
+            subnetSites.setId(new BigDecimal(siteId));
+            subnetSites.setName(siteName);
+            List<IpTreeSubnetSites> subnetSitesList = new ArrayList<>();
+            subnetSitesList.add(subnetSites);
+            vnetBody.setSites(subnetSitesList);
+
+            vnetBody.setState(VnetEditBody.StateEnum.ACTIVE);
+
+            vnetBody.setTags(new ArrayList<>());
+
+            IpTreeAllocationTenant allocationTenant = new IpTreeAllocationTenant();
+            allocationTenant.setId(new BigDecimal(tenantId));
+            allocationTenant.setName(tenantName);
+            vnetBody.setTenant(allocationTenant);
+
+            vnetBody.setVlan(0);
+            vnetBody.setVlanAware(false);
+            vnetBody.setVlans("");
+
+            VnetAddBodyVpc vpc = new VnetAddBodyVpc();
+            vpc.setName(associatedVpc.getName());
+            vpc.setId(associatedVpc.getId());
+            vnetBody.setVpc(vpc);
+
+            vnetBody.setTags(vnetsBody.getTags());
+
+            VNetApi vnetApi = apiClient.getApiStubForMethod(VNetApi.class);
+            return vnetApi.apiV2VnetIdPut(vnetBody, vnetsBody.getId().intValue());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error creating Netris vNet %s for VPC %s", netrisVnetName, associatedVpc.getName()), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean deleteVnet(DeleteNetrisVnetCommand cmd) {
+        String vpcName = cmd.getVpcName();
+        Long vpcId = cmd.getVpcId();
+        String networkName = cmd.getName();
+        Long networkId = cmd.getId();
+        boolean isVpc = cmd.isVpc();
+        String vnetCidr = cmd.getVNetCidr();
+        String vnetV6Cidr = cmd.getvNetV6Cidr();
+        try {
+            String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
+            VPCListing associatedVpc = getNetrisVpcResource(netrisVpcName);
+            if (associatedVpc == null) {
+                logger.error("Failed to find Netris VPC with name: {}, to create the corresponding vNet for network {}", netrisVpcName, networkName);
+                return false;
+            }
+
+            String vNetName;
+            if (isVpc) {
+                vNetName = String.format("V%s-N%s-%s", vpcId, networkId, networkName);
+            } else {
+                vNetName = String.format("N%s-%s", networkId, networkName);
+            }
+
+            String netrisVnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VNET, vNetName) ;
+            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetCidr);
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(associatedVpc.getId());
+            FilterBySites siteFilter = new FilterBySites();
+            siteFilter.add(siteId);
+            deleteVnetInternal(associatedVpc, siteFilter, vpcFilter, netrisVnetName, vNetName);
+
+            logger.debug("Successfully deleted vNet {}", vNetName);
+            deleteSubnetInternal(vpcFilter, netrisVnetName, netrisSubnetName);
+            if (Objects.nonNull(vnetV6Cidr)) {
+                String netrisV6IpamAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, vnetV6Cidr);
+                String netrisV6SubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetV6Cidr);
+                deleteSubnetInternal(vpcFilter, netrisVnetName, netrisV6SubnetName);
+                deleteVpcIpamAllocationInternal(associatedVpc, netrisV6IpamAllocationName);
+            }
+
+        } catch (Exception e) {
+            throw new CloudRuntimeException(String.format("Failed to delete Netris vNet %s", networkName), e);
+        }
+        return true;
+    }
+
+    protected VPCListing getSystemVpc() throws ApiException {
+        List<VPCListing> systemVpcList = listVPCs().stream().filter(VPCListing::isIsSystem).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(systemVpcList)) {
+            String msg = "Cannot find any system VPC";
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        return systemVpcList.get(0);
+    }
+
+    private BigDecimal getIpamAllocationIdByPrefixAndVpc(String superCidrPrefix, VPCListing vpc) throws ApiException {
+        IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+        FilterBySites filterBySites = new FilterBySites();
+        filterBySites.add(siteId);
+        FilterByVpc filterByVpc = new FilterByVpc();
+        filterByVpc.add(vpc.getId());
+        IpTree ipamTree = ipamApi.apiV2IpamGet(filterBySites, filterByVpc);
+        List<IpTreeAllocation> superCidrList = ipamTree.getData().stream()
+                .filter(x -> x.getPrefix().equals(superCidrPrefix) || isAllocationPartOfBiggerAllocation(x.getPrefix(), superCidrPrefix))
+                .collect(Collectors.toList());
+        return CollectionUtils.isEmpty(superCidrList) ? null : superCidrList.get(0).getId();
+    }
+
+    private boolean isAllocationPartOfBiggerAllocation(String netrisAllocation, String providedAllocation) {
+        IPAddress biggerAllocation = new IPAddressString(netrisAllocation).getAddress();
+        IPAddress smallerAllocation = new IPAddressString(providedAllocation).getAddress();
+
+        return biggerAllocation.contains(smallerAllocation);
+
+    }
+
+    private IpTreeSubnet getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(BigDecimal ipamAllocationId, String exactCidr, IpTreeSubnet.PurposeEnum purpose, VPCListing vpc) throws ApiException {
+        IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+        FilterByVpc filterByVpc = new FilterByVpc();
+        filterByVpc.add(vpc.getId());
+        SubnetResBody subnetResBody = ipamApi.apiV2IpamSubnetsGet(filterByVpc);
+        List<IpTreeSubnet> exactSubnetList = subnetResBody.getData().stream()
+                .filter(x -> ipamAllocationId != null ?
+                        x.getAllocationID().equals(ipamAllocationId) && x.getPrefix().equals(exactCidr) && x.getPurpose() == purpose :
+                        x.getPrefix().equals(exactCidr) && x.getPurpose() == purpose)
+                .collect(Collectors.toList());
+        return CollectionUtils.isEmpty(exactSubnetList) ? null : exactSubnetList.get(0);
+    }
+
+    @Override
+    public boolean setupZoneLevelPublicRange(SetupNetrisPublicRangeCommand cmd) {
+        String superCidr = cmd.getSuperCidr();
+        String exactCidr = cmd.getExactCidr();
+        try {
+            VPCListing systemVpc = getSystemVpc();
+            logger.debug("Checking if the Netris Public Super CIDR {} exists", superCidr);
+            BigDecimal ipamAllocationId = getIpamAllocationIdByPrefixAndVpc(superCidr, systemVpc);
+            if (ipamAllocationId == null) {
+                String ipamName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, superCidr);
+                InlineResponse2004Data ipamAllocation = createIpamAllocationInternal(ipamName, superCidr, systemVpc);
+                if (ipamAllocation == null) {
+                    String msg = String.format("Could not create the zone level super CIDR %s for the system VPC", superCidr);
+                    logger.error(msg);
+                    throw new CloudRuntimeException(msg);
+                }
+                ipamAllocationId = new BigDecimal(ipamAllocation.getId());
+            }
+            IpTreeSubnet exactSubnet = getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(ipamAllocationId, exactCidr, IpTreeSubnet.PurposeEnum.COMMON, systemVpc);
+            if (exactSubnet == null) {
+                String ipamSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, exactCidr);
+                createIpamSubnetInternal(ipamSubnetName, exactCidr, SubnetBody.PurposeEnum.COMMON, systemVpc, null);
+            }
+        } catch (ApiException e) {
+            String msg = String.format("Error setting up the Netris Public Range %s on super CIDR %s", exactCidr, superCidr);
+            logAndThrowException(msg, e);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean createOrUpdateNatRuleInternal(CreateOrUpdateNetrisNatCommand cmd) {
+        String ruleName = cmd.getNatRuleName();
+        long vpcId = cmd.getVpcId();
+        Long networkId = cmd.getId();
+        String networkName = cmd.getName();
+        String vpcName = cmd.getVpcName();
+        String vpcCidr = cmd.getVpcCidr();
+        boolean isVpc = cmd.isVpc();
+        NatPostBody.ActionEnum action = getNatActionFromRuleType(cmd.getNatRuleType());
+        NatPostBody.ProtocolEnum protocol = getProtocolFromString(cmd.getProtocol());
+        NatPostBody.StateEnum state = getStateFromString(cmd.getState());
+
+        String vNetName = isVpc ?
+                String.format("V%s-N%s-%s", vpcId, networkId, networkName) :
+                String.format("N%s-%s", networkId, networkName);
+        String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
+        VPCListing vpcResource = getNetrisVpcResource(netrisVpcName);
+        if (vpcResource == null) {
+            logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+            return false;
+        }
+
+        String targetIpSubnet = null;
+        if (NatPostBody.ActionEnum.SNAT == action) {
+            targetIpSubnet = cmd.getNatIp() + "/32";
+        } else if (NatPostBody.ActionEnum.DNAT == action) {
+            targetIpSubnet = cmd.getDestinationAddress() + "/32";
+        }
+
+        if (StringUtils.isNotBlank(targetIpSubnet) && existsDestinationSubnet(targetIpSubnet)) {
+            logger.debug("Creating subnet with NAT purpose for {}}", targetIpSubnet);
+            createNatSubnet(cmd, targetIpSubnet, vpcResource.getId());
+        }
+
+        NatGetBody existingNatRule = netrisNatRuleExists(ruleName);
+        boolean ruleExists = Objects.nonNull(existingNatRule);
+        if (!ruleExists) {
+            String destinationAddress = action == NatPostBody.ActionEnum.SNAT ? ANY_IP : cmd.getDestinationAddress() + "/32";
+            String destinationPort = cmd.getDestinationPort();
+            String sourceAddress = action == NatPostBody.ActionEnum.SNAT ? vpcCidr : ANY_IP;
+            String sourcePort = "1-65535";
+            String snatToIp = action == NatPostBody.ActionEnum.SNAT ? targetIpSubnet : null;
+            String dnatToIp = action == NatPostBody.ActionEnum.DNAT ? cmd.getSourceAddress() + "/32" : null;
+            String dnatToPort = action == NatPostBody.ActionEnum.DNAT ? cmd.getSourcePort() : null;
+            return createNatRuleInternal(ruleName, action, protocol, state, destinationAddress, destinationPort,
+                    sourceAddress, sourcePort, snatToIp, dnatToIp, dnatToPort, netrisVpcName, networkName, vNetName);
+        } else if (NatPostBody.ActionEnum.SNAT == action) {
+            return updateSnatRuleInternal(ruleName, targetIpSubnet, netrisVpcName, networkName, vNetName, existingNatRule.getId(), vpcCidr);
+        }
+        return true;
+    }
+
+    private NatPostBody.StateEnum getStateFromString(String state) {
+        return NatPostBody.StateEnum.fromValue(state);
+    }
+
+    private NatPostBody.ActionEnum getNatActionFromRuleType(String natRuleType) {
+        return NatPostBody.ActionEnum.fromValue(natRuleType);
+    }
+
+    @Override
+    public boolean createOrUpdateSNATRule(CreateOrUpdateNetrisNatCommand cmd) {
+        return createOrUpdateNatRuleInternal(cmd);
+    }
+
+    private boolean existsDestinationSubnet(String destinationSubnet) {
+        try {
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(getSystemVpc().getId());
+            List<IpTreeSubnet> targetSubnetList = getSubnet(vpcFilter, destinationSubnet);
+            return targetSubnetList != null;
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error checking if subnet %s exists: %s", destinationSubnet, e.getMessage()), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean createStaticNatRule(CreateOrUpdateNetrisNatCommand cmd) {
+        String staticNatRuleName = cmd.getNatRuleName();
+        String natIP = cmd.getNatIp() + "/32";
+        String vmIp = cmd.getVmIp() + "/32";
+        String vpcName = cmd.getVpcName();
+        String vpcCidr = cmd.getVpcCidr();
+        Long vpcId = cmd.getVpcId();
+        Long networkId = cmd.getId();
+        String networkName = cmd.getName();
+        boolean isVpc = cmd.isVpc();
+
+        try {
+            String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
+            VPCListing vpcResource = getNetrisVpcResource(netrisVpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+                return false;
+            }
+            // Create a /32 subnet for the DNAT IP
+            createNatSubnet(cmd, natIP, vpcResource.getId());
+            NatApi natApi = apiClient.getApiStubForMethod(NatApi.class);
+            NatPostBody natBody = new NatPostBody();
+            natBody.setAction(NatPostBody.ActionEnum.DNAT);
+            natBody.setDestinationAddress(natIP);
+            natBody.setName(staticNatRuleName);
+            natBody.setProtocol(NatPostBody.ProtocolEnum.ALL);
+            natBody.setState(NatPostBody.StateEnum.ENABLED);
+            natBody.setComment(String.format("Static NAT rule for %s", netrisVpcName));
+
+            NatBodySiteSite site = new NatBodySiteSite();
+            site.setId(siteId);
+            site.setName(siteName);
+            natBody.setSite(site);
+            natBody.setSourceAddress(ANY_IP);
+            natBody.setDnatToIP(vmIp);
+
+            NatBodyVpcVpc vpc = new NatBodyVpcVpc();
+            vpc.setId(vpcResource.getId());
+            vpc.setName(vpcResource.getName());
+            natBody.setVpc(vpc);
+
+            InlineResponse20015 natResponse = natApi.apiV2NatPost(natBody);
+            if (natResponse == null || !natResponse.isIsSuccess()) {
+                String reason = natResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris static NAT (DNAT) rule creation failed for netris VPC - {}: {}", netrisVpcName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to create Static NAT (DNAT) rule for network : %s", Objects.nonNull(vpcName) ? vpcName : networkName), e);
+        }
+        return true;
+    }
+
+    private void createNatSubnet(NetrisCommand cmd, String natIp, Integer netrisVpcId) {
+        try {
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(netrisVpcId);
+            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(((CreateOrUpdateNetrisNatCommand)cmd).getVpcId()), natIp);
+            List<IpTreeSubnet> matchedSubnets = getSubnet(vpcFilter, netrisSubnetName);
+            if (matchedSubnets.isEmpty()) {
+                VPCListing systemVpc = getSystemVpc();
+                createIpamSubnetInternal(netrisSubnetName, natIp, SubnetBody.PurposeEnum.NAT, systemVpc, null);
+            } else {
+                IpTreeSubnet existingSubnet = matchedSubnets.stream().filter(x -> x.getPrefix().equals(natIp)).collect(Collectors.toList()).get(0);
+                if (existingSubnet.getPurpose() != IpTreeSubnet.PurposeEnum.NAT) {
+                    VPCListing systemVpc = getSystemVpc();
+                    logger.debug("Subnet: {} already exists, but purpose is not NAT, updating its purpose to 'nat'", natIp);
+                    updateIpamSubnetInternal(existingSubnet.getId().intValue(), netrisSubnetName, natIp, SubnetBody.PurposeEnum.NAT, systemVpc, null);
+                }
+            }
+        } catch (ApiException e) {
+            throw new CloudRuntimeException(String.format("Failed to create subnet for %s with NAT purpose", natIp));
+        }
+    }
+
+    private void createLBSubnet(NetrisCommand cmd, String lbIp, Integer netrisVpcId) {
+        try {
+            FilterByVpc vpcFilter = new FilterByVpc();
+            vpcFilter.add(netrisVpcId);
+            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd,
+                    NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET,
+                    String.valueOf(cmd.getId()), lbIp);
+            List<IpTreeSubnet> matchedSubnets = getSubnet(vpcFilter, netrisSubnetName);
+            VPCListing systemVpc = getSystemVpc();
+            if (matchedSubnets.isEmpty()) {
+                createIpamSubnetInternal(netrisSubnetName, lbIp, SubnetBody.PurposeEnum.LOAD_BALANCER, systemVpc, null);
+            } else if (IpTreeSubnet.PurposeEnum.LOAD_BALANCER != matchedSubnets.get(0).getPurpose()){
+                logger.debug("Updating existing NAT subnet {} to have load balancer purpose", netrisSubnetName);
+                updateIpamSubnetInternal(matchedSubnets.get(0).getId().intValue(), netrisSubnetName, lbIp, SubnetBody.PurposeEnum.LOAD_BALANCER, systemVpc, null);
+            }
+            logger.debug("LB subnet: {} already exists", netrisSubnetName);
+        } catch (ApiException e) {
+            throw new CloudRuntimeException(String.format("Failed to create subnet for %s with LB purpose", lbIp));
+        }
+    }
+
+    private NatPostBody.ProtocolEnum getProtocolFromString(String protocol) {
+        return NatPostBody.ProtocolEnum.fromValue(protocol);
+    }
+
+    private NatPostBody createNatRulePostBody(String ruleName, NatPostBody.ActionEnum action, NatPostBody.ProtocolEnum protocol, NatPostBody.StateEnum state,
+                                              String destinationAddress, String destinationPort,
+                                              String sourceAddress, String sourcePort,
+                                              String dnatToIp, String dnatToPort,
+                                              String netrisVpcName, String snatIP, String comment) {
+        NatPostBody natBody = new NatPostBody();
+        natBody.setAction(action);
+        natBody.setName(ruleName);
+        natBody.setProtocol(protocol);
+        natBody.setState(state);
+        if (StringUtils.isNotBlank(comment)) {
+            natBody.setComment(comment);
+        }
+
+        natBody.setDestinationAddress(destinationAddress);
+        if (StringUtils.isNotBlank(destinationPort)) {
+            natBody.setDestinationPort(destinationPort);
+        }
+
+        if (StringUtils.isNotBlank(sourceAddress)) {
+            natBody.setSourceAddress(sourceAddress);
+        }
+        if (StringUtils.isNotBlank(sourcePort)) {
+            natBody.setSourcePort(sourcePort);
+        }
+
+        NatBodySiteSite site = new NatBodySiteSite();
+        site.setId(siteId);
+        site.setName(siteName);
+        natBody.setSite(site);
+
+        if (StringUtils.isNotBlank(snatIP)) {
+            natBody.setSnatToIP(snatIP);
+        }
+
+        if (StringUtils.isNotBlank(dnatToIp)) {
+            natBody.setDnatToIP(dnatToIp);
+        }
+        if (StringUtils.isNotBlank(dnatToPort)) {
+            natBody.setDnatToPort(Integer.valueOf(dnatToPort));
+        }
+
+        NatBodyVpcVpc vpc = new NatBodyVpcVpc();
+        VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+        if (vpcResource == null) {
+            logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+            return null;
+        }
+        vpc.setId(vpcResource.getId());
+        vpc.setName(vpcResource.getName());
+        natBody.setVpc(vpc);
+        return natBody;
+    }
+
+    @Override
+    public boolean createOrUpdateDNATRule(CreateOrUpdateNetrisNatCommand cmd) {
+        return createOrUpdateNatRuleInternal(cmd);
+    }
+
+    private boolean createNatRuleInternal(String ruleName, NatPostBody.ActionEnum action, NatPostBody.ProtocolEnum protocol, NatPostBody.StateEnum state,
+                                          String destinationAddress, String destinationPort, String sourceAddress, String sourcePort,
+                                          String sNatToIp, String dNatToIp, String dNatToPort,
+                                          String netrisVpcName, String networkName, String vNetName) {
+        try {
+            NatApi natApi = apiClient.getApiStubForMethod(NatApi.class);
+            String comment = String.format("NAT rule for %s with action %s", netrisVpcName, action.name());
+            NatPostBody natBody = createNatRulePostBody(ruleName, action, protocol, state,
+                    destinationAddress, destinationPort, sourceAddress, sourcePort,
+                    dNatToIp, dNatToPort, netrisVpcName, sNatToIp, comment);
+            if (natBody == null) {
+                return false;
+            }
+            InlineResponse20015 natResponse = natApi.apiV2NatPost(natBody);
+            if (natResponse == null || !natResponse.isIsSuccess()) {
+                String reason = natResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris NAT rule {} creation failed for network(vNet) - {}({}): {}", action.name(), networkName, vNetName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to create NAT rule %s for network(vNet): %s(%s)", action.name(), networkName, vNetName), e);
+        }
+        return true;
+    }
+
+    private boolean updateSnatRuleInternal(String snatRuleName, String snatIP, String netrisVpcName, String networkName,
+                                           String vNetName, Integer netisSnatId, String vpcCidr) {
+        try {
+            NatApi natApi = apiClient.getApiStubForMethod(NatApi.class);
+            NatPutBody natBody = new NatPutBody();
+            natBody.setAction(NatPutBody.ActionEnum.SNAT);
+            natBody.setDestinationAddress(ANY_IP);
+            natBody.setName(snatRuleName);
+            natBody.setProtocol(NatPutBody.ProtocolEnum.ALL);
+
+            NatBodySiteSite site = new NatBodySiteSite();
+            site.setId(siteId);
+            site.setName(siteName);
+            natBody.setSite(site);
+            natBody.setSourceAddress(vpcCidr);
+            natBody.setSnatToIP(snatIP);
+
+            NatBodyVpcVpc vpc = new NatBodyVpcVpc();
+            VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+            if (vpcResource == null) {
+                logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+                return false;
+            }
+            vpc.setId(vpcResource.getId());
+            vpc.setName(vpcResource.getName());
+            natBody.setVpc(vpc);
+
+            InlineResponse20016 natUpdateResponse = natApi.apiV2NatIdPut(natBody, netisSnatId);
+            if (natUpdateResponse == null || !natUpdateResponse.isIsSuccess()) {
+                String reason = natUpdateResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("Update of Netris SNAT rule failed for network(vNet) - {}({}): {}", networkName, vNetName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to create SNAT rule for network(vNet): %s(%s)", networkName, vNetName), e);
+        }
+        return true;
+    }
+
+    private List<VnetsBody> getVnets(VPCListing associatedVpc, String netrisVnetName, FilterBySites siteFilter, FilterByVpc vpcFilter) {
+        try {
+            VNetApi vNetApi = apiClient.getApiStubForMethod(VNetApi.class);
+            VnetResListBody vnetList = vNetApi.apiV2VnetGet(siteFilter, vpcFilter);
+            if (vnetList == null || !vnetList.isIsSuccess()) {
+                throw new CloudRuntimeException(String.format("Failed to list vNets for the given VPC: %s and site: %s", associatedVpc.getName(), siteName));
+            }
+            return vnetList.getData().stream().filter(vnet -> vnet.getName().equals(netrisVnetName)).collect(Collectors.toList());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to get vNets: %s", netrisVnetName), e);
+        }
+        return Collections.emptyList();
+    }
+
+    private void deleteVnetInternal(VPCListing associatedVpc, FilterBySites siteFilter, FilterByVpc vpcFilter, String netrisVnetName, String vNetName) {
+        try {
+            VNetApi vNetApi = apiClient.getApiStubForMethod(VNetApi.class);
+            List<VnetsBody> vnetsList = getVnets(associatedVpc, netrisVnetName, siteFilter, vpcFilter);
+            if (CollectionUtils.isEmpty(vnetsList)) {
+                logger.debug("vNet: {} for the given VPC: {} appears to already be deleted on Netris", vNetName, associatedVpc.getName());
+                return;
+            }
+            VnetsBody vnetsBody = vnetsList.get(0);
+
+            VnetResDeleteBody deleteVnetResponse = vNetApi.apiV2VnetIdDelete(vnetsBody.getId().intValue());
+            if (deleteVnetResponse == null || !deleteVnetResponse.isIsSuccess()) {
+                throw new CloudRuntimeException(String.format("Failed to delete vNet: %s", vNetName));
+            }
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to delete vNet: %s", netrisVnetName), e);
+        }
+    }
+
+    private List<IpTreeSubnet> getSubnet(FilterByVpc vpcFilter, String netrisSubnetName) {
+        try {
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            SubnetResBody subnetsResponse = ipamApi.apiV2IpamSubnetsGet(vpcFilter);
+            List<IpTreeSubnet> subnets = subnetsResponse.getData();
+            return subnets.stream().filter(subnet -> subnet.getName().equals(netrisSubnetName)).collect(Collectors.toList());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to get IPAM subnet: %s", netrisSubnetName), e);
+        }
+        return new ArrayList<>();
+    }
+
+    private void deleteSubnetInternal(FilterByVpc vpcFilter, String netrisVnetName, String netrisSubnetName) {
+        try {
+            String logString = "";
+            if (Objects.nonNull(netrisVnetName)) {
+                logString = String.format("for vNet: %s ", netrisVnetName);
+            }
+            logger.debug("Deleting Netris VPC IPAM Subnet {} {}", netrisSubnetName, logString);
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            List<IpTreeSubnet> matchedSubnets = getSubnet(vpcFilter, netrisSubnetName);
+            if (CollectionUtils.isEmpty(matchedSubnets)) {
+                logger.debug("IPAM subnet: {} {} appears to already be deleted on Netris", netrisSubnetName, logString);
+                return;
+            }
+
+            ipamApi.apiV2IpamTypeIdDelete("subnet", matchedSubnets.get(0).getId().intValue());
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Failed to delete subnet: %s", netrisSubnetName), e);
+        }
+    }
+
+    private SubnetBody getIpamSubnetBody(VPCListing vpc, SubnetBody.PurposeEnum purpose, String subnetName, String subnetPrefix, Boolean isGlobalRouting) {
+        SubnetBody subnetBody = new SubnetBody();
+        subnetBody.setName(subnetName);
+
+        AllocationBodyVpc vpcAllocationBody = new AllocationBodyVpc();
+        vpcAllocationBody.setName(vpc.getName());
+        vpcAllocationBody.setId(vpc.getId());
+        subnetBody.setVpc(vpcAllocationBody);
+
+        IpTreeAllocationTenant allocationTenant = new IpTreeAllocationTenant();
+        allocationTenant.setId(new BigDecimal(tenantId));
+        allocationTenant.setName(tenantName);
+        subnetBody.setTenant(allocationTenant);
+
+        IpTreeSubnetSites subnetSites = new IpTreeSubnetSites();
+        subnetSites.setId(new BigDecimal(siteId));
+        subnetSites.setName(siteName);
+        subnetBody.setSites(List.of(subnetSites));
+
+        subnetBody.setPurpose(purpose);
+        subnetBody.setPrefix(subnetPrefix);
+        if (isGlobalRouting != null) {
+            subnetBody.setGlobalRouting(isGlobalRouting);
+        }
+        return subnetBody;
+    }
+
+    private InlineResponse2004Data createIpamSubnetInternal(String subnetName, String subnetPrefix, SubnetBody.PurposeEnum purpose, VPCListing vpc, Boolean isGlobalRouting) {
+        logger.debug("Creating Netris IPAM Subnet {} for VPC {}", subnetPrefix, vpc.getName());
+        try {
+
+            SubnetBody subnetBody = getIpamSubnetBody(vpc, purpose, subnetName, subnetPrefix, isGlobalRouting);
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            InlineResponse2004 subnetResponse = ipamApi.apiV2IpamSubnetPost(subnetBody);
+            if (subnetResponse == null || !subnetResponse.isIsSuccess()) {
+                String reason = subnetResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris IPAM Subnet {} creation failed: {}", subnetName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+            return subnetResponse.getData();
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error creating Netris IPAM Subnet %s for VPC %s", subnetPrefix, vpc.getName()), e);
+            return null;
+        }
+    }
+
+    private InlineResponse2004Data updateIpamSubnetInternal(Integer netrisSubnetId, String subnetName, String subnetPrefix,
+                                                            SubnetBody.PurposeEnum purpose, VPCListing vpc, Boolean isGlobalRouting) {
+        logger.debug("Updating Netris IPAM Subnet {} for VPC {}", subnetPrefix, vpc.getName());
+        try {
+
+            SubnetBody subnetBody = getIpamSubnetBody(vpc, purpose, subnetName, subnetPrefix, isGlobalRouting);
+            IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
+            InlineResponse2004 subnetResponse = ipamApi.apiV2IpamSubnetIdPut(subnetBody, netrisSubnetId);
+            if (subnetResponse == null || !subnetResponse.isIsSuccess()) {
+                String reason = subnetResponse == null ? "Empty response" : "Operation failed on Netris";
+                logger.debug("The Netris IPAM Subnet {} update failed: {}", subnetName, reason);
+                throw new CloudRuntimeException(reason);
+            }
+            return subnetResponse.getData();
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error Updating Netris IPAM Subnet %s for VPC %s", subnetPrefix, vpc.getName()), e);
+            return null;
+        }
+    }
+
+    VnetResAddBody createVnetInternal(VPCListing associatedVpc, String netrisVnetName, String netrisGateway, String netrisV6Cidr, Integer vxlanId, String netrisTag) {
+        logger.debug("Creating Netris VPC vNet {} for CIDR {}", netrisVnetName, netrisGateway);
+        try {
+            VnetAddBody vnetBody = new VnetAddBody();
+
+            vnetBody.setCustomAnycastMac("");
+
+            VnetAddBodyGateways gatewayV4 = new VnetAddBodyGateways();
+            gatewayV4.prefix(netrisGateway);
+            gatewayV4.setDhcpEnabled(false);
+            VnetAddBodyDhcp dhcp = new VnetAddBodyDhcp();
+            dhcp.setEnd("");
+            dhcp.setStart("");
+            dhcp.setOptionSet(new VnetAddBodyDhcpOptionSet());
+            gatewayV4.setDhcp(dhcp);
+            List<VnetAddBodyGateways> gatewaysList = new ArrayList<>();
+            gatewaysList.add(gatewayV4);
+
+            if (Objects.nonNull(netrisV6Cidr)) {
+                VnetAddBodyGateways gatewayV6 = new VnetAddBodyGateways();
+                gatewayV6.prefix(NetUtils.getIpv6Gateway(netrisV6Cidr));
+                gatewayV6.setDhcpEnabled(false);
+                gatewayV6.setDhcp(dhcp);
+                gatewaysList.add(gatewayV6);
+            }
+
+            vnetBody.setGateways(gatewaysList);
+            vnetBody.setGuestTenants(new ArrayList<>());
+            vnetBody.setL3vpn(false);
+            vnetBody.setName(netrisVnetName);
+            vnetBody.setNativeVlan(0);
+            vnetBody.setVxlanID(vxlanId);
+            vnetBody.setPorts(new ArrayList<>());
+
+            IpTreeSubnetSites subnetSites = new IpTreeSubnetSites();
+            subnetSites.setId(new BigDecimal(siteId));
+            subnetSites.setName(siteName);
+            List<IpTreeSubnetSites> subnetSitesList = new ArrayList<>();
+            subnetSitesList.add(subnetSites);
+            vnetBody.setSites(subnetSitesList);
+
+            vnetBody.setState(VnetAddBody.StateEnum.ACTIVE);
+
+            vnetBody.setTags(new ArrayList<>());
+
+            IpTreeAllocationTenant allocationTenant = new IpTreeAllocationTenant();
+            allocationTenant.setId(new BigDecimal(tenantId));
+            allocationTenant.setName(tenantName);
+            vnetBody.setTenant(allocationTenant);
+
+            vnetBody.setVlan(0);
+            vnetBody.setVlanAware(false);
+            vnetBody.setVlans("");
+
+            VnetAddBodyVpc vpc = new VnetAddBodyVpc();
+            vpc.setName(associatedVpc.getName());
+            vpc.setId(associatedVpc.getId());
+            vnetBody.setVpc(vpc);
+
+            vnetBody.setTags(Collections.singletonList(netrisTag));
+
+            VNetApi vnetApi = apiClient.getApiStubForMethod(VNetApi.class);
+            return vnetApi.apiV2VnetPost(vnetBody);
+        } catch (ApiException e) {
+            logAndThrowException(String.format("Error creating Netris vNet %s for VPC %s", netrisVnetName, associatedVpc.getName()), e);
+            return null;
+        }
+    }
+
+    private String getNetrisVpcNameSuffix(Long vpcId, String vpcName, Long networkId, String networkName, boolean isVpc) {
+        String suffix = null;
+        if (isVpc) {
+            suffix = String.format("%s-%s", vpcId, vpcName);
+        } else {
+            suffix = String.format("%s-%s", networkId, networkName);
+        }
+        return suffix;
+    }
+
+    private NatGetBody netrisNatRuleExists(String netrisNatRule) {
+        try {
+            NatApi natApi = apiClient.getApiStubForMethod(NatApi.class);
+            //NatResponseGetOk response = natApi.apiV2NatGet(null, Arrays.asList(new BigDecimal(vpcId)));
+            NatResponseGetOk response = natApi.apiV2NatGet(null, null);
+            if (Objects.isNull(response) || !response.isIsSuccess()) {
+                throw new CloudRuntimeException("Failed to list Netris NAT rules");
+            }
+            List<NatGetBody> data = response.getData().stream().filter(natData -> natData.getName().equals(netrisNatRule)).collect(Collectors.toList());
+            if (data.isEmpty()) {
+                return null;
+            }
+            return data.get(0);
+
+        } catch (ApiException e) {
+            throw new CloudRuntimeException("Failed to list Netris NAT rules");
+        }
+    }
+
+    private VPCListing getNetrisVpcResource(String netrisVpcName) {
+        VPCListing vpcResource = getVpcByNameAndTenant(netrisVpcName);
+        if (vpcResource == null) {
+            logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", netrisVpcName, tenantId);
+        }
+        return vpcResource;
+    }
+
+    private String getNetrisVpcName(NetrisCommand cmd, Long vpcId, String vpcName) {
+        String suffix = getNetrisVpcNameSuffix(vpcId, vpcName, cmd.getId(), cmd.getName(), cmd.isVpc());
+        return NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, suffix);
+    }
+
+    private void deleteNatSubnet(String netrisSubnetName, Integer netrisVpcId, String natIp) {
+        FilterByVpc vpcFilter = new FilterByVpc();
+        vpcFilter.add(netrisVpcId);
+        deleteSubnetInternal(vpcFilter, null, netrisSubnetName);
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java
new file mode 100644
index 00000000000..0e798ebb6be
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java
@@ -0,0 +1,820 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.amazonaws.util.CollectionUtils;
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.Listener;
+import com.cloud.agent.api.AgentControlAnswer;
+import com.cloud.agent.api.AgentControlCommand;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.to.LoadBalancerTO;
+import com.cloud.api.ApiDBUtils;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ConnectionException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.PhysicalNetworkServiceProvider;
+import com.cloud.network.PublicIpAddress;
+import com.cloud.network.SDNProviderNetworkRule;
+import com.cloud.network.SDNProviderOpObject;
+import com.cloud.network.as.AutoScaleCounter;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.LoadBalancerVMMapDao;
+import com.cloud.network.dao.LoadBalancerVMMapVO;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.element.DhcpServiceProvider;
+import com.cloud.network.element.DnsServiceProvider;
+import com.cloud.network.element.IpDeployer;
+import com.cloud.network.element.LoadBalancingServiceProvider;
+import com.cloud.network.element.NetworkACLServiceProvider;
+import com.cloud.network.element.PortForwardingServiceProvider;
+import com.cloud.network.element.StaticNatServiceProvider;
+import com.cloud.network.element.VirtualRouterElement;
+import com.cloud.network.element.VpcProvider;
+import com.cloud.network.lb.LoadBalancingRule;
+import com.cloud.network.netris.NetrisLbBackend;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.rules.LoadBalancerContainer;
+import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.network.rules.StaticNat;
+import com.cloud.network.vpc.NetworkACLItem;
+import com.cloud.network.vpc.PrivateGateway;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.StaticRouteProfile;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.resource.ResourceManager;
+import com.cloud.resource.ResourceStateAdapter;
+import com.cloud.resource.ServerResource;
+import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.Gson;
+import org.apache.cloudstack.StartupNetrisCommand;
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.network.netris.NetrisNetworkRule;
+import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+@Component
+public class NetrisElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider, VpcProvider,
+        StaticNatServiceProvider, IpDeployer, PortForwardingServiceProvider, NetworkACLServiceProvider,
+        LoadBalancingServiceProvider, ResourceStateAdapter, Listener {
+
+    @Inject
+    NetworkModel networkModel;
+    @Inject
+    AgentManager agentManager;
+    @Inject
+    ResourceManager resourceManager;
+    @Inject
+    private NetrisService netrisService;
+    @Inject
+    private AccountManager accountManager;
+    @Inject
+    private DataCenterDao dataCenterDao;
+    @Inject
+    private NetworkDao networkDao;
+    @Inject
+    private DomainDao domainDao;
+    @Inject
+    private VpcDao vpcDao;
+    @Inject
+    private FirewallRuleDetailsDao firewallRuleDetailsDao;
+    @Inject
+    private IPAddressDao ipAddressDao;
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+    @Inject
+    LoadBalancerVMMapDao lbVmMapDao;
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    private final Map<Network.Service, Map<Network.Capability, String>> capabilities = initCapabilities();
+
+    protected static List<AutoScaleCounter> getNetrisAutoScaleCounters() {
+        AutoScaleCounter counter;
+        final List<AutoScaleCounter> counterList = new ArrayList<>();
+        counter = new AutoScaleCounter(AutoScaleCounter.AutoScaleCounterType.Cpu);
+        counterList.add(counter);
+        counter = new AutoScaleCounter(AutoScaleCounter.AutoScaleCounterType.Memory);
+        counterList.add(counter);
+        return counterList;
+    }
+
+    protected static Map<Network.Service, Map<Network.Capability, String>> initCapabilities() {
+        Map<Network.Service, Map<Network.Capability, String>> capabilities = new HashMap<>();
+
+        Map<Network.Capability, String> dhcpCapabilities = Map.of(Network.Capability.DhcpAccrossMultipleSubnets, "true");
+        capabilities.put(Network.Service.Dhcp, dhcpCapabilities);
+
+        Map<Network.Capability, String> dnsCapabilities = new HashMap<>();
+        dnsCapabilities.put(Network.Capability.AllowDnsSuffixModification, "true");
+        capabilities.put(Network.Service.Dns, dnsCapabilities);
+
+        capabilities.put(Network.Service.StaticNat, null);
+
+        // Set capabilities for LB service
+        Map<Network.Capability, String> lbCapabilities = new HashMap<Network.Capability, String>();
+        lbCapabilities.put(Network.Capability.SupportedLBAlgorithms, "roundrobin,leastconn");
+        lbCapabilities.put(Network.Capability.SupportedLBIsolation, "dedicated");
+        lbCapabilities.put(Network.Capability.SupportedProtocols, "tcp, udp");
+        lbCapabilities.put(Network.Capability.SupportedStickinessMethods, VirtualRouterElement.getHAProxyStickinessCapability());
+        lbCapabilities.put(Network.Capability.LbSchemes, String.join(",", LoadBalancerContainer.Scheme.Internal.name(), LoadBalancerContainer.Scheme.Public.name()));
+        final Gson gson = new Gson();
+        final String autoScaleCounterList = gson.toJson(getNetrisAutoScaleCounters());
+        lbCapabilities.put(Network.Capability.AutoScaleCounters, autoScaleCounterList);
+        lbCapabilities.put(Network.Capability.VmAutoScaling, "true");
+
+        capabilities.put(Network.Service.Lb, lbCapabilities);
+        capabilities.put(Network.Service.PortForwarding, null);
+        capabilities.put(Network.Service.NetworkACL, null);
+
+        Map<Network.Capability, String> firewallCapabilities = new HashMap<>();
+        firewallCapabilities.put(Network.Capability.SupportedProtocols, "tcp,udp,icmp");
+        firewallCapabilities.put(Network.Capability.SupportedEgressProtocols, "tcp,udp,icmp,all");
+        firewallCapabilities.put(Network.Capability.MultipleIps, "true");
+        firewallCapabilities.put(Network.Capability.TrafficStatistics, "per public ip");
+        firewallCapabilities.put(Network.Capability.SupportedTrafficDirection, "ingress, egress");
+        capabilities.put(Network.Service.Firewall, firewallCapabilities);
+
+        Map<Network.Capability, String> sourceNatCapabilities = new HashMap<>();
+        sourceNatCapabilities.put(Network.Capability.RedundantRouter, "true");
+        sourceNatCapabilities.put(Network.Capability.SupportedSourceNatTypes, "peraccount");
+        capabilities.put(Network.Service.Gateway, null);
+        capabilities.put(Network.Service.SourceNat, sourceNatCapabilities);
+        return capabilities;
+    }
+
+    @Override
+    public boolean processAnswers(long agentId, long seq, Answer[] answers) {
+        return false;
+    }
+
+    @Override
+    public boolean processCommands(long agentId, long seq, Command[] commands) {
+        return false;
+    }
+
+    @Override
+    public AgentControlAnswer processControlCommand(long agentId, AgentControlCommand cmd) {
+        return null;
+    }
+
+    @Override
+    public void processHostAdded(long hostId) {
+        // Do nothing
+    }
+
+    @Override
+    public void processConnect(Host host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
+        // Do nothing
+    }
+
+    @Override
+    public boolean processDisconnect(long agentId, Status state) {
+        return false;
+    }
+
+    @Override
+    public void processHostAboutToBeRemoved(long hostId) {
+        // Do nothing
+    }
+
+    @Override
+    public void processHostRemoved(long hostId, long clusterId) {
+        // Do nothing
+    }
+
+    @Override
+    public boolean isRecurring() {
+        return false;
+    }
+
+    @Override
+    public int getTimeout() {
+        return 0;
+    }
+
+    @Override
+    public boolean processTimeout(long agentId, long seq) {
+        return false;
+    }
+
+    protected boolean canHandle(Network network, Network.Service service) {
+        logger.debug("Checking if Netris Element can handle service " + service.getName() + " on network "
+                + network.getDisplayText());
+
+        if (!networkModel.isProviderForNetwork(getProvider(), network.getId())) {
+            logger.debug("Netris Element is not a provider for network " + network.getDisplayText());
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean addDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean removeDhcpSupportForSubnet(Network network) throws ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean setExtraDhcpOptions(Network network, long nicId, Map<Integer, String> dhcpOptions) {
+        return true;
+    }
+
+    @Override
+    public boolean removeDhcpEntry(Network network, NicProfile nic, VirtualMachineProfile vmProfile) throws ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean addDnsEntry(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean configDnsSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean removeDnsSupportForSubnet(Network network) throws ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public Map<Network.Service, Map<Network.Capability, String>> getCapabilities() {
+        return capabilities;
+    }
+
+    @Override
+    public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Network.Service> services) throws ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public Network.Provider getProvider() {
+        return Network.Provider.Netris;
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        agentManager.registerForHostEvents(this, true, true, true);
+        resourceManager.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
+        return true;
+    }
+
+    @Override
+    public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+        return true;
+    }
+
+    @Override
+    public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+        return false;
+    }
+
+    @Override
+    public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
+        return false;
+    }
+
+    @Override
+    public boolean releaseIp(IpAddress ipAddress) {
+        return netrisService.releaseNatIp(ipAddress.getDataCenterId(), ipAddress.getAddress().addr());
+    }
+
+    @Override
+    public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException {
+        return canHandle(network, Network.Service.Connectivity);
+    }
+
+    @Override
+    public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
+        Account account = accountManager.getAccount(network.getAccountId());
+        NetworkVO networkVO = networkDao.findById(network.getId());
+        DataCenterVO zone = dataCenterDao.findById(network.getDataCenterId());
+        DomainVO domain = domainDao.findById(account.getDomainId());
+        if (Objects.isNull(zone)) {
+            String msg = String.format("Cannot find zone with ID %s", network.getDataCenterId());
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        String vpcName = null;
+        Long vpcId = network.getVpcId();
+        if (Objects.nonNull(vpcId)) {
+            VpcVO vpc = vpcDao.findById(vpcId);
+            if (Objects.nonNull(vpc)) {
+                vpcName = vpc.getName();
+            }
+        }
+        netrisService.deleteVnetResource(zone.getId(), account.getId(), domain.getId(), vpcName, vpcId, networkVO.getName(), network.getId(), network.getCidr());
+        return true;
+    }
+
+    @Override
+    public boolean isReady(PhysicalNetworkServiceProvider provider) {
+        return true;
+    }
+
+    @Override
+    public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
+        return false;
+    }
+
+    @Override
+    public boolean canEnableIndividualServices() {
+        return true;
+    }
+
+    @Override
+    public boolean verifyServicesCombination(Set<Network.Service> services) {
+        return true;
+    }
+
+    @Override
+    public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd) {
+        return null;
+    }
+
+    @Override
+    public HostVO createHostVOForDirectConnectAgent(HostVO host, StartupCommand[] startup, ServerResource resource, Map<String, String> details, List<String> hostTags) {
+        if (!(startup[0] instanceof StartupNetrisCommand)) {
+            return null;
+        }
+        host.setType(Host.Type.L2Networking);
+        return host;
+    }
+
+    @Override
+    public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) throws UnableDeleteHostException {
+        return null;
+    }
+
+    @Override
+    public boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+        return true;
+    }
+
+    @Override
+    public boolean shutdownVpc(Vpc vpc, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
+        long zoneId = vpc.getZoneId();
+        long accountId = vpc.getAccountId();
+        long domainId = vpc.getDomainId();
+        return netrisService.deleteVpcResource(zoneId, accountId, domainId, vpc);
+    }
+
+    @Override
+    public boolean createPrivateGateway(PrivateGateway gateway) throws ConcurrentOperationException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean deletePrivateGateway(PrivateGateway privateGateway) throws ConcurrentOperationException, ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException {
+        List<StaticRoute> existingStaticRoutes = netrisService.listStaticRoutes(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getName(), vpc.getId(), true, null, null, null);
+        List<String> staticRouteCidrs = new ArrayList<>();
+        for(StaticRouteProfile staticRoute : routes) {
+            if (StaticRoute.State.Add == staticRoute.getState()) {
+                netrisService.addOrUpdateStaticRoute(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getName(), vpc.getId(), true, staticRoute.getCidr(), staticRoute.getGateway(), staticRoute.getId(), false);
+            } else if (StaticRoute.State.Revoke == staticRoute.getState()) {
+                netrisService.deleteStaticRoute(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getName(), vpc.getId(), true, staticRoute.getCidr(), staticRoute.getGateway(), staticRoute.getId());
+            } else if (StaticRoute.State.Update == staticRoute.getState()) {
+                netrisService.addOrUpdateStaticRoute(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getName(), vpc.getId(), true, staticRoute.getCidr(), staticRoute.getGateway(), staticRoute.getId(), true);
+            }
+            staticRouteCidrs.add(staticRoute.getCidr());
+        }
+        for (StaticRoute staticRoute : existingStaticRoutes) {
+            if (!staticRouteCidrs.contains(staticRoute.getCidr())) {
+                logger.info("Revoking static route with cidr {} which are not used by VPC {}", staticRoute.getCidr(), vpc);
+                netrisService.deleteStaticRoute(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getName(), vpc.getId(), true, staticRoute.getCidr(), null, staticRoute.getId());
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
+        return true;
+    }
+
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        return netrisService.updateVpcSourceNatIp(vpc, address);
+    }
+
+    @Override
+    public boolean updateVpc(Vpc vpc, String previousVpcName) {
+        return netrisService.updateVpcResource(vpc.getZoneId(), vpc.getAccountId(), vpc.getDomainId(), vpc.getId(), vpc.getName(), previousVpcName);
+    }
+
+    @Override
+    public boolean applyNetworkACLs(Network network, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
+        if (!canHandle(network, Network.Service.NetworkACL)) {
+            return false;
+        }
+
+        List<NetrisNetworkRule> nsxDelNetworkRules = new ArrayList<>();
+        boolean success = true;
+        for (NetworkACLItem rule : rules) {
+            String privatePort = PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule);
+            NetrisNetworkRule networkRule = getNetrisNetworkRuleForAcl(rule, privatePort);
+            if (Arrays.asList(NetworkACLItem.State.Active, NetworkACLItem.State.Add).contains(rule.getState())) {
+                success = success && netrisService.addFirewallRules(network, List.of(networkRule));
+            } else if (NetworkACLItem.State.Revoke == rule.getState()) {
+                nsxDelNetworkRules.add(networkRule);
+            }
+        }
+
+        if (!nsxDelNetworkRules.isEmpty()) {
+            success = netrisService.deleteFirewallRules(network, nsxDelNetworkRules);
+            if (!success) {
+                logger.warn("Not all firewall rules were successfully deleted");
+            }
+        }
+        return success;
+    }
+
+    private NetrisNetworkRule getNetrisNetworkRuleForAcl(NetworkACLItem rule, String privatePort) {
+        SDNProviderNetworkRule baseNetworkRule = new SDNProviderNetworkRule.Builder()
+                .setRuleId(rule.getId())
+                .setSourceCidrList(!CollectionUtils.isNullOrEmpty(rule.getSourceCidrList())  ? transformCidrListValues(rule.getSourceCidrList()) : List.of("ANY"))
+                .setTrafficType(rule.getTrafficType().toString())
+                .setProtocol(rule.getProtocol().toUpperCase())
+                .setPublicPort(String.valueOf(rule.getSourcePortStart()))
+                .setPrivatePort(String.valueOf(privatePort))
+                .setIcmpCode(rule.getIcmpCode())
+                .setIcmpType(rule.getIcmpType())
+                .setService(Network.Service.NetworkACL)
+                .build();
+        return new NetrisNetworkRule.Builder()
+                .baseRule(baseNetworkRule)
+                .aclAction(transformActionValue(rule.getAction()))
+                        .reason(rule.getReason())
+                .build();
+    }
+
+    protected List<String> transformCidrListValues(List<String> sourceCidrList) {
+        List<String> list = new ArrayList<>();
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(sourceCidrList)) {
+            for (String cidr : sourceCidrList) {
+                if (cidr.equals("0.0.0.0/0")) {
+                    list.add("ANY");
+                } else {
+                    list.add(cidr);
+                }
+            }
+        }
+        return list;
+    }
+
+    protected NetrisNetworkRule.NetrisRuleAction transformActionValue(NetworkACLItem.Action action) {
+        if (action == NetworkACLItem.Action.Allow) {
+            return NetrisNetworkRule.NetrisRuleAction.PERMIT;
+        } else if (action == NetworkACLItem.Action.Deny) {
+            return NetrisNetworkRule.NetrisRuleAction.DENY;
+        }
+        String err = String.format("Unsupported action %s", action.toString());
+        logger.error(err);
+        throw new CloudRuntimeException(err);
+    }
+
+    @Override
+    public boolean reorderAclRules(Vpc vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems) {
+        List<NetrisNetworkRule> aclRulesList = new ArrayList<>();
+        for (NetworkACLItem rule : networkACLItems) {
+            String privatePort = PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule);
+            aclRulesList.add(getNetrisNetworkRuleForAcl(rule, privatePort));
+        }
+        for (Network network: networks) {
+            netrisService.deleteFirewallRules(network, aclRulesList);
+        }
+        boolean success = true;
+        for (Network network : networks) {
+            for (NetrisNetworkRule aclRule : aclRulesList) {
+                success = success && netrisService.addFirewallRules(network, List.of(aclRule));
+            }
+        }
+        return success;
+    }
+
+    @Override
+    public IpDeployer getIpDeployer(Network network) {
+        return this;
+    }
+
+    @Override
+    public boolean applyPFRules(Network network, List<PortForwardingRule> rules) throws ResourceUnavailableException {
+        if (!canHandle(network, Network.Service.PortForwarding)) {
+            return false;
+        }
+        return applyPFRulesInternal(network, rules);
+    }
+
+    private boolean addOrRemovePFRuleOnNetris(UserVm vm, PortForwardingRule rule, NetrisNetworkRule networkRule, SDNProviderOpObject netrisObject, boolean create) {
+        logger.debug("{} port forwarding rule on Netris for VM {} to ports {} - {}",
+                create ? "Creating" : "Deleting", vm.getUuid(), rule.getDestinationPortStart(), rule.getDestinationPortEnd());
+        Long vpcId = netrisObject.getVpcVO() != null ? netrisObject.getVpcVO().getId() : null;
+        String vpcName = netrisObject.getVpcVO() != null ? netrisObject.getVpcVO().getName() : null;
+        Long networkId = netrisObject.getNetworkVO() != null ? netrisObject.getNetworkVO().getId() : null;
+        String networkName = netrisObject.getNetworkVO() != null ? netrisObject.getNetworkVO().getName() : null;
+        String vpcCidr = netrisObject.getVpcVO() != null ? netrisObject.getVpcVO().getCidr() : null;
+        SDNProviderNetworkRule baseNetRule = networkRule.getBaseRule();
+        return create ?
+                netrisService.createPortForwardingRule(baseNetRule.getZoneId(), baseNetRule.getAccountId(), baseNetRule.getDomainId(),
+                        vpcName, vpcId, networkName, networkId, netrisObject.isVpcResource(), vpcCidr, baseNetRule) :
+                netrisService.deletePortForwardingRule(baseNetRule.getZoneId(), baseNetRule.getAccountId(), baseNetRule.getDomainId(),
+                        vpcName, vpcId, networkName, networkId, netrisObject.isVpcResource(), vpcCidr, baseNetRule);
+    }
+
+    private boolean applyPFRulesInternal(Network network, List<PortForwardingRule> rules) {
+        return Transaction.execute((TransactionCallback<Boolean>) status -> {
+            boolean result = true;
+            for (PortForwardingRule rule : rules) {
+                IPAddressVO publicIp = ApiDBUtils.findIpAddressById(rule.getSourceIpAddressId());
+                UserVm vm = ApiDBUtils.findUserVmById(rule.getVirtualMachineId());
+                if (vm == null && rule.getState() != FirewallRule.State.Revoke) {
+                    continue;
+                }
+                SDNProviderOpObject netrisObject = getNetrisOpObject(network);
+                String publicPort = PortForwardingServiceProvider.getPublicPortRange(rule);
+                String privatePort = PortForwardingServiceProvider.getPrivatePFPortRange(rule);
+                FirewallRuleDetailVO ruleDetail = firewallRuleDetailsDao.findDetail(rule.getId(), ApiConstants.NETRIS_DETAIL_KEY);
+
+                SDNProviderNetworkRule baseNetworkRule = new SDNProviderNetworkRule.Builder()
+                        .setDomainId(netrisObject.getDomainId())
+                .setAccountId(netrisObject.getAccountId())
+                .setZoneId(netrisObject.getZoneId())
+                .setNetworkResourceId(netrisObject.getNetworkResourceId())
+                .setNetworkResourceName(netrisObject.getNetworkResourceName())
+                .setVpcResource(netrisObject.isVpcResource())
+                .setVmId(Objects.nonNull(vm) ? vm.getId() : 0)
+                .setVmIp(Objects.nonNull(vm) ? vm.getPrivateIpAddress() : null)
+                .setPublicIp(publicIp.getAddress().addr())
+                .setPrivatePort(privatePort)
+                .setPublicPort(publicPort)
+                .setRuleId(rule.getId())
+                .setProtocol(rule.getProtocol().toUpperCase(Locale.ROOT))
+                        .build();
+
+                NetrisNetworkRule networkRule = new NetrisNetworkRule.Builder().baseRule(baseNetworkRule).build();
+
+                if (Arrays.asList(FirewallRule.State.Add, FirewallRule.State.Active).contains(rule.getState())) {
+                    boolean pfRuleResult = addOrRemovePFRuleOnNetris(vm, rule, networkRule, netrisObject, true);
+                    if (pfRuleResult) {
+                        logger.debug("Port forwarding rule {} created on Netris, adding detail on firewall rules details", rule.getId());
+                        if (ruleDetail == null && FirewallRule.State.Add == rule.getState()) {
+                            logger.debug("Adding new firewall detail for rule {}", rule.getId());
+                            firewallRuleDetailsDao.addDetail(rule.getId(), ApiConstants.NETRIS_DETAIL_KEY, "true", false);
+                        } else if (ruleDetail != null) {
+                            logger.debug("Updating firewall detail for rule {}", rule.getId());
+                            ruleDetail.setValue("true");
+                            firewallRuleDetailsDao.update(ruleDetail.getId(), ruleDetail);
+                        }
+                    }
+                    result &= pfRuleResult;
+                } else if (rule.getState() == FirewallRule.State.Revoke) {
+                    boolean pfRuleResult = addOrRemovePFRuleOnNetris(vm, rule, networkRule, netrisObject, false);
+                    if (pfRuleResult && ruleDetail != null) {
+                        logger.debug("Updating firewall rule detail {} for rule {}, set to false", ruleDetail.getId(), rule.getId());
+                        ruleDetail.setValue("false");
+                        firewallRuleDetailsDao.update(ruleDetail.getId(), ruleDetail);
+                    }
+                    result &= pfRuleResult;
+                }
+            }
+            return result;
+        });
+    }
+
+    private SDNProviderOpObject getNetrisOpObject(Network network) {
+        Pair<VpcVO, NetworkVO> vpcOrNetwork = getVpcOrNetwork(network.getVpcId(), network.getId());
+        VpcVO vpc = vpcOrNetwork.first();
+        NetworkVO networkVO = vpcOrNetwork.second();
+        long domainId = getResourceId("domain", vpc, networkVO);
+        long accountId = getResourceId("account", vpc, networkVO);
+        long zoneId = getResourceId("zone", vpc, networkVO);
+
+        return new SDNProviderOpObject.Builder()
+                .vpcVO(vpc)
+                .networkVO(networkVO)
+                .domainId(domainId)
+                .accountId(accountId)
+                .zoneId(zoneId)
+                .build();
+    }
+
+    public boolean applyStaticNats(Network config, List<? extends StaticNat> rules) throws ResourceUnavailableException {
+        for(StaticNat staticNat : rules) {
+            long sourceIpAddressId = staticNat.getSourceIpAddressId();
+            IPAddressVO ipAddressVO = ipAddressDao.findByIdIncludingRemoved(sourceIpAddressId);
+            VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(ipAddressVO.getAssociatedWithVmId());
+            // floating ip is released when nic was deleted
+            if (vm == null || networkModel.getNicInNetworkIncludingRemoved(vm.getId(), config.getId()) == null) {
+                continue;
+            }
+            long vmId = vm.getId();
+            Pair<VpcVO, NetworkVO> vpcOrNetwork = getVpcOrNetwork(config.getVpcId(), config.getId());
+            VpcVO vpc = vpcOrNetwork.first();
+            NetworkVO network = vpcOrNetwork.second();
+            Long networkResourceId = Objects.nonNull(vpc) ? vpc.getId() : network.getId();
+            String networkResourceName = Objects.nonNull(vpc) ? vpc.getName() : network.getName();
+            boolean isVpcResource = Objects.nonNull(vpc);
+            if (!staticNat.isForRevoke()) {
+                return netrisService.createStaticNatRule(config.getDataCenterId(), config.getAccountId(), config.getDomainId(),
+                       networkResourceName, networkResourceId, isVpcResource, vpc.getCidr(),
+                        ipAddressVO.getAddress().addr(), staticNat.getDestIpAddress(), vmId);
+            } else {
+                return netrisService.deleteStaticNatRule(config.getDataCenterId(), config.getAccountId(), config.getDomainId(),
+                        networkResourceName, networkResourceId, isVpcResource, ipAddressVO.getAddress().addr(), vmId);
+            }
+        }
+        return false;
+    }
+
+    public Pair<VpcVO, NetworkVO> getVpcOrNetwork(Long vpcId, long networkId) {
+        VpcVO vpc = null;
+        NetworkVO network = null;
+        if (Objects.nonNull(vpcId)) {
+            vpc = vpcDao.findById(vpcId);
+            if (Objects.isNull(vpc)) {
+                throw new CloudRuntimeException(String.format("Failed to find VPC with id: %s", vpcId));
+            }
+        } else {
+            network = networkDao.findById(networkId);
+            if (Objects.isNull(network)) {
+                throw new CloudRuntimeException(String.format("Failed to find network with id: %s", networkId));
+            }
+        }
+        return new Pair<>(vpc, network);
+    }
+
+    private long getResourceId(String resource, VpcVO vpc, NetworkVO network) {
+        switch (resource) {
+            case "domain":
+                return Objects.nonNull(vpc) ? vpc.getDomainId() : network.getDomainId();
+            case "account":
+                return Objects.nonNull(vpc) ? vpc.getAccountId() : network.getAccountId();
+            case "zone":
+                return Objects.nonNull(vpc) ? vpc.getZoneId() : network.getDataCenterId();
+            default:
+                return 0;
+        }
+    }
+
+    private SDNProviderOpObject getNetrisObject(Network network) {
+        Pair<VpcVO, NetworkVO> vpcOrNetwork = getVpcOrNetwork(network.getVpcId(), network.getId());
+        VpcVO vpc = vpcOrNetwork.first();
+        NetworkVO networkVO = vpcOrNetwork.second();
+        long domainId = getResourceId("domain", vpc, networkVO);
+        long accountId = getResourceId("account", vpc, networkVO);
+        long zoneId = getResourceId("zone", vpc, networkVO);
+
+        return new SDNProviderOpObject.Builder()
+                .vpcVO(vpc)
+                .networkVO(networkVO)
+                .domainId(domainId)
+                .accountId(accountId)
+                .zoneId(zoneId)
+                .build();
+    }
+
+    @Override
+    public boolean applyLBRules(Network network, List<LoadBalancingRule> rules) throws ResourceUnavailableException {
+        boolean result = true;
+        for (LoadBalancingRule loadBalancingRule : rules) {
+            IPAddressVO publicIp = ipAddressDao.findByIpAndDcId(network.getDataCenterId(),
+                    loadBalancingRule.getSourceIp().addr());
+
+            List<NetrisLbBackend> lbBackends = getLoadBalancerBackends(loadBalancingRule);
+            SDNProviderOpObject netrisObject = getNetrisObject(network);
+            SDNProviderNetworkRule baseNetworkRule = new SDNProviderNetworkRule.Builder()
+                    .setDomainId(netrisObject.getDomainId())
+                    .setAccountId(netrisObject.getAccountId())
+                    .setZoneId(netrisObject.getZoneId())
+                    .setNetworkResourceId(netrisObject.getNetworkResourceId())
+                    .setNetworkResourceName(netrisObject.getNetworkResourceName())
+                    .setVpcResource(netrisObject.isVpcResource())
+                    .setPublicIp(LoadBalancerContainer.Scheme.Public == loadBalancingRule.getScheme() ?
+                            publicIp.getAddress().addr() : loadBalancingRule.getSourceIp().addr())
+                    .setPrivatePort(String.valueOf(loadBalancingRule.getDefaultPortStart()))
+                    .setPublicPort(String.valueOf(loadBalancingRule.getSourcePortStart()))
+                    .setRuleId(loadBalancingRule.getId())
+                    .setProtocol(loadBalancingRule.getProtocol().toUpperCase(Locale.ROOT))
+                    .setAlgorithm(loadBalancingRule.getAlgorithm())
+                    .build();
+
+            NetrisNetworkRule networkRule = new NetrisNetworkRule.Builder()
+                    .baseRule(baseNetworkRule)
+                    .lbBackends(lbBackends)
+                    .lbCidrList(loadBalancingRule.getCidrList())
+                    .lbRuleName(loadBalancingRule.getName())
+                    .build();
+            if (Arrays.asList(FirewallRule.State.Add, FirewallRule.State.Active).contains(loadBalancingRule.getState())) {
+                result &= netrisService.createOrUpdateLbRule(networkRule);
+            } else if (loadBalancingRule.getState() == FirewallRule.State.Revoke) {
+                result &= netrisService.deleteLbRule(networkRule);
+            }
+        }
+        return result;
+    }
+
+    private List<NetrisLbBackend> getLoadBalancerBackends(LoadBalancingRule lbRule) {
+        List<LoadBalancerVMMapVO> lbVms = lbVmMapDao.listByLoadBalancerId(lbRule.getId(), false);
+        List<NetrisLbBackend> lbMembers = new ArrayList<>();
+
+        for (LoadBalancerVMMapVO lbVm : lbVms) {
+            NetrisLbBackend member = new NetrisLbBackend(lbVm.getInstanceId(), lbVm.getInstanceIp(), lbRule.getDefaultPortStart());
+            lbMembers.add(member);
+        }
+        return lbMembers;
+    }
+
+    @Override
+    public boolean validateLBRule(Network network, LoadBalancingRule rule) {
+        return true;
+    }
+
+    @Override
+    public List<LoadBalancerTO> updateHealthChecks(Network network, List<LoadBalancingRule> lbrules) {
+        return List.of();
+    }
+
+    @Override
+    public boolean handlesOnlyRulesInTransitionState() {
+        return false;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java
new file mode 100644
index 00000000000..df566e90b67
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java
@@ -0,0 +1,346 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.domain.DomainVO;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventTypes;
+import com.cloud.event.EventVO;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkMigrationResponder;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks;
+import com.cloud.network.PhysicalNetwork;
+import com.cloud.network.PublicIpAddress;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.guru.GuestNetworkGuru;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.user.Account;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.context.CallContext;
+
+import javax.inject.Inject;
+import java.util.Objects;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+public class NetrisGuestNetworkGuru  extends GuestNetworkGuru implements NetworkMigrationResponder {
+
+    @Inject
+    private NetrisService netrisService;
+    @Inject
+    NetworkModel networkModel;
+    @Inject
+    NetworkDetailsDao networkDetailsDao;
+
+    public NetrisGuestNetworkGuru() {
+        super();
+        _isolationMethods = new PhysicalNetwork.IsolationMethod[] {new PhysicalNetwork.IsolationMethod("Netris")};
+    }
+
+    @Override
+    public boolean canHandle(NetworkOffering offering, DataCenter.NetworkType networkType,
+                             PhysicalNetwork physicalNetwork) {
+        return networkType == DataCenter.NetworkType.Advanced && isMyTrafficType(offering.getTrafficType())
+                && isMyIsolationMethod(physicalNetwork) && (NetworkOffering.NetworkMode.ROUTED.equals(offering.getNetworkMode())
+                || (networkOfferingServiceMapDao.isProviderForNetworkOffering(
+                offering.getId(), Network.Provider.Netris) && NetworkOffering.NetworkMode.NATTED.equals(offering.getNetworkMode())));
+    }
+
+    @Override
+    public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, String name, Long vpcId, Account owner) {
+        PhysicalNetworkVO physnet = _physicalNetworkDao.findById(plan.getPhysicalNetworkId());
+        DataCenter dc = _dcDao.findById(plan.getDataCenterId());
+
+        if (!canHandle(offering, dc.getNetworkType(), physnet)) {
+            logger.debug("Refusing to design this network");
+            return null;
+        }
+
+        NetworkVO network = (NetworkVO) super.design(offering, plan, userSpecified, name, vpcId, owner);
+        if (network == null) {
+            return null;
+        }
+        network.setBroadcastDomainType(Networks.BroadcastDomainType.Netris);
+
+        if (userSpecified != null) {
+            if ((userSpecified.getIp6Cidr() == null && userSpecified.getIp6Gateway() != null) || (
+                    userSpecified.getIp6Cidr() != null && userSpecified.getIp6Gateway() == null)) {
+                throw new InvalidParameterValueException("cidrv6 and gatewayv6 must be specified together.");
+            }
+
+            if (userSpecified.getIp6Cidr() != null) {
+                network.setIp6Cidr(userSpecified.getIp6Cidr());
+                network.setIp6Gateway(userSpecified.getIp6Gateway());
+            }
+        }
+
+        network.setBroadcastDomainType(Networks.BroadcastDomainType.Netris);
+        network.setState(Network.State.Allocated);
+
+        NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(),
+                network.getBroadcastDomainType(), network.getNetworkOfferingId(), Network.State.Implemented,
+                network.getDataCenterId(), network.getPhysicalNetworkId(), offering.isRedundantRouter());
+        implemented.setAccountId(owner.getAccountId());
+
+        if (network.getGateway() != null) {
+            implemented.setGateway(network.getGateway());
+        }
+
+        if (network.getCidr() != null) {
+            implemented.setCidr(network.getCidr());
+        }
+
+        if (vpcId != null) {
+            implemented.setVpcId(vpcId);
+        }
+
+        if (name != null) {
+            implemented.setName(name);
+        }
+        implemented.setBroadcastUri(Networks.BroadcastDomainType.Netris.toUri("netris"));
+
+        return network;
+    }
+
+    @Override
+    public void setup(Network network, long networkId) {
+        try {
+            NetworkVO designedNetwork  = _networkDao.findById(networkId);
+            long zoneId = network.getDataCenterId();
+            DataCenter zone = _dcDao.findById(zoneId);
+            if (isNull(zone)) {
+                throw new CloudRuntimeException(String.format("Failed to find zone with id: %s", zoneId));
+            }
+            try {
+                allocateVnet(network, designedNetwork, network.getDataCenterId(), network.getPhysicalNetworkId(), network.getReservationId());
+            } catch (Exception e) {
+                throw new CloudRuntimeException(String.format("Failed to allocate VXLAN for Netris guest Network %s", network.getName()));
+            }
+            _networkDao.update(designedNetwork.getId(), designedNetwork);
+            createNetrisVnet(designedNetwork, zone);
+        } catch (Exception ex) {
+            throw new CloudRuntimeException("unable to create Netris network " + network.getUuid() + "due to: " + ex.getMessage());
+        }
+    }
+
+    @Override
+    @DB
+    public void deallocate(Network config, NicProfile nic, VirtualMachineProfile vm) {
+        // Do nothing
+    }
+
+    @Override
+    public boolean update(Network network, String prevNetworkName) {
+        Long vpcId = network.getVpcId();
+        String vpcName = null;
+        if (Objects.nonNull(vpcId)) {
+            VpcVO vpc = _vpcDao.findById(vpcId);
+            if (Objects.nonNull(vpc)) {
+                vpcName = vpc.getName();
+            }
+        }
+        return netrisService.updateVnetResource(network.getDataCenterId(), network.getAccountId(), network.getDomainId(),
+                vpcName, vpcId, network.getName(), network.getId(), prevNetworkName);
+    }
+
+    @Override
+    public Network implement(Network network, NetworkOffering offering, DeployDestination dest,
+                             ReservationContext context) throws InsufficientVirtualNetworkCapacityException {
+        NetworkVO implemented = new NetworkVO(network.getTrafficType(), network.getMode(),
+                network.getBroadcastDomainType(), network.getNetworkOfferingId(), Network.State.Implemented,
+                network.getDataCenterId(), network.getPhysicalNetworkId(), offering.isRedundantRouter());
+        implemented.setAccountId(network.getAccountId());
+
+        if (network.getGateway() != null) {
+            implemented.setGateway(network.getGateway());
+        }
+
+        if (network.getCidr() != null) {
+            implemented.setCidr(network.getCidr());
+        }
+
+        if (network.getVpcId() != null) {
+            implemented.setVpcId(network.getVpcId());
+        }
+
+        if (network.getName() != null) {
+            implemented.setName(network.getName());
+        }
+        allocateVnet(network, implemented, network.getDataCenterId(), network.getPhysicalNetworkId(), network.getReservationId());
+        return implemented;
+    }
+
+    @Override
+    protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId)
+            throws InsufficientVirtualNetworkCapacityException {
+        String vnet = null;
+        Long networkId = implemented.getId() > 0 ? implemented.getId() : network.getId();
+        if (network.getBroadcastUri() == null) {
+            NetworkDetailVO netrisVnetDetail = networkDetailsDao.findDetail(networkId, ApiConstants.NETRIS_VXLAN_ID);
+            if (nonNull(netrisVnetDetail)) {
+                vnet = netrisVnetDetail.getValue();
+            } else {
+                vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId()));
+                if (vnet == null) {
+                    throw new InsufficientVirtualNetworkCapacityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class,
+                            dcId);
+                }
+                networkDetailsDao.addDetail(networkId, ApiConstants.NETRIS_VXLAN_ID, vnet, true);
+            }
+            implemented.setBroadcastUri(Networks.BroadcastDomainType.Netris.toUri(vnet));
+            ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VXLAN_ASSIGN,
+                    "Assigned Zone vNet: " + vnet + " Network Id: " + networkId, networkId, ApiCommandResourceType.Network.toString(), 0);
+        } else {
+            implemented.setBroadcastUri(network.getBroadcastUri());
+        }
+    }
+
+    @Override
+    public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        NicProfile nicProfile = super.allocate(network, nic, vm);
+        if (vm.getType() != VirtualMachine.Type.DomainRouter) {
+            return nicProfile;
+        }
+
+        final DataCenter zone = _dcDao.findById(network.getDataCenterId());
+        long zoneId = network.getDataCenterId();
+        if (Objects.isNull(zone)) {
+            String msg = String.format("Unable to find zone with id: %s", zoneId);
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        Account account = accountDao.findById(network.getAccountId());
+        if (Objects.isNull(account)) {
+            String msg = String.format("Unable to find account with id: %s", network.getAccountId());
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        VpcVO vpc = _vpcDao.findById(network.getVpcId());
+        if (Objects.isNull(vpc)) {
+            String msg = String.format("Unable to find VPC with id: %s, allocating for network %s", network.getVpcId(), network.getName());
+            logger.debug(msg);
+        }
+
+        DomainVO domain = domainDao.findById(account.getDomainId());
+        if (Objects.isNull(domain)) {
+            String msg = String.format("Unable to find domain with id: %s", account.getDomainId());
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+
+        NetworkOfferingVO networkOfferingVO = networkOfferingDao.findById(network.getNetworkOfferingId());
+
+        if (isNull(network.getVpcId()) && networkOfferingVO.getNetworkMode().equals(NetworkOffering.NetworkMode.NATTED)) {
+            // Netris Natted mode
+            long domainId = domain.getId();
+            long accountId = account.getId();
+            long dataCenterId = zone.getId();
+            long resourceId = network.getId();
+            PublicIpAddress ipAddress = networkModel.getSourceNatIpAddressForGuestNetwork(account, network);
+            String snatIP = ipAddress.getAddress().addr();
+            boolean result = netrisService.createSnatRule(dataCenterId, accountId, domainId, vpc.getName(), vpc.getId(), network.getName(), resourceId, nonNull(network.getVpcId()), vpc.getCidr(), snatIP);
+            if (!result) {
+                String msg = String.format("Could not create Netris Nat Rule for IP %s", snatIP);
+                logger.error(msg);
+                throw new CloudRuntimeException(msg);
+            }
+        }
+
+        return nicProfile;
+    }
+
+    @Override
+    public boolean prepareMigration(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) {
+        return false;
+    }
+
+    @Override
+    public void rollbackMigration(NicProfile nic, Network network, VirtualMachineProfile vm, ReservationContext src, ReservationContext dst) {
+        // Do nothing
+    }
+
+    @Override
+    public void commitMigration(NicProfile nic, Network network, VirtualMachineProfile vm, ReservationContext src, ReservationContext dst) {
+        // Do nothing
+    }
+
+    public void createNetrisVnet(NetworkVO networkVO, DataCenter zone) {
+        Account account = accountDao.findById(networkVO.getAccountId());
+        if (isNull(account)) {
+            throw new CloudRuntimeException(String.format("Unable to find account with id: %s", networkVO.getAccountId()));
+        }
+        DomainVO domain = domainDao.findById(account.getDomainId());
+        if (Objects.isNull(domain)) {
+            String msg = String.format("Unable to find domain with id: %s", account.getDomainId());
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        String vpcName = null;
+        Long vpcId = null;
+        Boolean globalRouting = null;
+        long networkOfferingId = networkVO.getNetworkOfferingId();
+        NetworkOfferingVO networkOfferingVO = networkOfferingDao.findById(networkOfferingId);
+        if (NetworkOffering.NetworkMode.ROUTED.equals(networkOfferingVO.getNetworkMode())) {
+            globalRouting = true;
+        }
+        if (nonNull(networkVO.getVpcId())) {
+            VpcVO vpc = _vpcDao.findById(networkVO.getVpcId());
+            if (isNull(vpc)) {
+                throw new CloudRuntimeException(String.format("Failed to find VPC network with id: %s", networkVO.getVpcId()));
+            }
+            vpcName = vpc.getName();
+            vpcId = vpc.getId();
+        } else {
+            logger.debug(String.format("Creating IPAM Allocation before creating IPAM Subnet", networkVO.getName()));
+            boolean isSourceNatSupported = !NetworkOffering.NetworkMode.ROUTED.equals(networkOfferingVO.getNetworkMode()) &&
+                    networkOfferingServiceMapDao.areServicesSupportedByNetworkOffering(networkVO.getNetworkOfferingId(), Network.Service.SourceNat);
+            boolean result = netrisService.createVpcResource(zone.getId(), networkVO.getAccountId(), networkVO.getDomainId(),
+                    networkVO.getId(), networkVO.getName(), isSourceNatSupported, networkVO.getCidr(), false);
+            if (!result) {
+                String msg = String.format("Error creating Netris VPC for the network: %s", networkVO.getName());
+                logger.error(msg);
+                throw new CloudRuntimeException(msg);
+            }
+        }
+        boolean result = netrisService.createVnetResource(zone.getId(), account.getId(), domain.getId(), vpcName, vpcId,
+                networkVO.getName(), networkVO.getId(), networkVO.getCidr(), globalRouting);
+        if (!result) {
+            throw new CloudRuntimeException("Failed to create Netris vNet resource for network: " + networkVO.getName());
+        }
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java
new file mode 100644
index 00000000000..7d5f4146ab1
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java
@@ -0,0 +1,32 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.network.netris.NetrisProvider;
+import com.cloud.utils.component.PluggableService;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.command.AddNetrisProviderCmd;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+
+import java.util.List;
+
+public interface NetrisProviderService extends PluggableService {
+    NetrisProvider addProvider(AddNetrisProviderCmd cmd);
+    List<BaseResponse> listNetrisProviders(Long zoneId);
+    boolean deleteNetrisProvider(Long providerId);
+    NetrisProviderResponse createNetrisProviderResponse(NetrisProvider provider);
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java
new file mode 100644
index 00000000000..14a845e1c3a
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java
@@ -0,0 +1,217 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.host.DetailVO;
+import com.cloud.host.Host;
+import com.cloud.host.dao.HostDetailsDao;
+import com.cloud.network.Network;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.netris.NetrisProvider;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.resource.ResourceManager;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.command.AddNetrisProviderCmd;
+import org.apache.cloudstack.api.command.DeleteNetrisProviderCmd;
+import org.apache.cloudstack.api.command.ListNetrisProvidersCmd;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.resource.NetrisResource;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+public class NetrisProviderServiceImpl implements NetrisProviderService {
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    @Inject
+    DataCenterDao dataCenterDao;
+    @Inject
+    ResourceManager resourceManager;
+    @Inject
+    NetrisProviderDao netrisProviderDao;
+    @Inject
+    HostDetailsDao hostDetailsDao;
+    @Inject
+    PhysicalNetworkDao physicalNetworkDao;
+    @Inject
+    NetworkDao networkDao;
+    @Inject
+    private NetrisService netrisService;
+
+    @Override
+    public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
+        final Long zoneId = cmd.getZoneId();
+        final String name = cmd.getName();
+        final String url = cmd.getUrl();
+        final String username = cmd.getUsername();
+        final String password = cmd.getPassword();
+        final String tenantName = cmd.getTenantName();
+        final String siteName = cmd.getSiteName();
+        final String netrisTag = cmd.getNetrisTag();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("guid", UUID.randomUUID().toString());
+        params.put("zoneId", zoneId.toString());
+        params.put("name", name);
+        params.put("url", url);
+        params.put("username", username);
+        params.put("password", password);
+        params.put("siteName", siteName);
+        params.put("tenantName", tenantName);
+        params.put("netrisTag", netrisTag);
+
+        Map<String, Object> hostdetails = new HashMap<>(params);
+        NetrisProvider netrisProvider;
+
+        NetrisResource netrisResource = new NetrisResource();
+        try {
+            netrisResource.configure(url, hostdetails);
+            final Host host = resourceManager.addHost(zoneId, netrisResource, netrisResource.getType(), params);
+            if (host != null) {
+                netrisProvider = Transaction.execute((TransactionCallback<NetrisProviderVO>) status -> {
+                    NetrisProviderVO netrisProviderVO = new NetrisProviderVO.Builder()
+                            .setZoneId(zoneId)
+                            .setHostId(host.getId())
+                            .setName(name)
+                            .setUrl(url)
+                            .setUsername(username)
+                            .setPassword(password)
+                            .setSiteName(siteName)
+                            .setTenantName(tenantName)
+                            .setNetrisTag(netrisTag)
+                            .build();
+
+                    netrisProviderDao.persist(netrisProviderVO);
+
+                    DetailVO detail = new DetailVO(host.getId(), "netriscontrollerid",
+                            String.valueOf(netrisProviderVO.getId()));
+                    hostDetailsDao.persist(detail);
+
+                    return netrisProviderVO;
+                });
+            } else {
+                throw new CloudRuntimeException("Failed to add Netris controller due to internal error.");
+            }
+            netrisService.createIPAMAllocationsForZoneLevelPublicRanges(zoneId);
+        } catch (ConfigurationException e) {
+            throw new CloudRuntimeException(e.getMessage());
+        }
+        return  netrisProvider;
+    }
+
+    @Override
+    public List<BaseResponse> listNetrisProviders(Long zoneId) {
+        List<BaseResponse> netrisControllersResponseList = new ArrayList<>();
+        if (zoneId != null) {
+            NetrisProviderVO netrisProviderVO = netrisProviderDao.findByZoneId(zoneId);
+            if (Objects.nonNull(netrisProviderVO)) {
+                netrisControllersResponseList.add(createNetrisProviderResponse(netrisProviderVO));
+            }
+        } else {
+            List<NetrisProviderVO> netrisProviderVOList = netrisProviderDao.listAll();
+            for (NetrisProviderVO nsxProviderVO : netrisProviderVOList) {
+                netrisControllersResponseList.add(createNetrisProviderResponse(nsxProviderVO));
+            }
+        }
+
+        return netrisControllersResponseList;
+    }
+
+    @Override
+    public boolean deleteNetrisProvider(Long providerId) {
+        NetrisProviderVO netrisProvider = netrisProviderDao.findById(providerId);
+        if (Objects.isNull(netrisProvider)) {
+            throw new InvalidParameterValueException(String.format("Failed to find Netris provider with id: %s", providerId));
+        }
+        Long zoneId = netrisProvider.getZoneId();
+        // Find the physical network we work for
+        List<PhysicalNetworkVO> physicalNetworks = physicalNetworkDao.listByZone(zoneId);
+        for (PhysicalNetworkVO physicalNetwork : physicalNetworks) {
+            List<NetworkVO> networkList = networkDao.listByPhysicalNetwork(physicalNetwork.getId());
+            if (!CollectionUtils.isEmpty(networkList)) {
+                validateNetworkState(networkList);
+            }
+        }
+        netrisProviderDao.remove(providerId);
+        return true;
+    }
+
+    @Override
+    public NetrisProviderResponse createNetrisProviderResponse(NetrisProvider provider) {
+        DataCenterVO zone  = dataCenterDao.findById(provider.getZoneId());
+        if (Objects.isNull(zone)) {
+            throw new CloudRuntimeException(String.format("Failed to find zone with id %s", provider.getZoneId()));
+        }
+
+        NetrisProviderResponse response = new NetrisProviderResponse();
+        response.setName(provider.getName());
+        response.setUuid(provider.getUuid());
+        response.setHostname(provider.getUrl());
+        response.setZoneId(zone.getUuid());
+        response.setZoneName(zone.getName());
+        response.setSiteName(provider.getSiteName());
+        response.setTenantName(provider.getTenantName());
+        response.setNetrisTag(provider.getNetrisTag());
+        response.setObjectName("netrisProvider");
+        return response;
+    }
+
+    @VisibleForTesting
+    void validateNetworkState(List<NetworkVO> networkList) {
+        for (NetworkVO network : networkList) {
+            if (network.getBroadcastDomainType() == Networks.BroadcastDomainType.Netris &&
+                    ((network.getState() != Network.State.Shutdown) && (network.getState() != Network.State.Destroy))) {
+                throw new CloudRuntimeException("This Netris provider cannot be deleted as there are one or more logical networks provisioned by CloudStack on it.");
+            }
+        }
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        List<Class<?>> cmdList = new ArrayList<>();
+        if (Boolean.TRUE.equals(NetworkOrchestrationService.NETRIS_ENABLED.value())) {
+            cmdList.add(AddNetrisProviderCmd.class);
+            cmdList.add(ListNetrisProvidersCmd.class);
+            cmdList.add(DeleteNetrisProviderCmd.class);
+        }
+        return cmdList;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java
new file mode 100644
index 00000000000..f1cc49b7125
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java
@@ -0,0 +1,144 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.network.Network;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.guru.PublicNetworkGuru;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.VpcOffering;
+import com.cloud.network.vpc.VpcOfferingVO;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.user.Account;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.commons.collections.CollectionUtils;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class NetrisPublicNetworkGuru extends PublicNetworkGuru {
+
+    @Inject
+    private NetrisService netrisService;
+
+    public NetrisPublicNetworkGuru() {
+        super();
+    }
+
+    @Override
+    protected boolean canHandle(NetworkOffering offering) {
+        boolean isForNetris = networkModel.isProviderForNetworkOffering(Network.Provider.Netris, offering.getId());
+        return isMyTrafficType(offering.getTrafficType()) && offering.isSystemOnly() && isForNetris;
+    }
+
+    @Override
+    public Network design(NetworkOffering offering, DeploymentPlan plan, Network network, String name, Long vpcId, Account owner) {
+        if (!canHandle(offering)) {
+            return null;
+        }
+
+        if (offering.getTrafficType() == Networks.TrafficType.Public) {
+            return new NetworkVO(offering.getTrafficType(), Networks.Mode.Static, network.getBroadcastDomainType(), offering.getId(), Network.State.Setup, plan.getDataCenterId(),
+                    plan.getPhysicalNetworkId(), offering.isRedundantRouter());
+        }
+        return null;
+    }
+
+    @Override
+    public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException {
+        logger.debug("Netris Public network guru: allocate");
+
+        IPAddressVO ipAddress = _ipAddressDao.findByIp(nic.getIPv4Address());
+        if (ipAddress == null) {
+            String err = String.format("Cannot find the IP address %s", nic.getIPv4Address());
+            logger.error(err);
+            throw new CloudRuntimeException(err);
+        }
+        Long vpcId = ipAddress.getVpcId();
+        boolean isForVpc = vpcId != null;
+        VpcVO vpc = vpcDao.findById(vpcId);
+        if (vpc == null) {
+            String err = String.format("Cannot find a VPC with ID %s", vpcId);
+            logger.error(err);
+            throw new CloudRuntimeException(err);
+        }
+
+        // For NSX, use VR Public IP != Source NAT
+        List<IPAddressVO> ips = _ipAddressDao.listByAssociatedVpc(vpc.getId(), true);
+        if (CollectionUtils.isEmpty(ips)) {
+            String err = String.format("Cannot find a source NAT IP for the VPC %s", vpc.getName());
+            logger.error(err);
+            throw new CloudRuntimeException(err);
+        }
+
+        ips = ips.stream().filter(x -> !x.getAddress().addr().equals(nic.getIPv4Address())).collect(Collectors.toList());
+        // Use Source NAT IP address from the Netris Public Range. Do not Use the VR Public IP address
+        ipAddress = ips.get(0);
+        if (ipAddress.isSourceNat() && !ipAddress.isForSystemVms()) {
+            VlanDetailsVO detail = vlanDetailsDao.findDetail(ipAddress.getVlanId(), ApiConstants.NETRIS_DETAIL_KEY);
+            if (detail != null && detail.getValue().equalsIgnoreCase("true")) {
+                long accountId = vpc.getAccountId();
+                long domainId = vpc.getDomainId();
+                long dataCenterId = vpc.getZoneId();
+                long resourceId = vpc.getId();
+                Network.Service[] services = { Network.Service.SourceNat };
+                long networkOfferingId = vpc.getVpcOfferingId();
+                VpcOfferingVO vpcVO = vpcOfferingDao.findById(networkOfferingId);
+                boolean sourceNatEnabled = !NetworkOffering.NetworkMode.ROUTED.equals(vpcVO.getNetworkMode()) &&
+                        vpcOfferingServiceMapDao.areServicesSupportedByVpcOffering(vpc.getVpcOfferingId(), services);
+
+                logger.info(String.format("Creating Netris VPC %s", vpc.getName()));
+                boolean result = netrisService.createVpcResource(dataCenterId, accountId, domainId, resourceId, vpc.getName(), sourceNatEnabled, vpc.getCidr(), true);
+                if (!result) {
+                    String msg = String.format("Error creating Netris VPC %s", vpc.getName());
+                    logger.error(msg);
+                    throw new CloudRuntimeException(msg);
+                }
+
+                boolean hasNatSupport = false;
+                VpcOffering vpcOffering = vpcOfferingDao.findById(vpc.getVpcOfferingId());
+                hasNatSupport = NetworkOffering.NetworkMode.NATTED.equals(vpcOffering.getNetworkMode());
+
+                if (!hasNatSupport) {
+                    return nic;
+                }
+
+                String snatIP = ipAddress.getAddress().addr();
+                result = netrisService.createSnatRule(dataCenterId, accountId, domainId, vpc.getName(), vpc.getId(), network.getName(), network.getId(), isForVpc, vpc.getCidr(), snatIP);
+                if (!result) {
+                    String msg = String.format("Could not create Netris Nat Rule for IP %s", snatIP);
+                    logger.error(msg);
+                    throw new CloudRuntimeException(msg);
+                }
+
+            }
+        }
+        return nic;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
new file mode 100644
index 00000000000..6cd944c4678
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
@@ -0,0 +1,556 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.dc.VlanVO;
+import com.cloud.dc.dao.VlanDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Ipv6GuestPrefixSubnetNetworkMapVO;
+import com.cloud.network.Network;
+import com.cloud.network.Networks;
+import com.cloud.network.SDNProviderNetworkRule;
+import com.cloud.network.dao.Ipv6GuestPrefixSubnetNetworkMapDao;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.dao.VpcDao;
+import io.netris.model.NatPostBody;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisACLCommand;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.NetUtils;
+import inet.ipaddr.IPAddress;
+import inet.ipaddr.IPAddressString;
+import org.apache.cloudstack.agent.api.AddOrUpdateNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisNatCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisACLCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesAnswer;
+import org.apache.cloudstack.agent.api.ListNetrisStaticRoutesCommand;
+import org.apache.cloudstack.agent.api.NetrisAnswer;
+import org.apache.cloudstack.agent.api.NetrisCommand;
+import org.apache.cloudstack.agent.api.ReleaseNatIpCommand;
+import org.apache.cloudstack.agent.api.SetupNetrisPublicRangeCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.UpdateNetrisVpcCommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import com.cloud.network.netris.NetrisNetworkRule;
+import org.apache.cloudstack.resource.NetrisResourceObjectUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.inject.Inject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class NetrisServiceImpl implements NetrisService, Configurable {
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    @Inject
+    private NetrisProviderDao netrisProviderDao;
+    @Inject
+    private NetworkDao networkDao;
+    @Inject
+    private VpcDao vpcDao;
+    @Inject
+    private AgentManager agentMgr;
+    @Inject
+    private PhysicalNetworkDao physicalNetworkDao;
+    @Inject
+    private VlanDao vlanDao;
+    @Inject
+    private Ipv6GuestPrefixSubnetNetworkMapDao  ipv6PrefixNetworkMapDao;
+
+    @Override
+    public String getConfigComponentName() {
+        return NetrisService.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey[0];
+    }
+
+    private NetrisProviderVO getZoneNetrisProvider(long zoneId) {
+        NetrisProviderVO netrisProviderVO = netrisProviderDao.findByZoneId(zoneId);
+        if (netrisProviderVO == null) {
+            logger.error("No Netris controller was found!");
+            throw new InvalidParameterValueException("Failed to find a Netris controller");
+        }
+        return netrisProviderVO;
+    }
+
+    private NetrisAnswer sendNetrisCommand(NetrisCommand cmd, long zoneId) {
+        NetrisProviderVO netrisProviderVO = getZoneNetrisProvider(zoneId);
+        Answer answer = agentMgr.easySend(netrisProviderVO.getHostId(), cmd);
+        if (answer == null || !answer.getResult()) {
+            logger.error("Netris API Command failed");
+            throw new InvalidParameterValueException("Failed API call to Netris controller");
+        }
+        return (NetrisAnswer) answer;
+    }
+
+    /**
+     * Calculate the minimum CIDR subnet containing the IP range (using the library: <a href="https://github.com/seancfoley/IPAddress">IPAddress</a>)
+     * From: <a href="https://github.com/seancfoley/IPAddress/wiki/Code-Examples-3:-Subnetting-and-Other-Subnet-Operations#from-start-and-end-address-get-single-cidr-block-covering-both">Example</a>
+     * @param ipRange format: startIP-endIP
+     * @return the minimum CIDR containing the IP range
+     */
+    protected String calculateSubnetCidrFromIpRange(String ipRange) {
+        if (StringUtils.isBlank(ipRange) || !ipRange.contains("-")) {
+            return null;
+        }
+        String[] rangeArray = ipRange.split("-");
+        String startIp = rangeArray[0];
+        String endIp = rangeArray[1];
+        IPAddress startIpAddress = new IPAddressString(startIp).getAddress();
+        IPAddress endIpAddress = new IPAddressString(endIp).getAddress();
+        return startIpAddress.coverWithPrefixBlock(endIpAddress).toPrefixLengthString();
+    }
+
+    /**
+     * Prepare the Netris Public Range to be used by CloudStack after the zone is created and the Netris provider is added
+     */
+    private Pair<String, String> getAllocationAndSubnet(String gateway, String netmask, String ipRange) {
+        String superCidr = NetUtils.getCidrFromGatewayAndNetmask(gateway, netmask);
+        String subnetNatCidr = calculateSubnetCidrFromIpRange(ipRange);
+        return new Pair<>(superCidr, subnetNatCidr);
+    }
+
+    @Override
+    public boolean createIPAMAllocationsForZoneLevelPublicRanges(long zoneId) {
+        List<PhysicalNetworkVO> physicalNetworks = physicalNetworkDao.listByZoneAndTrafficType(zoneId, Networks.TrafficType.Public);
+        physicalNetworks = physicalNetworks.stream().filter(x -> x.getIsolationMethods().contains(Network.Provider.Netris.getName())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(physicalNetworks)) {
+            return false;
+        }
+
+        List<VlanVO> providerVlanIds = vlanDao.listVlansForExternalNetworkProvider(zoneId, ApiConstants.NETRIS_DETAIL_KEY);
+        List<Long> vlanDbIds = providerVlanIds.stream().map(VlanVO::getId).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(vlanDbIds)) {
+            String msg = "Cannot find a public IP range VLAN range for the Netris Public traffic";
+            logger.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        for (Long vlanDbId : vlanDbIds) {
+            VlanVO vlanRecord = vlanDao.findById(vlanDbId);
+
+            String gateway = Objects.nonNull(vlanRecord.getVlanGateway()) ? vlanRecord.getVlanGateway() : vlanRecord.getIp6Gateway();
+            String netmask = vlanRecord.getVlanNetmask();
+            String ipRange = vlanRecord.getIpRange();
+            String ip6Cidr = vlanRecord.getIp6Cidr();
+            SetupNetrisPublicRangeCommand cmd = null;
+            if (NetUtils.isValidIp4(gateway)) {
+                Pair<String, String> allocationAndSubnet = getAllocationAndSubnet(gateway, netmask, ipRange);
+                cmd = new SetupNetrisPublicRangeCommand(zoneId, allocationAndSubnet.first(), allocationAndSubnet.second());
+            } else if (NetUtils.isValidIp6(gateway)) {
+                cmd = new SetupNetrisPublicRangeCommand(zoneId, ip6Cidr, ip6Cidr);
+            }
+
+            if (cmd == null) {
+                throw new CloudRuntimeException("Incorrect gateway and netmask details provided for the Netris Public IP range setup");
+            }
+            NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+            if (!answer.getResult()) {
+                throw new CloudRuntimeException("Netris Public IP Range setup failed, please check the logs");
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean createVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled, String cidr, boolean isVpc) {
+        CreateNetrisVpcCommand cmd = new CreateNetrisVpcCommand(zoneId, accountId, domainId, vpcName, cidr, vpcId, isVpc);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean updateVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, String previousVpcName) {
+        UpdateNetrisVpcCommand cmd = new UpdateNetrisVpcCommand(zoneId, accountId, domainId, vpcName, vpcId, true);
+        cmd.setPreviousVpcName(previousVpcName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deleteVpcResource(long zoneId, long accountId, long domainId, Vpc vpc) {
+        DeleteNetrisVpcCommand cmd = new DeleteNetrisVpcCommand(zoneId, accountId, domainId, vpc.getName(), vpc.getCidr(), vpc.getId(), true);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean createVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr, Boolean globalRouting) {
+        NetworkVO network = networkDao.findById(networkId);
+        String vxlanId = Networks.BroadcastDomainType.getValue(network.getBroadcastUri());
+        CreateNetrisVnetCommand cmd = new CreateNetrisVnetCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, cidr, network.getGateway(), !Objects.isNull(vpcId));
+        cmd.setVxlanId(Integer.parseInt(vxlanId));
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(zoneId);
+        cmd.setNetrisTag(netrisProvider.getNetrisTag());
+        cmd.setGlobalRouting(globalRouting);
+        if (Objects.nonNull(networkId)) {
+            Ipv6GuestPrefixSubnetNetworkMapVO ipv6PrefixNetworkMapVO = ipv6PrefixNetworkMapDao.findByNetworkId(networkId);
+            if (Objects.nonNull(ipv6PrefixNetworkMapVO)) {
+                cmd.setIpv6Cidr(ipv6PrefixNetworkMapVO.getSubnet());
+            }
+        }
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean updateVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String prevNetworkName) {
+        UpdateNetrisVnetCommand cmd = new UpdateNetrisVnetCommand(zoneId, accountId, domainId, networkName, networkId, Objects.nonNull(vpcId));
+        cmd.setPrevNetworkName(prevNetworkName);
+        cmd.setVpcId(vpcId);
+        cmd.setVpcName(vpcName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deleteVnetResource(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr) {
+        DeleteNetrisVnetCommand cmd = new DeleteNetrisVnetCommand(zoneId, accountId, domainId, networkName, networkId, vpcName, vpcId, cidr, Objects.nonNull(vpcName));
+        Ipv6GuestPrefixSubnetNetworkMapVO ipv6PrefixNetworkMapVO = ipv6PrefixNetworkMapDao.findByNetworkId(networkId);
+        if (Objects.nonNull(ipv6PrefixNetworkMapVO)) {
+            cmd.setvNetV6Cidr(ipv6PrefixNetworkMapVO.getSubnet());
+        }
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean createSnatRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName, long networkId, boolean isForVpc, String vpcCidr, String snatIP) {
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, isForVpc, vpcCidr);
+        cmd.setNatIp(snatIP);
+        cmd.setNatRuleType("SNAT");
+        String suffix;
+        if (isForVpc) {
+            suffix = String.valueOf(vpcId); // D1-A1-Z1-V25-SNAT
+        } else {
+            suffix = String.valueOf(networkId); // D1-A1-Z1-N25-SNAT
+        }
+        cmd.setProtocol(NatPostBody.ProtocolEnum.ALL.getValue());
+        cmd.setState(NatPostBody.StateEnum.ENABLED.getValue());
+        String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, suffix);
+        cmd.setNatRuleName(snatRuleName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean createPortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName,
+                                            Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule) {
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId,
+                networkName, networkId, isForVpc, vpcCidr);
+        cmd.setProtocol(networkRule.getProtocol().toLowerCase(Locale.ROOT));
+        cmd.setDestinationAddress(networkRule.getPublicIp());
+        cmd.setDestinationPort(networkRule.getPublicPort());
+        cmd.setSourceAddress(networkRule.getVmIp());
+        cmd.setSourcePort(networkRule.getPrivatePort());
+        cmd.setState(NatPostBody.StateEnum.ENABLED.getValue());
+        String ruleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.DNAT,
+                String.valueOf(vpcId), String.format("R%s", networkRule.getRuleId()));
+        cmd.setNatRuleName(ruleName);
+        cmd.setNatRuleType("DNAT");
+
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deletePortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule) {
+        DeleteNetrisNatRuleCommand cmd = new DeleteNetrisNatRuleCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, isForVpc);
+        String ruleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.DNAT,
+                String.valueOf(vpcId), String.format("R%s", networkRule.getRuleId()));
+        cmd.setNatRuleType("DNAT");
+        cmd.setNatRuleName(ruleName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        if (vpc == null || address == null) {
+            return false;
+        }
+        long accountId = vpc.getAccountId();
+        long domainId = vpc.getDomainId();
+        long zoneId = vpc.getZoneId();
+        long vpcId = vpc.getId();
+        String vpcName = vpc.getName();
+
+        logger.debug("Updating the source NAT IP for Netris VPC {} to IP: {}", vpc.getName(), address.getAddress().addr());
+
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, null, null, true, vpc.getCidr());
+        cmd.setNatIp(address.getAddress().addr());
+        cmd.setNatRuleType("SNAT");
+        String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, String.valueOf(vpcId));
+        cmd.setNatRuleName(snatRuleName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        if (!answer.getResult()) {
+            logger.error("Could not update the source NAT IP address for VPC {}: {}", vpc.getName(), answer.getDetails());
+            return false;
+        }
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean createStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String vpcCidr, String staticNatIp, String vmIp, long vmId) {
+        String vpcName = null;
+        String networkName = null;
+        Long vpcId = null;
+        Long networkId = null;
+        if (isForVpc) {
+            vpcName = networkResourceName;
+            vpcId = networkResourceId;
+        } else {
+            networkName = networkResourceName;
+            networkId = networkResourceId;
+        }
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, isForVpc, vpcCidr);
+        cmd.setNatRuleType("STATICNAT");
+        cmd.setNatIp(staticNatIp);
+        cmd.setVmIp(vmIp);
+        String[] suffixes = getStaticNatResourceSuffixes(vpcId, networkId, isForVpc, vmId);
+        String dnatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.STATICNAT, suffixes);
+        cmd.setNatRuleName(dnatRuleName);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deleteStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String staticNatIp, long vmId) {
+        String vpcName = null;
+        String networkName = null;
+        Long vpcId = null;
+        Long networkId = null;
+        if (isForVpc) {
+            vpcName = networkResourceName;
+            vpcId = networkResourceId;
+        } else {
+            networkName = networkResourceName;
+            networkId = networkResourceId;
+        }
+        DeleteNetrisNatRuleCommand cmd = new DeleteNetrisNatRuleCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, isForVpc);
+        String suffixes[] = getStaticNatResourceSuffixes(vpcId, networkId, isForVpc, vmId);
+        String dnatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.STATICNAT, suffixes);
+        cmd.setNatRuleName(dnatRuleName);
+        cmd.setNatRuleType("STATICNAT");
+        cmd.setNatIp(staticNatIp);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean addFirewallRules(Network network, List<NetrisNetworkRule> firewallRules) {
+        Long zoneId = network.getDataCenterId();
+        Long accountId = network.getAccountId();
+        Long domainId = network.getDomainId();
+        Long vpcId = network.getVpcId();
+        Long networkId = network.getId();
+        String vpcName = null;
+        Vpc vpc = null;
+        if (Objects.nonNull(vpcId)) {
+            vpc = vpcDao.findById(vpcId);
+            if (Objects.nonNull(vpc)) {
+                vpcName = vpc.getName();
+            }
+        }
+        String networkName = network.getName();
+        NetrisNetworkRule rule = firewallRules.get(0);
+        SDNProviderNetworkRule baseNetworkRule = rule.getBaseRule();
+        String trafficType = baseNetworkRule.getTrafficType();
+        String sourcePrefix;
+        String destinationPrefix;
+        boolean result = true;
+        List<String> sourceCidrs = baseNetworkRule.getSourceCidrList();
+        int index = 1;
+        for (String sourceCidr : sourceCidrs) {
+            if (FirewallRule.TrafficType.Ingress.name().equalsIgnoreCase(trafficType)) {
+                sourcePrefix = sourceCidr;
+                destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ||
+                        NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr) ?
+                        network.getCidr() : network.getIp6Cidr();
+            } else {
+                destinationPrefix = sourceCidr;
+                sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ||
+                        NetUtils.ANY_PROTO.equalsIgnoreCase(sourceCidr) ?
+                        network.getCidr() : network.getIp6Cidr();
+            }
+            String srcPort;
+            String dstPort;
+            if (baseNetworkRule.getPrivatePort().contains("-")) {
+                srcPort = baseNetworkRule.getPrivatePort().split("-")[0];
+                dstPort = baseNetworkRule.getPrivatePort().split("-")[1];
+            } else {
+                srcPort = dstPort = baseNetworkRule.getPrivatePort();
+            }
+            CreateOrUpdateNetrisACLCommand cmd = new CreateOrUpdateNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId,
+                    vpcName, vpcId, Objects.nonNull(vpcId), rule.getAclAction().name().toLowerCase(Locale.ROOT), getPrefix(sourcePrefix), getPrefix(destinationPrefix),
+                    "null".equals(srcPort) ? 1 : Integer.parseInt(srcPort),
+                    "null".equals(dstPort) ? 65535 : Integer.parseInt(dstPort), baseNetworkRule.getProtocol());
+            String aclName = String.format("V%s-N%s-ACL%s", vpcId, networkId, rule.getBaseRule().getRuleId());
+            if (sourceCidrs.size() > 1) {
+                aclName = aclName + "-" + index++;
+            }
+            String netrisAclName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName);
+            cmd.setNetrisAclName(netrisAclName);
+            cmd.setReason(rule.getReason());
+            if (NetUtils.ICMP_PROTO.equals(baseNetworkRule.getProtocol().toLowerCase(Locale.ROOT))) {
+                cmd.setIcmpType(baseNetworkRule.getIcmpType());
+            }
+            NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+            result = result && answer.getResult();
+        }
+        return result;
+    }
+
+    public static String getPrefix(String prefix) {
+        if ("ANY".equals(prefix)) {
+            return NetUtils.ALL_IP4_CIDRS;
+        }
+        return prefix;
+    }
+
+    @Override
+    public boolean deleteFirewallRules(Network network, List<NetrisNetworkRule> firewallRules) {
+        long zoneId = network.getDataCenterId();
+        Long accountId = network.getAccountId();
+        Long domainId = network.getDomainId();
+        String networkName = network.getName();
+        Long networkId = network.getId();
+        String vpcName = null;
+        Long vpcId = network.getVpcId();
+        if (Objects.nonNull(vpcId)) {
+            vpcName = vpcDao.findById(vpcId).getName();
+        }
+        DeleteNetrisACLCommand cmd = new DeleteNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId, Objects.nonNull(network.getVpcId()), vpcId, vpcName);
+        List<String> aclRuleNames = new ArrayList<>();
+        for (NetrisNetworkRule rule : firewallRules) {
+            List<String> sourceCidrs = rule.getBaseRule().getSourceCidrList();
+            int cidrCount = sourceCidrs.size();
+            if (cidrCount > 1) {
+                for (int i = 0; i < cidrCount; i++) {
+                    String aclName = String.format("V%s-N%s-ACL%s-%d", vpcId, networkId, rule.getBaseRule().getRuleId(), (i + 1));
+                    aclRuleNames.add(NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName));
+                }
+            } else {
+                String aclName = String.format("V%s-N%s-ACL%s", vpcId, networkId, rule.getBaseRule().getRuleId());
+                aclRuleNames.add(NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName));
+            }
+        }
+        cmd.setAclRuleNames(aclRuleNames);
+
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    public boolean addOrUpdateStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId, boolean updateRoute) {
+        AddOrUpdateNetrisStaticRouteCommand cmd = new AddOrUpdateNetrisStaticRouteCommand(zoneId, accountId, domainId, networkResourceName, networkResourceId, isForVpc, prefix, nextHop, routeId, updateRoute);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deleteStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId) {
+        DeleteNetrisStaticRouteCommand cmd = new DeleteNetrisStaticRouteCommand(zoneId, accountId, domainId, networkResourceName, networkResourceId, isForVpc, prefix, nextHop, routeId);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public List<StaticRoute> listStaticRoutes(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId) {
+        ListNetrisStaticRoutesCommand cmd = new ListNetrisStaticRoutesCommand(zoneId, accountId, domainId, networkResourceName, networkResourceId, isForVpc, prefix, nextHop, routeId);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        if (answer instanceof ListNetrisStaticRoutesAnswer) {
+            return ((ListNetrisStaticRoutesAnswer) answer).getStaticRoutes();
+        }
+        return List.of();
+    }
+
+    @Override
+    public boolean releaseNatIp(long zoneId, String publicIp) {
+        ReleaseNatIpCommand cmd = new ReleaseNatIpCommand(zoneId, null, null, null, null, false, publicIp);
+        NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean createOrUpdateLbRule(NetrisNetworkRule rule) {
+        SDNProviderNetworkRule baseRule = rule.getBaseRule();
+        CreateOrUpdateNetrisLoadBalancerRuleCommand cmd = new CreateOrUpdateNetrisLoadBalancerRuleCommand(baseRule.getZoneId(), baseRule.getAccountId(),
+                baseRule.getDomainId(), baseRule.getNetworkResourceName(), baseRule.getNetworkResourceId(), baseRule.isVpcResource(),
+                rule.getLbBackends(), baseRule.getRuleId(), baseRule.getPublicIp(), baseRule.getPublicPort(),
+                baseRule.getPrivatePort(), baseRule.getAlgorithm(), baseRule.getProtocol());
+        if (Objects.nonNull(rule.getLbCidrList())) {
+            cmd.setCidrList(rule.getLbCidrList());
+        }
+        cmd.setRuleName(rule.getLbRuleName());
+        NetrisAnswer answer = sendNetrisCommand(cmd, baseRule.getZoneId());
+        return answer.getResult();
+    }
+
+    @Override
+    public boolean deleteLbRule(NetrisNetworkRule rule) {
+        SDNProviderNetworkRule baseRule = rule.getBaseRule();
+        DeleteNetrisLoadBalancerRuleCommand cmd = new DeleteNetrisLoadBalancerRuleCommand(baseRule.getZoneId(), baseRule.getAccountId(),
+                baseRule.getDomainId(), baseRule.getNetworkResourceName(), baseRule.getNetworkResourceId(), baseRule.isVpcResource(),
+                baseRule.getRuleId());
+        if (Objects.nonNull(rule.getLbCidrList())) {
+            cmd.setCidrList(rule.getLbCidrList());
+        }
+        cmd.setRuleName(rule.getLbRuleName());
+        NetrisAnswer answer = sendNetrisCommand(cmd, baseRule.getZoneId());
+        return answer.getResult();
+    }
+
+    public static String[] getStaticNatResourceSuffixes(Long vpcId, Long networkId, boolean isForVpc, long vmId) {
+        String[] suffixes = new String[2];
+        suffixes[0] = isForVpc ? String.valueOf(vpcId) : String.valueOf(networkId);
+        suffixes[1] = String.valueOf(vmId);
+        return suffixes;
+    }
+}
diff --git a/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml
new file mode 100644
index 00000000000..397460dc7f8
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml
@@ -0,0 +1,31 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <bean id="netrisService" class="org.apache.cloudstack.service.NetrisServiceImpl"/>
+
+</beans>
diff --git a/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/module.properties b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/module.properties
new file mode 100644
index 00000000000..0670b1629f4
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/module.properties
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+
+name=netris
+parent=network
diff --git a/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml
new file mode 100644
index 00000000000..a0551b7804a
--- /dev/null
+++ b/plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml
@@ -0,0 +1,41 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd">
+    <bean id="Netris" class="org.apache.cloudstack.service.NetrisElement">
+        <property name="name" value="Netris"/>
+    </bean>
+
+    <bean id="netrisGuestNetworkGuru" class="org.apache.cloudstack.service.NetrisGuestNetworkGuru">
+        <property name="name" value="NetrisGuestNetworkGuru" />
+    </bean>
+    <bean id="NetrisPublicNetworkGuru" class="org.apache.cloudstack.service.NetrisPublicNetworkGuru">
+        <property name="name" value="NetrisPublicNetworkGuru" />
+    </bean>
+
+    <bean id="netrisProviderService" class="org.apache.cloudstack.service.NetrisProviderServiceImpl"/>
+
+</beans>
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java
new file mode 100644
index 00000000000..bd9c7433f66
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java
@@ -0,0 +1,91 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AddOrUpdateNetrisStaticRouteCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-vpc";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final String PREFIX = "10.0.0.0/24";
+    private static final String NEXT_HOP = "10.0.0.1";
+    private static final Long ROUTE_ID = 5L;
+    private static final boolean UPDATE_ROUTE = true;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        AddOrUpdateNetrisStaticRouteCommand command = new AddOrUpdateNetrisStaticRouteCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, PREFIX, NEXT_HOP, ROUTE_ID, UPDATE_ROUTE);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(PREFIX, command.getPrefix());
+        Assert.assertEquals(NEXT_HOP, command.getNextHop());
+        Assert.assertEquals(ROUTE_ID, command.getRouteId());
+        Assert.assertEquals(UPDATE_ROUTE, command.isUpdateRoute());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        AddOrUpdateNetrisStaticRouteCommand command = new AddOrUpdateNetrisStaticRouteCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC, PREFIX, NEXT_HOP, null, UPDATE_ROUTE);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertNull(command.getAccountId());
+        Assert.assertNull(command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertNull(command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(PREFIX, command.getPrefix());
+        Assert.assertEquals(NEXT_HOP, command.getNextHop());
+        Assert.assertNull(command.getRouteId());
+        Assert.assertEquals(UPDATE_ROUTE, command.isUpdateRoute());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        AddOrUpdateNetrisStaticRouteCommand command = new AddOrUpdateNetrisStaticRouteCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC, "", "", ROUTE_ID, UPDATE_ROUTE);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals("", command.getPrefix());
+        Assert.assertEquals("", command.getNextHop());
+        Assert.assertEquals(ROUTE_ID, command.getRouteId());
+        Assert.assertEquals(UPDATE_ROUTE, command.isUpdateRoute());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java
new file mode 100644
index 00000000000..aed9a921c36
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java
@@ -0,0 +1,144 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.apache.cloudstack.resource.NetrisPortGroup;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CreateNetrisACLCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-network";
+    private static final Long ID = 4L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 5L;
+    private static final boolean IS_VPC = true;
+    private static final String ACTION = "allow";
+    private static final String SOURCE_PREFIX = "10.0.0.0/24";
+    private static final String DEST_PREFIX = "10.0.1.0/24";
+    private static final Integer DEST_PORT_START = 80;
+    private static final Integer DEST_PORT_END = 80;
+    private static final String PROTOCOL = "tcp";
+    private static final Integer ICMP_TYPE = 8;
+    private static final String NETRIS_ACL_NAME = "test-acl";
+    private static final String REASON = "test reason";
+    private static final String PORTS = "80,443";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        CreateNetrisACLCommand command = new CreateNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, VPC_NAME, VPC_ID, IS_VPC, ACTION,
+                SOURCE_PREFIX, DEST_PREFIX, DEST_PORT_START, DEST_PORT_END, PROTOCOL);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(VPC_NAME, command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals(ACTION, command.getAction());
+        Assert.assertEquals(SOURCE_PREFIX, command.getSourcePrefix());
+        Assert.assertEquals(DEST_PREFIX, command.getDestPrefix());
+        Assert.assertEquals(DEST_PORT_START, command.getDestPortStart());
+        Assert.assertEquals(DEST_PORT_END, command.getDestPortEnd());
+        Assert.assertEquals(PROTOCOL, command.getProtocol());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        CreateNetrisACLCommand command = new CreateNetrisACLCommand(
+                ZONE_ID, null, null, NAME, null, VPC_NAME, null, IS_VPC, ACTION,
+                SOURCE_PREFIX, DEST_PREFIX, null, null, PROTOCOL);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertNull(command.getAccountId());
+        Assert.assertNull(command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertNull(command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(VPC_NAME, command.getVpcName());
+        Assert.assertNull(command.getVpcId());
+        Assert.assertEquals(ACTION, command.getAction());
+        Assert.assertEquals(SOURCE_PREFIX, command.getSourcePrefix());
+        Assert.assertEquals(DEST_PREFIX, command.getDestPrefix());
+        Assert.assertNull(command.getDestPortStart());
+        Assert.assertNull(command.getDestPortEnd());
+        Assert.assertEquals(PROTOCOL, command.getProtocol());
+    }
+
+    @Test
+    public void testSetters() {
+        // Arrange
+        CreateNetrisACLCommand command = new CreateNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, VPC_NAME, VPC_ID, IS_VPC, ACTION,
+                SOURCE_PREFIX, DEST_PREFIX, DEST_PORT_START, DEST_PORT_END, PROTOCOL);
+
+        NetrisPortGroup portGroup = new NetrisPortGroup(PORTS);
+        String newVpcName = "new-vpc";
+        Long newVpcId = 6L;
+
+        // Act
+        command.setVpcName(newVpcName);
+        command.setVpcId(newVpcId);
+        command.setPortGroup(portGroup);
+        command.setIcmpType(ICMP_TYPE);
+        command.setNetrisAclName(NETRIS_ACL_NAME);
+        command.setReason(REASON);
+
+        // Assert
+        Assert.assertEquals(newVpcName, command.getVpcName());
+        Assert.assertEquals(newVpcId, command.getVpcId());
+        Assert.assertEquals(portGroup, command.getPortGroup());
+        Assert.assertEquals(ICMP_TYPE, command.getIcmpType());
+        Assert.assertEquals(NETRIS_ACL_NAME, command.getNetrisAclName());
+        Assert.assertEquals(REASON, command.getReason());
+        Assert.assertEquals(PORTS, command.getPortGroup().getPorts());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        CreateNetrisACLCommand command = new CreateNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, "", VPC_ID, IS_VPC, "",
+                "", "", DEST_PORT_START, DEST_PORT_END, "");
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals("", command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals("", command.getAction());
+        Assert.assertEquals("", command.getSourcePrefix());
+        Assert.assertEquals("", command.getDestPrefix());
+        Assert.assertEquals(DEST_PORT_START, command.getDestPortStart());
+        Assert.assertEquals(DEST_PORT_END, command.getDestPortEnd());
+        Assert.assertEquals("", command.getProtocol());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java
new file mode 100644
index 00000000000..cc367d181e3
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java
@@ -0,0 +1,95 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CreateNetrisVnetCommandTest {
+
+    private static final Long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 4L;
+    private static final String VNET_NAME = "test-vnet";
+    private static final Long NETWORK_ID = 5L;
+    private static final String CIDR = "10.0.0.0/24";
+    private static final String GATEWAY = "10.0.0.1";
+    private static final boolean IS_VPC = true;
+    private static final Integer VXLAN_ID = 100;
+    private static final String NETRIS_TAG = "test-tag";
+    private static final String IPV6_CIDR = "2001:db8::/64";
+    private static final Boolean GLOBAL_ROUTING = true;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        CreateNetrisVnetCommand command = new CreateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, CIDR, GATEWAY, IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID.longValue(), command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(VNET_NAME, command.getName());
+        Assert.assertEquals(NETWORK_ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(VPC_NAME, command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals(CIDR, command.getCidr());
+        Assert.assertEquals(GATEWAY, command.getGateway());
+    }
+
+    @Test
+    public void testSetters() {
+        // Arrange
+        CreateNetrisVnetCommand command = new CreateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, CIDR, GATEWAY, IS_VPC);
+
+        // Act
+        command.setVxlanId(VXLAN_ID);
+        command.setNetrisTag(NETRIS_TAG);
+        command.setIpv6Cidr(IPV6_CIDR);
+        command.setGlobalRouting(GLOBAL_ROUTING);
+
+        // Assert
+        Assert.assertEquals(VXLAN_ID, command.getVxlanId());
+        Assert.assertEquals(NETRIS_TAG, command.getNetrisTag());
+        Assert.assertEquals(IPV6_CIDR, command.getIpv6Cidr());
+        Assert.assertEquals(GLOBAL_ROUTING, command.isGlobalRouting());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        CreateNetrisVnetCommand command = new CreateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", VPC_ID, "", NETWORK_ID, "", "", IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID.longValue(), command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(NETWORK_ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals("", command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals("", command.getCidr());
+        Assert.assertEquals("", command.getGateway());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java
new file mode 100644
index 00000000000..666ff8d2ee8
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java
@@ -0,0 +1,63 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CreateNetrisVpcCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-vpc";
+    private static final String CIDR = "10.0.0.0/24";
+    private static final Long VPC_ID = 4L;
+    private static final boolean IS_VPC = true;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        CreateNetrisVpcCommand command = new CreateNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, CIDR, VPC_ID, IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(VPC_ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(CIDR, command.getCidr());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        CreateNetrisVpcCommand command = new CreateNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", "", VPC_ID, IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(VPC_ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals("", command.getCidr());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java
new file mode 100644
index 00000000000..d8b2b8e7ae2
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java
@@ -0,0 +1,139 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import com.cloud.network.netris.NetrisLbBackend;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CreateOrUpdateNetrisLoadBalancerRuleCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-lb";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final Long LB_ID = 5L;
+    private static final String PUBLIC_IP = "10.0.0.1";
+    private static final String PUBLIC_PORT = "80";
+    private static final String PRIVATE_PORT = "8080";
+    private static final String ALGORITHM = "roundrobin";
+    private static final String PROTOCOL = "tcp";
+    private static final String CIDR_LIST = "0.0.0.0/0";
+    private static final String RULE_NAME = "test-rule";
+    private static final Long INSTANCE_ID = 6L;
+    private static final String BACKEND_IP = "10.0.0.2";
+    private static final Integer BACKEND_PORT = 8080;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Arrange
+        List<NetrisLbBackend> lbBackends = Arrays.asList(
+                new NetrisLbBackend(INSTANCE_ID, BACKEND_IP, BACKEND_PORT)
+        );
+
+        // Act
+        CreateOrUpdateNetrisLoadBalancerRuleCommand command = new CreateOrUpdateNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC,
+                lbBackends, LB_ID, PUBLIC_IP, PUBLIC_PORT,
+                PRIVATE_PORT, ALGORITHM, PROTOCOL);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+        Assert.assertEquals(PUBLIC_IP, command.getPublicIp());
+        Assert.assertEquals(PUBLIC_PORT, command.getPublicPort());
+        Assert.assertEquals(PRIVATE_PORT, command.getPrivatePort());
+        Assert.assertEquals(ALGORITHM, command.getAlgorithm());
+        Assert.assertEquals(PROTOCOL, command.getProtocol());
+        Assert.assertEquals(lbBackends, command.getLbBackends());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        CreateOrUpdateNetrisLoadBalancerRuleCommand command = new CreateOrUpdateNetrisLoadBalancerRuleCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC,
+                null, LB_ID, PUBLIC_IP, PUBLIC_PORT,
+                PRIVATE_PORT, ALGORITHM, PROTOCOL);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertNull(command.getAccountId());
+        Assert.assertNull(command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertNull(command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+        Assert.assertEquals(PUBLIC_IP, command.getPublicIp());
+        Assert.assertEquals(PUBLIC_PORT, command.getPublicPort());
+        Assert.assertEquals(PRIVATE_PORT, command.getPrivatePort());
+        Assert.assertEquals(ALGORITHM, command.getAlgorithm());
+        Assert.assertEquals(PROTOCOL, command.getProtocol());
+        Assert.assertNull(command.getLbBackends());
+    }
+
+    @Test
+    public void testSetters() {
+        // Arrange
+        CreateOrUpdateNetrisLoadBalancerRuleCommand command = new CreateOrUpdateNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC,
+                null, LB_ID, PUBLIC_IP, PUBLIC_PORT,
+                PRIVATE_PORT, ALGORITHM, PROTOCOL);
+
+        // Act
+        command.setCidrList(CIDR_LIST);
+        command.setRuleName(RULE_NAME);
+
+        // Assert
+        Assert.assertEquals(CIDR_LIST, command.getCidrList());
+        Assert.assertEquals(RULE_NAME, command.getRuleName());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        CreateOrUpdateNetrisLoadBalancerRuleCommand command = new CreateOrUpdateNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC,
+                null, LB_ID, "", "",
+                "", "", "");
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+        Assert.assertEquals("", command.getPublicIp());
+        Assert.assertEquals("", command.getPublicPort());
+        Assert.assertEquals("", command.getPrivatePort());
+        Assert.assertEquals("", command.getAlgorithm());
+        Assert.assertEquals("", command.getProtocol());
+        Assert.assertNull(command.getLbBackends());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java
new file mode 100644
index 00000000000..ddc943810c4
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java
@@ -0,0 +1,145 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CreateOrUpdateNetrisNatCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 4L;
+    private static final String VNET_NAME = "test-vnet";
+    private static final Long NETWORK_ID = 5L;
+    private static final boolean IS_VPC = true;
+    private static final String VPC_CIDR = "10.0.0.0/24";
+    private static final String NAT_RULE_NAME = "test-nat-rule";
+    private static final String NAT_IP = "10.0.0.1";
+    private static final String NAT_RULE_TYPE = "DNAT";
+    private static final String PROTOCOL = "TCP";
+    private static final String SOURCE_ADDRESS = "192.168.1.0/24";
+    private static final String SOURCE_PORT = "80";
+    private static final String DESTINATION_ADDRESS = "10.0.0.10";
+    private static final String DESTINATION_PORT = "8080";
+    private static final String STATE = "enabled";
+    private static final String VM_IP = "10.0.0.100";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        CreateOrUpdateNetrisNatCommand command = new CreateOrUpdateNetrisNatCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, IS_VPC, VPC_CIDR);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals(VNET_NAME, command.getName());
+        assertEquals(NETWORK_ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(VPC_CIDR, command.getVpcCidr());
+        assertNull(command.getNatRuleName());
+        assertNull(command.getNatIp());
+        assertNull(command.getNatRuleType());
+        assertNull(command.getProtocol());
+        assertNull(command.getSourceAddress());
+        assertNull(command.getSourcePort());
+        assertNull(command.getDestinationAddress());
+        assertNull(command.getDestinationPort());
+        assertNull(command.getState());
+        assertNull(command.getVmIp());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        // Arrange
+        CreateOrUpdateNetrisNatCommand command = new CreateOrUpdateNetrisNatCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, IS_VPC, VPC_CIDR);
+
+        // Act
+        command.setNatRuleName(NAT_RULE_NAME);
+        command.setNatIp(NAT_IP);
+        command.setNatRuleType(NAT_RULE_TYPE);
+        command.setProtocol(PROTOCOL);
+        command.setSourceAddress(SOURCE_ADDRESS);
+        command.setSourcePort(SOURCE_PORT);
+        command.setDestinationAddress(DESTINATION_ADDRESS);
+        command.setDestinationPort(DESTINATION_PORT);
+        command.setState(STATE);
+        command.setVmIp(VM_IP);
+        command.setVpcName(VPC_NAME);
+        command.setVpcId(VPC_ID);
+        command.setVpcCidr(VPC_CIDR);
+
+        // Assert
+        assertEquals(NAT_RULE_NAME, command.getNatRuleName());
+        assertEquals(NAT_IP, command.getNatIp());
+        assertEquals(NAT_RULE_TYPE, command.getNatRuleType());
+        assertEquals(PROTOCOL, command.getProtocol());
+        assertEquals(SOURCE_ADDRESS, command.getSourceAddress());
+        assertEquals(SOURCE_PORT, command.getSourcePort());
+        assertEquals(DESTINATION_ADDRESS, command.getDestinationAddress());
+        assertEquals(DESTINATION_PORT, command.getDestinationPort());
+        assertEquals(STATE, command.getState());
+        assertEquals(VM_IP, command.getVmIp());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals(VPC_CIDR, command.getVpcCidr());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        CreateOrUpdateNetrisNatCommand command = new CreateOrUpdateNetrisNatCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", VPC_ID, "", NETWORK_ID, IS_VPC, "");
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals("", command.getName());
+        assertEquals(NETWORK_ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals("", command.getVpcCidr());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        CreateOrUpdateNetrisNatCommand command = new CreateOrUpdateNetrisNatCommand(
+                ZONE_ID, null, null, VPC_NAME, null, VNET_NAME, null, IS_VPC, VPC_CIDR);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertNull(command.getVpcId());
+        assertEquals(VNET_NAME, command.getName());
+        assertNull(command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(VPC_CIDR, command.getVpcCidr());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java
new file mode 100644
index 00000000000..6cc34efefb2
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java
@@ -0,0 +1,103 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import java.util.Arrays;
+import java.util.List;
+
+public class DeleteNetrisACLCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-network";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final Long VPC_ID = 5L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final List<String> ACL_RULE_NAMES = Arrays.asList("rule1", "rule2");
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        DeleteNetrisACLCommand command = new DeleteNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, VPC_ID, VPC_NAME);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertNull(command.getAclRuleNames());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        // Arrange
+        DeleteNetrisACLCommand command = new DeleteNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, VPC_ID, VPC_NAME);
+
+        // Act
+        command.setAclRuleNames(ACL_RULE_NAMES);
+
+        // Assert
+        assertEquals(ACL_RULE_NAMES, command.getAclRuleNames());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        DeleteNetrisACLCommand command = new DeleteNetrisACLCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC, VPC_ID, "");
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals("", command.getVpcName());
+        assertNull(command.getAclRuleNames());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        DeleteNetrisACLCommand command = new DeleteNetrisACLCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC, null, VPC_NAME);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertNull(command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getVpcId());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertNull(command.getAclRuleNames());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java
new file mode 100644
index 00000000000..b38d9674ec3
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java
@@ -0,0 +1,98 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DeleteNetrisLoadBalancerRuleCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-lb";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final Long LB_ID = 5L;
+    private static final String RULE_NAME = "test-rule";
+    private static final String CIDR_LIST = "0.0.0.0/0";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        DeleteNetrisLoadBalancerRuleCommand command = new DeleteNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, LB_ID);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        DeleteNetrisLoadBalancerRuleCommand command = new DeleteNetrisLoadBalancerRuleCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC, LB_ID);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertNull(command.getAccountId());
+        Assert.assertNull(command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertNull(command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+    }
+
+    @Test
+    public void testSetters() {
+        // Arrange
+        DeleteNetrisLoadBalancerRuleCommand command = new DeleteNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, LB_ID);
+
+        // Act
+        command.setRuleName(RULE_NAME);
+        command.setCidrList(CIDR_LIST);
+        command.setLbId(LB_ID);
+
+        // Assert
+        Assert.assertEquals(RULE_NAME, command.getRuleName());
+        Assert.assertEquals(CIDR_LIST, command.getCidrList());
+        Assert.assertEquals(LB_ID, command.getLbId());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        DeleteNetrisLoadBalancerRuleCommand command = new DeleteNetrisLoadBalancerRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC, LB_ID);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+        Assert.assertEquals(LB_ID, command.getLbId());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java
new file mode 100644
index 00000000000..eb02a5a53a7
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java
@@ -0,0 +1,94 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+
+public class DeleteNetrisNatRuleCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String VNET_NAME = "test-vnet";
+    private static final Long NETWORK_ID = 4L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 5L;
+    private static final boolean IS_VPC = true;
+    private static final String NAT_RULE_TYPE = "DNAT";
+    private static final String NAT_RULE_NAME = "test-nat-rule";
+    private static final String NAT_IP = "10.0.0.1";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        DeleteNetrisNatRuleCommand command = new DeleteNetrisNatRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals(VNET_NAME, command.getName());
+        assertEquals(NETWORK_ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getNatRuleType());
+        assertNull(command.getNatRuleName());
+        assertNull(command.getNatIp());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        // Arrange
+        DeleteNetrisNatRuleCommand command = new DeleteNetrisNatRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, VPC_NAME, VPC_ID, VNET_NAME, NETWORK_ID, IS_VPC);
+
+        // Act
+        command.setNatRuleType(NAT_RULE_TYPE);
+        command.setNatRuleName(NAT_RULE_NAME);
+        command.setNatIp(NAT_IP);
+        command.setVpcName(VPC_NAME);
+        command.setVpcId(VPC_ID);
+
+        // Assert
+        assertEquals(NAT_RULE_TYPE, command.getNatRuleType());
+        assertEquals(NAT_RULE_NAME, command.getNatRuleName());
+        assertEquals(NAT_IP, command.getNatIp());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        DeleteNetrisNatRuleCommand command = new DeleteNetrisNatRuleCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", VPC_ID, "", NETWORK_ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+        assertEquals("", command.getName());
+        assertEquals(NETWORK_ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java
new file mode 100644
index 00000000000..8427e9f71ac
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java
@@ -0,0 +1,83 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DeleteNetrisVnetCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-vnet";
+    private static final Long ID = 4L;
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 5L;
+    private static final String VNET_CIDR = "10.0.0.0/24";
+    private static final boolean IS_VPC = true;
+    private static final String VNET_V6_CIDR = "2001:db8::/32";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        DeleteNetrisVnetCommand command = new DeleteNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, VPC_NAME, VPC_ID, VNET_CIDR, IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals(NAME, command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals(VPC_NAME, command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals(VNET_CIDR, command.getVNetCidr());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        DeleteNetrisVnetCommand command = new DeleteNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, "", VPC_ID, VNET_CIDR, IS_VPC);
+
+        // Assert
+        Assert.assertEquals(ZONE_ID, command.getZoneId());
+        Assert.assertEquals(ACCOUNT_ID, command.getAccountId());
+        Assert.assertEquals(DOMAIN_ID, command.getDomainId());
+        Assert.assertEquals("", command.getName());
+        Assert.assertEquals(ID, command.getId());
+        Assert.assertEquals("", command.getVpcName());
+        Assert.assertEquals(VPC_ID, command.getVpcId());
+        Assert.assertEquals(VNET_CIDR, command.getVNetCidr());
+        Assert.assertEquals(IS_VPC, command.isVpc());
+    }
+
+    @Test
+    public void testVnetV6CidrSetterAndGetter() {
+        // Arrange
+        DeleteNetrisVnetCommand command = new DeleteNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, VPC_NAME, VPC_ID, VNET_CIDR, IS_VPC);
+
+        // Act
+        command.setvNetV6Cidr(VNET_V6_CIDR);
+
+        // Assert
+        Assert.assertEquals(VNET_V6_CIDR, command.getvNetV6Cidr());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java
new file mode 100644
index 00000000000..40f9347e898
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java
@@ -0,0 +1,64 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class DeleteNetrisVpcCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-vpc";
+    private static final String CIDR = "10.0.0.0/24";
+    private static final Long VPC_ID = 4L;
+    private static final boolean IS_VPC = true;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        DeleteNetrisVpcCommand command = new DeleteNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, CIDR, VPC_ID, IS_VPC);
+
+        // Assert
+        assertEquals("Zone ID should match", ZONE_ID, command.getZoneId());
+        assertEquals("Account ID should match", ACCOUNT_ID, command.getAccountId());
+        assertEquals("Domain ID should match", DOMAIN_ID, command.getDomainId());
+        assertEquals("Name should match", NAME, command.getName());
+        assertEquals("CIDR should match", CIDR, command.getCidr());
+        assertEquals("VPC ID should match", VPC_ID, command.getId());
+        assertEquals("Is VPC flag should match", IS_VPC, command.isVpc());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        DeleteNetrisVpcCommand command = new DeleteNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", CIDR, VPC_ID, IS_VPC);
+
+        // Assert
+        assertEquals("Zone ID should match", ZONE_ID, command.getZoneId());
+        assertEquals("Account ID should match", ACCOUNT_ID, command.getAccountId());
+        assertEquals("Domain ID should match", DOMAIN_ID, command.getDomainId());
+        assertEquals("Name should be empty", "", command.getName());
+        assertEquals("CIDR should match", CIDR, command.getCidr());
+        assertEquals("VPC ID should match", VPC_ID, command.getId());
+        assertEquals("Is VPC flag should match", IS_VPC, command.isVpc());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java
new file mode 100644
index 00000000000..0713fad6c8b
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java
@@ -0,0 +1,80 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ReleaseNatIpCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-network";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final String NAT_IP = "10.0.0.1";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        ReleaseNatIpCommand command = new ReleaseNatIpCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC, NAT_IP);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(NAT_IP, command.getNatIp());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        ReleaseNatIpCommand command = new ReleaseNatIpCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC, "");
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals("", command.getNatIp());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        ReleaseNatIpCommand command = new ReleaseNatIpCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC, NAT_IP);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertNull(command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertEquals(NAT_IP, command.getNatIp());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java
new file mode 100644
index 00000000000..93fd8105b7f
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java
@@ -0,0 +1,63 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+public class SetupNetrisPublicRangeCommandTest {
+
+    private static final Long ZONE_ID = 1L;
+    private static final String SUPER_CIDR = "10.0.0.0/16";
+    private static final String EXACT_CIDR = "10.0.1.0/24";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        SetupNetrisPublicRangeCommand command = new SetupNetrisPublicRangeCommand(
+                ZONE_ID, SUPER_CIDR, EXACT_CIDR);
+
+        // Assert
+        assertEquals(ZONE_ID.longValue(), command.getZoneId());
+        assertEquals(SUPER_CIDR, command.getSuperCidr());
+        assertEquals(EXACT_CIDR, command.getExactCidr());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertNull(command.getName());
+        assertEquals(ZONE_ID, command.getId());
+        assertFalse(command.isVpc());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        SetupNetrisPublicRangeCommand command = new SetupNetrisPublicRangeCommand(
+                ZONE_ID, "", "");
+
+        // Assert
+        assertEquals(ZONE_ID.longValue(), command.getZoneId());
+        assertEquals("", command.getSuperCidr());
+        assertEquals("", command.getExactCidr());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertNull(command.getName());
+        assertEquals(ZONE_ID, command.getId());
+        assertFalse(command.isVpc());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java
new file mode 100644
index 00000000000..7015f663433
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java
@@ -0,0 +1,105 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UpdateNetrisVnetCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-network";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final String PREV_NETWORK_NAME = "prev-network";
+    private static final String VPC_NAME = "test-vpc";
+    private static final Long VPC_ID = 5L;
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        UpdateNetrisVnetCommand command = new UpdateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPrevNetworkName());
+        assertNull(command.getVpcName());
+        assertNull(command.getVpcId());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        // Arrange
+        UpdateNetrisVnetCommand command = new UpdateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC);
+
+        // Act
+        command.setPrevNetworkName(PREV_NETWORK_NAME);
+        command.setVpcName(VPC_NAME);
+        command.setVpcId(VPC_ID);
+
+        // Assert
+        assertEquals(PREV_NETWORK_NAME, command.getPrevNetworkName());
+        assertEquals(VPC_NAME, command.getVpcName());
+        assertEquals(VPC_ID, command.getVpcId());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        UpdateNetrisVnetCommand command = new UpdateNetrisVnetCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPrevNetworkName());
+        assertNull(command.getVpcName());
+        assertNull(command.getVpcId());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        UpdateNetrisVnetCommand command = new UpdateNetrisVnetCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertNull(command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPrevNetworkName());
+        assertNull(command.getVpcName());
+        assertNull(command.getVpcId());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java
new file mode 100644
index 00000000000..47bea8560f1
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java
@@ -0,0 +1,93 @@
+// 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.
+package org.apache.cloudstack.agent.api;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UpdateNetrisVpcCommandTest {
+
+    private static final long ZONE_ID = 1L;
+    private static final Long ACCOUNT_ID = 2L;
+    private static final Long DOMAIN_ID = 3L;
+    private static final String NAME = "test-vpc";
+    private static final Long ID = 4L;
+    private static final boolean IS_VPC = true;
+    private static final String PREVIOUS_VPC_NAME = "previous-vpc";
+
+    @Test
+    public void testConstructorAndGetters() {
+        // Act
+        UpdateNetrisVpcCommand command = new UpdateNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPreviousVpcName());
+    }
+
+    @Test
+    public void testSettersAndGetters() {
+        // Arrange
+        UpdateNetrisVpcCommand command = new UpdateNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, NAME, ID, IS_VPC);
+
+        // Act
+        command.setPreviousVpcName(PREVIOUS_VPC_NAME);
+
+        // Assert
+        assertEquals(PREVIOUS_VPC_NAME, command.getPreviousVpcName());
+    }
+
+    @Test
+    public void testConstructorWithEmptyStrings() {
+        // Act
+        UpdateNetrisVpcCommand command = new UpdateNetrisVpcCommand(
+                ZONE_ID, ACCOUNT_ID, DOMAIN_ID, "", ID, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertEquals(ACCOUNT_ID, command.getAccountId());
+        assertEquals(DOMAIN_ID, command.getDomainId());
+        assertEquals("", command.getName());
+        assertEquals(ID, command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPreviousVpcName());
+    }
+
+    @Test
+    public void testConstructorWithNullValues() {
+        // Act
+        UpdateNetrisVpcCommand command = new UpdateNetrisVpcCommand(
+                ZONE_ID, null, null, NAME, null, IS_VPC);
+
+        // Assert
+        assertEquals(ZONE_ID, command.getZoneId());
+        assertNull(command.getAccountId());
+        assertNull(command.getDomainId());
+        assertEquals(NAME, command.getName());
+        assertNull(command.getId());
+        assertEquals(IS_VPC, command.isVpc());
+        assertNull(command.getPreviousVpcName());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java
new file mode 100644
index 00000000000..d27164a60f7
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java
@@ -0,0 +1,122 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.network.netris.NetrisProvider;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.service.NetrisProviderService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
+
+public class AddNetrisProviderCmdTest {
+
+    @Mock
+    private NetrisProviderService netrisProviderService;
+
+    @Mock
+    private CallContext callContext;
+
+    @Mock
+    Object _responseObject;
+
+    private MockedStatic<CallContext> callContextMockedStatic;
+
+    @InjectMocks
+    private AddNetrisProviderCmd cmd;
+
+    private AutoCloseable closeable;
+
+    private static final long ZONE_ID = 1L;
+    private static final String NAME = "test-provider";
+    private static final String URL = "http://domain.provider.dev";
+    private static final String USERNAME = "test-user";
+    private static final String PASSWORD = "test-password";
+    private static final String SITE_NAME = "test-site";
+    private static final String TENANT_NAME = "test-tenant";
+    private static final String NETRIS_TAG = "test-tag";
+
+    @Before
+    public void setup() throws Exception {
+        closeable = MockitoAnnotations.openMocks(this);
+        callContextMockedStatic = Mockito.mockStatic(CallContext.class);
+        callContextMockedStatic.when(CallContext::current).thenReturn(callContext);
+
+        // Set private fields using reflection
+        setPrivateField("zoneId", ZONE_ID);
+        setPrivateField("name", NAME);
+        setPrivateField("url", URL);
+        setPrivateField("username", USERNAME);
+        setPrivateField("password", PASSWORD);
+        setPrivateField("siteName", SITE_NAME);
+        setPrivateField("tenantName", TENANT_NAME);
+        setPrivateField("netrisTag", NETRIS_TAG);
+    }
+
+    private void setPrivateField(String fieldName, Object value) throws Exception {
+        Field field = AddNetrisProviderCmd.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(cmd, value);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+        callContextMockedStatic.close();
+    }
+
+    @Test
+    public void testExecuteSuccess() throws ConcurrentOperationException {
+        NetrisProvider provider = Mockito.mock(NetrisProvider.class);
+        NetrisProviderResponse response = Mockito.mock(NetrisProviderResponse.class);
+        Mockito.when(netrisProviderService.addProvider(cmd)).thenReturn(provider);
+        Mockito.when(netrisProviderService.createNetrisProviderResponse(provider)).thenReturn(response);
+        cmd.execute();
+        Mockito.verify(netrisProviderService).addProvider(cmd);
+        Mockito.verify(netrisProviderService).createNetrisProviderResponse(provider);
+        Mockito.verify(response).setResponseName(cmd.getCommandName());
+        Assert.assertEquals(response, cmd.getResponseObject());
+    }
+
+    @Test(expected = ServerApiException.class)
+    public void testExecuteFailure() throws ConcurrentOperationException {
+        NetrisProvider provider = Mockito.mock(NetrisProvider.class);
+        Mockito.when(netrisProviderService.addProvider(cmd)).thenReturn(provider);
+        Mockito.when(netrisProviderService.createNetrisProviderResponse(provider)).thenReturn(null);
+        cmd.execute();
+    }
+
+    @Test
+    public void testGetEntityOwnerId() {
+        long expectedAccountId = 123L;
+        Mockito.when(callContext.getCallingAccount()).thenReturn(Mockito.mock(com.cloud.user.Account.class));
+        Mockito.when(callContext.getCallingAccount().getId()).thenReturn(expectedAccountId);
+        long actualAccountId = cmd.getEntityOwnerId();
+        Assert.assertEquals(expectedAccountId, actualAccountId);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java
new file mode 100644
index 00000000000..527fecfad48
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java
@@ -0,0 +1,101 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.service.NetrisProviderService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
+
+public class DeleteNetrisProviderCmdTest {
+
+    @Mock
+    private NetrisProviderService netrisProviderService;
+
+    @InjectMocks
+    private DeleteNetrisProviderCmd cmd;
+
+    private AutoCloseable closeable;
+
+    private static final long PROVIDER_ID = 1L;
+
+    @Before
+    public void setup() throws Exception {
+        closeable = MockitoAnnotations.openMocks(this);
+        setPrivateField("id", PROVIDER_ID);
+    }
+
+    private void setPrivateField(String fieldName, Object value) throws Exception {
+        Field field = DeleteNetrisProviderCmd.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(cmd, value);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testExecuteSuccess() throws ConcurrentOperationException {
+        Mockito.when(netrisProviderService.deleteNetrisProvider(PROVIDER_ID)).thenReturn(true);
+        cmd.execute();
+        Mockito.verify(netrisProviderService).deleteNetrisProvider(PROVIDER_ID);
+        Assert.assertTrue(cmd.getResponseObject() instanceof SuccessResponse);
+        SuccessResponse response = (SuccessResponse) cmd.getResponseObject();
+        Assert.assertEquals(cmd.getCommandName(), response.getResponseName());
+    }
+
+    @Test(expected = ServerApiException.class)
+    public void testExecuteFailure() throws ConcurrentOperationException {
+        Mockito.when(netrisProviderService.deleteNetrisProvider(PROVIDER_ID)).thenReturn(false);
+        cmd.execute();
+    }
+
+    @Test(expected = ServerApiException.class)
+    public void testExecuteInvalidParameterException() throws ConcurrentOperationException {
+        String errorMessage = "Invalid provider ID";
+        Mockito.when(netrisProviderService.deleteNetrisProvider(PROVIDER_ID))
+                .thenThrow(new InvalidParameterValueException(errorMessage));
+        cmd.execute();
+    }
+
+    @Test(expected = ServerApiException.class)
+    public void testExecuteCloudRuntimeException() throws ConcurrentOperationException {
+        String errorMessage = "Cloud runtime error";
+        Mockito.when(netrisProviderService.deleteNetrisProvider(PROVIDER_ID))
+                .thenThrow(new CloudRuntimeException(errorMessage));
+        cmd.execute();
+    }
+
+    @Test
+    public void testGetEntityOwnerId() {
+        Assert.assertEquals(0L, cmd.getEntityOwnerId());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java
new file mode 100644
index 00000000000..c9d9a8a2d1b
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java
@@ -0,0 +1,104 @@
+// 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.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.exception.ConcurrentOperationException;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.apache.cloudstack.service.NetrisProviderService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ListNetrisProvidersCmdTest {
+
+    @Mock
+    private NetrisProviderService netrisProviderService;
+
+    @InjectMocks
+    private ListNetrisProvidersCmd cmd;
+
+    private AutoCloseable closeable;
+
+    private static final long ZONE_ID = 1L;
+
+    @Before
+    public void setup() throws Exception {
+        closeable = MockitoAnnotations.openMocks(this);
+        setPrivateField("zoneId", ZONE_ID);
+    }
+
+    private void setPrivateField(String fieldName, Object value) throws Exception {
+        java.lang.reflect.Field field = ListNetrisProvidersCmd.class.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(cmd, value);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testExecuteSuccess() throws ConcurrentOperationException {
+        // Setup
+        NetrisProviderResponse providerResponse = Mockito.mock(NetrisProviderResponse.class);
+        List<BaseResponse> providerList = Arrays.asList(providerResponse);
+        Mockito.when(netrisProviderService.listNetrisProviders(ZONE_ID)).thenReturn(providerList);
+
+        // Execute
+        cmd.execute();
+
+        // Verify
+        Mockito.verify(netrisProviderService).listNetrisProviders(ZONE_ID);
+        Assert.assertTrue(cmd.getResponseObject() instanceof ListResponse);
+        ListResponse<BaseResponse> response = (ListResponse<BaseResponse>) cmd.getResponseObject();
+        Assert.assertEquals(cmd.getCommandName(), response.getResponseName());
+    }
+
+    @Test
+    public void testExecuteWithoutZoneId() throws ConcurrentOperationException, Exception {
+        // Setup
+        setPrivateField("zoneId", null);
+        NetrisProviderResponse providerResponse = Mockito.mock(NetrisProviderResponse.class);
+        List<BaseResponse> providerList = Arrays.asList(providerResponse);
+        Mockito.when(netrisProviderService.listNetrisProviders(null)).thenReturn(providerList);
+
+        // Execute
+        cmd.execute();
+
+        // Verify
+        Mockito.verify(netrisProviderService).listNetrisProviders(null);
+        Assert.assertTrue(cmd.getResponseObject() instanceof ListResponse);
+        ListResponse<BaseResponse> response = (ListResponse<BaseResponse>) cmd.getResponseObject();
+        Assert.assertEquals(cmd.getCommandName(), response.getResponseName());
+    }
+
+    @Test
+    public void testGetEntityOwnerId() {
+        Assert.assertEquals(0L, cmd.getEntityOwnerId());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java
new file mode 100644
index 00000000000..44bd9824b2d
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java
@@ -0,0 +1,109 @@
+// 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.
+package org.apache.cloudstack.resource;
+
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisNatCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.service.NetrisServiceImpl;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NetrisResourceObjectUtilsTest {
+
+    private static final long zoneId = 1;
+    private static final long accountId = 2;
+    private static final long domainId = 2;
+
+    private static final long vpcId = 8;
+    private static final String vpcName = "testVpc";
+    private static final String vpcCidr = "10.10.0.0/16";
+
+    @Test
+    public void testCreateVpcName() {
+        CreateNetrisVpcCommand cmd = new CreateNetrisVpcCommand(zoneId, accountId, domainId, vpcName, vpcCidr, vpcId, true);
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
+        String expectedNetrisVpcName = String.format("D%s-A%s-Z%s-V%s-%s", domainId, accountId, zoneId, vpcId, vpcName);
+        Assert.assertEquals(expectedNetrisVpcName, netrisVpcName);
+    }
+
+    @Test
+    public void testCreateVpcNameWithSuffix() {
+        CreateNetrisVpcCommand cmd = new CreateNetrisVpcCommand(zoneId, accountId, domainId, vpcName, vpcCidr, vpcId, true);
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC, String.valueOf(vpcId));
+        String expectedNetrisVpcName = String.format("D%s-A%s-Z%s-V%s", domainId, accountId, zoneId, vpcId);
+        Assert.assertEquals(expectedNetrisVpcName, netrisVpcName);
+    }
+
+    @Test
+    public void testCreateVpcIpamAllocationName() {
+        CreateNetrisVpcCommand cmd = new CreateNetrisVpcCommand(zoneId, accountId, domainId, vpcName, vpcCidr, vpcId, true);
+        String ipamAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, vpcCidr);
+        String expectedNetrisVpcName = String.format("D%s-A%s-Z%s-V%s-%s", domainId, accountId, zoneId, vpcId, vpcCidr);
+        Assert.assertEquals(expectedNetrisVpcName, ipamAllocationName);
+    }
+
+    @Test
+    public void testDeleteVpcName() {
+        DeleteNetrisVpcCommand cmd = new DeleteNetrisVpcCommand(zoneId, accountId, domainId, vpcName, vpcCidr, vpcId, true);
+        String netrisVpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
+        String expectedNetrisVpcName = String.format("D%s-A%s-Z%s-V%s-%s", domainId, accountId, zoneId, vpcId, vpcName);
+        Assert.assertEquals(expectedNetrisVpcName, netrisVpcName);
+    }
+
+    @Test
+    public void testSuffixesForDNAT() {
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, vpcName, null, true, vpcCidr);
+        cmd.setNatRuleType("DNAT");
+        long ruleId = 23L;
+        String ruleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.DNAT,
+                String.valueOf(vpcId), String.format("R%s", ruleId));
+        String expectedNetrisRuleName = String.format("D%s-A%s-Z%s-V%s-DNAT-R%s", domainId, accountId, zoneId, vpcId, ruleId);
+        Assert.assertEquals(expectedNetrisRuleName, ruleName);
+    }
+
+    @Test
+    public void testSubnetName() {
+        String vNetName = "<NETRIS_VNET_NAME>";
+        Long vpcTierNetworkId = 240L;
+        String vpcTierNetworkCidr = "10.10.30.0/24";
+        String vpcTierNetworkGateway = "10.10.30.1";
+        CreateNetrisVnetCommand cmd = new CreateNetrisVnetCommand(zoneId, accountId, domainId, vpcName, vpcId, vNetName, vpcTierNetworkId, vpcTierNetworkCidr, vpcTierNetworkGateway, true);
+        String subnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(vpcId), vpcTierNetworkCidr);
+        String expectedName = String.format("D%s-A%s-Z%s-V%s-%s", domainId, accountId, zoneId, vpcId, vpcTierNetworkCidr);
+        Assert.assertEquals(expectedName, subnetName);
+    }
+
+    @Test
+    public void testSourceNatName() {
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, null, null, true, vpcCidr);
+        String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, String.valueOf(vpcId));
+        String expectedName = String.format("D%s-A%s-Z%s-V%s-SNAT", domainId, accountId, zoneId, vpcId);
+        Assert.assertEquals(expectedName, snatRuleName);
+    }
+
+    @Test
+    public void testStaticNatName() {
+        long vmId = 1234L;
+        CreateOrUpdateNetrisNatCommand cmd = new CreateOrUpdateNetrisNatCommand(zoneId, accountId, domainId, vpcName, vpcId, null, null, true, vpcCidr);
+        String[] suffixes = NetrisServiceImpl.getStaticNatResourceSuffixes(vpcId, null, true, vmId);
+        String staticNatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.STATICNAT, suffixes);
+        String expectedName = String.format("D%s-A%s-Z%s-V%s-VM%s-STATICNAT", domainId, accountId, zoneId, vpcId, vmId);
+        Assert.assertEquals(expectedName, staticNatRuleName);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java
new file mode 100644
index 00000000000..1f09045d00e
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java
@@ -0,0 +1,141 @@
+// 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.
+package org.apache.cloudstack.resource;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import org.apache.cloudstack.agent.api.AddOrUpdateNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisACLCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.CreateNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.CreateOrUpdateNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisACLCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisLoadBalancerRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisStaticRouteCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVnetCommand;
+import org.apache.cloudstack.agent.api.DeleteNetrisVpcCommand;
+import org.apache.cloudstack.agent.api.ReleaseNatIpCommand;
+import org.apache.cloudstack.agent.api.SetupNetrisPublicRangeCommand;
+import org.apache.cloudstack.service.NetrisApiClient;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class NetrisResourceTest {
+
+    @Mock
+    private NetrisApiClient netrisApiClient;
+
+    @Spy
+    @InjectMocks
+    private NetrisResource netrisResource = new NetrisResource();
+
+    private AutoCloseable closeable;
+
+    @Mock
+    private CreateNetrisVpcCommand createNetrisVpcCommand;
+    @Mock
+    private CreateNetrisVnetCommand createNetrisVnetCommand;
+    @Mock
+    private DeleteNetrisVnetCommand deleteNetrisVnetCommand;
+    @Mock
+    private DeleteNetrisVpcCommand deleteNetrisVpcCommand;
+    @Mock
+    private SetupNetrisPublicRangeCommand setupNetrisPublicRangeCommand;
+    @Mock
+    private DeleteNetrisNatRuleCommand deleteNetrisNatRuleCommand;
+    @Mock
+    private CreateOrUpdateNetrisACLCommand createNetrisACLCommand;
+    @Mock
+    private DeleteNetrisACLCommand deleteNetrisACLCommand;
+    @Mock
+    private AddOrUpdateNetrisStaticRouteCommand addOrUpdateNetrisStaticRouteCommand;
+    @Mock
+    private DeleteNetrisStaticRouteCommand deleteNetrisStaticRouteCommand;
+    @Mock
+    private ReleaseNatIpCommand releaseNatIpCommand;
+    @Mock
+    private CreateOrUpdateNetrisLoadBalancerRuleCommand createOrUpdateNetrisLoadBalancerRuleCommand;
+    @Mock
+    private DeleteNetrisLoadBalancerRuleCommand deleteNetrisLoadBalancerRuleCommand;
+
+    @Before
+    public void setup() {
+        closeable = MockitoAnnotations.openMocks(this);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testExecuteRequest() {
+        List<Command> commands = Arrays.asList(createNetrisVpcCommand, createNetrisVnetCommand, deleteNetrisVnetCommand,
+                deleteNetrisVpcCommand, setupNetrisPublicRangeCommand, deleteNetrisNatRuleCommand, createNetrisACLCommand,
+                deleteNetrisACLCommand, addOrUpdateNetrisStaticRouteCommand, deleteNetrisStaticRouteCommand,
+                releaseNatIpCommand, createOrUpdateNetrisLoadBalancerRuleCommand, deleteNetrisLoadBalancerRuleCommand);
+
+        for (boolean res : new boolean[]{true, false}) {
+            setMocksToValue(res);
+            for (Command command : commands) {
+                Answer answer = netrisResource.executeRequest(command);
+                Assert.assertEquals(res, answer.getResult());
+            }
+        }
+
+        Mockito.verify(netrisApiClient, Mockito.times(2)).createVpc(createNetrisVpcCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).createVnet(createNetrisVnetCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteVnet(deleteNetrisVnetCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteVpc(deleteNetrisVpcCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).setupZoneLevelPublicRange(setupNetrisPublicRangeCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteNatRule(deleteNetrisNatRuleCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).addOrUpdateAclRule(Mockito.eq(createNetrisACLCommand), Mockito.anyBoolean());
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteAclRule(Mockito.eq(deleteNetrisACLCommand), Mockito.anyBoolean());
+        Mockito.verify(netrisApiClient, Mockito.times(2)).addOrUpdateStaticRoute(addOrUpdateNetrisStaticRouteCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteStaticRoute(deleteNetrisStaticRouteCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).releaseNatIp(releaseNatIpCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).createOrUpdateLbRule(createOrUpdateNetrisLoadBalancerRuleCommand);
+        Mockito.verify(netrisApiClient, Mockito.times(2)).deleteLbRule(deleteNetrisLoadBalancerRuleCommand);
+    }
+
+    private void setMocksToValue(boolean value) {
+        Mockito.when(netrisApiClient.createVpc(createNetrisVpcCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.createVnet(createNetrisVnetCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteVnet(deleteNetrisVnetCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteVpc(deleteNetrisVpcCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.setupZoneLevelPublicRange(setupNetrisPublicRangeCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteNatRule(deleteNetrisNatRuleCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.addOrUpdateAclRule(Mockito.eq(createNetrisACLCommand), Mockito.anyBoolean())).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteAclRule(Mockito.eq(deleteNetrisACLCommand), Mockito.anyBoolean())).thenReturn(value);
+        Mockito.when(netrisApiClient.addOrUpdateStaticRoute(addOrUpdateNetrisStaticRouteCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteStaticRoute(deleteNetrisStaticRouteCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.releaseNatIp(releaseNatIpCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.createOrUpdateLbRule(createOrUpdateNetrisLoadBalancerRuleCommand)).thenReturn(value);
+        Mockito.when(netrisApiClient.deleteLbRule(deleteNetrisLoadBalancerRuleCommand)).thenReturn(value);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java
new file mode 100644
index 00000000000..6ae440afbff
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java
@@ -0,0 +1,103 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import io.netris.ApiClient;
+import io.netris.ApiResponse;
+import io.netris.api.v1.AuthenticationApi;
+import io.netris.api.v1.SitesApi;
+import io.netris.api.v1.TenantsApi;
+import io.netris.model.GetSiteBody;
+import io.netris.model.SitesResponseOK;
+import io.netris.model.response.AuthResponse;
+import io.netris.model.response.TenantResponse;
+import io.netris.model.response.TenantsResponse;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.MockedConstruction;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class NetrisApiClientImplTest {
+
+    private static final String endpointUrl = "https://my-netris-controller.localdomain";
+    private static final String username = "user";
+    private static final String password = "password";
+    private static final String siteName = "Datacenter-1";
+    private static final String adminTenantName = "Admin";
+    private static final int siteId = 1;
+    private static final int adminTenantId = 1;
+
+    private MockedConstruction<ApiClient> apiClientMockedConstruction;
+
+    @Spy
+    @InjectMocks
+    private NetrisApiClientImpl client;
+
+    @Before
+    public void setUp() {
+        GetSiteBody site = Mockito.mock(GetSiteBody.class);
+        SitesApi sitesApiMock = Mockito.mock(SitesApi.class);
+        Mockito.when(site.getName()).thenReturn(siteName);
+        Mockito.when(site.getId()).thenReturn(siteId);
+        TenantsApi tenantsApi = Mockito.mock(TenantsApi.class);
+        TenantResponse tenant = Mockito.mock(TenantResponse.class);
+        Mockito.when(tenant.getName()).thenReturn(adminTenantName);
+        Mockito.when(tenant.getId()).thenReturn(new BigDecimal(adminTenantId));
+
+        apiClientMockedConstruction = Mockito.mockConstruction(ApiClient.class, (mock, context) -> {
+            SitesResponseOK sitesResponse = Mockito.mock(SitesResponseOK.class);
+            Mockito.when(sitesResponse.getData()).thenReturn(List.of(site));
+            Mockito.when(sitesApiMock.apiSitesGet()).thenReturn(sitesResponse);
+            Mockito.when(mock.getApiStubForMethod(SitesApi.class)).thenReturn(sitesApiMock);
+            Mockito.when(mock.getApiStubForMethod(TenantsApi.class)).thenReturn(tenantsApi);
+            ApiResponse<TenantsResponse> tenantsResponse = Mockito.mock(ApiResponse.class);
+            Mockito.when(tenantsApi.apiTenantsGet()).thenReturn(tenantsResponse);
+            TenantsResponse tenantsResponseData = Mockito.mock(TenantsResponse.class);
+            Mockito.when(tenantsResponseData.getData()).thenReturn(List.of(tenant));
+            Mockito.when(tenantsResponse.getData()).thenReturn(tenantsResponseData);
+            AuthenticationApi authenticationApi = Mockito.mock(AuthenticationApi.class);
+            Mockito.when(mock.getApiStubForMethod(AuthenticationApi.class)).thenReturn(authenticationApi);
+            ApiResponse<AuthResponse> authResponseApiResponse = Mockito.mock(ApiResponse.class);
+            Mockito.when(authenticationApi.apiAuthGet()).thenReturn(authResponseApiResponse);
+            Mockito.when(authResponseApiResponse.getStatusCode()).thenReturn(200);
+        });
+        client = new NetrisApiClientImpl(endpointUrl, username, password, siteName, adminTenantName);
+    }
+
+    @After
+    public void tearDown() {
+        apiClientMockedConstruction.close();
+    }
+
+    @Test
+    public void testConstructor() {
+        Assert.assertEquals(siteId, client.siteId);
+        Assert.assertEquals(adminTenantId, client.tenantId);
+    }
+
+    @Test
+    public void testNetrisAuthStatus() {
+        Assert.assertTrue(client.isSessionAlive());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java
new file mode 100644
index 00000000000..a2622549deb
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java
@@ -0,0 +1,141 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Network;
+import com.cloud.network.as.AutoScaleCounter;
+import com.cloud.network.as.Counter;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.vm.ReservationContext;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class NetrisElementTest {
+
+    @Spy
+    @InjectMocks
+    private NetrisElement netrisElement = new NetrisElement();;
+
+    @Mock
+    private NetrisService netrisService;
+    @Mock
+    private AccountManager accountManager;
+    @Mock
+    private NetworkDao networkDao;
+    @Mock
+    private DataCenterDao dataCenterDao;
+    @Mock
+    private DomainDao domainDao;
+    @Mock
+    private VpcDao vpcDao;
+
+    private AutoCloseable closeable;
+
+    private static long accountId = 2L;
+    private static long zoneId = 1L;
+
+    @Before
+    public void setup() {
+        closeable = MockitoAnnotations.openMocks(this);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testAutoscalingCounterList() {
+        List<AutoScaleCounter> counters = NetrisElement.getNetrisAutoScaleCounters();
+        Assert.assertEquals(2, counters.size());
+        Set<String> counterNamesSet = counters.stream().map(AutoScaleCounter::getName).collect(Collectors.toSet());
+        Set<String> expected = Set.of(Counter.Source.CPU.name(), Counter.Source.MEMORY.name());
+        Assert.assertEquals(expected, counterNamesSet);
+    }
+
+    @Test
+    public void testInitCapabilities() {
+        Map<Network.Service, Map<Network.Capability, String>> capabilities = NetrisElement.initCapabilities();
+        Assert.assertTrue(capabilities.containsKey(Network.Service.Dns));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.Dhcp));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.SourceNat));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.StaticNat));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.Lb));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.PortForwarding));
+        Assert.assertTrue(capabilities.containsKey(Network.Service.NetworkACL));
+    }
+
+    @Test
+    public void testDeleteNetwork() throws ResourceUnavailableException {
+        long networkId = 210L;
+        long domainId = 2L;
+        long vpcId = 8L;
+        String vpcName = "testVpc";
+        String networkName = "testVpcTier";
+        String networkCidr = "10.10.30.0/24";
+        VpcVO vpc = Mockito.mock(VpcVO.class);
+        Mockito.when(vpc.getName()).thenReturn(vpcName);
+        Network network = Mockito.mock(Network.class);
+        Mockito.when(network.getAccountId()).thenReturn(accountId);
+        Mockito.when(network.getId()).thenReturn(networkId);
+        Mockito.when(network.getDataCenterId()).thenReturn(zoneId);
+        Mockito.when(network.getName()).thenReturn(networkName);
+        Mockito.when(network.getCidr()).thenReturn(networkCidr);
+        Mockito.when(network.getVpcId()).thenReturn(vpcId);
+        Account account = Mockito.mock(Account.class);
+        Mockito.when(account.getId()).thenReturn(accountId);
+        Mockito.when(account.getDomainId()).thenReturn(domainId);
+        NetworkVO networkVO = Mockito.mock(NetworkVO.class);
+        Mockito.when(networkVO.getName()).thenReturn(networkName);
+        DataCenterVO dataCenterVO = Mockito.mock(DataCenterVO.class);
+        Mockito.when(dataCenterVO.getId()).thenReturn(zoneId);
+        DomainVO domain = Mockito.mock(DomainVO.class);
+        Mockito.when(domain.getId()).thenReturn(domainId);
+        Mockito.when(accountManager.getAccount(accountId)).thenReturn(account);
+        Mockito.when(networkDao.findById(networkId)).thenReturn(networkVO);
+        Mockito.when(dataCenterDao.findById(zoneId)).thenReturn(dataCenterVO);
+        Mockito.when(domainDao.findById(domainId)).thenReturn(domain);
+        Mockito.when(vpcDao.findById(vpcId)).thenReturn(vpc);
+        ReservationContext context = Mockito.mock(ReservationContext.class);
+        netrisElement.destroy(network, context);
+        Mockito.verify(netrisService).deleteVnetResource(zoneId, accountId, domainId, vpcName, vpcId,
+                networkName, networkId, networkCidr);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java
new file mode 100644
index 00000000000..ad8d46c0dd8
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java
@@ -0,0 +1,230 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.NetworkDetailsDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.vm.ReservationContext;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+
+public class NetrisGuestNetworkGuruTest {
+
+    @Mock
+    private NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
+    @Mock
+    private PhysicalNetworkDao physicalNetworkDao;
+    @Mock
+    private DataCenterDao dataCenterDao;
+    @Mock
+    private NetworkModel networkModel;
+    @Mock
+    private AccountDao accountDao;
+    @Mock
+    private DomainDao domainDao;
+    @Mock
+    private NetworkOfferingDao networkOfferingDao;
+    @Mock
+    private VpcDao vpcDao;
+    @Mock
+    private NetrisService netrisService;
+    @Mock
+    private NetworkDetailsDao networkDetailsDao;
+
+    @Spy
+    @InjectMocks
+    private NetrisGuestNetworkGuru guru = new NetrisGuestNetworkGuru();
+
+    @Mock
+    private NetworkOfferingVO networkOffering;
+    @Mock
+    private PhysicalNetworkVO physicalNetwork;
+    @Mock
+    private DeploymentPlan plan;
+    @Mock
+    private NetworkVO network;
+    @Mock
+    private AccountVO account;
+    @Mock
+    private DomainVO domain;
+    @Mock
+    private DataCenterVO zone;
+    @Mock
+    private VpcVO vpc;
+
+    private AutoCloseable closeable;
+    private MockedStatic<ActionEventUtils> actionEventUtilsMocked;
+
+    private static final long networkOfferingId = 10L;
+    private static final long physicalNetworkId = 2L;
+    private static final long zoneId = 1L;
+    private static final long accountId = 2L;
+    private static final long domainId = 7L;
+    private static final long vpcId = 12L;
+    private static final long networkId = 210L;
+    private static final String networkName = "test-network";
+    private static final String vpcName = "test-vpc";
+    private static final String networkCidr = "172.20.10.0/24";
+
+    @Before
+    public void setup() {
+        closeable = MockitoAnnotations.openMocks(this);
+        Mockito.when(networkOffering.getId()).thenReturn(networkOfferingId);
+        Mockito.when(networkOffering.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+        Mockito.when(networkOffering.getNetworkMode()).thenReturn(NetworkOffering.NetworkMode.NATTED);
+        Mockito.when(networkOffering.isRedundantRouter()).thenReturn(false);
+        Mockito.when(networkOfferingDao.findById(networkOfferingId)).thenReturn(networkOffering);
+        Mockito.when(physicalNetwork.getIsolationMethods()).thenReturn(List.of("netris"));
+        Mockito.when(physicalNetworkDao.findById(physicalNetworkId)).thenReturn(physicalNetwork);
+        Mockito.when(networkOfferingServiceMapDao.isProviderForNetworkOffering(networkOfferingId, Network.Provider.Netris)).thenReturn(true);
+        Mockito.when(plan.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
+        Mockito.when(plan.getDataCenterId()).thenReturn(zoneId);
+        Mockito.when(dataCenterDao.findById(zoneId)).thenReturn(zone);
+        Mockito.when(zone.getNetworkType()).thenReturn(DataCenter.NetworkType.Advanced);
+        Mockito.when(zone.getGuestNetworkCidr()).thenReturn("172.20.0.0/16");
+        Mockito.when(zone.getId()).thenReturn(zoneId);
+        List<Network.Service> offeringServices = Arrays.asList(Network.Service.Dns, Network.Service.Dhcp,
+                Network.Service.SourceNat, Network.Service.StaticNat, Network.Service.PortForwarding,
+                Network.Service.NetworkACL, Network.Service.Vpn);
+        Mockito.when(networkModel.listNetworkOfferingServices(networkOfferingId)).thenReturn(offeringServices);
+        Mockito.when(accountDao.findById(accountId)).thenReturn(account);
+        Mockito.when(account.getDomainId()).thenReturn(domainId);
+        Mockito.when(account.getId()).thenReturn(accountId);
+        Mockito.when(domain.getId()).thenReturn(domainId);
+        Mockito.when(domainDao.findById(domainId)).thenReturn(domain);
+        Mockito.when(network.getAccountId()).thenReturn(accountId);
+        Mockito.when(network.getNetworkOfferingId()).thenReturn(networkOfferingId);
+        Mockito.when(network.getVpcId()).thenReturn(vpcId);
+        Mockito.when(network.getName()).thenReturn(networkName);
+        Mockito.when(network.getId()).thenReturn(networkId);
+        Mockito.when(network.getCidr()).thenReturn(networkCidr);
+        Mockito.when(network.getGateway()).thenReturn("172.20.10.1");
+        Mockito.when(network.getDataCenterId()).thenReturn(zoneId);
+        Mockito.when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
+        Mockito.when(network.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+        Mockito.when(network.getBroadcastDomainType()).thenReturn(Networks.BroadcastDomainType.Netris);
+        Mockito.when(vpcDao.findById(vpcId)).thenReturn(vpc);
+        Mockito.when(vpc.getName()).thenReturn(vpcName);
+        Mockito.when(vpc.getId()).thenReturn(vpcId);
+        actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
+        Mockito.when(ActionEventUtils.onCompletedActionEvent(anyLong(), anyLong(), anyString(), anyString(), anyString(), anyLong(), anyString(), anyLong())).thenReturn(1L);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+        actionEventUtilsMocked.close();
+    }
+
+    @Test
+    public void testCanHandleNetrisOfferingNatted() {
+        Assert.assertTrue(guru.canHandle(networkOffering, DataCenter.NetworkType.Advanced, physicalNetwork));
+    }
+
+    @Test
+    public void testCanHandleNetrisOfferingRouted() {
+        Mockito.when(networkOffering.getNetworkMode()).thenReturn(NetworkOffering.NetworkMode.ROUTED);
+        Assert.assertTrue(guru.canHandle(networkOffering, DataCenter.NetworkType.Advanced, physicalNetwork));
+    }
+
+    @Test
+    public void testCannotHandleBasicNetwork() {
+        Assert.assertFalse(guru.canHandle(networkOffering, DataCenter.NetworkType.Basic, physicalNetwork));
+    }
+
+    @Test
+    public void testCannotHandleVlanIsolation() {
+        Mockito.when(physicalNetwork.getIsolationMethods()).thenReturn(List.of("vlan"));
+        Assert.assertFalse(guru.canHandle(networkOffering, DataCenter.NetworkType.Advanced, physicalNetwork));
+    }
+
+    @Test
+    public void testCannotHandleDifferentOfferingProvider() {
+        Mockito.when(networkOfferingServiceMapDao.isProviderForNetworkOffering(networkOfferingId, Network.Provider.Netris)).thenReturn(false);
+        Assert.assertFalse(guru.canHandle(networkOffering, DataCenter.NetworkType.Advanced, physicalNetwork));
+    }
+
+    @Test
+    public void testDesignNetrisNetwork() {
+        Network designedNetwork = guru.design(networkOffering, plan, network, networkName, 1L, account);
+        Assert.assertEquals(Networks.BroadcastDomainType.Netris, designedNetwork.getBroadcastDomainType());
+        Assert.assertEquals(Network.State.Allocated, designedNetwork.getState());
+        Assert.assertEquals(Networks.TrafficType.Guest, designedNetwork.getTrafficType());
+    }
+
+    @Test
+    public void testCreateNetrisVnetVpcNetworkRoutedMode() {
+        Mockito.when(networkOffering.getNetworkMode()).thenReturn(NetworkOffering.NetworkMode.ROUTED);
+        Mockito.when(netrisService.createVnetResource(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(),
+                Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(),
+                Mockito.anyBoolean())).thenReturn(true);
+        guru.createNetrisVnet(network, zone);
+        Mockito.verify(netrisService).createVnetResource(zoneId, accountId, domainId, vpcName, vpcId,
+                networkName, networkId, networkCidr, true);
+    }
+
+    @Test
+    public void testImplementNetrisVpcNetwork() throws InsufficientVirtualNetworkCapacityException {
+        DeployDestination destination = Mockito.mock(DeployDestination.class);
+        ReservationContext context = Mockito.mock(ReservationContext.class);
+        String vnet = "1234";
+        Mockito.when(dataCenterDao.allocateVnet(Mockito.eq(zoneId), Mockito.eq(physicalNetworkId),
+                Mockito.eq(accountId), Mockito.nullable(String.class), Mockito.anyBoolean())).thenReturn(vnet);
+        actionEventUtilsMocked.when(() -> ActionEventUtils.onCompletedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong())).thenReturn(1L);
+        Mockito.when(networkDetailsDao.findDetail(Mockito.anyLong(), Mockito.anyString())).thenReturn(null);
+        Network implemented = guru.implement(network, networkOffering, destination, context);
+        Assert.assertEquals(String.format("netris://%s", vnet), implemented.getBroadcastUri().toString());
+        Assert.assertEquals(Network.State.Implemented, implemented.getState());
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java
new file mode 100644
index 00000000000..66684e0c54d
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java
@@ -0,0 +1,220 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.host.dao.HostDetailsDao;
+import com.cloud.network.Network;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.resource.ResourceManager;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.response.NetrisProviderResponse;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class NetrisProviderServiceImplTest {
+
+    @Mock
+    private DataCenterDao dataCenterDao;
+    @Mock
+    private ResourceManager resourceManager;
+    @Mock
+    private NetrisProviderDao netrisProviderDao;
+    @Mock
+    private HostDetailsDao hostDetailsDao;
+    @Mock
+    private PhysicalNetworkDao physicalNetworkDao;
+    @Mock
+    private NetworkDao networkDao;
+    @Mock
+    private NetrisService netrisService;
+
+    @InjectMocks
+    private NetrisProviderServiceImpl netrisProviderService;
+
+    private AutoCloseable closeable;
+    private MockedStatic<Transaction> transactionMockedStatic;
+
+    private static final long ZONE_ID = 1L;
+    private static final String NAME = "test-provider";
+    private static final String HOSTNAME = "test-host";
+    private static final String PORT = "8080";
+    private static final String USERNAME = "test-user";
+    private static final String PASSWORD = "test-password";
+    private static final String SITE_NAME = "test-site";
+    private static final String TENANT_NAME = "test-tenant";
+    private static final String NETRIS_TAG = "test-tag";
+    private static final long HOST_ID = 2L;
+    private static final long PROVIDER_ID = 3L;
+
+    @Before
+    public void setup() {
+        closeable = MockitoAnnotations.openMocks(this);
+        transactionMockedStatic = Mockito.mockStatic(Transaction.class);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+        transactionMockedStatic.close();
+    }
+
+    @Test
+    public void testListNetrisProvidersWithZoneId() {
+        // Setup
+        NetrisProviderVO providerVO = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(netrisProviderDao.findByZoneId(ZONE_ID)).thenReturn(providerVO);
+        Mockito.when(providerVO.getZoneId()).thenReturn(ZONE_ID);
+
+        DataCenterVO zone = Mockito.mock(DataCenterVO.class);
+        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(zone);
+        Mockito.when(zone.getName()).thenReturn("test-zone");
+
+        // Execute
+        List<BaseResponse> result = netrisProviderService.listNetrisProviders(ZONE_ID);
+
+        // Verify
+        Assert.assertEquals(1, result.size());
+        Assert.assertTrue(result.get(0) instanceof NetrisProviderResponse);
+    }
+
+    @Test
+    public void testListNetrisProvidersWithoutZoneId() {
+        // Setup
+        NetrisProviderVO providerVO = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(netrisProviderDao.listAll()).thenReturn(Arrays.asList(providerVO));
+
+        DataCenterVO zone = Mockito.mock(DataCenterVO.class);
+        Mockito.when(dataCenterDao.findById(Mockito.anyLong())).thenReturn(zone);
+        Mockito.when(zone.getName()).thenReturn("test-zone");
+
+        // Execute
+        List<BaseResponse> result = netrisProviderService.listNetrisProviders(null);
+
+        // Verify
+        Assert.assertEquals(1, result.size());
+        Assert.assertTrue(result.get(0) instanceof NetrisProviderResponse);
+    }
+
+    @Test
+    public void testDeleteNetrisProviderSuccess() {
+        // Setup
+        NetrisProviderVO providerVO = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(providerVO.getZoneId()).thenReturn(ZONE_ID);
+        Mockito.when(netrisProviderDao.findById(PROVIDER_ID)).thenReturn(providerVO);
+
+        PhysicalNetworkVO physicalNetwork = Mockito.mock(PhysicalNetworkVO.class);
+        Mockito.when(physicalNetworkDao.listByZone(ZONE_ID)).thenReturn(Arrays.asList(physicalNetwork));
+
+        NetworkVO network = Mockito.mock(NetworkVO.class);
+        Mockito.when(networkDao.listByPhysicalNetwork(Mockito.anyLong())).thenReturn(Arrays.asList(network));
+        Mockito.when(network.getBroadcastDomainType()).thenReturn(Networks.BroadcastDomainType.Netris);
+        Mockito.when(network.getState()).thenReturn(Network.State.Shutdown);
+
+        // Execute
+        boolean result = netrisProviderService.deleteNetrisProvider(PROVIDER_ID);
+
+        // Verify
+        Assert.assertTrue(result);
+        Mockito.verify(netrisProviderDao).remove(PROVIDER_ID);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDeleteNetrisProviderNotFound() {
+        // Setup
+        Mockito.when(netrisProviderDao.findById(PROVIDER_ID)).thenReturn(null);
+
+        // Execute
+        netrisProviderService.deleteNetrisProvider(PROVIDER_ID);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testDeleteNetrisProviderWithActiveNetworks() {
+        // Setup
+        NetrisProviderVO providerVO = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(providerVO.getZoneId()).thenReturn(ZONE_ID);
+        Mockito.when(netrisProviderDao.findById(PROVIDER_ID)).thenReturn(providerVO);
+
+        PhysicalNetworkVO physicalNetwork = Mockito.mock(PhysicalNetworkVO.class);
+        Mockito.when(physicalNetworkDao.listByZone(ZONE_ID)).thenReturn(Arrays.asList(physicalNetwork));
+
+        NetworkVO network = Mockito.mock(NetworkVO.class);
+        Mockito.when(networkDao.listByPhysicalNetwork(Mockito.anyLong())).thenReturn(Arrays.asList(network));
+        Mockito.when(network.getBroadcastDomainType()).thenReturn(Networks.BroadcastDomainType.Netris);
+        Mockito.when(network.getState()).thenReturn(Network.State.Implemented);
+
+        // Execute
+        netrisProviderService.deleteNetrisProvider(PROVIDER_ID);
+    }
+
+    @Test
+    public void testCreateNetrisProviderResponse() {
+        // Setup
+        NetrisProviderVO provider = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(provider.getZoneId()).thenReturn(ZONE_ID);
+        Mockito.when(provider.getName()).thenReturn(NAME);
+        Mockito.when(provider.getSiteName()).thenReturn(SITE_NAME);
+        Mockito.when(provider.getTenantName()).thenReturn(TENANT_NAME);
+        Mockito.when(provider.getNetrisTag()).thenReturn(NETRIS_TAG);
+
+        DataCenterVO zone = Mockito.mock(DataCenterVO.class);
+        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(zone);
+        Mockito.when(zone.getName()).thenReturn("test-zone");
+
+        // Execute
+        NetrisProviderResponse response = netrisProviderService.createNetrisProviderResponse(provider);
+
+        // Verify
+        Assert.assertNotNull(response);
+        Assert.assertEquals(NAME, response.getName());
+        Assert.assertEquals(SITE_NAME, response.getSiteName());
+        Assert.assertEquals(TENANT_NAME, response.getTenantName());
+        Assert.assertEquals(NETRIS_TAG, response.getNetrisTag());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testCreateNetrisProviderResponseZoneNotFound() {
+        // Setup
+        NetrisProviderVO provider = Mockito.mock(NetrisProviderVO.class);
+        Mockito.when(provider.getZoneId()).thenReturn(ZONE_ID);
+        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(null);
+
+        // Execute
+        netrisProviderService.createNetrisProviderResponse(provider);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java
new file mode 100644
index 00000000000..531e343f6aa
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java
@@ -0,0 +1,225 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.VpcOfferingVO;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.network.vpc.dao.VpcOfferingDao;
+import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.user.AccountVO;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.Ip;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.api.ApiConstants;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.Arrays;
+
+public class NetrisPublicNetworkGuruTest {
+
+    @Mock
+    private NetworkModel networkModel;
+    @Mock
+    private IPAddressDao ipAddressDao;
+    @Mock
+    private VpcDao vpcDao;
+    @Mock
+    private VlanDetailsDao vlanDetailsDao;
+    @Mock
+    private VpcOfferingDao vpcOfferingDao;
+    @Mock
+    private VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
+    @Mock
+    private NetrisService netrisService;
+    @Spy
+    @InjectMocks
+    private NetrisPublicNetworkGuru guru = new NetrisPublicNetworkGuru();
+
+    @Mock
+    private NetworkOfferingVO networkOffering;
+    @Mock
+    private DeploymentPlan deploymentPlan;
+    @Mock
+    private NetworkVO network;
+    @Mock
+    private AccountVO account;
+    @Mock
+    private NicProfile nicProfile;
+    @Mock
+    private VirtualMachineProfile virtualMachineProfile;
+    @Mock
+    private IPAddressVO ipAddressVpcVR;
+    @Mock
+    private IPAddressVO ipAddressVpcSourceNat;
+    @Mock
+    private VpcVO vpc;
+
+    private AutoCloseable closeable;
+
+    private static final long networkOfferingId = 10L;
+    private static final long physicalNetworkId = 2L;
+    private static final long zoneId = 1L;
+    private static final long vpcId = 12L;
+    private static final String vrNicIp = "10.10.10.10";
+    private static final String vpcSourceNatIp = "10.10.20.20";
+
+    @Before
+    public void setup() {
+        closeable = MockitoAnnotations.openMocks(this);
+        Mockito.when(networkOffering.getId()).thenReturn(networkOfferingId);
+        Mockito.when(networkOffering.getTrafficType()).thenReturn(Networks.TrafficType.Public);
+        Mockito.when(networkOffering.isSystemOnly()).thenReturn(true);
+        Mockito.when(networkModel.isProviderForNetworkOffering(Network.Provider.Netris, networkOfferingId)).thenReturn(true);
+        Mockito.when(network.getBroadcastDomainType()).thenReturn(Networks.BroadcastDomainType.Netris);
+        Mockito.when(deploymentPlan.getDataCenterId()).thenReturn(zoneId);
+        Mockito.when(deploymentPlan.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
+        Mockito.when(networkOffering.isRedundantRouter()).thenReturn(false);
+        Mockito.when(nicProfile.getIPv4Address()).thenReturn(vrNicIp);
+        Mockito.when(ipAddressDao.findByIp(vrNicIp)).thenReturn(ipAddressVpcVR);
+        Mockito.when(ipAddressVpcVR.getVpcId()).thenReturn(vpcId);
+        Mockito.when(vpcDao.findById(vpcId)).thenReturn(vpc);
+        Mockito.when(vpc.getId()).thenReturn(vpcId);
+        Mockito.when(ipAddressDao.listByAssociatedVpc(vpcId, true))
+                .thenReturn(Arrays.asList(ipAddressVpcVR, ipAddressVpcSourceNat));
+        Ip ipMock = Mockito.mock(Ip.class);
+        Mockito.when(ipMock.addr()).thenReturn(vrNicIp);
+        Mockito.when(ipAddressVpcVR.getAddress()).thenReturn(ipMock);
+        Ip ipVrMock = Mockito.mock(Ip.class);
+        Mockito.when(ipVrMock.addr()).thenReturn(vpcSourceNatIp);
+        Mockito.when(ipAddressVpcSourceNat.getAddress()).thenReturn(ipVrMock);
+        Mockito.when(ipAddressVpcSourceNat.isSourceNat()).thenReturn(true);
+        Mockito.when(ipAddressVpcSourceNat.isForSystemVms()).thenReturn(false);
+        Mockito.when(ipAddressVpcSourceNat.getVlanId()).thenReturn(4L);
+        VlanDetailsVO vlanDetailsVO = Mockito.mock(VlanDetailsVO.class);
+        Mockito.when(vlanDetailsVO.getValue()).thenReturn("true");
+        Mockito.when(vlanDetailsDao.findDetail(4L, ApiConstants.NETRIS_DETAIL_KEY)).thenReturn(vlanDetailsVO);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testCanHandleNetrisPublic() {
+        Assert.assertTrue(guru.canHandle(networkOffering));
+    }
+
+    @Test
+    public void testCannotHandleNonNetrisPublic() {
+        Mockito.when(networkModel.isProviderForNetworkOffering(Network.Provider.Netris, networkOfferingId)).thenReturn(false);
+        Assert.assertFalse(guru.canHandle(networkOffering));
+    }
+
+    @Test
+    public void testCannotHandleNonPublicTraffic() {
+        Mockito.when(networkOffering.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+        Assert.assertFalse(guru.canHandle(networkOffering));
+    }
+
+    @Test
+    public void testDesignNetrisNetwork() {
+        String name = "test-network";
+        long vpcId = 10L;
+        Network design = guru.design(networkOffering, deploymentPlan, network, name, vpcId, account);
+        Assert.assertEquals(Network.State.Setup, design.getState());
+        Assert.assertEquals(Networks.BroadcastDomainType.Netris, design.getBroadcastDomainType());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAllocateNetrisNetworkMissingIpAddress() throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        Mockito.when(ipAddressDao.findByIp(vrNicIp)).thenReturn(null);
+        guru.allocate(network, nicProfile, virtualMachineProfile);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAllocateNetrisNetworkMissingVpc() throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        Mockito.when(vpcDao.findById(vpcId)).thenReturn(null);
+        guru.allocate(network, nicProfile, virtualMachineProfile);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAllocateNetrisNetworkSourceNatIps() throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        Mockito.when(vpcDao.findById(vpcId)).thenReturn(null);
+        guru.allocate(network, nicProfile, virtualMachineProfile);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAllocateNetrisNetworkMissingIps() throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        Mockito.when(ipAddressDao.listByAssociatedVpc(vpcId, true)).thenReturn(null);
+        guru.allocate(network, nicProfile, virtualMachineProfile);
+    }
+
+    @Test
+    public void testAllocateNetrisNetwork() throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+        long vpcOfferingId = 20L;
+        long accountId = 2L;
+        long domainId = 8L;
+        long networkId = 210L;
+        String vpcName = "test-vpc";
+        String vpcCidr = "172.20.10.1/28";
+        String networkName = "vpc-tier";
+        Mockito.when(vpc.getAccountId()).thenReturn(accountId);
+        Mockito.when(vpc.getZoneId()).thenReturn(zoneId);
+        Mockito.when(vpc.getDomainId()).thenReturn(domainId);
+        Mockito.when(vpc.getVpcOfferingId()).thenReturn(vpcOfferingId);
+        Mockito.when(vpc.getName()).thenReturn(vpcName);
+        Mockito.when(vpc.getCidr()).thenReturn(vpcCidr);
+        Mockito.when(network.getName()).thenReturn(networkName);
+        Mockito.when(network.getId()).thenReturn(networkId);
+        VpcOfferingVO vpcOffering = Mockito.mock(VpcOfferingVO.class);
+        Mockito.when(vpcOfferingDao.findById(vpcOfferingId)).thenReturn(vpcOffering);
+        Mockito.when(vpcOffering.getNetworkMode()).thenReturn(NetworkOffering.NetworkMode.NATTED);
+        Mockito.when(vpcOfferingServiceMapDao.areServicesSupportedByVpcOffering(
+                vpcOfferingId, new Network.Service[]{Network.Service.SourceNat})).thenReturn(true);
+        Mockito.when(netrisService.createVpcResource(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(),
+                Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString(),
+                Mockito.anyBoolean())).thenReturn(true);
+        Mockito.when(netrisService.createSnatRule(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(),
+                Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong(),
+                Mockito.anyBoolean(), Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+        guru.allocate(network, nicProfile, virtualMachineProfile);
+        Mockito.verify(netrisService).createVpcResource(zoneId, accountId, domainId, vpcId, vpcName, true,
+                vpcCidr, true);
+        Mockito.verify(netrisService).createSnatRule(zoneId, accountId, domainId, vpcName, vpcId, networkName,
+                networkId, true, vpcCidr, vpcSourceNatIp);
+    }
+}
diff --git a/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java
new file mode 100644
index 00000000000..807324f404a
--- /dev/null
+++ b/plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java
@@ -0,0 +1,33 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NetrisServiceImplTest {
+
+    private NetrisServiceImpl service = new NetrisServiceImpl();
+
+    @Test
+    public void testCalculateSubnetCidrFromIpRange() {
+        String ipRange = "100.99.18.140-100.99.18.159";
+        String expectedCidr = "100.99.18.128/27";
+        String cidr = service.calculateSubnetCidrFromIpRange(ipRange);
+        Assert.assertEquals(expectedCidr, cidr);
+    }
+}
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
index 5a3e5586400..f7bf0a11bda 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
@@ -41,7 +41,8 @@ public class DeleteNsxControllerCmd extends BaseCmd {
 
     @Inject
     protected NsxProviderService nsxProviderService;
-/////////////////////////////////////////////////////
+
+    /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
index c11141db9d4..9c85c49adde 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
@@ -16,7 +16,7 @@
 // under the License.
 package org.apache.cloudstack.resource;
 
-import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
 
 import java.util.List;
 
@@ -26,140 +26,16 @@ public class NsxNetworkRule {
         ALLOW, DROP
     }
 
-    private long domainId;
-    private long accountId;
-    private long zoneId;
-    private Long networkResourceId;
-    private String networkResourceName;
-    private boolean isVpcResource;
-    private long vmId;
-    private long ruleId;
-    private String publicIp;
-    private String vmIp;
-    private String publicPort;
-    private String privatePort;
-    private String protocol;
-    private String algorithm;
+    private SDNProviderNetworkRule baseRule;
     private List<NsxLoadBalancerMember> memberList;
     private NsxRuleAction aclAction;
-    private List<String> sourceCidrList;
-    private List<String> destinationCidrList;
-    private Integer icmpCode;
 
-    private Integer icmpType;
-    private String trafficType;
-    private Network.Service service;
-
-    public long getDomainId() {
-        return domainId;
+    public SDNProviderNetworkRule getBaseRule() {
+        return baseRule;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-    public long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-    public long getZoneId() {
-        return zoneId;
-    }
-
-    public void setZoneId(long zoneId) {
-        this.zoneId = zoneId;
-    }
-
-    public Long getNetworkResourceId() {
-        return networkResourceId;
-    }
-
-    public void setNetworkResourceId(Long networkResourceId) {
-        this.networkResourceId = networkResourceId;
-    }
-
-    public String getNetworkResourceName() {
-        return networkResourceName;
-    }
-
-    public void setNetworkResourceName(String networkResourceName) {
-        this.networkResourceName = networkResourceName;
-    }
-
-    public boolean isVpcResource() {
-        return isVpcResource;
-    }
-
-    public void setVpcResource(boolean vpcResource) {
-        isVpcResource = vpcResource;
-    }
-
-    public long getVmId() {
-        return vmId;
-    }
-
-    public void setVmId(long vmId) {
-        this.vmId = vmId;
-    }
-
-    public long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getPublicIp() {
-        return publicIp;
-    }
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public String getVmIp() {
-        return vmIp;
-    }
-
-    public void setVmIp(String vmIp) {
-        this.vmIp = vmIp;
-    }
-
-    public String getPublicPort() {
-        return publicPort;
-    }
-
-    public void setPublicPort(String publicPort) {
-        this.publicPort = publicPort;
-    }
-
-    public String getPrivatePort() {
-        return privatePort;
-    }
-
-    public void setPrivatePort(String privatePort) {
-        this.privatePort = privatePort;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public void setAlgorithm(String algorithm) {
-        this.algorithm = algorithm;
-    }
-
-    public String getAlgorithm() {
-        return algorithm;
+    public void setBaseRule(SDNProviderNetworkRule baseRule) {
+        this.baseRule = baseRule;
     }
 
     public List<NsxLoadBalancerMember> getMemberList() {
@@ -177,221 +53,4 @@ public class NsxNetworkRule {
     public void setAclAction(NsxRuleAction aclAction) {
         this.aclAction = aclAction;
     }
-
-    public Network.Service getService() {
-        return service;
-    }
-
-    public void setService(Network.Service service) {
-        this.service = service;
-    }
-
-    public Integer getIcmpCode() {
-        return icmpCode;
-    }
-
-    public void setIcmpCode(Integer icmpCode) {
-        this.icmpCode = icmpCode;
-    }
-
-    public Integer getIcmpType() {
-        return icmpType;
-    }
-
-    public void setIcmpType(Integer icmpType) {
-        this.icmpType = icmpType;
-    }
-
-    public List<String> getSourceCidrList() {
-        return sourceCidrList;
-    }
-
-    public void setSourceCidrList(List<String> sourceCidrList) {
-        this.sourceCidrList = sourceCidrList;
-    }
-
-    public List<String> getDestinationCidrList() {
-        return destinationCidrList;
-    }
-
-    public void setDestinationCidrList(List<String> destinationCidrList) {
-        this.destinationCidrList = destinationCidrList;
-    }
-
-    public String getTrafficType() {
-        return trafficType;
-    }
-
-    public void setTrafficType(String trafficType) {
-        this.trafficType = trafficType;
-    }
-
-    public static final class Builder {
-        private long domainId;
-        private long accountId;
-        private long zoneId;
-        private Long networkResourceId;
-        private String networkResourceName;
-        private boolean isVpcResource;
-        private long vmId;
-
-        private long ruleId;
-        private String publicIp;
-        private String vmIp;
-        private String publicPort;
-        private String privatePort;
-        private String protocol;
-        private String algorithm;
-        private List<NsxLoadBalancerMember> memberList;
-        private NsxRuleAction aclAction;
-        private List<String> sourceCidrList;
-        private List<String> destinationidrList;
-        private String trafficType;
-        private Integer icmpType;
-        private Integer icmpCode;
-        private Network.Service service;
-
-        public Builder() {
-            // Default constructor
-        }
-
-        public Builder setDomainId(long domainId) {
-            this.domainId = domainId;
-            return this;
-        }
-
-        public Builder setAccountId(long accountId) {
-            this.accountId = accountId;
-            return this;
-        }
-
-        public Builder setZoneId(long zoneId) {
-            this.zoneId = zoneId;
-            return this;
-        }
-
-        public Builder setNetworkResourceId(Long networkResourceId) {
-            this.networkResourceId = networkResourceId;
-            return this;
-        }
-
-        public Builder setNetworkResourceName(String networkResourceName) {
-            this.networkResourceName = networkResourceName;
-            return this;
-        }
-
-        public Builder setVpcResource(boolean isVpcResource) {
-            this.isVpcResource = isVpcResource;
-            return this;
-        }
-
-
-        public Builder setVmId(long vmId) {
-            this.vmId = vmId;
-            return this;
-        }
-
-        public Builder setRuleId(long ruleId) {
-            this.ruleId = ruleId;
-            return this;
-        }
-
-        public Builder setPublicIp(String publicIp) {
-            this.publicIp = publicIp;
-            return this;
-        }
-
-        public Builder setVmIp(String vmIp) {
-            this.vmIp = vmIp;
-            return this;
-        }
-
-        public Builder setPublicPort(String publicPort) {
-            this.publicPort = publicPort;
-            return this;
-        }
-
-        public Builder setPrivatePort(String privatePort) {
-            this.privatePort = privatePort;
-            return this;
-        }
-
-        public Builder setProtocol(String protocol) {
-            this.protocol = protocol;
-            return this;
-        }
-
-        public Builder setAlgorithm(String algorithm) {
-            this.algorithm = algorithm;
-            return this;
-        }
-
-        public Builder setMemberList(List<NsxLoadBalancerMember> memberList) {
-            this.memberList = memberList;
-            return this;
-        }
-
-
-        public Builder setAclAction(NsxRuleAction aclAction) {
-            this.aclAction = aclAction;
-            return this;
-        }
-
-        public Builder setTrafficType(String trafficType) {
-            this.trafficType = trafficType;
-            return this;
-        }
-
-        public Builder setIcmpType(Integer icmpType) {
-            this.icmpType = icmpType;
-            return this;
-        }
-
-        public Builder setIcmpCode(Integer icmpCode) {
-            this.icmpCode = icmpCode;
-            return this;
-        }
-
-        public Builder setSourceCidrList(List<String> sourceCidrList) {
-            this.sourceCidrList = sourceCidrList;
-            return this;
-        }
-
-        public Builder setDestinationCidrList(List<String> destinationCidrList) {
-            this.destinationidrList = destinationCidrList;
-            return this;
-        }
-
-        public Builder setService(Network.Service service) {
-            this.service = service;
-            return this;
-        }
-
-        public NsxNetworkRule build() {
-            NsxNetworkRule rule = new NsxNetworkRule();
-            rule.setDomainId(this.domainId);
-            rule.setAccountId(this.accountId);
-            rule.setZoneId(this.zoneId);
-            rule.setNetworkResourceId(this.networkResourceId);
-            rule.setNetworkResourceName(this.networkResourceName);
-            rule.setVpcResource(this.isVpcResource);
-            rule.setVmId(this.vmId);
-            rule.setVmIp(this.vmIp);
-            rule.setPublicIp(this.publicIp);
-            rule.setPublicPort(this.publicPort);
-            rule.setPrivatePort(this.privatePort);
-            rule.setProtocol(this.protocol);
-            rule.setRuleId(this.ruleId);
-            rule.setAlgorithm(this.algorithm);
-            rule.setMemberList(this.memberList);
-            rule.setAclAction(this.aclAction);
-            rule.setIcmpType(this.icmpType);
-            rule.setIcmpCode(this.icmpCode);
-            rule.setSourceCidrList(this.sourceCidrList);
-            rule.setDestinationCidrList(this.destinationidrList);
-            rule.setTrafficType(this.trafficType);
-            rule.setService(service);
-            return rule;
-        }
-    }
 }
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
index b7631f78143..7ad27c4a635 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.service;
 
 import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
 import com.cloud.network.nsx.NsxService;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.vmware.nsx.cluster.Status;
@@ -1024,7 +1025,8 @@ public class NsxApiClient {
     }
 
     public void deleteDistributedFirewallRules(String segmentName, List<NsxNetworkRule> nsxRules) {
-        for(NsxNetworkRule rule : nsxRules) {
+        for(NsxNetworkRule nsxRule : nsxRules) {
+            SDNProviderNetworkRule rule = nsxRule.getBaseRule();
             String ruleId = NsxControllerUtils.getNsxDistributedFirewallPolicyRuleId(segmentName, rule.getRuleId());
            String svcName = getServiceName(ruleId, rule.getPrivatePort(), rule.getProtocol(), rule.getIcmpType(), rule.getIcmpCode());
             // delete rules
@@ -1042,10 +1044,11 @@ public class NsxApiClient {
         if (Objects.isNull(groupPath)) {
             throw new CloudRuntimeException(String.format("Failed to find group for segment %s", segmentName));
         }
-        for (NsxNetworkRule rule : nsxRules) {
+        for (NsxNetworkRule nsxRule : nsxRules) {
+            SDNProviderNetworkRule rule = nsxRule.getBaseRule();
             String ruleId = NsxControllerUtils.getNsxDistributedFirewallPolicyRuleId(segmentName, rule.getRuleId());
             Rule ruleToAdd = new Rule.Builder()
-                    .setAction(rule.getAclAction().toString())
+                    .setAction(nsxRule.getAclAction().toString())
                     .setId(ruleId)
                     .setDisplayName(ruleId)
                     .setResourceType("SecurityPolicy")
@@ -1059,7 +1062,7 @@ public class NsxApiClient {
         return rules;
     }
 
-    private List<String> getServicesListForDistributedFirewallRule(NsxNetworkRule rule, String segmentName) {
+    private List<String> getServicesListForDistributedFirewallRule(SDNProviderNetworkRule rule, String segmentName) {
         List<String> services = List.of("ANY");
         if (!rule.getProtocol().equalsIgnoreCase("all")) {
             String ruleName = String.format("%s-R%s", segmentName, rule.getRuleId());
@@ -1070,7 +1073,7 @@ public class NsxApiClient {
         return services;
     }
 
-    protected List<String> getGroupsForTraffic(NsxNetworkRule rule,
+    protected List<String> getGroupsForTraffic(SDNProviderNetworkRule rule,
                                              String segmentName, boolean source) {
         List<String> segmentGroup = List.of(String.format("%s/%s", GROUPS_PATH_PREFIX, segmentName));
         List<String> sourceCidrList = rule.getSourceCidrList();
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
index 85d203f4125..0486de96dd1 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
@@ -45,6 +45,7 @@ import com.cloud.network.NetworkModel;
 import com.cloud.network.Networks;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.PublicIpAddress;
+import com.cloud.network.SDNProviderNetworkRule;
 import com.cloud.network.VirtualRouterProvider;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
@@ -110,7 +111,7 @@ import org.apache.cloudstack.api.command.admin.internallb.ListInternalLoadBalanc
 import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 import org.apache.cloudstack.resource.NsxLoadBalancerMember;
 import org.apache.cloudstack.resource.NsxNetworkRule;
-import org.apache.cloudstack.resource.NsxOpObject;
+import com.cloud.network.SDNProviderOpObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO;
@@ -554,12 +555,12 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
                 if (vm == null && rule.getState() != FirewallRule.State.Revoke) {
                     continue;
                 }
-                NsxOpObject nsxObject = getNsxOpObject(network);
-                String publicPort = getPublicPortRange(rule);
+                SDNProviderOpObject nsxObject = getNsxOpObject(network);
+                String publicPort = PortForwardingServiceProvider.getPublicPortRange(rule);
 
-                String privatePort = getPrivatePFPortRange(rule);
+                String privatePort = PortForwardingServiceProvider.getPrivatePFPortRange(rule);
 
-                NsxNetworkRule networkRule = new NsxNetworkRule.Builder()
+                SDNProviderNetworkRule networkRule = new SDNProviderNetworkRule.Builder()
                         .setDomainId(nsxObject.getDomainId())
                         .setAccountId(nsxObject.getAccountId())
                         .setZoneId(nsxObject.getZoneId())
@@ -574,12 +575,16 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
                         .setRuleId(rule.getId())
                         .setProtocol(rule.getProtocol().toUpperCase(Locale.ROOT))
                         .build();
+
+                NsxNetworkRule nsxNetworkRule = new NsxNetworkRule();
+                nsxNetworkRule.setBaseRule(networkRule);
+
                 FirewallRuleDetailVO ruleDetail = firewallRuleDetailsDao.findDetail(rule.getId(), ApiConstants.FOR_NSX);
                 if (Arrays.asList(FirewallRule.State.Add, FirewallRule.State.Active).contains(rule.getState())) {
                     if ((ruleDetail == null && FirewallRule.State.Add == rule.getState()) || (ruleDetail != null && !ruleDetail.getValue().equalsIgnoreCase("true"))) {
                         logger.debug("Creating port forwarding rule on NSX for VM {} to ports {} - {}",
                                 vm, rule.getDestinationPortStart(), rule.getDestinationPortEnd());
-                        NsxAnswer answer = nsxService.createPortForwardRule(networkRule);
+                        NsxAnswer answer = nsxService.createPortForwardRule(nsxNetworkRule);
                         boolean pfRuleResult = answer.getResult();
                         if (pfRuleResult && !answer.isObjectExistent()) {
                             logger.debug("Port forwarding rule {} created on NSX, adding detail on firewall rules details", rule);
@@ -596,7 +601,7 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
                     }
                 } else if (rule.getState() == FirewallRule.State.Revoke) {
                     if (ruleDetail == null || (ruleDetail != null && ruleDetail.getValue().equalsIgnoreCase("true"))) {
-                        boolean pfRuleResult = nsxService.deletePortForwardRule(networkRule);
+                        boolean pfRuleResult = nsxService.deletePortForwardRule(nsxNetworkRule);
                         if (pfRuleResult && ruleDetail != null) {
                             logger.debug("Updating firewall rule detail {} () for rule {}, set to false", ruleDetail.getId(), ruleDetail.getName(), rule);
                             ruleDetail.setValue("false");
@@ -635,30 +640,6 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         return new Pair<>(vpc, network);
     }
 
-    private static String getPublicPortRange(PortForwardingRule rule) {
-        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
-                String.valueOf(rule.getSourcePortStart()) :
-                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
-    }
-
-    private static String getPrivatePFPortRange(PortForwardingRule rule) {
-        return rule.getDestinationPortStart() == rule.getDestinationPortEnd() ?
-                String.valueOf(rule.getDestinationPortStart()) :
-                String.valueOf(rule.getDestinationPortStart()).concat("-").concat(String.valueOf(rule.getDestinationPortEnd()));
-    }
-
-    private static String getPrivatePortRange(FirewallRule rule) {
-        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
-                String.valueOf(rule.getSourcePortStart()) :
-                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
-    }
-
-    private static String getPrivatePortRangeForACLRule(NetworkACLItem rule) {
-        return Objects.equals(rule.getSourcePortStart(), rule.getSourcePortEnd()) ?
-                String.valueOf(rule.getSourcePortStart()) :
-                String.valueOf(rule.getSourcePortStart()).concat("-").concat(String.valueOf(rule.getSourcePortEnd()));
-    }
-
     private long getResourceId(String resource, VpcVO vpc, NetworkVO network) {
         switch (resource) {
             case "domain":
@@ -672,7 +653,7 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         }
     }
 
-    private NsxOpObject getNsxOpObject(Network network) {
+    private SDNProviderOpObject getNsxOpObject(Network network) {
         Pair<VpcVO, NetworkVO> vpcOrNetwork = getVpcOrNetwork(network.getVpcId(), network.getId());
         VpcVO vpc = vpcOrNetwork.first();
         NetworkVO networkVO = vpcOrNetwork.second();
@@ -680,7 +661,7 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         long accountId = getResourceId("account", vpc, networkVO);
         long zoneId = getResourceId("zone", vpc, networkVO);
 
-        return new NsxOpObject.Builder()
+        return new SDNProviderOpObject.Builder()
                 .vpcVO(vpc)
                 .networkVO(networkVO)
                 .domainId(domainId)
@@ -695,25 +676,27 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         for (LoadBalancingRule loadBalancingRule : rules) {
             IPAddressVO publicIp = ipAddressDao.findByIpAndDcId(network.getDataCenterId(),
                     loadBalancingRule.getSourceIp().addr());
-            NsxOpObject nsxObject = getNsxOpObject(network);
+            SDNProviderOpObject nsxObject = getNsxOpObject(network);
 
             List<NsxLoadBalancerMember> lbMembers = getLoadBalancerMembers(loadBalancingRule);
-            NsxNetworkRule networkRule = new NsxNetworkRule.Builder()
-                    .setDomainId(nsxObject.getDomainId())
-                    .setAccountId(nsxObject.getAccountId())
-                    .setZoneId(nsxObject.getZoneId())
-                    .setNetworkResourceId(nsxObject.getNetworkResourceId())
-                    .setNetworkResourceName(nsxObject.getNetworkResourceName())
-                    .setVpcResource(nsxObject.isVpcResource())
-                    .setMemberList(lbMembers)
-                    .setPublicIp(LoadBalancerContainer.Scheme.Public == loadBalancingRule.getScheme() ?
+            SDNProviderNetworkRule baseNetRule = new SDNProviderNetworkRule.Builder()
+            .setDomainId(nsxObject.getDomainId())
+            .setAccountId(nsxObject.getAccountId())
+            .setZoneId(nsxObject.getZoneId())
+            .setNetworkResourceId(nsxObject.getNetworkResourceId())
+            .setNetworkResourceName(nsxObject.getNetworkResourceName())
+            .setVpcResource(nsxObject.isVpcResource())
+            .setPublicIp(LoadBalancerContainer.Scheme.Public == loadBalancingRule.getScheme() ?
                             publicIp.getAddress().addr() : loadBalancingRule.getSourceIp().addr())
-                    .setPublicPort(String.valueOf(loadBalancingRule.getSourcePortStart()))
-                    .setPrivatePort(String.valueOf(loadBalancingRule.getDefaultPortStart()))
-                    .setRuleId(loadBalancingRule.getId())
-                    .setProtocol(loadBalancingRule.getLbProtocol().toUpperCase(Locale.ROOT))
-                    .setAlgorithm(loadBalancingRule.getAlgorithm())
+            .setPublicPort(String.valueOf(loadBalancingRule.getSourcePortStart()))
+            .setPrivatePort(String.valueOf(loadBalancingRule.getDefaultPortStart()))
+            .setRuleId(loadBalancingRule.getId())
+            .setProtocol(loadBalancingRule.getLbProtocol().toUpperCase(Locale.ROOT))
+            .setAlgorithm(loadBalancingRule.getAlgorithm())
                     .build();
+            NsxNetworkRule networkRule = new NsxNetworkRule();
+            networkRule.setBaseRule(baseNetRule);
+            networkRule.setMemberList(lbMembers);
             if (Arrays.asList(FirewallRule.State.Add, FirewallRule.State.Active).contains(loadBalancingRule.getState())) {
                 result &= nsxService.createLbRule(networkRule);
             } else if (loadBalancingRule.getState() == FirewallRule.State.Revoke) {
@@ -758,7 +741,7 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         List<NsxNetworkRule> nsxDelNetworkRules = new ArrayList<>();
         boolean success = true;
         for (NetworkACLItem rule : rules) {
-            String privatePort = getPrivatePortRangeForACLRule(rule);
+            String privatePort = PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule);
             NsxNetworkRule networkRule = getNsxNetworkRuleForAcl(rule, privatePort);
             if (Arrays.asList(NetworkACLItem.State.Active, NetworkACLItem.State.Add).contains(rule.getState())) {
                 success = success && nsxService.addFirewallRules(network, List.of(networkRule));
@@ -780,7 +763,7 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
     public boolean reorderAclRules(Vpc vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems) {
         List<NsxNetworkRule> aclRulesList = new ArrayList<>();
         for (NetworkACLItem rule : networkACLItems) {
-            String privatePort = getPrivatePortRangeForACLRule(rule);
+            String privatePort = PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule);
             aclRulesList.add(getNsxNetworkRuleForAcl(rule, privatePort));
         }
         for (Network network: networks) {
@@ -796,18 +779,20 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
     }
 
     private NsxNetworkRule getNsxNetworkRuleForAcl(NetworkACLItem rule, String privatePort) {
-        return new NsxNetworkRule.Builder()
-                .setRuleId(rule.getId())
-                .setSourceCidrList(Objects.nonNull(rule.getSourceCidrList()) ? transformCidrListValues(rule.getSourceCidrList()) : List.of("ANY"))
-                .setAclAction(transformActionValue(rule.getAction()))
-                .setTrafficType(rule.getTrafficType().toString())
-                .setProtocol(rule.getProtocol().toUpperCase())
-                .setPublicPort(String.valueOf(rule.getSourcePortStart()))
-                .setPrivatePort(privatePort)
-                .setIcmpCode(rule.getIcmpCode())
-                .setIcmpType(rule.getIcmpType())
-                .setService(Network.Service.NetworkACL)
-                .build();
+        NsxNetworkRule nsxNetworkRule = new NsxNetworkRule();
+        SDNProviderNetworkRule networkRule = new SDNProviderNetworkRule.Builder()
+        .setRuleId(rule.getId())
+        .setSourceCidrList(Objects.nonNull(rule.getSourceCidrList()) ? transformCidrListValues(rule.getSourceCidrList()) : List.of("ANY"))
+        .setTrafficType(rule.getTrafficType().toString())
+        .setProtocol(rule.getProtocol().toUpperCase())
+        .setPublicPort(String.valueOf(rule.getSourcePortStart()))
+        .setPrivatePort(privatePort)
+        .setIcmpCode(rule.getIcmpCode())
+        .setIcmpType(rule.getIcmpType())
+        .setService(Network.Service.NetworkACL).build();
+        nsxNetworkRule.setBaseRule(networkRule);
+        nsxNetworkRule.setAclAction(transformActionValue(rule.getAction()));
+        return nsxNetworkRule;
     }
         @Override
     public boolean applyFWRules(Network network, List<? extends FirewallRule> rules) throws ResourceUnavailableException {
@@ -818,20 +803,21 @@ public class NsxElement extends AdapterBase implements  DhcpServiceProvider, Dns
         List<NsxNetworkRule> nsxAddNetworkRules = new ArrayList<>();
         List<NsxNetworkRule> nsxDelNetworkRules = new ArrayList<>();
         for (FirewallRule rule : rules) {
-            NsxNetworkRule networkRule = new NsxNetworkRule.Builder()
-                    .setRuleId(rule.getId())
-                    .setAclAction(NsxNetworkRule.NsxRuleAction.ALLOW)
-                    .setSourceCidrList(Objects.nonNull(rule.getSourceCidrList()) ?
-                            transformCidrListValues(rule.getSourceCidrList()) : List.of("ANY"))
-                    .setDestinationCidrList(Objects.nonNull(rule.getDestinationCidrList()) ?
-                            transformCidrListValues(rule.getDestinationCidrList()) : List.of("ANY"))
-                    .setIcmpCode(rule.getIcmpCode())
-                    .setIcmpType(rule.getIcmpType())
-                    .setPrivatePort(getPrivatePortRange(rule))
-                    .setTrafficType(rule.getTrafficType().toString())
-                    .setService(Network.Service.Firewall)
-                    .setProtocol(rule.getProtocol().toUpperCase(Locale.ROOT))
-                    .build();
+            NsxNetworkRule networkRule = new NsxNetworkRule();
+            SDNProviderNetworkRule baseNetRule = new SDNProviderNetworkRule.Builder()
+            .setRuleId(rule.getId())
+            .setSourceCidrList(Objects.nonNull(rule.getSourceCidrList()) ?
+                        transformCidrListValues(rule.getSourceCidrList()) : List.of("ANY"))
+            .setDestinationCidrList(Objects.nonNull(rule.getDestinationCidrList()) ?
+                        transformCidrListValues(rule.getDestinationCidrList()) : List.of("ANY"))
+            .setIcmpCode(rule.getIcmpCode())
+            .setIcmpType(rule.getIcmpType())
+            .setPrivatePort(PortForwardingServiceProvider.getPrivatePortRange(rule))
+            .setTrafficType(rule.getTrafficType().toString())
+            .setService(Network.Service.Firewall)
+            .setProtocol(rule.getProtocol().toUpperCase(Locale.ROOT)).build();
+            networkRule.setBaseRule(baseNetRule);
+            networkRule.setAclAction(NsxNetworkRule.NsxRuleAction.ALLOW);
             if (rule.getState() == FirewallRule.State.Add) {
                 nsxAddNetworkRules.add(networkRule);
             } else if (rule.getState() == FirewallRule.State.Revoke) {
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
index 0ab622c1808..0f7865d7d73 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
@@ -23,7 +23,6 @@ import com.cloud.dc.DataCenter;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.domain.DomainVO;
-import com.cloud.domain.dao.DomainDao;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
@@ -40,9 +39,7 @@ import com.cloud.network.guru.GuestNetworkGuru;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offerings.NetworkOfferingVO;
-import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.Account;
-import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicProfile;
@@ -67,15 +64,9 @@ import java.util.Objects;
 public class NsxGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigrationResponder  {
     protected Logger logger = LogManager.getLogger(getClass());
 
-    @Inject
-    NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
     @Inject
     NsxControllerUtils nsxControllerUtils;
     @Inject
-    AccountDao accountDao;
-    @Inject
-    DomainDao domainDao;
-    @Inject
     NetworkModel networkModel;
 
     public NsxGuestNetworkGuru() {
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
index c7931b46c82..9c631ac9a6d 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
@@ -17,7 +17,6 @@
 package org.apache.cloudstack.service;
 
 import com.cloud.dc.VlanDetailsVO;
-import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;
@@ -31,11 +30,7 @@ import com.cloud.network.guru.PublicNetworkGuru;
 import com.cloud.network.vpc.VpcOffering;
 import com.cloud.network.vpc.VpcOfferingVO;
 import com.cloud.network.vpc.VpcVO;
-import com.cloud.network.vpc.dao.VpcDao;
-import com.cloud.network.vpc.dao.VpcOfferingDao;
-import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
 import com.cloud.offering.NetworkOffering;
-import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicProfile;
@@ -55,20 +50,10 @@ import java.util.stream.Collectors;
 
 public class NsxPublicNetworkGuru extends PublicNetworkGuru {
 
-    @Inject
-    private VlanDetailsDao vlanDetailsDao;
-    @Inject
-    private VpcDao vpcDao;
-    @Inject
-    private VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
     @Inject
     private NsxControllerUtils nsxControllerUtils;
     @Inject
     private NsxService nsxService;
-    @Inject
-    private VpcOfferingDao vpcOfferingDao;
-    @Inject
-    private NetworkOfferingDao offeringDao;
 
     protected Logger logger = LogManager.getLogger(getClass());
 
@@ -78,7 +63,8 @@ public class NsxPublicNetworkGuru extends PublicNetworkGuru {
 
     @Override
     protected boolean canHandle(NetworkOffering offering) {
-        return isMyTrafficType(offering.getTrafficType()) && offering.isSystemOnly() && offering.isForNsx();
+        boolean isForNsx = networkModel.isProviderForNetworkOffering(Network.Provider.Nsx, offering.getId());
+        return isMyTrafficType(offering.getTrafficType()) && offering.isSystemOnly() && isForNsx;
     }
 
     @Override
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
index 64a2514fc51..427ad4cbfed 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.service;
 
 import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
 import com.cloud.network.nsx.NsxService;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.vpc.Vpc;
@@ -138,7 +139,8 @@ public class NsxServiceImpl implements NsxService, Configurable {
         return result.getResult();
     }
 
-    public NsxAnswer createPortForwardRule(NsxNetworkRule netRule) {
+    public NsxAnswer createPortForwardRule(NsxNetworkRule nsxNetRule) {
+        SDNProviderNetworkRule netRule = nsxNetRule.getBaseRule();
         // TODO: if port doesn't exist in default list of services, create a service entry
         CreateNsxPortForwardRuleCommand createPortForwardCmd = new CreateNsxPortForwardRuleCommand(netRule.getDomainId(),
                 netRule.getAccountId(), netRule.getZoneId(), netRule.getNetworkResourceId(),
@@ -147,7 +149,8 @@ public class NsxServiceImpl implements NsxService, Configurable {
         return nsxControllerUtils.sendNsxCommand(createPortForwardCmd, netRule.getZoneId());
     }
 
-    public boolean deletePortForwardRule(NsxNetworkRule netRule) {
+    public boolean deletePortForwardRule(NsxNetworkRule nsxNetRule) {
+        SDNProviderNetworkRule netRule = nsxNetRule.getBaseRule();
         DeleteNsxNatRuleCommand deleteCmd = new DeleteNsxNatRuleCommand(netRule.getDomainId(),
                 netRule.getAccountId(), netRule.getZoneId(), netRule.getNetworkResourceId(),
                 netRule.getNetworkResourceName(), netRule.isVpcResource(),  netRule.getVmId(), netRule.getRuleId(), netRule.getPrivatePort(), netRule.getProtocol());
@@ -156,20 +159,22 @@ public class NsxServiceImpl implements NsxService, Configurable {
         return result.getResult();
     }
 
-    public boolean createLbRule(NsxNetworkRule netRule) {
+    public boolean createLbRule(NsxNetworkRule nsxNetRule) {
+        SDNProviderNetworkRule netRule = nsxNetRule.getBaseRule();
         CreateNsxLoadBalancerRuleCommand command = new CreateNsxLoadBalancerRuleCommand(netRule.getDomainId(),
                 netRule.getAccountId(), netRule.getZoneId(), netRule.getNetworkResourceId(),
-                netRule.getNetworkResourceName(), netRule.isVpcResource(),  netRule.getMemberList(), netRule.getRuleId(),
+                netRule.getNetworkResourceName(), netRule.isVpcResource(),  nsxNetRule.getMemberList(), netRule.getRuleId(),
                 netRule.getPublicPort(), netRule.getPrivatePort(), netRule.getAlgorithm(), netRule.getProtocol());
         command.setPublicIp(netRule.getPublicIp());
         NsxAnswer result = nsxControllerUtils.sendNsxCommand(command, netRule.getZoneId());
         return result.getResult();
     }
 
-    public boolean deleteLbRule(NsxNetworkRule netRule) {
+    public boolean deleteLbRule(NsxNetworkRule nsxNetRule) {
+        SDNProviderNetworkRule netRule = nsxNetRule.getBaseRule();
         DeleteNsxLoadBalancerRuleCommand command = new DeleteNsxLoadBalancerRuleCommand(netRule.getDomainId(),
                 netRule.getAccountId(), netRule.getZoneId(), netRule.getNetworkResourceId(),
-                netRule.getNetworkResourceName(), netRule.isVpcResource(),  netRule.getMemberList(), netRule.getRuleId(),
+                netRule.getNetworkResourceName(), netRule.isVpcResource(),  nsxNetRule.getMemberList(), netRule.getRuleId(),
                 netRule.getVmId());
         NsxAnswer result = nsxControllerUtils.sendNsxCommand(command, netRule.getZoneId());
         return result.getResult();
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java
index fbcca86a28b..f9ee8daea4b 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java
@@ -17,6 +17,7 @@
 package org.apache.cloudstack.service;
 
 import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
 import com.vmware.nsx.cluster.Status;
 import com.vmware.nsx.model.ClusterStatus;
 import com.vmware.nsx.model.ControllerClusterStatus;
@@ -24,7 +25,6 @@ import com.vmware.nsx_policy.infra.domains.Groups;
 import com.vmware.nsx_policy.model.Group;
 import com.vmware.nsx_policy.model.PathExpression;
 import com.vmware.vapi.bindings.Service;
-import org.apache.cloudstack.resource.NsxNetworkRule;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +73,7 @@ public class NsxApiClientTest {
 
     @Test
     public void testGetGroupsForTrafficIngress() {
-        NsxNetworkRule rule = Mockito.mock(NsxNetworkRule.class);
+        SDNProviderNetworkRule rule = Mockito.mock(SDNProviderNetworkRule.class);
         Mockito.when(rule.getSourceCidrList()).thenReturn(List.of("ANY"));
         Mockito.when(rule.getTrafficType()).thenReturn("Ingress");
         Mockito.when(rule.getService()).thenReturn(Network.Service.NetworkACL);
@@ -86,7 +86,7 @@ public class NsxApiClientTest {
 
     @Test
     public void testGetGroupsForTrafficEgress() {
-        NsxNetworkRule rule = Mockito.mock(NsxNetworkRule.class);
+        SDNProviderNetworkRule rule = Mockito.mock(SDNProviderNetworkRule.class);
         Mockito.when(rule.getSourceCidrList()).thenReturn(List.of("ANY"));
         Mockito.when(rule.getTrafficType()).thenReturn("Egress");
         Mockito.when(rule.getService()).thenReturn(Network.Service.NetworkACL);
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java
index 7c44a7324fb..a807155a2dc 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java
@@ -36,6 +36,7 @@ import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.element.PortForwardingServiceProvider;
 import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRuleVO;
@@ -72,7 +73,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.List;
 
 import static org.junit.Assert.assertTrue;
@@ -307,84 +307,60 @@ public class NsxElementTest {
         assertNotNull(vpcNetworkPair.second());
     }
 
-    private Method getPublicPortRangeMethod() throws NoSuchMethodException {
-        Method method = NsxElement.class.getDeclaredMethod("getPublicPortRange", PortForwardingRule.class);
-        method.setAccessible(true);
-        return method;
-    }
-
-    private Method getPrivatePFPortRangeMethod() throws NoSuchMethodException {
-        Method method = NsxElement.class.getDeclaredMethod("getPrivatePFPortRange", PortForwardingRule.class);
-        method.setAccessible(true);
-        return method;
-    }
-
-    private Method getPrivatePortRangeMethod() throws NoSuchMethodException {
-        Method method = NsxElement.class.getDeclaredMethod("getPrivatePortRange", FirewallRule.class);
-        method.setAccessible(true);
-        return method;
-    }
-
-    private Method getPrivatePortRangeForACLRuleMethod() throws NoSuchMethodException {
-        Method method = NsxElement.class.getDeclaredMethod("getPrivatePortRangeForACLRule", NetworkACLItem.class);
-        method.setAccessible(true);
-        return method;
-    }
-
     @Test
     public void testGetPublicPortRangeWhenStartAndEndPortNumbersAreDifferent() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         PortForwardingRule rule = new PortForwardingRuleVO("1", 11L, 80, 90, new Ip("172.30.10.11"), 8080, 8090, "tcp", 12L,
                 5L, 2L, 15L);
-        assertEquals("80-90", getPublicPortRangeMethod().invoke(null, rule));
+        assertEquals("80-90", PortForwardingServiceProvider.getPublicPortRange(rule));
     }
 
     @Test
     public void testGetPublicPortRangeWhenStartAndEndPortNumbersAreSame() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         PortForwardingRule rule = new PortForwardingRuleVO("1", 11L, 80, 80, new Ip("172.30.10.11"), 8080, 8080, "tcp", 12L,
                 5L, 2L, 15L);
-        assertEquals("80", getPublicPortRangeMethod().invoke(null, rule));
+        assertEquals("80", PortForwardingServiceProvider.getPublicPortRange(rule));
     }
 
     @Test
     public void testGetPrivatePFPortRangeWhenStartAndEndPortNumbersAreDifferent() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         PortForwardingRule rule = new PortForwardingRuleVO("1", 11L, 80, 90, new Ip("172.30.10.11"), 8080, 8090, "tcp", 12L,
                 5L, 2L, 15L);
-        assertEquals("8080-8090", getPrivatePFPortRangeMethod().invoke(null, rule));
+        assertEquals("8080-8090", PortForwardingServiceProvider.getPrivatePFPortRange(rule));
     }
 
     @Test
     public void testGetPrivatePFPortRangeWhenStartAndEndPortNumbersAreSame() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         PortForwardingRule rule = new PortForwardingRuleVO("1", 11L, 80, 80, new Ip("172.30.10.11"), 8080, 8080, "tcp", 12L,
                 5L, 2L, 15L);
-        assertEquals("8080", getPrivatePFPortRangeMethod().invoke(null, rule));
+        assertEquals("8080", PortForwardingServiceProvider.getPrivatePFPortRange(rule));
     }
 
     @Test
     public void testGetPrivatePortRangeWhenStartAndEndPortNumbersAreSame() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         FirewallRuleVO rule = new FirewallRuleVO("1", 11L, 80, 80, "tcp", 23L, 5L, 2L,
         FirewallRule.Purpose.Firewall, List.of("172.30.10.0/24"), null, null, null, null, FirewallRule.TrafficType.Egress, FirewallRule.FirewallRuleType.User);
-        assertEquals("80", getPrivatePortRangeMethod().invoke(null, rule));
+        assertEquals("80", PortForwardingServiceProvider.getPrivatePortRange(rule));
     }
 
     @Test
     public void testGetPrivatePortRangeWhenStartAndEndPortNumbersAreDifferent() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         FirewallRuleVO rule = new FirewallRuleVO("1", 11L, 80, 90, "tcp", 23L, 5L, 2L,
                 FirewallRule.Purpose.Firewall, List.of("172.30.10.0/24"), null, null, null, null, FirewallRule.TrafficType.Egress, FirewallRule.FirewallRuleType.User);
-        assertEquals("80-90", getPrivatePortRangeMethod().invoke(null, rule));
+        assertEquals("80-90", PortForwardingServiceProvider.getPrivatePortRange(rule));
     }
 
     @Test
     public void testGetPrivatePortRangeForACLWhenStartAndEndPortNumbersAreSame() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         NetworkACLItem rule = new NetworkACLItemVO(80, 80, "udp", 10L, List.of("172.30.10.0/24"), null, null, NetworkACLItem.TrafficType.Ingress, NetworkACLItem.Action.Allow,
         2, null);
-        assertEquals("80", getPrivatePortRangeForACLRuleMethod().invoke(null, rule));
+        assertEquals("80", PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule));
     }
 
     @Test
     public void testGetPrivatePortRangeForACLWhenStartAndEndPortNumbersAreDifferent() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         NetworkACLItem rule = new NetworkACLItemVO(80, 90, "udp", 10L, List.of("172.30.10.0/24"), null, null, NetworkACLItem.TrafficType.Ingress, NetworkACLItem.Action.Allow,
                 2, null);
-        assertEquals("80-90", getPrivatePortRangeForACLRuleMethod().invoke(null, rule));
+        assertEquals("80-90", PortForwardingServiceProvider.getPrivatePortRangeForACLRule(rule));
     }
 
     @Test
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
index 1abef392345..ae3f3f3ecd5 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
@@ -22,10 +22,10 @@ import com.cloud.deploy.DeploymentPlan;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
 import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
 import com.cloud.network.Networks;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
-import com.cloud.network.guru.PublicNetworkGuru;
 import com.cloud.network.vpc.VpcOfferingVO;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
@@ -56,6 +56,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.times;
@@ -80,23 +81,26 @@ public class NsxPublicNetworkGuruTest {
     VpcOfferingDao vpcOfferingDao;
     @Mock
     NsxControllerUtils nsxControllerUtils;
+    @Mock
+    NetworkModel networkModel;
 
     @Before
     public void setup() {
         guru = new NsxPublicNetworkGuru();
 
-        ReflectionTestUtils.setField((PublicNetworkGuru) guru, "_ipAddressDao", ipAddressDao);
+        ReflectionTestUtils.setField(guru, "_ipAddressDao", ipAddressDao);
         ReflectionTestUtils.setField(guru, "vpcDao", vpcDao);
         ReflectionTestUtils.setField(guru, "vlanDetailsDao", vlanDetailsDao);
         ReflectionTestUtils.setField(guru, "vpcOfferingServiceMapDao", vpcOfferingServiceMapDao);
         ReflectionTestUtils.setField(guru, "nsxService", nsxService);
         ReflectionTestUtils.setField(guru, "vpcOfferingDao", vpcOfferingDao);
         ReflectionTestUtils.setField(guru, "nsxControllerUtils", nsxControllerUtils);
+        ReflectionTestUtils.setField(guru, "networkModel", networkModel);
 
         offering = Mockito.mock(NetworkOffering.class);
         when(offering.getTrafficType()).thenReturn(Networks.TrafficType.Public);
-        when(offering.isForNsx()).thenReturn(true);
         when(offering.isSystemOnly()).thenReturn(true);
+        when(networkModel.isProviderForNetworkOffering(eq(Network.Provider.Nsx), anyLong())).thenReturn(true);
     }
 
     @Test
diff --git a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java
index d4ee924858e..efb564e35bc 100644
--- a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java
+++ b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java
@@ -165,7 +165,6 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd {
                             "Default offering for Tungsten-Fabric Network", Networks.TrafficType.Guest, false, false,
                             null, null, true, NetworkOffering.Availability.Optional, null, Network.GuestType.Isolated,
                             false, false, false, false, true, false);
-                    networkOfferingVO.setForTungsten(true);
                     networkOfferingVO.setState(NetworkOffering.State.Enabled);
                     networkOfferingDao.persist(networkOfferingVO);
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3b84ba072a4..0471e5a3228 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -232,6 +232,7 @@
                 <module>hypervisors/vmware</module>
                 <module>network-elements/cisco-vnmc</module>
                 <module>network-elements/nsx</module>
+                <module>network-elements/netris</module>
                 <module>network-elements/juniper-contrail</module>
                 <module>network-elements/tungsten</module>
             </modules>
diff --git a/pom.xml b/pom.xml
index 663e2cdf0fa..06e9969a160 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
         <cs.gmavenplus.version>3.0.2</cs.gmavenplus.version>
         <cs.google-http-client>1.42.3</cs.google-http-client>
         <cs.groovy.version>2.4.17</cs.groovy.version>
-        <cs.gson.version>1.7.2</cs.gson.version>
+        <cs.gson.version>2.10.1</cs.gson.version>
         <cs.guava.version>31.1-jre</cs.guava.version>
         <cs.httpclient.version>4.5.14</cs.httpclient.version>
         <cs.httpcore.version>4.4.16</cs.httpcore.version>
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 15d8c7309d4..a8c0991b7dc 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -39,6 +39,18 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import com.cloud.bgp.ASNumber;
+import com.cloud.bgp.ASNumberRange;
+import com.cloud.configuration.ConfigurationService;
+import com.cloud.dc.ASNumberRangeVO;
+import com.cloud.dc.ASNumberVO;
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.dc.dao.ASNumberDao;
+import com.cloud.dc.dao.ASNumberRangeDao;
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.vpc.VpcGateway;
+import com.cloud.storage.BucketVO;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.affinity.AffinityGroup;
@@ -264,8 +276,6 @@ import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.api.query.vo.VolumeJoinVO;
 import com.cloud.api.query.vo.VpcOfferingJoinVO;
 import com.cloud.api.response.ApiResponseSerializer;
-import com.cloud.bgp.ASNumber;
-import com.cloud.bgp.ASNumberRange;
 import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity;
@@ -274,8 +284,6 @@ import com.cloud.configuration.Resource.ResourceOwnerType;
 import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.configuration.ResourceCount;
 import com.cloud.configuration.ResourceLimit;
-import com.cloud.dc.ASNumberRangeVO;
-import com.cloud.dc.ASNumberVO;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
@@ -286,11 +294,7 @@ import com.cloud.dc.Pod;
 import com.cloud.dc.StorageNetworkIpRange;
 import com.cloud.dc.Vlan;
 import com.cloud.dc.Vlan.VlanType;
-import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
-import com.cloud.dc.dao.ASNumberDao;
-import com.cloud.dc.dao.ASNumberRangeDao;
-import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
 import com.cloud.event.Event;
@@ -300,7 +304,6 @@ import com.cloud.gpu.GPU;
 import com.cloud.host.ControlState;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
-import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.network.GuestVlan;
 import com.cloud.network.GuestVlanRange;
@@ -385,7 +388,6 @@ import com.cloud.server.ResourceIconManager;
 import com.cloud.server.ResourceTag;
 import com.cloud.server.ResourceTag.ResourceObjectType;
 import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.BucketVO;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.GuestOS;
@@ -1004,8 +1006,7 @@ public class ApiResponseHelper implements ResponseGenerator {
                 }
             }
             vlanResponse.setForSystemVms(isForSystemVms(vlan.getId()));
-            VlanDetailsVO vlanDetail = vlanDetailsDao.findDetail(vlan.getId(), ApiConstants.NSX_DETAIL_KEY);
-            vlanResponse.setForNsx(Objects.nonNull(vlanDetail) && vlanDetail.getValue().equals("true"));
+            vlanResponse.setProvider(getProviderFromVlanDetailKey(vlan));
             vlanResponse.setObjectName("vlan");
             return vlanResponse;
         } catch (InstantiationException | IllegalAccessException e) {
@@ -1013,6 +1014,15 @@ public class ApiResponseHelper implements ResponseGenerator {
         }
     }
 
+    private String getProviderFromVlanDetailKey(Vlan vlan) {
+        for (Map.Entry<String, String> entry : ConfigurationService.ProviderDetailKeyMap.entrySet()) {
+            VlanDetailsVO vlanDetail = vlanDetailsDao.findDetail(vlan.getId(), entry.getValue());
+            if (Objects.nonNull(vlanDetail) && "true".equals(vlanDetail.getValue())) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
     /**
      * Return true if vlan IP range is dedicated for system vms (SSVM and CPVM), false if not
      * @param vlanId vlan id
@@ -1034,6 +1044,9 @@ public class ApiResponseHelper implements ResponseGenerator {
                 addSystemVmInfoToIpResponse(nic, response);
             }
         }
+        if (ipAddress.isForRouter()) {
+            response.setVirtualMachineType(Type.DomainRouter.toString());
+        }
         if (ipAddress.getAssociatedWithVmId() != null) {
             addUserVmDetailsInIpResponse(response, ipAddress);
         }
@@ -1060,12 +1073,25 @@ public class ApiResponseHelper implements ResponseGenerator {
     }
 
     private void addUserVmDetailsInIpResponse(IPAddressResponse response, IpAddress ipAddress) {
-        UserVm userVm = ApiDBUtils.findUserVmById(ipAddress.getAssociatedWithVmId());
-        if (userVm != null) {
-            response.setVirtualMachineId(userVm.getUuid());
-            response.setVirtualMachineName(userVm.getHostName());
-            response.setVirtualMachineType(userVm.getType().toString());
-            response.setVirtualMachineDisplayName(ObjectUtils.firstNonNull(userVm.getDisplayName(), userVm.getHostName()));
+        VirtualMachine vm = ApiDBUtils.findVMInstanceById(ipAddress.getAssociatedWithVmId());
+        if (vm == null) {
+            return;
+        }
+        if (vm.getType().equals(Type.User)) {
+            UserVm userVm = ApiDBUtils.findUserVmById(ipAddress.getAssociatedWithVmId());
+            if (userVm != null) {
+                response.setVirtualMachineId(userVm.getUuid());
+                response.setVirtualMachineName(userVm.getHostName());
+                response.setVirtualMachineType(userVm.getType().toString());
+                response.setVirtualMachineDisplayName(ObjectUtils.firstNonNull(userVm.getDisplayName(), userVm.getHostName()));
+            }
+        } else if (vm.getType().equals(Type.DomainRouter)) {
+            final boolean isAdmin = Account.Type.ADMIN.equals(CallContext.current().getCallingAccount().getType());
+            if (isAdmin) {
+                response.setVirtualMachineId(vm.getUuid());
+                response.setVirtualMachineName(vm.getHostName());
+            }
+            response.setVirtualMachineType(vm.getType().toString());
         }
     }
 
@@ -1166,6 +1192,9 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         ipResponse.setPortable(ipAddr.isPortable());
         ipResponse.setForSystemVms(ipAddr.isForSystemVms());
+        if (Objects.nonNull(getProviderFromVlanDetailKey(vlan))) {
+            ipResponse.setForProvider(true);
+        }
 
         //set tag information
         List<? extends ResourceTag> tags = ApiDBUtils.listByResourceTypeAndId(ResourceObjectType.PublicIpAddress, ipAddr.getId());
@@ -1229,6 +1258,13 @@ public class ApiResponseHelper implements ResponseGenerator {
                         ipResponse.setVirtualMachineDisplayName(vm.getHostName());
                     }
                 }
+            } else if (nic.getVmType() == Type.DomainRouter) {
+                VirtualMachine vm = ApiDBUtils.findVMInstanceById(nic.getInstanceId());
+                if (vm != null) {
+                    ipResponse.setVirtualMachineId(vm.getUuid());
+                    ipResponse.setVirtualMachineName(vm.getHostName());
+                    ipResponse.setVirtualMachineType(vm.getType().toString());
+                }
             } else if (nic.getVmType().isUsedBySystem()) {
                 ipResponse.setIsSystem(true);
                 addSystemVmInfoToIpResponse(nic, ipResponse);
@@ -2446,8 +2482,8 @@ public class ApiResponseHelper implements ResponseGenerator {
             serviceResponses.add(svcRsp);
         }
         response.setForVpc(_configMgr.isOfferingForVpc(offering));
-        response.setForTungsten(offering.isForTungsten());
-        response.setForNsx(offering.isForNsx());
+        response.setForTungsten(_ntwkModel.isProviderForNetworkOffering(Provider.Tungsten, offering.getId()));
+        response.setForNsx(_ntwkModel.isProviderForNetworkOffering(Provider.Nsx, offering.getId()));
         if (offering.getNetworkMode() != null) {
             response.setNetworkMode(offering.getNetworkMode().name());
         }
@@ -3177,12 +3213,6 @@ public class ApiResponseHelper implements ResponseGenerator {
         List<? extends Network.Provider> serviceProviders = ApiDBUtils.getProvidersForService(service);
         List<ProviderResponse> serviceProvidersResponses = new ArrayList<ProviderResponse>();
         for (Network.Provider serviceProvider : serviceProviders) {
-            // return only Virtual Router/JuniperSRX/CiscoVnmc as a provider for the firewall
-            if (service == Service.Firewall
-                    && !(serviceProvider == Provider.VirtualRouter || serviceProvider == Provider.CiscoVnmc || serviceProvider == Provider.PaloAlto || serviceProvider == Provider.BigSwitchBcf || serviceProvider == Provider.Tungsten)) {
-                continue;
-            }
-
             ProviderResponse serviceProviderResponse = createServiceProviderResponse(serviceProvider);
             serviceProvidersResponses.add(serviceProviderResponse);
         }
@@ -3793,6 +3823,16 @@ public class ApiResponseHelper implements ResponseGenerator {
                 response.setVpcId(vpc.getUuid());
             }
         }
+        if (result.getVpcGatewayId() != null) {
+            VpcGateway vpcGateway = _entityMgr.findById(VpcGateway.class, result.getVpcGatewayId());
+            if (vpcGateway != null) {
+                response.setVpcGatewayId(vpcGateway.getUuid());
+                response.setVpcGatewayIp(vpcGateway.getIp4Address());
+            }
+        }
+        if (result.getNextHop() != null) {
+            response.setNextHop(result.getNextHop());
+        }
         response.setCidr(result.getCidr());
 
         StaticRoute.State state = result.getState();
diff --git a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
index b311beeb0cc..a3177594e7f 100644
--- a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
@@ -25,7 +25,10 @@ import javax.inject.Inject;
 import com.cloud.cpu.CPU;
 import com.cloud.dc.ASNumberRangeVO;
 import com.cloud.dc.dao.ASNumberRangeDao;
+import com.cloud.network.Network;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
+import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -63,6 +66,8 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
     @Inject
     private NsxProviderDao nsxProviderDao;
     @Inject
+    private NetrisProviderDao netrisProviderDao;
+    @Inject
     private ASNumberRangeDao asNumberRangeDao;
 
     protected DataCenterJoinDaoImpl() {
@@ -140,10 +145,7 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
             }
         }
 
-        NsxProviderVO nsxProviderVO = nsxProviderDao.findByZoneId(dataCenter.getId());
-        if (Objects.nonNull(nsxProviderVO)) {
-            zoneResponse.setNsxEnabled(true);
-        }
+        setExternalNetworkProviderUsedByZone(zoneResponse, dataCenter.getId());
 
         List<CPU.CPUArch> clusterArchs = ApiDBUtils.listZoneClustersArchs(dataCenter.getId());
         zoneResponse.setMultiArch(CollectionUtils.isNotEmpty(clusterArchs) && clusterArchs.size() > 1);
@@ -165,6 +167,19 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
         return zoneResponse;
     }
 
+    private void setExternalNetworkProviderUsedByZone(ZoneResponse zoneResponse, Long zoneId) {
+        NsxProviderVO nsxProviderVO = nsxProviderDao.findByZoneId(zoneId);
+        if (Objects.nonNull(nsxProviderVO)) {
+            zoneResponse.setNsxEnabled(true);
+            zoneResponse.setProvider(Network.Provider.Nsx.getName());
+        }
+
+        NetrisProviderVO netrisProviderVO = netrisProviderDao.findByZoneId(zoneId);
+        if (Objects.nonNull(netrisProviderVO)) {
+            zoneResponse.setProvider(Network.Provider.Netris.getName());
+        }
+    }
+
     @Override
     public DataCenterJoinVO newDataCenterView(DataCenter dataCenter) {
         SearchCriteria<DataCenterJoinVO> sc = dofIdSearch.create();
diff --git a/server/src/main/java/com/cloud/api/query/dao/VpcOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VpcOfferingJoinDaoImpl.java
index afa5c206f0f..7ea4b7d5834 100644
--- a/server/src/main/java/com/cloud/api/query/dao/VpcOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/VpcOfferingJoinDaoImpl.java
@@ -19,6 +19,8 @@ package com.cloud.api.query.dao;
 
 import java.util.List;
 
+import com.cloud.network.Network;
+import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
 import org.apache.cloudstack.api.response.VpcOfferingResponse;
 import org.apache.commons.lang3.StringUtils;
 
@@ -29,8 +31,13 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.net.NetUtils;
 
+import javax.inject.Inject;
+
 public class VpcOfferingJoinDaoImpl extends GenericDaoBase<VpcOfferingJoinVO, Long> implements VpcOfferingJoinDao {
 
+    @Inject
+    private VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
+
     private SearchBuilder<VpcOfferingJoinVO> sofIdSearch;
 
     protected VpcOfferingJoinDaoImpl() {
@@ -76,7 +83,7 @@ public class VpcOfferingJoinDaoImpl extends GenericDaoBase<VpcOfferingJoinVO, Lo
             offeringResponse.setDomain(offeringJoinVO.getDomainPath());
             offeringResponse.setZoneId(offeringJoinVO.getZoneUuid());
             offeringResponse.setZone(offeringJoinVO.getZoneName());
-            offeringResponse.setForNsx(offeringJoinVO.isForNsx());
+            offeringResponse.setForNsx(vpcOfferingServiceMapDao.isProviderForVpcOffering(Network.Provider.Nsx, offeringJoinVO.getId()));
             if (offeringJoinVO.getNetworkMode() != null) {
                 offeringResponse.setNetworkMode(offeringJoinVO.getNetworkMode().name());
             }
diff --git a/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java
index bded9a440ec..40940736bbb 100644
--- a/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java
@@ -155,12 +155,6 @@ public class NetworkOfferingJoinVO extends BaseViewVO implements NetworkOffering
     @Column(name = "for_vpc")
     private boolean forVpc;
 
-    @Column(name = "for_tungsten")
-    boolean forTungsten;
-
-    @Column(name = "for_nsx")
-    boolean forNsx;
-
     @Column(name = "network_mode")
     NetworkMode networkMode;
 
@@ -362,22 +356,8 @@ public class NetworkOfferingJoinVO extends BaseViewVO implements NetworkOffering
         return forVpc;
     }
 
-    @Override
-    public boolean isForTungsten() {
-        return forTungsten;
-    }
-
     public void setForVpc(boolean forVpc) { this.forVpc = forVpc; }
 
-    @Override
-    public boolean isForNsx() {
-        return forNsx;
-    }
-
-    public void setForNsx(boolean forNsx) {
-        this.forNsx = forNsx;
-    }
-
     @Override
     public NetworkMode getNetworkMode() {
         return networkMode;
diff --git a/server/src/main/java/com/cloud/api/query/vo/VpcOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/VpcOfferingJoinVO.java
index d72f5b61907..4e0707edf88 100644
--- a/server/src/main/java/com/cloud/api/query/vo/VpcOfferingJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/VpcOfferingJoinVO.java
@@ -78,9 +78,6 @@ public class VpcOfferingJoinVO implements VpcOffering {
     @Column(name = "sort_key")
     int sortKey;
 
-    @Column(name = "for_nsx")
-    boolean forNsx = false;
-
     @Column(name = "network_mode")
     NetworkOffering.NetworkMode networkMode;
 
@@ -152,11 +149,6 @@ public class VpcOfferingJoinVO implements VpcOffering {
         return isDefault;
     }
 
-    @Override
-    public boolean isForNsx() {
-        return forNsx;
-    }
-
     @Override
     public NetworkOffering.NetworkMode getNetworkMode() {
         return networkMode;
diff --git a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
index f40bbdf06ac..bee9cbeb53a 100644
--- a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
@@ -87,8 +87,8 @@ public class ApiResponseSerializer {
 
     public static String toJSONSerializedString(ResponseObject result, StringBuilder log) {
         if (result != null && log != null) {
-            Gson responseBuilder = ApiResponseGsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).create();
-            Gson logBuilder = ApiResponseGsonHelper.getLogBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).create();
+            Gson responseBuilder = ApiResponseGsonHelper.getBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.STATIC).create();
+            Gson logBuilder = ApiResponseGsonHelper.getLogBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.STATIC).create();
 
             StringBuilder sb = new StringBuilder();
 
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 8cee3dba527..72c9c1c0845 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -50,6 +50,9 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.netris.NetrisService;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroup;
@@ -467,6 +470,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Inject
     NsxProviderDao nsxProviderDao;
     @Inject
+    NetrisProviderDao netrisProviderDao;
+    @Inject
+    private javax.inject.Provider<NetrisService> netrisServiceProvider;
+    @Inject
     VMLeaseManager vmLeaseManager;
 
     // FIXME - why don't we have interface for DataCenterLinkLocalIpAddressDao?
@@ -2807,10 +2814,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                 final boolean success = _zoneDao.remove(zoneId);
 
                 if (success) {
-                    NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
-                    if (Objects.nonNull(nsxProvider)) {
-                        nsxProviderDao.remove(nsxProvider.getId());
-                    }
+                    deleteExternalProviderIfAny(zoneId);
 
                     // delete template refs for this zone
                     templateZoneDao.deleteByZoneId(zoneId);
@@ -2836,6 +2840,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         });
     }
 
+    private void deleteExternalProviderIfAny(Long zoneId) {
+        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+        if (Objects.nonNull(nsxProvider)) {
+            nsxProviderDao.remove(nsxProvider.getId());
+        }
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(zoneId);
+        if (Objects.nonNull(netrisProvider)) {
+            netrisProviderDao.remove(netrisProvider.getId());
+        }
+    }
+
     @Override
     @DB
     @ActionEvent(eventType = EventTypes.EVENT_ZONE_EDIT, eventDescription = "editing zone", async = false)
@@ -4790,6 +4805,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             throw new InvalidParameterValueException("Unable to find zone by id " + zoneId);
         }
 
+        // If external provider is provided, verify zone has that provider enabled and the controller added
+        Provider provider = cmd.getProvider();
+        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(zoneId);
+        if (Objects.nonNull(provider) && ObjectUtils.anyNotNull(nsxProvider, netrisProvider)) {
+            boolean unsupported =
+                    (Provider.Nsx == provider && nsxProvider == null) ||
+                            (Provider.Netris == provider && netrisProvider == null);
+            if (unsupported) {
+                throw new InvalidParameterValueException(String.format("Cannot add public IP range as the zone does not support provider: %s", provider.getName()));
+            }
+        }
+
         // verify that physical network exists
         PhysicalNetworkVO pNtwk = null;
         if (physicalNetworkId != null) {
@@ -4919,7 +4947,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
 
         return commitVlan(zoneId, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, forVirtualNetwork, forSystemVms, networkId, physicalNetworkId, startIPv6, endIPv6, ip6Gateway,
-                ip6Cidr, domain, vlanOwner, network, sameSubnet, cmd.isForNsx());
+                ip6Cidr, domain, vlanOwner, network, sameSubnet, cmd.getProvider());
     }
 
     private Network getNetwork(Long networkId) {
@@ -4950,7 +4978,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
     private Vlan commitVlan(final Long zoneId, final Long podId, final String startIP, final String endIP, final String newVlanGatewayFinal, final String newVlanNetmaskFinal,
             final String vlanId, final Boolean forVirtualNetwork, final Boolean forSystemVms, final Long networkId, final Long physicalNetworkId, final String startIPv6, final String endIPv6,
-            final String ip6Gateway, final String ip6Cidr, final Domain domain, final Account vlanOwner, final Network network, final Pair<Boolean, Pair<String, String>> sameSubnet, boolean forNsx) {
+            final String ip6Gateway, final String ip6Cidr, final Domain domain, final Account vlanOwner, final Network network, final Pair<Boolean, Pair<String, String>> sameSubnet, Provider provider) {
         final GlobalLock commitVlanLock = GlobalLock.getInternLock("CommitVlan");
         commitVlanLock.lock(5);
         logger.debug("Acquiring lock for committing vlan");
@@ -4978,13 +5006,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                         newVlanNetmask = sameSubnet.second().second();
                     }
                     final Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, forSystemVms, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId,
-                            false, domain, vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr, forNsx);
+                            false, domain, vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr, provider);
                     // create an entry in the nic_secondary table. This will be the new
                     // gateway that will be configured on the corresponding routervm.
                     return vlan;
                 }
             });
 
+            if (provider == Provider.Netris && netrisProviderDao.findByZoneId(zoneId) != null) {
+                if (Objects.nonNull(netrisServiceProvider) && Objects.nonNull(netrisServiceProvider.get())) {
+                    NetrisService netrisService = netrisServiceProvider.get();
+                    netrisService.createIPAMAllocationsForZoneLevelPublicRanges(zoneId);
+                }
+            }
             messageBus.publish(_name, MESSAGE_CREATE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, vlan);
 
             return vlan;
@@ -5105,7 +5139,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Override
     @DB
     public Vlan createVlanAndPublicIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final boolean forVirtualNetwork, final boolean forSystemVms, final Long podId, final String startIP, final String endIP,
-                                           final String vlanGateway, final String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, final Account vlanOwner, final String startIPv6, final String endIPv6, final String vlanIp6Gateway, final String vlanIp6Cidr, boolean forNsx) {
+                                           final String vlanGateway, final String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, final Account vlanOwner, final String startIPv6, final String endIPv6, final String vlanIp6Gateway, final String vlanIp6Cidr, Provider provider) {
         final Network network = _networkModel.getNetwork(networkId);
 
         boolean ipv4 = false, ipv6 = false;
@@ -5155,6 +5189,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         // 1) if vlan is specified for the guest network range, it should be the
         // same as network's vlan
         // 2) if vlan is missing, default it to the guest network's vlan
+        boolean forExternalProvider = ConfigurationService.IsIpRangeForProvider(provider);
         if (network.getTrafficType() == TrafficType.Guest) {
             boolean connectivityWithoutVlan = isConnectivityWithoutVlan(network);
             String networkVlanId = getNetworkVlanId(network, connectivityWithoutVlan);
@@ -5167,11 +5202,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             } else {
                 vlanId = networkVlanId;
             }
-        } else if (network.getTrafficType() == TrafficType.Public && vlanId == null && !forNsx) {
+        } else if (network.getTrafficType() == TrafficType.Public && vlanId == null && !forExternalProvider) {
             throw new InvalidParameterValueException("Unable to determine vlan id or untagged vlan for public network");
         }
 
-        if (vlanId == null && !forNsx) {
+        if (vlanId == null && !forExternalProvider) {
             vlanId = Vlan.UNTAGGED;
         }
 
@@ -5268,7 +5303,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         if (isSharedNetworkWithoutSpecifyVlan) {
             bypassVlanOverlapCheck = true;
         }
-        if (!bypassVlanOverlapCheck && !forNsx && !_zoneDao.findVnet(zoneId, physicalNetworkId, BroadcastDomainType.getValue(BroadcastDomainType.fromString(vlanId))).isEmpty()) {
+        if (!bypassVlanOverlapCheck && !forExternalProvider && !_zoneDao.findVnet(zoneId, physicalNetworkId, BroadcastDomainType.getValue(BroadcastDomainType.fromString(vlanId))).isEmpty()) {
             throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone "
                     + zone.getName());
         }
@@ -5284,7 +5319,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
         // Everything was fine, so persist the VLAN
         final VlanVO vlan = commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, domain, vlanOwner, vlanIp6Gateway, vlanIp6Cidr,
-                ipv4, zone, vlanType, ipv6Range, ipRange, forSystemVms, forNsx);
+                ipv4, zone, vlanType, ipv6Range, ipRange, forSystemVms, provider);
 
         return vlan;
     }
@@ -5385,14 +5420,16 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
     private VlanVO commitVlanAndIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final Long podId, final String startIP, final String endIP,
             final String vlanGateway, final String vlanNetmask, final String vlanId, final Domain domain, final Account vlanOwner, final String vlanIp6Gateway, final String vlanIp6Cidr,
-            final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange, final boolean forSystemVms, final boolean forNsx) {
+            final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange, final boolean forSystemVms, final Provider provider) {
         return Transaction.execute(new TransactionCallback<>() {
             @Override
             public VlanVO doInTransaction(final TransactionStatus status) {
                 VlanVO vlan = new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId, physicalNetworkId, vlanIp6Gateway, vlanIp6Cidr, ipv6Range);
                 logger.debug("Saving vlan range " + vlan);
                 vlan = _vlanDao.persist(vlan);
-                vlanDetailsDao.addDetail(vlan.getId(), ApiConstants.NSX_DETAIL_KEY, String.valueOf(forNsx), true);
+                if (Objects.nonNull(provider)) {
+                    addProviderVlanDetailKey(vlan, provider);
+                }
 
                 // IPv6 use a used ip map, is different from ipv4, no need to save
                 // public ip range
@@ -5433,6 +5470,15 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
     }
 
+    private void addProviderVlanDetailKey(Vlan vlan, Provider provider) {
+        vlanDetailsDao.addDetail(vlan.getId(), getProviderDetailKey(provider.getName()),
+                String.valueOf(ConfigurationService.IsIpRangeForProvider(provider)), true);
+    }
+
+    private String getProviderDetailKey(String providerName) {
+        return ConfigurationService.ProviderDetailKeyMap.get(providerName);
+    }
+
     @Override
     public Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws ConcurrentOperationException,
             ResourceUnavailableException,ResourceAllocationException {
@@ -6378,7 +6424,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         final Map<String, String> detailsStr = cmd.getDetails();
         final Boolean egressDefaultPolicy = cmd.getEgressDefaultPolicy();
         Boolean forVpc = cmd.getForVpc();
-        Boolean forNsx = cmd.isForNsx();
+        boolean forNsx = cmd.isForNsx();
+        boolean forNetris = cmd.isForNetris();
         Boolean forTungsten = cmd.getForTungsten();
         String networkModeStr = cmd.getNetworkMode();
         boolean nsxSupportInternalLbSvc = cmd.getNsxSupportsInternalLbService();
@@ -6417,8 +6464,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             }
         }
 
-        if (Boolean.TRUE.equals(forNsx) && Boolean.TRUE.equals(forTungsten)) {
-            throw new InvalidParameterValueException("Network Offering cannot be for both Tungsten-Fabric and NSX");
+        if ((Boolean.TRUE.equals(forTungsten) ? 1 : 0) + (forNetris ? 1 : 0) + (forNsx ? 1 : 0) > 1) {
+            throw new InvalidParameterValueException("Network Offering cannot be for multiple providers - Tungsten-Fabric, NSX and Netris");
         }
 
         NetworkOffering.NetworkMode networkMode = null;
@@ -6631,7 +6678,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         // offering
         final Map<Capability, String> sourceNatServiceCapabilityMap = cmd.getServiceCapabilities(Service.SourceNat);
         if (!serviceProviderMap.containsKey(Service.SourceNat) && sourceNatServiceCapabilityMap != null && !sourceNatServiceCapabilityMap.isEmpty()) {
-            throw new InvalidParameterValueException("Capabilities for source NAT service can be specifed only when source NAT service is enabled for network offering.");
+            throw new InvalidParameterValueException("Capabilities for source NAT service can be specified only when source NAT service is enabled for network offering.");
         }
         validateSourceNatServiceCapablities(sourceNatServiceCapabilityMap);
 
@@ -6639,7 +6686,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         // offering
         final Map<Capability, String> staticNatServiceCapabilityMap = cmd.getServiceCapabilities(Service.StaticNat);
         if (!serviceProviderMap.containsKey(Service.StaticNat) && sourceNatServiceCapabilityMap != null && !staticNatServiceCapabilityMap.isEmpty()) {
-            throw new InvalidParameterValueException("Capabilities for static NAT service can be specifed only when static NAT service is enabled for network offering.");
+            throw new InvalidParameterValueException("Capabilities for static NAT service can be specified only when static NAT service is enabled for network offering.");
         }
         validateStaticNatServiceCapablities(staticNatServiceCapabilityMap);
 
@@ -6700,7 +6747,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
 
         final NetworkOfferingVO offering = createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false,
-                serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive, forVpc, forTungsten, forNsx, networkMode, domainIds, zoneIds, enable, internetProtocol, routingMode, specifyAsNumber);
+                serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive, forVpc, forTungsten, forNsx, forNetris, networkMode, domainIds, zoneIds, enable, internetProtocol, routingMode, specifyAsNumber);
         if (Boolean.TRUE.equals(forNsx) && nsxSupportInternalLbSvc) {
             offering.setInternalLb(true);
             offering.setPublicLb(false);
@@ -6867,7 +6914,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                                                    final Long serviceOfferingId,
                                                    final boolean conserveMode, final Map<Service, Map<Capability, String>> serviceCapabilityMap, final boolean specifyIpRanges, final boolean isPersistent,
                                                    final Map<Detail, String> details, final boolean egressDefaultPolicy, final Integer maxconn, final boolean enableKeepAlive, Boolean forVpc,
-                                                   Boolean forTungsten, boolean forNsx, NetworkOffering.NetworkMode networkMode, final List<Long> domainIds, final List<Long> zoneIds, final boolean enableOffering, final NetUtils.InternetProtocol internetProtocol,
+                                                   Boolean forTungsten, boolean forNsx, boolean forNetris, NetworkOffering.NetworkMode networkMode, final List<Long> domainIds, final List<Long> zoneIds, final boolean enableOffering, final NetUtils.InternetProtocol internetProtocol,
                                                    final NetworkOffering.RoutingMode routingMode, final boolean specifyAsNumber) {
 
         String servicePackageUuid;
@@ -6962,6 +7009,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                     } else {
                         serviceProviderMap.put(Service.Gateway, Sets.newHashSet(Provider.VirtualRouter));
                     }
+                } else {
+                    Set<Provider> providers = serviceProviderMap.get(Service.NetworkACL);
+                    serviceProviderMap.put(Service.Gateway, Sets.newHashSet(providers.iterator().next()));
                 }
             }
         }
@@ -7094,9 +7144,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         if (serviceOfferingId != null) {
             offeringFinal.setServiceOfferingId(serviceOfferingId);
         }
-
-        offeringFinal.setForTungsten(Objects.requireNonNullElse(forTungsten, false));
-        offeringFinal.setForNsx(Objects.requireNonNullElse(forNsx, false));
         offeringFinal.setNetworkMode(networkMode);
 
         if (enableOffering) {
@@ -7167,7 +7214,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                                 logger.trace("Added service for the network offering: " + offService + " with provider " + provider.getName());
                             }
 
-                            if (vpcOff && !forNsx) {
+                            if (vpcOff && !forNsx && !forNetris) {
                                 final List<Service> supportedSvcs = new ArrayList<>();
                                 supportedSvcs.addAll(serviceProviderMap.keySet());
                                 _vpcMgr.validateNtwkOffForVpc(offering, supportedSvcs);
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index feb7e66159d..68b057fef13 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -2044,7 +2044,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
     }
 
     public static String logDeploymentWithoutException(VirtualMachine vm, DeploymentPlan plan, ExcludeList avoids, DeploymentPlanner planner) {
-        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner);
+        return LogUtils.logGsonWithoutException("Trying to deploy VM [%s] and details: Plan [%s]; avoid list [%s] and planner: [%s].", vm, plan, avoids, planner != null ? planner.getName() : null);
     }
     @Override
     public ConfigKey<?>[] getConfigKeys() {
diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
index ca47393f434..b99a2f553c4 100644
--- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
@@ -33,8 +33,20 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PublicIpQuarantineDao;
+import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.element.NsxProviderVO;
 import com.cloud.network.vo.PublicIpQuarantineVO;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcOffering;
+import com.cloud.network.vpc.VpcOfferingServiceMapVO;
+import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
 import com.cloud.resourcelimit.CheckedReservation;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -189,6 +201,7 @@ import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.commons.lang3.ObjectUtils;
 
 public class IpAddressManagerImpl extends ManagerBase implements IpAddressManager, Configurable {
 
@@ -266,6 +279,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     @Inject
     NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
     @Inject
+    VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
+    @Inject
     PhysicalNetworkDao _physicalNetworkDao;
     @Inject
     PhysicalNetworkServiceProviderDao _pNSPDao;
@@ -313,9 +328,19 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
     private AnnotationDao annotationDao;
     @Inject
     MessageBus messageBus;
+    @Inject
+    NsxProviderDao nsxProviderDao;
+    @Inject
+    NetrisProviderDao netrisProviderDao;
+    @Inject
+    VlanDetailsDao vlanDetailsDao;
 
     @Inject
     PublicIpQuarantineDao publicIpQuarantineDao;
+    @Inject
+    RemoteAccessVpnDao remoteAccessVpnDao;
+    @Inject
+    Site2SiteVpnGatewayDao site2SiteVpnGatewayDao;
 
     SearchBuilder<IPAddressVO> AssignIpAddressSearch;
     SearchBuilder<IPAddressVO> AssignIpAddressFromPodVlanSearch;
@@ -733,6 +758,21 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
                 throw new CloudRuntimeException("Unable to acquire lock on public IP.");
             }
 
+            if (ipToBeDisassociated.isForRouter()) {
+                if (remoteAccessVpnDao.findByPublicIpAddress(ipToBeDisassociated.getId()) != null) {
+                    InvalidParameterValueException ex = new InvalidParameterValueException("Can't release IP address as the IP address is used by a Remote Access VPN");
+                    ex.addProxyObject(ipToBeDisassociated.getUuid(), "ipId");
+                    throw ex;
+
+                }
+                if (site2SiteVpnGatewayDao.findByPublicIpAddress(ipToBeDisassociated.getId()) != null) {
+                    InvalidParameterValueException ex = new InvalidParameterValueException("Can't release IP address as the IP address is used by a VPC gateway");
+                    ex.addProxyObject(ipToBeDisassociated.getUuid(), "ipId");
+                    throw ex;
+
+                }
+            }
+
             PublicIpQuarantine publicIpQuarantine = null;
             // Cleanup all ip address resources - PF/LB/Static nat rules
             if (!cleanupIpResources(ipAddress, userId, caller)) {
@@ -774,6 +814,28 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
             } else if (publicIpQuarantine != null) {
                 removePublicIpAddressFromQuarantine(publicIpQuarantine.getId(), "Public IP address removed from quarantine as there was an error while disassociating it.");
             }
+            Network network = _networksDao.findById(ipToBeDisassociated.getAssociatedWithNetworkId());
+            Vpc vpc = _vpcDao.findById(ip.getVpcId());
+            if (ObjectUtils.allNull(network, vpc)) {
+                return success;
+            }
+            List<String> providers;
+            if (Objects.nonNull(network)) {
+                NetworkOffering offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
+                providers = _ntwkOfferingSrvcDao.listProvidersForServiceForNetworkOffering(offering.getId(), Service.NetworkACL);
+            } else {
+                VpcOffering offering = vpcOfferingDao.findById(vpc.getVpcOfferingId());
+                List<VpcOfferingServiceMapVO> servicesMap = vpcOfferingServiceMapDao.listProvidersForServiceForVpcOffering(offering.getId(), Service.NetworkACL);
+                providers = servicesMap.stream().map(VpcOfferingServiceMapVO::getProvider).collect(Collectors.toList());
+            }
+
+            if (!providers.isEmpty()) {
+                String provider = providers.get(0);
+                NetworkElement element = _networkModel.getElementImplementingProvider(provider);
+                if (element != null) {
+                    element.releaseIp(ipToBeDisassociated);
+                }
+            }
         } finally {
             _ipAddressDao.releaseFromLockTable(addrId);
         }
@@ -1315,6 +1377,30 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
         }
     }
 
+    /**
+     * When the zone is linked to external provider NSX or Netris: check if the IP to be associated is from the suitable pool
+     * Otherwise, no checks are performed
+     */
+    private void checkPublicIpOnExternalProviderZone(DataCenter zone, String ip) {
+        long zoneId = zone.getId();
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(zoneId);
+        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+        if (ObjectUtils.allNull(netrisProvider, nsxProvider)) {
+            return;
+        }
+        IPAddressVO ipAddress = _ipAddressDao.findByIpAndDcId(zoneId, ip);
+        if (ipAddress != null) {
+            String detailKey = nsxProvider != null ? ApiConstants.NSX_DETAIL_KEY : ApiConstants.NETRIS_DETAIL_KEY;
+            VlanDetailsVO vlanDetailVO = vlanDetailsDao.findDetail(ipAddress.getVlanId(), detailKey);
+            if (vlanDetailVO == null || vlanDetailVO.getValue().equalsIgnoreCase("false")) {
+                String msg = String.format("Cannot acquire IP %s on the zone %s as the IP is not from the reserved pool " +
+                        "for the external provider", ip, zone.getName());
+                logger.error(msg);
+                throw new CloudRuntimeException(msg);
+            }
+        }
+    }
+
     @DB
     @Override
     public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Account caller, User callerUser, final DataCenter zone, final Boolean displayIp, final String ipaddress)
@@ -1323,6 +1409,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
         final VlanType vlanType = VlanType.VirtualNetwork;
         final boolean assign = false;
 
+        checkPublicIpOnExternalProviderZone(zone, ipaddress);
+
         if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) {
             // zone is of type DataCenter. See DataCenterVO.java.
             PermissionDeniedException ex = new PermissionDeniedException(generateErrorMessageForOperationOnDisabledZone("allocate IP addresses", zone));
diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
index 6cc18aaef54..5a7df7df32d 100644
--- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
@@ -207,7 +207,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel, Confi
     DomainManager _domainMgr;
 
     @Inject
-    NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
+    protected NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
     @Inject
     PhysicalNetworkDao _physicalNetworkDao;
     @Inject
@@ -494,7 +494,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel, Confi
     @Override
     public Map<Provider, ArrayList<PublicIpAddress>> getProviderToIpList(Network network, Map<PublicIpAddress, Set<Service>> ipToServices) {
         NetworkOffering offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
-        if (!offering.isConserveMode() && !offering.isForNsx()) {
+        boolean isForNsx = isProviderForNetworkOffering(Provider.Nsx, offering.getId());
+        if (!offering.isConserveMode() && !isForNsx) {
             for (PublicIpAddress ip : ipToServices.keySet()) {
                 Set<Service> services = new HashSet<Service>();
                 services.addAll(ipToServices.get(ip));
@@ -1631,7 +1632,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel, Confi
         if (!canIpUsedForService(publicIp, service, networkId)) {
             return false;
         }
-        if (!offering.isConserveMode() && !offering.isForNsx()) {
+        boolean isForNsx = isProviderForNetworkOffering(Provider.Nsx, offering.getId());
+        if (!offering.isConserveMode() && !isForNsx) {
             return canIpUsedForNonConserveService(publicIp, service);
         }
         return true;
@@ -2310,6 +2312,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel, Confi
             }
             if (capabilities != null && implementedProvider != null) {
                 for (Service service : capabilities.keySet()) {
+                    logger.info("Add provider {} and service {}", implementedProvider.getName(), service.getName());
                     if (s_serviceToImplementedProvidersMap.containsKey(service)) {
                         List<Provider> providers = s_serviceToImplementedProvidersMap.get(service);
                         providers.add(implementedProvider);
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index bd3a3975eac..f593212a13a 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -32,6 +32,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -40,6 +41,7 @@ import java.util.UUID;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.dc.dao.ASNumberDao;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -1832,10 +1834,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
             _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, String.valueOf(hideIpAddressUsage), false));
         }
 
-        if (ip6GatewayCidr != null) {
-            ipv6Service.assignIpv6SubnetToNetwork(ip6Cidr, network.getId());
-        }
-
         // assign to network
         if (NetworkOffering.NetworkMode.ROUTED.equals(ntwkOff.getNetworkMode())) {
             routedIpv4Manager.assignIpv4SubnetToNetwork(network);
@@ -2333,9 +2331,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
                     }
 
                     if (createVlan && network != null) {
+                        Provider networkProvider = getNetworkOfferingProvider(ntwkOff);
                         // Create vlan ip range
                         _configMgr.createVlanAndPublicIpRange(pNtwk.getDataCenterId(), network.getId(), physicalNetworkId, false, false, null, startIP, endIP, gateway, netmask, vlanId,
-                                bypassVlanOverlapCheck, null, null, startIPv6, endIPv6, ip6Gateway, ip6Cidr, ntwkOff.isForNsx());
+                                bypassVlanOverlapCheck, null, null, startIPv6, endIPv6, ip6Gateway, ip6Cidr, networkProvider);
                     }
                     if (associatedNetwork != null) {
                         _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetwork.getId()), true));
@@ -2361,6 +2360,15 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
         }
     }
 
+    private Provider getNetworkOfferingProvider(NetworkOffering networkOffering) {
+        if (_networkModel.isProviderForNetworkOffering(Provider.Nsx, networkOffering.getId())) {
+            return Provider.Nsx;
+        } else if (_networkModel.isProviderForNetworkOffering(Provider.Netris, networkOffering.getId())) {
+            return Provider.Netris;
+        }
+        return null;
+    }
+
     @Override
     public Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd cmd) {
         Long id = cmd.getId();
@@ -3114,7 +3122,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
 
         // verify input parameters
         final NetworkVO network = getNetworkVO(networkId, "Specified network id doesn't exist in the system");
-
+        String prevNetworkName = network.getName();
         //perform below validation if the network is vpc network
         if (network.getVpcId() != null && networkOfferingId != null) {
             Vpc vpc = _entityMgr.findById(Vpc.class, network.getVpcId());
@@ -3597,9 +3605,17 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
         }
         Network updatedNetwork = getNetwork(network.getId());
         UsageEventUtils.publishNetworkUpdate(updatedNetwork);
+        updateProviderNetwork(updatedNetwork, prevNetworkName);
         return updatedNetwork;
     }
 
+    private void updateProviderNetwork(Network network, String prevNetworkName) {
+        final NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName());
+        if (Objects.nonNull(guru) && !guru.update(network, prevNetworkName)) {
+            logger.error("Failed to update name of network on provider");
+        }
+    }
+
     protected Pair<Integer, Integer> validateMtuOnUpdate(NetworkVO network, Long zoneId, Integer publicMtu, Integer privateMtu) {
         if (!AllowUsersToSpecifyVRMtu.valueIn(zoneId)) {
             return new Pair<>(null, null);
@@ -4269,6 +4285,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
                         logger.warn("Failed to add NSX provider to physical network due to:", ex.getMessage());
                     }
 
+                    // Add Netris provider
+                    try {
+                        addNetrisProviderToPhysicalNetwork(pNetwork.getId());
+                    } catch (Exception ex) {
+                        logger.warn("Failed to add Netris provider to physical network due to:", ex.getMessage());
+                    }
+
                     CallContext.current().putContextParameter(PhysicalNetwork.class, pNetwork.getUuid());
 
                     return pNetwork;
@@ -4465,7 +4488,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
             if (network.getIsolationMethods().contains("GRE")) {
                 minVnet = MIN_GRE_KEY;
                 maxVnet = MAX_GRE_KEY;
-            } else if (network.getIsolationMethods().contains("VXLAN")) {
+            } else if (network.getIsolationMethods().contains("VXLAN") || network.getIsolationMethods().contains("Netris")) {
                 minVnet = MIN_VXLAN_VNI;
                 maxVnet = MAX_VXLAN_VNI;
                 // fail if zone already contains VNI, need to be unique per zone.
@@ -5097,11 +5120,14 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
 
             // validate Services
             boolean addGatewayService = false;
+            boolean isRoutedMode = enabledServices.stream().noneMatch(svc -> svc.equalsIgnoreCase(Service.SourceNat.getName()));
             for (String serviceName : enabledServices) {
                 Network.Service service = Network.Service.getService(serviceName);
                 if (service == null || service == Service.Gateway) {
                     throw new InvalidParameterValueException("Invalid Network Service specified=" + serviceName);
-                } else if (service == Service.SourceNat) {
+                } else if (service == Service.SourceNat ||
+                        (isRoutedMode && Arrays.asList(Provider.Nsx.getName().toLowerCase(Locale.ROOT),
+                        Provider.Netris.getName().toLowerCase(Locale.ROOT)).contains(providerName.toLowerCase(Locale.ROOT)))) {
                     addGatewayService = true;
                 }
 
@@ -5678,6 +5704,22 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
         return null;
     }
 
+    private PhysicalNetworkServiceProvider addNetrisProviderToPhysicalNetwork(long physicalNetworkId) {
+        PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId);
+        DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
+        if (dvo.getNetworkType() == NetworkType.Advanced) {
+
+            Provider provider = Network.Provider.getProvider(Provider.Netris.getName());
+            if (provider == null) {
+                return null;
+            }
+
+            addProviderToPhysicalNetwork(physicalNetworkId, Provider.Netris.getName(), null, null);
+            enableProvider(Provider.Netris.getName());
+        }
+        return null;
+    }
+
     protected boolean isNetworkSystem(Network network) {
         NetworkOffering no = _networkOfferingDao.findByIdIncludingRemoved(network.getNetworkOfferingId());
         if (no.isSystemOnly()) {
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java b/server/src/main/java/com/cloud/network/SDNProviderOpObject.java
similarity index 94%
rename from plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java
rename to server/src/main/java/com/cloud/network/SDNProviderOpObject.java
index bb411249b88..902e47545e9 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java
+++ b/server/src/main/java/com/cloud/network/SDNProviderOpObject.java
@@ -14,14 +14,14 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.resource;
+package com.cloud.network;
 
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.vpc.VpcVO;
 
 import java.util.Objects;
 
-public class NsxOpObject {
+public class SDNProviderOpObject {
     VpcVO vpcVO;
     NetworkVO networkVO;
     long accountId;
@@ -116,8 +116,8 @@ public class NsxOpObject {
             return this;
         }
 
-        public NsxOpObject build() {
-            NsxOpObject object = new NsxOpObject();
+        public SDNProviderOpObject build() {
+            SDNProviderOpObject object = new SDNProviderOpObject();
             object.setVpcVO(this.vpcVO);
             object.setNetworkVO(this.networkVO);
             object.setDomainId(this.domainId);
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index 9d001080400..8884a5edb1f 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -2250,8 +2250,9 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
             Network.Provider provider = getLoadBalancerServiceProvider(asGroup.getLoadBalancerId());
             if (Network.Provider.Netscaler.equals(provider)) {
                 checkNetScalerAsGroup(asGroup);
-            } else if (Network.Provider.VirtualRouter.equals(provider) || Network.Provider.VPCVirtualRouter.equals(provider)) {
-                checkVirtualRouterAsGroup(asGroup);
+            } else if (Network.Provider.VirtualRouter.equals(provider) || Network.Provider.VPCVirtualRouter.equals(provider) ||
+                       Network.Provider.Netris.equals(provider)) {
+                checkAutoscalingGroup(asGroup);
             }
         }
     }
@@ -2631,7 +2632,7 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         countersNumberMap.put(key, countersNumberMap.get(key) + 1);
     }
 
-    protected void monitorVirtualRouterAsGroup(AutoScaleVmGroupVO asGroup) {
+    protected void monitorAutoscalingGroup(AutoScaleVmGroupVO asGroup) {
         if (!checkAsGroupMaxAndMinMembers(asGroup)) {
             return;
         }
@@ -2661,7 +2662,7 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         }
     }
 
-    protected void checkVirtualRouterAsGroup(AutoScaleVmGroupVO asGroup) {
+    protected void checkAutoscalingGroup(AutoScaleVmGroupVO asGroup) {
         AutoScaleVmGroupTO groupTO = lbRulesMgr.toAutoScaleVmGroupTO(asGroup);
 
         Map<String, Double> countersMap = new HashMap<>();
@@ -3011,8 +3012,9 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
                     Network.Provider provider = getLoadBalancerServiceProvider(asGroup.getLoadBalancerId());
                     if (Network.Provider.Netscaler.equals(provider)) {
                         logger.debug("Skipping the monitoring on AutoScale VmGroup with Netscaler provider: " + asGroup);
-                    } else if (Network.Provider.VirtualRouter.equals(provider) || Network.Provider.VPCVirtualRouter.equals(provider)) {
-                        monitorVirtualRouterAsGroup(asGroup);
+                    } else if (Network.Provider.VirtualRouter.equals(provider) || Network.Provider.VPCVirtualRouter.equals(provider) ||
+                               Network.Provider.Netris.equals(provider)) {
+                        monitorAutoscalingGroup(asGroup);
                     }
                 }
             } catch (final Exception e) {
diff --git a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
index 263ff523ab6..430d4757944 100644
--- a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
@@ -947,7 +947,6 @@ NetworkMigrationResponder, AggregatedCommandExecutor, RedundantResource, DnsServ
         return true;
     }
 
-
     @Override
     public boolean configDhcpSupportForSubnet(final Network network, final NicProfile nic, final VirtualMachineProfile vm, final DeployDestination dest,
                                               final ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
diff --git a/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
index 954c70f610e..3b4af537feb 100644
--- a/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -269,8 +269,9 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
             profile.setIPv4Netmask(null);
         }
 
-        if (config.getVpcId() == null && vm.getType() == VirtualMachine.Type.DomainRouter) {
-            boolean isPublicNetwork = _networkModel.isProviderSupportServiceInNetwork(config.getId(), Service.SourceNat, Provider.VirtualRouter);
+        if (vm.getType() == VirtualMachine.Type.DomainRouter) {
+            boolean isPublicNetwork = _networkModel.isProviderSupportServiceInNetwork(config.getId(), Service.SourceNat, Provider.VirtualRouter)
+                    || _networkModel.isProviderSupportServiceInNetwork(config.getId(), Service.SourceNat, Provider.VPCVirtualRouter);
             if (!isPublicNetwork) {
                 Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(config, null);
                 if (placeholderNic == null) {
diff --git a/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
index 2f668b59d62..7e09501a15e 100644
--- a/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
@@ -17,11 +17,15 @@
 package com.cloud.network.guru;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
 import javax.inject.Inject;
 
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.user.dao.AccountDao;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -124,6 +128,12 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur
     @Inject
     DomainRouterDao domainRouterDao;
     @Inject
+    public NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
+    @Inject
+    public AccountDao accountDao;
+    @Inject
+    public DomainDao domainDao;
+    @Inject
     RoutedIpv4Manager routedIpv4Manager;
 
     Random _rand = new Random(System.currentTimeMillis());
@@ -519,12 +529,16 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur
             return; // Nothing to do here if the uri is null already
         }
 
-        if ((profile.getBroadcastDomainType() == BroadcastDomainType.Vlan || profile.getBroadcastDomainType() == BroadcastDomainType.Vxlan) && !offering.isSpecifyVlan()) {
+        if ((profile.getBroadcastDomainType() == BroadcastDomainType.Vlan || profile.getBroadcastDomainType() == BroadcastDomainType.Vxlan || profile.getBroadcastDomainType() == BroadcastDomainType.Netris) && !offering.isSpecifyVlan()) {
             logger.debug("Releasing vnet for the network: {}", profile);
             _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(), profile.getAccountId(),
                     profile.getReservationId());
-            ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), profile.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_RELEASE,
-                    String.format("Released Zone Vnet: %s for Network: %s", BroadcastDomainType.getValue(profile.getBroadcastUri()), profile),
+            String eventType = EventTypes.EVENT_ZONE_VLAN_RELEASE;
+            if (Arrays.asList(BroadcastDomainType.Vxlan, BroadcastDomainType.Netris).contains(profile.getBroadcastDomainType())) {
+                eventType = EventTypes.EVENT_ZONE_VXLAN_RELEASE;
+            }
+            ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), profile.getAccountId(), EventVO.LEVEL_INFO, eventType,
+                    "Released Zone Vnet: " + BroadcastDomainType.getValue(profile.getBroadcastUri()) + " for Network: " + profile.getId(),
                     profile.getDataCenterId(), ApiCommandResourceType.Zone.toString(), 0);
         }
 
diff --git a/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java
index f5434388f40..bac397f2809 100644
--- a/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java
@@ -18,6 +18,10 @@ package com.cloud.network.guru;
 
 import javax.inject.Inject;
 
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.network.vpc.dao.VpcOfferingDao;
+import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 
 import com.cloud.dc.DataCenter;
@@ -74,7 +78,15 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
     @Inject
     Ipv6Service ipv6Service;
     @Inject
-    NetworkModel networkModel;
+    protected NetworkModel networkModel;
+    @Inject
+    protected VpcDao vpcDao;
+    @Inject
+    protected VlanDetailsDao vlanDetailsDao;
+    @Inject
+    protected VpcOfferingDao vpcOfferingDao;
+    @Inject
+    protected VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
 
     private static final TrafficType[] TrafficTypes = {TrafficType.Public};
 
diff --git a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 015cbe49049..ee4fe62aef9 100644
--- a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -1007,6 +1008,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
             return false;
         }
         if (provider.get(0) == Provider.Netscaler || provider.get(0) == Provider.F5BigIp ||
+            provider.get(0) == Provider.Netris ||
             provider.get(0) == Provider.VirtualRouter || provider.get(0) == Provider.VPCVirtualRouter) {
             return true;
         }
@@ -2245,6 +2247,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
             lb.setLbProtocol(lbProtocol);
         }
 
+        validateInputsForExternalNetworkProvider(lb, algorithm, lbProtocol);
         // Validate rule in LB provider
         LoadBalancingRule rule = getLoadBalancerRuleToApply(lb);
         if (!validateLbRule(rule)) {
@@ -2294,6 +2297,18 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
         return lb;
     }
 
+    private void validateInputsForExternalNetworkProvider(LoadBalancerVO lb, String algorithm, String protocol) {
+        Network network = _networkDao.findById(lb.getNetworkId());
+        if (_networkOfferingServiceDao.canProviderSupportServiceInNetworkOffering(network.getNetworkOfferingId(), Service.Lb, Provider.Netris)) {
+            if (Objects.nonNull(algorithm)) {
+                throw new InvalidParameterValueException(String.format("Algorithm: %s specified for Netris Provider is not supported.", algorithm));
+            }
+            if (Objects.nonNull(protocol) && "tcp-proxy".equalsIgnoreCase(protocol)) {
+                throw new InvalidParameterValueException("TCP Proxy protocol is not supported for Netris Provider.");
+            }
+        }
+    }
+
     @Override
     public Pair<List<? extends UserVm>, List<String>> listLoadBalancerInstances(ListLoadBalancerRuleInstancesCmd cmd) throws PermissionDeniedException {
         Account caller = CallContext.current().getCallingAccount();
diff --git a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
index 5a53c1016cf..10da04d04ca 100644
--- a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
@@ -869,7 +869,11 @@ public class CommandSetupHelper {
                 String vlanTag = ipAddr.getVlanTag();
                 String key = null;
                 if (Objects.isNull(vlanTag)) {
-                    key = "nsx-" + ipAddr.getAddress().addr();
+                    if (Hypervisor.HypervisorType.VMware == router.getHypervisorType()) {
+                        key = "nsx-" + ipAddr.getAddress().addr();
+                    } else if (Hypervisor.HypervisorType.KVM == router.getHypervisorType()) {
+                        key = "netris-" + ipAddr.getAddress().addr();
+                    }
                 } else {
                     key = BroadcastDomainType.getValue(BroadcastDomainType.fromString(ipAddr.getVlanTag()));
                 }
@@ -1218,7 +1222,10 @@ public class CommandSetupHelper {
         final SetupGuestNetworkCommand setupCmd = new SetupGuestNetworkCommand(dhcpRange, networkDomain, router.getIsRedundantRouter(), defaultDns1, defaultDns2, add, _itMgr.toNicTO(nicProfile,
                 router.getHypervisorType()));
 
-        setupCmd.setVrGuestGateway(networkOfferingVO.isForNsx());
+        boolean isVrGuestGateway = _networkModel.isAnyServiceSupportedInNetwork(network.getId(), Provider.VPCVirtualRouter, Service.SourceNat, Service.Gateway);
+        setupCmd.setVrGuestGateway(isVrGuestGateway);
+        setupCmd.setNetworkId(network.getId());
+
         NicVO publicNic = _nicDao.findDefaultNicForVM(router.getId());
         if (publicNic != null) {
             updateSetupGuestNetworkCommandIpv6(setupCmd, network, publicNic, defaultIp6Dns1, defaultIp6Dns2);
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
index ee2081adc73..b844d2b8958 100644
--- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -28,6 +28,9 @@ import java.util.Map;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.utils.validation.ChecksumUtil;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -84,7 +87,6 @@ import com.cloud.network.lb.LoadBalancingRule;
 import com.cloud.network.router.VirtualRouter.RedundantState;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.network.rules.LbStickinessMethod;
-import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.network.vpn.Site2SiteVpnManager;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.resource.ResourceManager;
@@ -103,7 +105,6 @@ import com.cloud.user.dao.UserDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
-import com.cloud.utils.validation.ChecksumUtil;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
@@ -176,6 +177,8 @@ public class NetworkHelperImpl implements NetworkHelper {
     CapacityManager capacityMgr;
     @Inject
     VpcDao vpcDao;
+    @Inject
+    VpcManager vpcManager;
 
     protected final Map<HypervisorType, ConfigKey<String>> hypervisorsMap = new HashMap<>();
 
@@ -275,6 +278,10 @@ public class NetworkHelperImpl implements NetworkHelper {
         _itMgr.expunge(router.getUuid());
         _routerHealthCheckResultDao.expungeHealthChecks(router.getId());
         _routerDao.remove(router.getId());
+
+        if (router.getVpcId() != null) {
+            vpcManager.reconfigStaticNatForVpcVr(router.getVpcId());
+        }
         return router;
     }
 
@@ -808,7 +815,8 @@ public class NetworkHelperImpl implements NetworkHelper {
             logger.debug("Adding nic for Virtual Router in Guest network " + guestNetwork);
             String defaultNetworkStartIp = null, defaultNetworkStartIpv6 = null;
             final Nic placeholder = _networkModel.getPlaceholderNicForRouter(guestNetwork, routerDeploymentDefinition.getPodId());
-            if (!routerDeploymentDefinition.isPublicNetwork()) {
+            if (!routerDeploymentDefinition.isPublicNetwork()
+                    || !_networkModel.isAnyServiceSupportedInNetwork(guestNetwork.getId(), Network.Provider.VPCVirtualRouter, Network.Service.SourceNat, Network.Service.Gateway)) {
                 if (guestNetwork.getCidr() != null) {
                     if (placeholder != null && placeholder.getIPv4Address() != null) {
                         logger.debug("Requesting ipv4 address " + placeholder.getIPv4Address() + " stored in placeholder nic for the network "
diff --git a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
index 399019db3e2..649689d8d77 100644
--- a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
@@ -120,7 +120,9 @@ public class NicProfileHelperImpl implements NicProfileHelper {
     public NicProfile createGuestNicProfileForVpcRouter(final RouterDeploymentDefinition vpcRouterDeploymentDefinition, final Network guestNetwork) {
         final NicProfile guestNic = new NicProfile();
 
-        if (BroadcastDomainType.NSX == guestNetwork.getBroadcastDomainType()) {
+        if (BroadcastDomainType.NSX == guestNetwork.getBroadcastDomainType() ||
+                BroadcastDomainType.Netris == guestNetwork.getBroadcastDomainType() ||
+                !_vpcMgr.isSrcNatIpRequiredForVpcVr(vpcRouterDeploymentDefinition.getVpc().getVpcOfferingId())) {
             NicVO vrNic = _nicDao.findByNetworkIdAndTypeIncludingRemoved(guestNetwork.getId(), VirtualMachine.Type.DomainRouter);
             if (vrNic != null) {
                 guestNic.setIPv4Address(vrNic.getIPv4Address());
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index fa3c3abc681..8e486127364 100644
--- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -203,6 +203,7 @@ import com.cloud.network.rules.StaticNatImpl;
 import com.cloud.network.rules.StaticNatRule;
 import com.cloud.network.rules.dao.PortForwardingRulesDao;
 import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.VpcService;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.network.vpn.Site2SiteVpnManager;
@@ -335,6 +336,7 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
 
     @Inject private NetworkService networkService;
     @Inject private VpcService vpcService;
+    @Inject private VpcManager vpcManager;
 
     @Autowired
     @Qualifier("networkHelper")
@@ -2043,6 +2045,12 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
             if (_disableRpFilter) {
                 rpFilter = " disable_rp_filter=true";
             }
+            Vpc vpc = vpcManager.getActiveVpc(router.getVpcId());
+            if (vpcManager.isSrcNatIpRequiredForVpcVr(vpc.getVpcOfferingId())) {
+                buf.append(" has_public_network=true");
+            } else {
+                buf.append(" has_public_network=false");
+            }
         } else if (!publicNetwork) {
             type = "dhcpsrvr";
         } else {
diff --git a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 66b5cf6c8b6..85ee35f81fe 100644
--- a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -82,10 +82,9 @@ import com.cloud.network.vpc.NetworkACLManager;
 import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.PrivateIpAddress;
 import com.cloud.network.vpc.PrivateIpVO;
-import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.StaticRouteVO;
 import com.cloud.network.vpc.StaticRouteProfile;
 import com.cloud.network.vpc.Vpc;
-import com.cloud.network.vpc.VpcGateway;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.PrivateIpDao;
@@ -321,17 +320,19 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
                 String defaultDns2 = null;
                 String defaultIp6Dns1 = null;
                 String defaultIp6Dns2 = null;
+                boolean isDnsConfigured = false;
                 // remove public and guest nics as we will plug them later
                 final Iterator<NicProfile> it = profile.getNics().iterator();
                 while (it.hasNext()) {
                     final NicProfile nic = it.next();
                     if (nic.getTrafficType() == TrafficType.Public || nic.getTrafficType() == TrafficType.Guest) {
                         // save dns information
-                        if (nic.getTrafficType() == TrafficType.Public) {
+                        if (nic.getTrafficType() == TrafficType.Public || !isDnsConfigured) {
                             defaultDns1 = nic.getIPv4Dns1();
                             defaultDns2 = nic.getIPv4Dns2();
                             defaultIp6Dns1 = nic.getIPv6Dns1();
                             defaultIp6Dns2 = nic.getIPv6Dns2();
+                            isDnsConfigured = true;
                         }
                         logger.debug("Removing nic " + nic + " of type " + nic.getTrafficType() + " from the nics passed on vm start. " + "The nic will be plugged later");
                         it.remove();
@@ -532,17 +533,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
             }
 
             // 4) RE-APPLY ALL STATIC ROUTE RULES
-            final List<? extends StaticRoute> routes = _staticRouteDao.listByVpcId(domainRouterVO.getVpcId());
-            final List<StaticRouteProfile> staticRouteProfiles = new ArrayList<StaticRouteProfile>(routes.size());
-            final Map<Long, VpcGateway> gatewayMap = new HashMap<Long, VpcGateway>();
-            for (final StaticRoute route : routes) {
-                VpcGateway gateway = gatewayMap.get(route.getVpcGatewayId());
-                if (gateway == null) {
-                    gateway = _entityMgr.findById(VpcGateway.class, route.getVpcGatewayId());
-                    gatewayMap.put(gateway.getId(), gateway);
-                }
-                staticRouteProfiles.add(new StaticRouteProfile(route, gateway));
-            }
+            final List<StaticRouteVO> routes = _vpcMgr.getVpcStaticRoutes(domainRouterVO.getVpcId());
+            final List<StaticRouteProfile> staticRouteProfiles = _vpcMgr.getVpcStaticRoutes(routes);
 
             logger.debug("Found " + staticRouteProfiles.size() + " static routes to apply as a part of vpc route " + domainRouterVO + " start");
             if (!staticRouteProfiles.isEmpty()) {
diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
index bfcaca72b31..db79cad9d65 100644
--- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
@@ -59,6 +59,8 @@ import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerVMMapDao;
 import com.cloud.network.dao.LoadBalancerVMMapVO;
+import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
 import com.cloud.network.rules.FirewallRule.FirewallRuleType;
 import com.cloud.network.rules.FirewallRule.Purpose;
 import com.cloud.network.rules.FirewallRule.State;
@@ -155,6 +157,10 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
     VpcService _vpcSvc;
     @Inject
     VMTemplateDao _templateDao;
+    @Inject
+    RemoteAccessVpnDao remoteAccessVpnDao;
+    @Inject
+    Site2SiteVpnGatewayDao site2SiteVpnGatewayDao;
 
     protected void checkIpAndUserVm(IpAddress ipAddress, UserVm userVm, Account caller, Boolean ignoreVmState) {
         if (ipAddress == null || ipAddress.getAllocatedTime() == null || ipAddress.getAllocatedToAccountId() == null) {
@@ -1270,6 +1276,25 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
             throw ex;
         }
 
+        if (ipAddress.isForRouter()) {
+            if (remoteAccessVpnDao.findByPublicIpAddress(ipAddress.getId()) != null) {
+                InvalidParameterValueException ex = new InvalidParameterValueException("Can't disable static nat as the IP address is used by a Remote Access VPN");
+                ex.addProxyObject(ipAddress.getUuid(), "ipId");
+                throw ex;
+
+            }
+            if (site2SiteVpnGatewayDao.findByPublicIpAddress(ipAddress.getId()) != null) {
+                InvalidParameterValueException ex = new InvalidParameterValueException("Can't disable static nat as the IP address is used by a VPC gateway");
+                ex.addProxyObject(ipAddress.getUuid(), "ipId");
+                throw ex;
+
+            }
+            if (disableStaticNat(ipId, caller, ctx.getCallingUserId(), false)) {
+                return true;
+            }
+            return false;
+        }
+
         Long vmId = ipAddress.getAssociatedWithVmId();
         if (vmId == null) {
             InvalidParameterValueException ex = new InvalidParameterValueException("Specified IP address id is not associated with any vm Id");
@@ -1302,7 +1327,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
 
         IPAddressVO ipAddress = _ipAddressDao.findById(ipId);
         checkIpAndUserVm(ipAddress, null, caller, false);
-        long networkId = ipAddress.getAssociatedWithNetworkId();
+        Long networkId = ipAddress.getAssociatedWithNetworkId();
 
         if (!ipAddress.isOneToOneNat()) {
             InvalidParameterValueException ex = new InvalidParameterValueException("One to one nat is not enabled for the specified ip id");
@@ -1337,11 +1362,14 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
             ipAddress.setAssociatedWithVmId(null);
             ipAddress.setRuleState(null);
             ipAddress.setVmIp(null);
+            ipAddress.setForRouter(false);
             if (isIpSystem && !releaseIpIfElastic) {
                 ipAddress.setSystem(false);
             }
             _ipAddressDao.update(ipAddress.getId(), ipAddress);
-            _vpcMgr.unassignIPFromVpcNetwork(ipAddress.getId(), networkId);
+            if (networkId != null) {
+                _vpcMgr.unassignIPFromVpcNetwork(ipAddress.getId(), networkId);
+            }
 
             if (isIpSystem && releaseIpIfElastic && !_ipAddrMgr.handleSystemIpRelease(ipAddress)) {
                 logger.warn("Failed to release system ip address " + ipAddress);
@@ -1379,7 +1407,8 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
         return new StaticNatRuleImpl(ruleVO, dstIp);
     }
 
-    protected boolean applyStaticNatForIp(long sourceIpId, boolean continueOnError, Account caller, boolean forRevoke) {
+    @Override
+    public boolean applyStaticNatForIp(long sourceIpId, boolean continueOnError, Account caller, boolean forRevoke) {
         IpAddress sourceIp = _ipAddressDao.findById(sourceIpId);
 
         List<StaticNat> staticNats = createStaticNatForIp(sourceIp, caller, forRevoke);
diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 5335b24e897..5dac69d96da 100644
--- a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -369,15 +369,16 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana
     }
 
     @Override
-    public boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems) {
-        List<NetworkACLServiceProvider> nsxElements = new ArrayList<>();
-        nsxElements.add((NetworkACLServiceProvider) _ntwkModel.getElementImplementingProvider(Network.Provider.Nsx.getName()));
+    public boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks,
+                                   List<? extends NetworkACLItem> networkACLItems, Network.Provider networkProvider) {
+        List<NetworkACLServiceProvider> providers = new ArrayList<>();
+        providers.add((NetworkACLServiceProvider) _ntwkModel.getElementImplementingProvider(networkProvider.getName()));
         try {
-            for (final NetworkACLServiceProvider provider : nsxElements) {
+            for (final NetworkACLServiceProvider provider : providers) {
                 return provider.reorderAclRules(vpc, networks, networkACLItems);
             }
         } catch (final Exception ex) {
-            logger.debug("Failed to reorder ACLs on NSX due to: " + ex.getLocalizedMessage());
+            logger.debug(String.format("Failed to reorder ACLs on %s due to: %s", networkProvider.getName(), ex.getLocalizedMessage()));
         }
         return false;
     }
diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
index 0791ca7ecd3..2a9bc27f302 100644
--- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -28,7 +28,9 @@ import javax.inject.Inject;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
+import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ServerApiException;
@@ -41,6 +43,7 @@ import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLListCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -104,6 +107,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
     private VpcService _vpcSvc;
     @Inject
     private NsxProviderDao nsxProviderDao;
+    @Inject
+    private NetrisProviderDao netrisProviderDao;
 
     private String supportedProtocolsForAclRules = "tcp,udp,icmp,all";
 
@@ -1031,10 +1036,12 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
             }
             final DataCenter dc = _entityMgr.findById(DataCenter.class, vpc.getZoneId());
             final NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(dc.getId());
+            final NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(dc.getId());
             List<NetworkVO> networks = _networkDao.listByAclId(lockedAcl.getId());
-            if (Objects.nonNull(nsxProvider) && !networks.isEmpty()) {
+            if (ObjectUtils.anyNotNull(nsxProvider, netrisProvider) && !networks.isEmpty()) {
                 allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId());
-                _networkAclMgr.reorderAclRules(vpc, networks, allAclRules);
+                Network.Provider networkProvider = nsxProvider != null ? Network.Provider.Nsx : Network.Provider.Netris;
+                _networkAclMgr.reorderAclRules(vpc, networks, allAclRules, networkProvider);
             }
             return networkACLItem;
         } finally {
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index 7a2e789996f..e63394ee445 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -48,8 +48,22 @@ import com.cloud.bgp.BGPService;
 import com.cloud.dc.ASNumberVO;
 import com.cloud.dc.dao.ASNumberDao;
 import com.cloud.dc.Vlan;
+import com.cloud.network.RemoteAccessVpn;
+import com.cloud.network.Site2SiteVpnConnection;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
+import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.RemoteAccessVpnVO;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayVO;
+import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionVO;
+import com.cloud.network.element.NetrisProviderVO;
+import com.cloud.network.element.NetworkACLServiceProvider;
 import com.cloud.network.element.NsxProviderVO;
+import com.cloud.network.rules.RulesManager;
+import com.cloud.network.vpn.RemoteAccessVpnService;
+import com.cloud.vm.dao.VMInstanceDao;
 import com.google.common.collect.Sets;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.alert.AlertService;
@@ -292,13 +306,29 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @Inject
     private NsxProviderDao nsxProviderDao;
     @Inject
+    private NetrisProviderDao netrisProviderDao;
+    @Inject
     RoutedIpv4Manager routedIpv4Manager;
+    @Inject
+    DomainRouterDao domainRouterDao;
+    @Inject
+    RulesManager rulesManager;
+    @Inject
+    VMInstanceDao vmInstanceDao;
+    @Inject
+    RemoteAccessVpnDao remoteAccessVpnDao;
+    @Inject
+    RemoteAccessVpnService remoteAccessVpnMgr;
+    @Inject
+    Site2SiteVpnConnectionDao site2SiteVpnConnectionDao;
+    @Inject
+    Site2SiteCustomerGatewayDao site2SiteCustomerGatewayDao;
 
     private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
     private List<VpcProvider> vpcElements = null;
     private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
     private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp, Provider.InternalLbVm, Provider.Netscaler,
-            Provider.JuniperContrailVpcRouter, Provider.Ovs, Provider.BigSwitchBcf, Provider.ConfigDrive, Provider.Nsx);
+            Provider.JuniperContrailVpcRouter, Provider.Ovs, Provider.BigSwitchBcf, Provider.ConfigDrive, Provider.Nsx, Provider.Netris);
 
     int _cleanupInterval;
     int _maxNetworks;
@@ -354,7 +384,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                     }
                     createVpcOffering(VpcOffering.defaultVPCOfferingName, VpcOffering.defaultVPCOfferingName, svcProviderMap,
                             true, State.Enabled, null, false,
-                            false, false, false, null, null, false);
+                            false, false, null, null, false);
                 }
 
                 // configure default vpc offering with Netscaler as LB Provider
@@ -374,7 +404,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                         }
                     }
                     createVpcOffering(VpcOffering.defaultVPCNSOfferingName, VpcOffering.defaultVPCNSOfferingName,
-                            svcProviderMap, false, State.Enabled, null, false, false, false, false, null, null, false);
+                            svcProviderMap, false, State.Enabled, null, false, false, false, null, null, false);
 
                 }
 
@@ -395,7 +425,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                         }
                     }
                     createVpcOffering(VpcOffering.redundantVPCOfferingName, VpcOffering.redundantVPCOfferingName, svcProviderMap, true, State.Enabled,
-                            null, false, false, true, false, null, null, false);
+                            null, false, false, true, null, null, false);
                 }
 
                 // configure default vpc offering with NSX as network service provider in NAT mode
@@ -412,7 +442,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                         }
                     }
                     createVpcOffering(VpcOffering.DEFAULT_VPC_NAT_NSX_OFFERING_NAME, VpcOffering.DEFAULT_VPC_NAT_NSX_OFFERING_NAME, svcProviderMap, false,
-                            State.Enabled, null, false, false, false, true, NetworkOffering.NetworkMode.NATTED, null, false);
+                            State.Enabled, null, false, false, false, NetworkOffering.NetworkMode.NATTED, null, false);
 
                 }
 
@@ -430,7 +460,43 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                         }
                     }
                     createVpcOffering(VpcOffering.DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME, VpcOffering.DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME, svcProviderMap, false,
-                            State.Enabled, null, false, false, false, true, NetworkOffering.NetworkMode.ROUTED, null, false);
+                            State.Enabled, null, false, false, false, NetworkOffering.NetworkMode.ROUTED, null, false);
+
+                }
+
+                // configure default vpc offering with Netris as network service provider in Route mode
+                if (_vpcOffDao.findByUniqueName(VpcOffering.DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME) == null) {
+                    logger.debug(String.format("Creating default VPC offering for Netris network service provider %s in Routed mode", VpcOffering.DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME));
+                    final Map<Service, Set<Provider>> svcProviderMap = new HashMap<>();
+                    final Set<Provider> defaultProviders = Set.of(Provider.Netris);
+                    for (final Service svc : getSupportedServices()) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns).contains(svc)) {
+                            final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
+                            svcProviderMap.put(svc, userDataProvider);
+                        } else if (List.of(Service.SourceNat, Service.NetworkACL).contains(svc)){
+                            svcProviderMap.put(svc, defaultProviders);
+                        }
+                    }
+                    createVpcOffering(VpcOffering.DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME, VpcOffering.DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME, svcProviderMap, false,
+                            State.Enabled, null, false, false, false, NetworkOffering.NetworkMode.ROUTED, null, false);
+
+                }
+
+                // configure default vpc offering with Netris as network service provider in NAT mode
+                if (_vpcOffDao.findByUniqueName(VpcOffering.DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME) == null) {
+                    logger.debug(String.format("Creating default VPC offering for Netris network service provider %s in NAT mode", VpcOffering.DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME));
+                    final Map<Service, Set<Provider>> svcProviderMap = new HashMap<>();
+                    final Set<Provider> defaultProviders = Set.of(Provider.Netris);
+                    for (final Service svc : getSupportedServices()) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns, Service.Vpn).contains(svc)) {
+                            final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
+                            svcProviderMap.put(svc, userDataProvider);
+                        } else {
+                            svcProviderMap.put(svc, defaultProviders);
+                        }
+                    }
+                    createVpcOffering(VpcOffering.DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME, VpcOffering.DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME, svcProviderMap, false,
+                            State.Enabled, null, false, false, false, NetworkOffering.NetworkMode.NATTED, null, false);
 
                 }
             }
@@ -490,7 +556,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         final Long serviceOfferingId = cmd.getServiceOfferingId();
         final List<Long> domainIds = cmd.getDomainIds();
         final List<Long> zoneIds = cmd.getZoneIds();
-        final Boolean forNsx = cmd.isForNsx();
+        final String provider = cmd.getProvider();
+        final Boolean forNsx = Objects.nonNull(provider) && provider.equalsIgnoreCase("NSX");
         final String networkModeStr = cmd.getNetworkMode();
         final boolean enable = cmd.getEnable();
 
@@ -552,7 +619,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         }
 
         return createVpcOffering(vpcOfferingName, displayText, supportedServices,
-                serviceProviderList, serviceCapabilityList, internetProtocol, serviceOfferingId, forNsx, networkMode,
+                serviceProviderList, serviceCapabilityList, internetProtocol, serviceOfferingId, provider, networkMode,
                 domainIds, zoneIds, (enable ? State.Enabled : State.Disabled), routingMode, specifyAsNumber);
     }
 
@@ -560,7 +627,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @ActionEvent(eventType = EventTypes.EVENT_VPC_OFFERING_CREATE, eventDescription = "creating vpc offering", create = true)
     public VpcOffering createVpcOffering(final String name, final String displayText, final List<String> supportedServices, final Map<String, List<String>> serviceProviders,
                                          final Map serviceCapabilityList, final NetUtils.InternetProtocol internetProtocol, final Long serviceOfferingId,
-                                         final Boolean forNsx, final NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, State state,
+                                         final String externalProvider, final NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, State state,
                                          NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber) {
 
         if (!Ipv6Service.Ipv6OfferingCreationEnabled.value() && !(internetProtocol == null || NetUtils.InternetProtocol.IPv4.equals(internetProtocol))) {
@@ -644,7 +711,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         Service redundantRouterService = Service.SourceNat;
         if (CollectionUtils.isNotEmpty(sourceNatServiceProviders)) {
             svcProviderMap.put(Service.Gateway, sourceNatServiceProviders);
-        } else if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode)) {
+        } else if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode) && org.apache.commons.lang3.StringUtils.isBlank(externalProvider)) {
+            // For Routed mode, add the Gateway service except for external providers such as NSX, Netris to not override the svcProviderMap mapping
             svcProviderMap.put(Service.Gateway, Sets.newHashSet(Provider.VPCVirtualRouter));
             redundantRouterService = Service.Gateway;
         }
@@ -655,7 +723,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         final boolean offersRegionLevelVPC = isVpcOfferingForRegionLevelVpc(serviceCapabilityList);
         final boolean redundantRouter = isVpcOfferingRedundantRouter(serviceCapabilityList, redundantRouterService);
         final VpcOfferingVO offering = createVpcOffering(name, displayText, svcProviderMap, false, state, serviceOfferingId, supportsDistributedRouter, offersRegionLevelVPC,
-                redundantRouter, forNsx, networkMode, routingMode, specifyAsNumber);
+                redundantRouter, networkMode, routingMode, specifyAsNumber);
 
         if (offering != null) {
             List<VpcOfferingDetailsVO> detailsVO = new ArrayList<>();
@@ -681,9 +749,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     }
 
     @DB
-    protected VpcOfferingVO createVpcOffering(final String name, final String displayText, final Map<Network.Service, Set<Network.Provider>> svcProviderMap,
+    protected VpcOfferingVO createVpcOffering(final String name, final String displayText, final Map<Service, Set<Provider>> svcProviderMap,
                                               final boolean isDefault, final State state, final Long serviceOfferingId, final boolean supportsDistributedRouter, final boolean offersRegionLevelVPC,
-                                              final boolean redundantRouter, Boolean forNsx, NetworkOffering.NetworkMode networkMode, NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber) {
+                                              final boolean redundantRouter, NetworkOffering.NetworkMode networkMode, NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber) {
 
         return Transaction.execute(new TransactionCallback<VpcOfferingVO>() {
             @Override
@@ -694,7 +762,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                 if (state != null) {
                     offering.setState(state);
                 }
-                offering.setForNsx(forNsx);
                 offering.setNetworkMode(networkMode);
                 offering.setSpecifyAsNumber(specifyAsNumber);
                 if (Objects.nonNull(routingMode)) {
@@ -1309,11 +1376,12 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
             cmd.getIp6Dns2(), cmd.isDisplay(), cmd.getPublicMtu(), cmd.getCidrSize(), cmd.getAsNumber(), bgpPeerIds, cmd.getUseVrIpResolver());
 
         String sourceNatIP = cmd.getSourceNatIP();
-        boolean forNsx = isVpcForNsx(vpc);
+        boolean forNsx = isVpcForProvider(Provider.Nsx, vpc);
+        boolean forNetris = isVpcForProvider(Provider.Netris, vpc);
         try {
-            if (sourceNatIP != null || forNsx) {
-                if (forNsx) {
-                    logger.info("Provided source NAT IP will be ignored in an NSX-enabled zone");
+            if (sourceNatIP != null || forNsx || forNetris) {
+                if (forNsx || forNetris) {
+                    logger.info("Provided source NAT IP will be ignored in an NSX-enabled or Netris-enabled zone");
                     sourceNatIP = null;
                 }
                 logger.info(String.format("Trying to allocate the specified IP [%s] as the source NAT of VPC [%s].", sourceNatIP, vpc));
@@ -1342,15 +1410,11 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         return NetworkOffering.RoutingMode.Dynamic == vpcOffering.getRoutingMode();
     }
 
-    private boolean isVpcForNsx(Vpc vpc) {
+    private boolean isVpcForProvider(Provider provider, Vpc vpc) {
         if (vpc == null) {
             return false;
         }
-        VpcOfferingServiceMapVO mapVO = _vpcOffSvcMapDao.findByServiceProviderAndOfferingId(Service.SourceNat.getName(), Provider.Nsx.getName(), vpc.getVpcOfferingId());
-        if (mapVO != null) {
-            logger.debug(String.format("The VPC %s is NSX-based and supports the %s service", vpc.getName(), Service.SourceNat.getName()));
-        }
-        return mapVO != null;
+        return _vpcOffSvcMapDao.isProviderForVpcOffering(provider, vpc.getVpcOfferingId());
     }
 
     private void allocateSourceNatIp(Vpc vpc, String sourceNatIP) {
@@ -1358,9 +1422,12 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         DataCenter zone = _dcDao.findById(vpc.getZoneId());
         // reserve this ip and then
         try {
-            if (isVpcForNsx(vpc) && org.apache.commons.lang3.StringUtils.isBlank(sourceNatIP)) {
+            if (isVpcForProvider(Provider.Nsx, vpc) && org.apache.commons.lang3.StringUtils.isBlank(sourceNatIP)) {
                 logger.debug(String.format("Reserving a source NAT IP for NSX VPC %s", vpc.getName()));
-                sourceNatIP = reserveSourceNatIpForNsxVpc(account, zone);
+                sourceNatIP = reserveSourceNatIpForProviderVpc(account, zone, Provider.Nsx);
+            } else if (isVpcForProvider(Provider.Netris, vpc) && org.apache.commons.lang3.StringUtils.isBlank(sourceNatIP)) {
+                logger.debug(String.format("Reserving a source NAT IP for Netris VPC %s", vpc.getName()));
+                sourceNatIP = reserveSourceNatIpForProviderVpc(account, zone, Provider.Netris);
             }
             IpAddress ip = _ipAddrMgr.allocateIp(account, false, CallContext.current().getCallingAccount(), CallContext.current().getCallingUser(), zone, null, sourceNatIP);
             this.associateIPToVpc(ip.getId(), vpc.getId());
@@ -1369,8 +1436,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         }
     }
 
-    private String reserveSourceNatIpForNsxVpc(Account account, DataCenter zone) throws ResourceAllocationException {
-        IpAddress ipAddress = _ntwkSvc.reserveIpAddressWithVlanDetail(account, zone, true, ApiConstants.NSX_DETAIL_KEY);
+    private String reserveSourceNatIpForProviderVpc(Account account, DataCenter zone, Provider provider) throws ResourceAllocationException {
+        String detailKey = provider == Provider.Nsx ? ApiConstants.NSX_DETAIL_KEY : ApiConstants.NETRIS_DETAIL_KEY;
+        IpAddress ipAddress = _ntwkSvc.reserveIpAddressWithVlanDetail(account, zone, true, detailKey);
         return ipAddress.getAddress().addr();
     }
 
@@ -1534,6 +1602,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         _accountMgr.checkAccess(caller, null, false, vpcToUpdate);
 
         final VpcVO vpc = vpcDao.createForUpdate(vpcId);
+        String previousVpcName = vpcToUpdate.getName();
 
         if (vpcName != null) {
             vpc.setName(vpcName);
@@ -1569,10 +1638,20 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
             } else {
                 if (logger.isDebugEnabled()) {
                     logger.debug("no restart needed.");
+                    if (isVpcForProvider(Provider.Netris, vpcToUpdate)) {
+                        final String aclProvider = _vpcSrvcDao.getProviderForServiceInVpc(vpc.getId(), Service.NetworkACL);
+                        for (final VpcProvider provider : getVpcElements()) {
+                            if ((provider instanceof NetworkACLServiceProvider && provider.getName().equalsIgnoreCase(aclProvider))) {
+                                vpcToUpdate.setName(vpcName);
+                                provider.updateVpc(vpcToUpdate, previousVpcName);
+                                break;
+                            }
+                        }
+                    }
                 }
             }
             return vpcDao.findById(vpcId);
-        } else if (isVpcForNsx(vpcToUpdate)) {
+        } else if (isVpcForProvider(Provider.Nsx, vpcToUpdate)) {
             if (logger.isDebugEnabled()) {
                 logger.debug("no restart needed.");
             }
@@ -1591,14 +1670,15 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         if (! userIps.isEmpty()) {
             try {
                 _ipAddrMgr.updateSourceNatIpAddress(requestedIp, userIps);
-                if (isVpcForNsx(vpc)) {
-                    VpcProvider nsxElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(Provider.Nsx.getName());
-                    if (nsxElement == null) {
-                        return true;
+                if (isVpcForProvider(Provider.Nsx, vpc) || isVpcForProvider(Provider.Netris, vpc)) {
+                    boolean isForNsx = _vpcOffSvcMapDao.isProviderForVpcOffering(Provider.Nsx, vpc.getVpcOfferingId());
+                    String providerName = isForNsx ? Provider.Nsx.getName() : Provider.Netris.getName();
+                    VpcProvider providerElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(providerName);
+                    if (Objects.nonNull(providerElement)) {
+                        providerElement.updateVpcSourceNatIp(vpc, requestedIp);
+                        return false;
                     }
-                    nsxElement.updateVpcSourceNatIp(vpc, requestedIp);
-                    // The NSX source NAT IP change does not require to update the VPC VR
-                    return false;
+                    return true;
                 }
             } catch (Exception e) { // pokemon exception from transaction
                 String msg = String.format("Update of source NAT ip to %s for network \"%s\"/%s failed due to %s",
@@ -2054,7 +2134,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
 
         // 5) When aclId is provided, verify that ACLProvider is supported by
         // network offering
-        if (aclId != null && !_ntwkModel.areServicesSupportedByNetworkOffering(guestNtwkOff.getId(), Service.NetworkACL) && !guestNtwkOff.isForNsx()) {
+        boolean isForNsx = _ntwkModel.isProviderForNetworkOffering(Provider.Nsx, guestNtwkOff.getId());
+        if (aclId != null && !_ntwkModel.areServicesSupportedByNetworkOffering(guestNtwkOff.getId(), Service.NetworkACL) && !isForNsx) {
             throw new InvalidParameterValueException("Cannot apply NetworkACL. Network Offering does not support NetworkACL service");
         }
 
@@ -2072,7 +2153,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
 
         // 2) Only Isolated networks with Source nat service enabled can be
         // added to vpc
-        if (!guestNtwkOff.isForNsx()
+        boolean isForNsx = _ntwkModel.isProviderForNetworkOffering(Provider.Nsx, guestNtwkOff.getId());
+        boolean isForNNetris = _ntwkModel.isProviderForNetworkOffering(Provider.Netris, guestNtwkOff.getId());
+        if (!isForNsx && !isForNNetris
                 && !(guestNtwkOff.getGuestType() == GuestType.Isolated && (supportedSvcs.contains(Service.SourceNat) || supportedSvcs.contains(Service.Gateway)))) {
 
             throw new InvalidParameterValueException("Only network offerings of type " + GuestType.Isolated + " with service " + Service.SourceNat.getName()
@@ -2200,6 +2283,12 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         logger.debug("Cleaning up existed site to site VPN gateways");
         _s2sVpnMgr.cleanupVpnGatewayByVpc(vpc.getId());
 
+        List<RemoteAccessVpnVO> vpns = remoteAccessVpnDao.listByVpcId(vpc.getId());
+        for (RemoteAccessVpnVO vpn : vpns) {
+            logger.debug("Disabling remote access VPN on {}", vpn.getServerAddressId());
+            remoteAccessVpnMgr.destroyRemoteAccessVpnForIp(vpn.getServerAddressId(), caller, true);
+        }
+
         // 2) release all ip addresses
         final List<IPAddressVO> ipsToRelease = _ipAddressDao.listByAssociatedVpc(vpc.getId(), null);
         logger.debug("Releasing ips for vpc {} as a part of vpc cleanup", vpc);
@@ -2334,6 +2423,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
                     restartRequired = true;
                     return false;
                 }
+                reconfigStaticNatForVpcVr(vpcId);
                 return true;
             }
 
@@ -2840,28 +2930,38 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @Override
     public boolean applyStaticRoutesForVpc(final long vpcId) throws ResourceUnavailableException {
         final Account caller = CallContext.current().getCallingAccount();
-        final List<? extends StaticRoute> routes = _staticRouteDao.listByVpcId(vpcId);
+        final List<StaticRouteVO> routes = getVpcStaticRoutes(vpcId);
         return applyStaticRoutes(routes, caller, true);
     }
 
-    protected boolean applyStaticRoutes(final List<? extends StaticRoute> routes, final Account caller, final boolean updateRoutesInDB) throws ResourceUnavailableException {
-        final boolean success = true;
-        final List<StaticRouteProfile> staticRouteProfiles = new ArrayList<StaticRouteProfile>(routes.size());
-        final Map<Long, VpcGateway> gatewayMap = new HashMap<Long, VpcGateway>();
-        for (final StaticRoute route : routes) {
-            VpcGateway gateway = gatewayMap.get(route.getVpcGatewayId());
-            if (gateway == null) {
-                gateway = _vpcGatewayDao.findById(route.getVpcGatewayId());
-                gatewayMap.put(gateway.getId(), gateway);
+    @Override
+    public boolean applyStaticRouteForVpcVpnIfNeeded(final Long vpcId, boolean updateAllVpn) throws ResourceUnavailableException {
+        if (isProviderSupportServiceInVpc(vpcId, Service.Vpn, Network.Provider.VPCVirtualRouter)) {
+            boolean isVpcVRSourceNat = isProviderSupportServiceInVpc(vpcId, Service.SourceNat, Network.Provider.VPCVirtualRouter);
+            if (isVpcVRSourceNat) {
+                logger.debug("Skipping static route configuration as VPC VR is Source NAT");
+                return true;
             }
-            staticRouteProfiles.add(new StaticRouteProfile(route, gateway));
+            logger.debug("Configuring static route for VPC VR of VPC " + vpcId);
+            final Account caller = CallContext.current().getCallingAccount();
+            final List<StaticRouteVO> routes = getVpcStaticRoutes(vpcId, updateAllVpn);
+            return applyStaticRoutes(routes, caller, false);
         }
+        return true;
+    }
+
+    protected boolean applyStaticRoutes(final List<StaticRouteVO> routes, final Account caller, final boolean updateRoutesInDB) throws ResourceUnavailableException {
+        final boolean success = true;
+        final List<StaticRouteProfile> staticRouteProfiles = getVpcStaticRoutes(routes);
         if (!applyStaticRoutes(staticRouteProfiles)) {
             logger.warn("Routes are not completely applied");
             return false;
         } else {
             if (updateRoutesInDB) {
-                for (final StaticRoute route : routes) {
+                for (final StaticRouteVO route : routes) {
+                    if (route.isForVpn()) {
+                        continue;
+                    }
                     if (route.getState() == StaticRoute.State.Revoke) {
                         _staticRouteDao.remove(route.getId());
                         logger.debug("Removed route " + route + " from the DB");
@@ -2924,7 +3024,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @DB
     protected boolean revokeStaticRoutesForVpc(final Vpc vpc, final Account caller) throws ResourceUnavailableException {
         // get all static routes for the vpc
-        final List<StaticRouteVO> routes = _staticRouteDao.listByVpcId(vpc.getId());
+        final List<StaticRouteVO> routes = getVpcStaticRoutes(vpc.getId());
         logger.debug("Found {} to revoke for the vpc {}", routes.size(), vpc);
         if (!routes.isEmpty()) {
             // mark all of them as revoke
@@ -2945,23 +3045,46 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @Override
     @DB
     @ActionEvent(eventType = EventTypes.EVENT_STATIC_ROUTE_CREATE, eventDescription = "creating static route", create = true)
-    public StaticRoute createStaticRoute(final long gatewayId, final String cidr) throws NetworkRuleConflictException {
+    public StaticRoute createStaticRoute(final Long gatewayId, Long vpcId, final String nextHop, final String cidr) throws NetworkRuleConflictException {
         final Account caller = CallContext.current().getCallingAccount();
 
         // parameters validation
-        final VpcGateway gateway = _vpcGatewayDao.findById(gatewayId);
-        if (gateway == null) {
-            throw new InvalidParameterValueException("Invalid gateway id is given");
+        if (gatewayId == null && nextHop == null) {
+            throw new InvalidParameterValueException("one of gatewayId and nextHop must be specified");
         }
 
-        if (gateway.getState() != VpcGateway.State.Ready) {
-            throw new InvalidParameterValueException("Gateway is not in the " + VpcGateway.State.Ready + " state: " + gateway.getState());
+        if (gatewayId != null && nextHop != null) {
+            throw new InvalidParameterValueException("Only one of gatewayId and nextHop can be specified");
         }
 
-        final Vpc vpc = getActiveVpc(gateway.getVpcId());
+        if (gatewayId != null) {
+            final VpcGateway gateway = _vpcGatewayDao.findById(gatewayId);
+            if (gateway == null) {
+                throw new InvalidParameterValueException("Invalid gateway id is given");
+            }
+
+            if (gateway.getState() != VpcGateway.State.Ready) {
+                throw new InvalidParameterValueException("Gateway is not in the " + VpcGateway.State.Ready + " state: " + gateway.getState());
+            }
+
+            if (vpcId != null) {
+                if (!vpcId.equals(gateway.getVpcId())) {
+                    throw new InvalidParameterValueException("Invalid gateway id is given");
+                }
+            } else {
+                vpcId = gateway.getVpcId();
+            }
+        } else if (nextHop != null) {
+            if (vpcId == null) {
+                throw new InvalidParameterValueException("vpcId must be specified");
+            }
+        }
+
+        final Vpc vpc = getActiveVpc(vpcId);
         if (vpc == null) {
             throw new InvalidParameterValueException("Can't add static route to VPC that is being deleted");
         }
+
         _accountMgr.checkAccess(caller, null, false, vpc);
 
         if (!NetUtils.isValidIp4Cidr(cidr)) {
@@ -2984,10 +3107,15 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
             throw new InvalidParameterValueException("The static gateway cidr overlaps with one of the denied routes of the zone the VPC belongs to");
         }
 
+        // 4) validate next hop
+        if (nextHop != null && !isNextHopValid(nextHop, vpc)) {
+            throw new InvalidParameterValueException(String.format("Next hop %s is invalid. It must be within VPC CIDR or on the same public or private network", nextHop));
+        }
+
         return Transaction.execute(new TransactionCallbackWithException<StaticRouteVO, NetworkRuleConflictException>() {
             @Override
             public StaticRouteVO doInTransaction(final TransactionStatus status) throws NetworkRuleConflictException {
-                StaticRouteVO newRoute = new StaticRouteVO(gateway.getId(), cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId());
+                StaticRouteVO newRoute = new StaticRouteVO(gatewayId, cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId(), nextHop);
                 logger.debug("Adding static route " + newRoute);
                 newRoute = _staticRouteDao.persist(newRoute);
 
@@ -3003,6 +3131,44 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         });
     }
 
+    private boolean isNextHopValid(String nextHop, Vpc vpc) {
+        // Scenario 1: VM as next hop
+        if (NetUtils.isIpWithInCidrRange(nextHop, vpc.getCidr())) {
+            logger.debug("The next Hop {} is valid as it is within the VPC cidr {}", nextHop, vpc.getCidr());
+            return true;
+        }
+        // Scenario 2: Another public IP as next hop
+        List<IPAddressVO> ips = _ipAddressDao.listByAssociatedVpc(vpc.getId(), null);
+        List<Long> vlanIds = new ArrayList<>();
+        for (IPAddressVO ip : ips) {
+            if (vlanIds.contains(ip.getVlanId())) {
+                continue;
+            }
+            VlanVO vlan = _vlanDao.findById(ip.getVlanId());
+            if (vlan != null) {
+                String vlanCidr = NetUtils.getCidrFromGatewayAndNetmask(vlan.getVlanGateway(), vlan.getVlanNetmask());
+                if (NetUtils.isIpWithInCidrRange(nextHop, vlanCidr)) {
+                    logger.debug("The next Hop {} is valid as it is on the same network as Public IP address {} ", nextHop, ip.getAddress());
+                    return true;
+                }
+            }
+            vlanIds.add(ip.getVlanId());
+        }
+
+        // Scenario 3: An IP on private gateway as next hop
+        List<VpcGatewayVO> vpcGateways = _vpcGatewayDao.listByVpcId(vpc.getId());
+        for (VpcGatewayVO vpcGateway : vpcGateways) {
+            String vpcGatewayCidr = NetUtils.getCidrFromGatewayAndNetmask(vpcGateway.getGateway(), vpcGateway.getNetmask());
+            if (NetUtils.isIpWithInCidrRange(nextHop, vpcGatewayCidr)) {
+                logger.debug("The next Hop {} is valid as it is on the same network as private gateway {} ", nextHop, vpcGateway.getIp4Address());
+                return true;
+            }
+        }
+
+        logger.debug("The next Hop {} is invalid", nextHop);
+        return false;
+    }
+
     protected boolean isCidrDenylisted(final String cidr, final long zoneId) {
         final String routesStr = NetworkOrchestrationService.DeniedRoutes.valueIn(zoneId);
         if (routesStr != null && !routesStr.isEmpty()) {
@@ -3208,7 +3374,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
 
         logger.debug(String.format("Associating IP [%s] to VPC [%s]", ipToAssoc, vpc));
 
-        final boolean isSourceNatFinal = isSrcNatIpRequired(vpc.getVpcOfferingId()) && getExistingSourceNatInVpc(vpc.getAccountId(), vpcId, false) == null;
+        final boolean isSourceNatFinal = isSrcNatIpRequired(vpc.getVpcOfferingId()) && getExistingSourceNatInVpc(vpc.getAccountId(), vpcId, false, false) == null;
         try {
             IPAddressVO updatedIpAddress = Transaction.execute((TransactionCallbackWithException<IPAddressVO, CloudRuntimeException>) status -> {
                 final IPAddressVO ip = _ipAddressDao.findById(ipId);
@@ -3311,7 +3477,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         return guestNetwork;
     }
 
-    protected IPAddressVO getExistingSourceNatInVpc(final long ownerId, final long vpcId, final boolean forNsx) {
+    protected IPAddressVO getExistingSourceNatInVpc(final long ownerId, final long vpcId, final boolean forNsx, final boolean forNetris) {
 
         final List<IPAddressVO> addrs = listPublicIpsAssignedToVpc(ownerId, true, vpcId);
 
@@ -3322,7 +3488,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
             // Account already has ip addresses
             for (final IPAddressVO addr : addrs) {
                 if (addr.isSourceNat()) {
-                    if (!forNsx) {
+                    if (!forNsx && !forNetris) {
                         sourceNatIp = addr;
                     } else {
                         if (addr.isForSystemVms()) {
@@ -3359,16 +3525,21 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         final long dcId = vpc.getZoneId();
         NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(dcId);
         boolean forNsx = nsxProvider != null;
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(dcId);
+        boolean forNetris = netrisProvider != null;
 
-        final IPAddressVO sourceNatIp = getExistingSourceNatInVpc(owner.getId(), vpc.getId(), forNsx);
+        final IPAddressVO sourceNatIp = getExistingSourceNatInVpc(owner.getId(), vpc.getId(), forNsx, forNetris);
 
         PublicIp ipToReturn = null;
 
         if (sourceNatIp != null) {
             ipToReturn = PublicIp.createFromAddrAndVlan(sourceNatIp, _vlanDao.findById(sourceNatIp.getVlanId()));
         } else {
-            if (forNsx) {
-                ipToReturn = _ipAddrMgr.assignPublicIpAddress(dcId, podId, owner, Vlan.VlanType.VirtualNetwork, null, null, false, true);
+            if (forNsx || forNetris) {
+                // Assign VR (helper VM) public NIC IP address from the separate provider Public IP range/pool
+                // NSX: VR uses Public IP from the system VM range
+                // Netris: VR uses Public IP from the non system VM range
+                ipToReturn = _ipAddrMgr.assignPublicIpAddress(dcId, podId, owner, Vlan.VlanType.VirtualNetwork, null, null, false, forNsx);
             } else {
                 ipToReturn = _ipAddrMgr.assignDedicateIpAddress(owner, null, vpc.getId(), dcId, true);
             }
@@ -3411,11 +3582,23 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         final Map<Network.Service, Set<Network.Provider>> vpcOffSvcProvidersMap = getVpcOffSvcProvidersMap(vpcOfferingId);
         return (Objects.nonNull(vpcOffSvcProvidersMap.get(Network.Service.SourceNat))
                 && (vpcOffSvcProvidersMap.get(Network.Service.SourceNat).contains(Network.Provider.VPCVirtualRouter)
-                || vpcOffSvcProvidersMap.get(Service.SourceNat).contains(Provider.Nsx)))
+                || vpcOffSvcProvidersMap.get(Service.SourceNat).contains(Provider.Nsx)
+                || vpcOffSvcProvidersMap.get(Service.SourceNat).contains(Provider.Netris)))
                 || (Objects.nonNull(vpcOffSvcProvidersMap.get(Network.Service.Gateway))
-                && vpcOffSvcProvidersMap.get(Service.Gateway).contains(Network.Provider.VPCVirtualRouter));
+                    && (vpcOffSvcProvidersMap.get(Service.Gateway).contains(Network.Provider.VPCVirtualRouter)
+                    || vpcOffSvcProvidersMap.get(Service.Gateway).contains(Provider.Nsx)
+                    || vpcOffSvcProvidersMap.get(Service.Gateway).contains(Network.Provider.Netris)));
     }
 
+     @Override
+     public boolean isSrcNatIpRequiredForVpcVr(long vpcOfferingId) {
+         final Map<Network.Service, Set<Network.Provider>> vpcOffSvcProvidersMap = getVpcOffSvcProvidersMap(vpcOfferingId);
+         return (Objects.nonNull(vpcOffSvcProvidersMap.get(Network.Service.SourceNat))
+                 && vpcOffSvcProvidersMap.get(Network.Service.SourceNat).contains(Network.Provider.VPCVirtualRouter))
+                 || (Objects.nonNull(vpcOffSvcProvidersMap.get(Network.Service.Gateway))
+                 && vpcOffSvcProvidersMap.get(Service.Gateway).contains(Network.Provider.VPCVirtualRouter));
+     }
+
     /**
      * rollingRestartVpc performs restart of routers of a VPC by first
      * deploying a new VR and then destroying old VRs in rolling fashion. For
@@ -3505,4 +3688,244 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     protected boolean isDefaultAcl(long aclId) {
         return aclId == NetworkACL.DEFAULT_ALLOW || aclId == NetworkACL.DEFAULT_DENY;
     }
+
+    @Override
+    public List<StaticRouteProfile> getVpcStaticRoutes(final List<? extends StaticRoute> routes) {
+        final List<StaticRouteProfile> staticRouteProfiles = new ArrayList<>(routes.size());
+        final Map<Long, VpcGateway> gatewayMap = new HashMap<Long, VpcGateway>();
+        for (final StaticRoute route : routes) {
+            if (route.getVpcGatewayId() != null) {
+                VpcGateway gateway = gatewayMap.get(route.getVpcGatewayId());
+                if (gateway == null) {
+                    gateway = _entityMgr.findById(VpcGateway.class, route.getVpcGatewayId());
+                    gatewayMap.put(gateway.getId(), gateway);
+                }
+                staticRouteProfiles.add(new StaticRouteProfile(route, gateway));
+            } else {
+                staticRouteProfiles.add(new StaticRouteProfile(route));
+            }
+        }
+        return staticRouteProfiles;
+    }
+
+    @Override
+    public List<StaticRouteVO> getVpcStaticRoutes(Long vpcId) {
+        return getVpcStaticRoutes(vpcId, false);
+    }
+
+    public List<StaticRouteVO> getVpcStaticRoutes(Long vpcId, boolean updateAllVpn) {
+        final List<StaticRouteVO> routes = _staticRouteDao.listByVpcId(vpcId);
+
+        if (isProviderSupportServiceInVpc(vpcId, Service.Vpn, Network.Provider.VPCVirtualRouter)
+                && !isProviderSupportServiceInVpc(vpcId, Service.SourceNat, Network.Provider.VPCVirtualRouter)) {
+
+            Vpc vpc = vpcDao.findById(vpcId);
+            IPAddressVO ipAddressForVpcVR = getIpAddressForVpcVr(vpc, null, false);
+            String nextHop = getFirstGuestIpAddressForVpcVr(vpc.getId());
+
+            if (ipAddressForVpcVR != null && (updateAllVpn || nextHop != null)) {
+                // Add Static Routes for Remote Access VPN
+                List<StaticRouteVO> staticRoutesForRemoteAccessVpn = new ArrayList<>();
+                RemoteAccessVpnVO remoteAccessVpn = remoteAccessVpnDao.findByPublicIpAddress(ipAddressForVpcVR.getId());
+                if (remoteAccessVpn != null) {
+                    String ipRange = remoteAccessVpn.getIpRange();
+                    String startIp = ipRange.split("-")[0];
+                    String endIp = ipRange.split("-")[1];
+                    int cidrSize = NetUtils.getBigCidrSizeOfIpRange(NetUtils.ip2Long(startIp), NetUtils.ip2Long(endIp));
+                    String cidr = NetUtils.transformCidr(startIp + "/" + cidrSize);
+                    if (nextHop == null || RemoteAccessVpn.State.Removed.equals(remoteAccessVpn.getState())) {
+                        StaticRouteVO newRoute = new StaticRouteVO(cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId(), null,
+                                StaticRoute.State.Revoke, true);
+                        staticRoutesForRemoteAccessVpn.add(newRoute);
+                    } else {
+                        StaticRoute.State state = updateAllVpn ? StaticRoute.State.Update : StaticRoute.State.Add;
+                        StaticRouteVO newRoute = new StaticRouteVO(cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId(), nextHop,
+                                state, true);
+                        staticRoutesForRemoteAccessVpn.add(newRoute);
+                    }
+                }
+                logger.debug("Adding {} static routes for Remote Access VPN", staticRoutesForRemoteAccessVpn.size());
+                routes.addAll(staticRoutesForRemoteAccessVpn);
+
+                // Add Static Routes for Site-to-Site VPN connections
+                List<StaticRouteVO> staticRoutesForSite2SiteVpn = new ArrayList<>();
+                List<Site2SiteVpnConnectionVO> vpnConnections = site2SiteVpnConnectionDao.listByVpcId(vpcId);
+                for (Site2SiteVpnConnectionVO vpnConnection : vpnConnections) {
+                    Site2SiteCustomerGatewayVO customerGateway = site2SiteCustomerGatewayDao.findById(vpnConnection.getCustomerGatewayId());
+                    if (nextHop == null || Site2SiteVpnConnection.State.Removed.equals(vpnConnection.getState())) {
+                        for (String cidr: customerGateway.getGuestCidrList().split(",")) {
+                            StaticRouteVO newRoute = new StaticRouteVO(cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId(), null,
+                                    StaticRoute.State.Revoke, true);
+                            staticRoutesForSite2SiteVpn.add(newRoute);
+                        }
+                    } else {
+                        StaticRoute.State state = updateAllVpn ? StaticRoute.State.Update : StaticRoute.State.Add;
+                        for (String cidr : customerGateway.getGuestCidrList().split(",")) {
+                            StaticRouteVO newRoute = new StaticRouteVO(cidr, vpc.getId(), vpc.getAccountId(), vpc.getDomainId(), nextHop,
+                                    state, true);
+                            staticRoutesForSite2SiteVpn.add(newRoute);
+                        }
+                    }
+                }
+                logger.debug("Adding {} static routes for {} Site-to-Site VPN connections",
+                        staticRoutesForSite2SiteVpn.size(), vpnConnections.size());
+                routes.addAll(staticRoutesForSite2SiteVpn);
+            }
+        }
+
+        logger.debug("Found {} static routes for VPC {}", routes.size(), vpcId);
+        return routes;
+    }
+
+    @Override
+    public boolean isProviderSupportServiceInVpc(long vpcId, Service service, Provider provider) {
+        return _vpcSrvcDao.canProviderSupportServiceInVpc(vpcId, service, provider);
+    }
+
+    @Override
+    public IPAddressVO getIpAddressForVpcVr(Vpc vpc, IPAddressVO ipAddress, boolean allocateIpIfNeeded) {
+        // Validate if the IP address is associated to a VPC VR
+        final List<IPAddressVO> ips = _ipAddressDao.listByAssociatedVpc(vpc.getId(), null);
+        IPAddressVO ipAddressForVR = ips.stream().filter(ip -> ip.isForRouter()).findFirst().orElse(null);
+        if (ipAddressForVR != null) {
+            if (ipAddress != null && ipAddressForVR.getId() != ipAddress.getId()) {
+                throw new InvalidParameterValueException(String.format("Cannot assign Public IP %s to VPC VR as %s has been associated to the VPC VR.",
+                        ipAddress.getAddress().addr(), ipAddressForVR.getAddress().addr()));
+            }
+            return ipAddressForVR;
+        } else if (ipAddress != null) {
+            if (ipAddress.isSourceNat()) {
+                throw new InvalidParameterValueException("Vpn service can not be configured on the Source NAT IP of VPC id=" + ipAddress.getVpcId());
+            }
+            return ipAddress;
+        }
+
+        if (allocateIpIfNeeded) {
+            Account account = _accountMgr.getAccount(vpc.getAccountId());
+            DataCenter zone = _dcDao.findById(vpc.getZoneId());
+            try {
+                IpAddress ip = _ipAddrMgr.allocateIp(account, false, CallContext.current().getCallingAccount(),
+                        CallContext.current().getCallingUser(), zone, null, null);
+                this.associateIPToVpc(ip.getId(), vpc.getId());
+                return _ipAddressDao.findById(ip.getId());
+            } catch (InsufficientAddressCapacityException | ResourceAllocationException |
+                     ResourceUnavailableException ex) {
+                throw new InvalidParameterValueException("Cannot assign Public IP to VPC VR: " + ex.getMessage());
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /* This method configures the Static Nat for VPC VR if it is used for VPN but not Source NAT.
+     * (1) Update forRouter to true and one-to-one to true
+     * (2) Get current network and router ID/IP
+     * (3) Get new network and router ID/IP
+     * (4) If network or IP is changed (in case VPC tier is removed or shutdown), disable/apply Static NAT with new VM ID and VM IP
+     * (5) otherwise, If VPC VR ID does not exist or is changed, update the VM ID.
+     * (6) otherwise, do nothing
+     *
+     * This is used in the following processes
+     * (1) create remote access VPN
+     * (2) create S2S VPN
+     * (3) destroy Router
+     * (4) restart Vpc with cleanup
+     * (5) add VPC tier
+     * (6) delete VPC tier
+     * (7) remove VPC
+     */
+
+    @Override
+    public boolean configStaticNatForVpcVr(Vpc vpc, IPAddressVO ipAddress) {
+        logger.debug("Configuring static nat for VPC VR of VPC " + vpc.getId());
+        // (1) Update forRouter to true and one-to-one to true
+        if (!ipAddress.isForRouter()) {
+            ipAddress.setForRouter(true);
+            ipAddress.setOneToOneNat(true);
+            _ipAddressDao.update(ipAddress.getId(), ipAddress);
+        }
+
+        // (2) Get current network and router ID/IP
+        Long currentNetworkId = ipAddress.getAssociatedWithNetworkId();
+        Long currentRouterId = ipAddress.getAssociatedWithVmId();
+        String currentRouterIp = ipAddress.getVmIp();
+
+        // (3) Get new network and router ID/IP
+        Long newNetworkId = null;
+        Long newRouterId = null;
+        String newRouterIp = null;
+        List<NetworkVO> networks = _ntwkDao.listByVpc(vpc.getId());
+        for (NetworkVO network : networks) {
+            NicVO newNic = nicDao.findNonPlaceHolderByNetworkIdAndType(network.getId(), VirtualMachine.Type.DomainRouter);
+            if (newNic != null) {
+                logger.debug("Got VPC VR NIC for network {}: {}", network.getId(), newNic);
+                newNetworkId = network.getId();
+                newRouterId = newNic.getInstanceId();
+                newRouterIp = newNic.getIPv4Address();
+                break;
+            }
+        }
+
+        // Do nothing if the current and new network and router are Null
+        if (ObjectUtils.allNull(currentNetworkId, currentRouterId, newNetworkId, newRouterId)) {
+            logger.debug("The current and new network and router are Null, do nothing");
+            return true;
+        }
+
+        if (currentNetworkId == null || !currentNetworkId.equals(newNetworkId)) {
+            // (4) If network or IP is changed (in case VPC tier is removed or shutdown), disable/apply Static NAT with new VM ID and VM IP
+            if (currentNetworkId != null) {
+                // Disable Static NAT for current VPC VR
+                logger.debug("Disabling static nat for VPC VR (network: {}, router: {})", currentNetworkId, currentRouterId);
+                CallContext ctx = CallContext.current();
+                if (!rulesManager.applyStaticNatForIp(ipAddress.getId(), false, ctx.getCallingAccount(),true)) {
+                    throw new CloudRuntimeException("Failed to disable static nat for VPC VR");
+                }
+                ipAddress.setAssociatedWithNetworkId(null);
+                ipAddress.setAssociatedWithVmId(null);
+                ipAddress.setVmIp(null);
+                _ipAddressDao.update(ipAddress.getId(), ipAddress);
+            }
+            if (newNetworkId != null) {
+                // Enable static nat for the new VPC VR
+                logger.debug("Enabling static nat for VPC VR  (network: {}, router: {})", newNetworkId, newRouterId);
+                ipAddress.setAssociatedWithNetworkId(newNetworkId);
+                ipAddress.setAssociatedWithVmId(newRouterId);
+                ipAddress.setVmIp(newRouterIp);
+                _ipAddressDao.update(ipAddress.getId(), ipAddress);
+                CallContext ctx = CallContext.current();
+                if (!rulesManager.applyStaticNatForIp(ipAddress.getId(), false, ctx.getCallingAccount(),false)) {
+                    throw new CloudRuntimeException("Failed to enable static nat for VPC VR");
+                }
+            }
+        } else if (currentRouterId == null || !currentRouterId.equals(newRouterId)) {
+            // (5) otherwise, If VPC VR ID does not exist or is changed, update the VM ID.
+            ipAddress.setAssociatedWithVmId(newRouterId);
+            ipAddress.setVmIp(newRouterIp);
+            _ipAddressDao.update(ipAddress.getId(), ipAddress);
+        }
+        return true;
+    }
+
+    @Override
+    public void reconfigStaticNatForVpcVr(Long vpcId) {
+        Vpc vpc = vpcDao.findById(vpcId);
+        IPAddressVO ipAddressForVpcVR = getIpAddressForVpcVr(vpc, null, false);
+        if (ipAddressForVpcVR != null && !configStaticNatForVpcVr(vpc, ipAddressForVpcVR)) {
+            throw new CloudRuntimeException("Failed to reconfig static nat for VPC VR as part of the process");
+        }
+    }
+
+    private String getFirstGuestIpAddressForVpcVr(Long vpcId) {
+        String nextHop = null;
+        List<NetworkVO> networks = _ntwkDao.listByVpc(vpcId);
+        for (NetworkVO network : networks) {
+            NicVO nic = nicDao.findNonPlaceHolderByNetworkIdAndType(network.getId(), VirtualMachine.Type.DomainRouter);
+            if (nic != null) {
+                nextHop = nic.getIPv4Address();
+                break;
+            }
+        }
+        return nextHop;
+    }
 }
diff --git a/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 29c0106dc18..24c2f2221d9 100644
--- a/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -67,6 +67,7 @@ import com.cloud.network.rules.FirewallRule.Purpose;
 import com.cloud.network.rules.FirewallRuleVO;
 import com.cloud.network.rules.RulesManager;
 import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.server.ConfigurationServer;
@@ -124,6 +125,9 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
     UsageEventDao _usageEventDao;
     @Inject
     ConfigurationDao _configDao;
+    @Inject
+    VpcManager vpcManager;
+
     List<RemoteAccessVPNServiceProvider> _vpnServiceProviders;
 
     @Inject
@@ -181,7 +185,11 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
 
             Long networkId = ipAddress.getAssociatedWithNetworkId();
             if (networkId != null) {
-                _networkMgr.checkIpForService(ipAddress, Service.Vpn, null);
+                if (ipAddress.isForRouter()) {
+                    logger.debug("The IP address is reserved for Domain Router, skipping the check now");
+                } else {
+                    _networkMgr.checkIpForService(ipAddress, Service.Vpn, null);
+                }
             }
 
             final Long vpcId = ipAddress.getVpcId();
@@ -218,6 +226,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
             Pair<String, Integer> cidr = null;
 
             if (networkId != null) {
+                Network network = _networkMgr.getNetwork(networkId);
                 long ipAddressOwner = ipAddr.getAccountId();
                 vpnVO = _remoteAccessVpnDao.findByAccountAndNetwork(ipAddressOwner, networkId);
                 if (vpnVO != null) {
@@ -225,16 +234,17 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
                         return vpnVO;
                     }
 
-                    throw new InvalidParameterValueException(String.format("A remote access VPN already exists for the account [%s].", ipAddressOwner));
+                    throw new InvalidParameterValueException(String.format("A remote access VPN already exists for the network %s.", network));
                 }
-                Network network = _networkMgr.getNetwork(networkId);
                 if (!_networkMgr.areServicesSupportedInNetwork(network.getId(), Service.Vpn)) {
                     throw new InvalidParameterValueException("Vpn service is not supported in network id=" + ipAddr.getAssociatedWithNetworkId());
                 }
                 cidr = NetUtils.getCidr(network.getCidr());
+                validateIpAddressForVpnServiceOnNetwork(network, ipAddress);
             } else {
                 Vpc vpc = _vpcDao.findById(vpcId);
                 cidr = NetUtils.getCidr(vpc.getCidr());
+                validateIpAddressForVpnServiceOnVpc(vpc, ipAddress);
             }
 
             String[] guestIpRange = NetUtils.getIpRangeFromCidr(cidr.first(), cidr.second());
@@ -257,13 +267,59 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
                 if (forDisplay != null) {
                     remoteAccessVpnVO.setDisplay(forDisplay);
                 }
-                return _remoteAccessVpnDao.persist(remoteAccessVpnVO);
+                remoteAccessVpnVO = _remoteAccessVpnDao.persist(remoteAccessVpnVO);
+                if (vpcId != null) {
+                    try {
+                        vpcManager.applyStaticRouteForVpcVpnIfNeeded(vpcId, false);
+                    } catch (ResourceUnavailableException | CloudRuntimeException e) {
+                        logger.error("Unable to apply static routes for vpc " + vpcId + " due to " + e.getMessage());
+                    }
+                }
+                return remoteAccessVpnVO;
             });
         } finally {
             _ipAddressDao.releaseFromLockTable(publicIpId);
         }
     }
 
+    private void validateIpAddressForVpnServiceOnNetwork(Network network, IPAddressVO ipAddress) {
+        Long networkId = network.getId();
+        if (_networkMgr.isProviderSupportServiceInNetwork(networkId, Service.Vpn, Network.Provider.VirtualRouter)) {
+            // if VR is the VPN provider,
+            // (1) if VR is Source NAT, the IP address must be used as Source NAT
+            // (2) if VR is not Source NAT, the IP address must not be used as Source NAT
+            boolean isVRSourceNat = _networkMgr.isProviderSupportServiceInNetwork(networkId, Service.SourceNat, Network.Provider.VirtualRouter);
+            if (isVRSourceNat && !ipAddress.isSourceNat()) {
+                throw new InvalidParameterValueException("Vpn service can only be configured on the Source NAT IP of network id=" + ipAddress.getAssociatedWithNetworkId());
+            }
+            if (!isVRSourceNat && ipAddress.isSourceNat()) {
+                throw new InvalidParameterValueException("Vpn service can not be configured on the Source NAT IP of network id=" + ipAddress.getAssociatedWithNetworkId());
+            }
+            if (!isVRSourceNat) {
+                throw new InvalidParameterValueException("Currently it is not supported to create Vpn service on a non-Source NAT IP of network id=" + ipAddress.getAssociatedWithNetworkId());
+            }
+        }
+    }
+
+    private void validateIpAddressForVpnServiceOnVpc(Vpc vpc, IPAddressVO ipAddress) {
+        Long vpcId = vpc.getId();
+        if (vpcManager.isProviderSupportServiceInVpc(vpcId, Service.Vpn, Network.Provider.VPCVirtualRouter)) {
+            // if VPC VR is the VPN provider,
+            // (1) if VPC VR is Source NAT, the IP address must be used as Source NAT
+            // (2) if VPC VR is not Source NAT, the IP address must not be used as Source NAT
+            boolean isVpcVRSourceNat = vpcManager.isProviderSupportServiceInVpc(vpcId, Service.SourceNat, Network.Provider.VPCVirtualRouter);
+            if (isVpcVRSourceNat && !ipAddress.isSourceNat()) {
+                throw new InvalidParameterValueException("Vpn service can only be configured on the Source NAT IP of VPC id=" + ipAddress.getVpcId());
+            }
+            if (!isVpcVRSourceNat) {
+                IPAddressVO ipAddressForVpcVR = vpcManager.getIpAddressForVpcVr(vpc, ipAddress, true);
+                if (!vpcManager.configStaticNatForVpcVr(vpc, ipAddressForVpcVR)) {
+                    throw new CloudRuntimeException("Failed to enable static nat for VPC VR as part of remote access vpn creation");
+                }
+            }
+        }
+    }
+
     private void validateRemoteAccessVpnConfiguration() throws ConfigurationException {
         String ipRange = RemoteAccessVpnClientIpRange.value();
         if (ipRange == null) {
@@ -364,6 +420,14 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
                         Transaction.execute(new TransactionCallbackNoReturn() {
                             @Override
                             public void doInTransactionWithoutResult(TransactionStatus status) {
+                                if (vpn.getVpcId() != null) {
+                                    try {
+                                        vpcManager.applyStaticRouteForVpcVpnIfNeeded(vpn.getVpcId(), false);
+                                    } catch (ResourceUnavailableException | CloudRuntimeException e) {
+                                        logger.error("Unable to apply static routes for vpc " + vpn.getVpcId() + " due to " + e.getMessage());
+                                    }
+                                }
+
                                 _remoteAccessVpnDao.remove(vpn.getId());
 
                                 List<VpnUserVO> vpnUsers = _vpnUsersDao.listByAccount(vpn.getAccountId());
diff --git a/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 8be97644bf5..ad1d1f02682 100644
--- a/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -48,6 +48,8 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.IpAddressManager;
+import com.cloud.network.Network;
 import com.cloud.network.Site2SiteCustomerGateway;
 import com.cloud.network.Site2SiteVpnConnection;
 import com.cloud.network.Site2SiteVpnConnection.State;
@@ -61,9 +63,12 @@ import com.cloud.network.dao.Site2SiteVpnConnectionVO;
 import com.cloud.network.dao.Site2SiteVpnGatewayDao;
 import com.cloud.network.dao.Site2SiteVpnGatewayVO;
 import com.cloud.network.element.Site2SiteVpnServiceProvider;
+import com.cloud.network.vpc.Vpc;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.VpcOfferingServiceMapVO;
 import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
@@ -80,6 +85,7 @@ import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.dao.DomainRouterDao;
 
 @Component
 public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager {
@@ -100,11 +106,17 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
     @Inject
     ConfigurationDao _configDao;
     @Inject
-    VpcManager _vpcMgr;
-    @Inject
     AccountManager _accountMgr;
     @Inject
     private AnnotationDao annotationDao;
+    @Inject
+    VpcOfferingServiceMapDao vpcOfferingServiceMapDao;
+    @Inject
+    private DomainRouterDao domainRouterDao;
+    @Inject
+    private IpAddressManager ipAddressManager;
+    @Inject
+    private VpcManager vpcManager;
 
     int _connLimit;
     int _subnetsLimit;
@@ -136,13 +148,10 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         if (gws != null) {
             throw new InvalidParameterValueException(String.format("The VPN gateway of VPC %s already existed!", vpc));
         }
-        //Use source NAT ip for VPC
-        List<IPAddressVO> ips = _ipAddressDao.listByAssociatedVpc(vpcId, true);
-        if (ips.size() != 1) {
-            throw new CloudRuntimeException(String.format("Cannot found source nat ip of vpc %s", vpc));
-        }
 
-        Site2SiteVpnGatewayVO gw = new Site2SiteVpnGatewayVO(owner.getAccountId(), owner.getDomainId(), ips.get(0).getId(), vpcId);
+        IPAddressVO requestedIp = _ipAddressDao.findById(cmd.getIpAddressId());
+        IPAddressVO ipAddress = getIpAddressIdForVpn(vpcId, vpc.getVpcOfferingId(), requestedIp);
+        Site2SiteVpnGatewayVO gw = new Site2SiteVpnGatewayVO(owner.getAccountId(), owner.getDomainId(), ipAddress.getId(), vpcId);
 
         if (cmd.getDisplay() != null) {
             gw.setDisplay(cmd.getDisplay());
@@ -152,6 +161,32 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         return gw;
     }
 
+    private IPAddressVO getIpAddressIdForVpn(Long vpcId, Long vpcOferingId, IPAddressVO requestedIp) {
+        VpcOfferingServiceMapVO mapForSourceNat = vpcOfferingServiceMapDao.findByServiceProviderAndOfferingId(Network.Service.SourceNat.getName(), Network.Provider.VPCVirtualRouter.getName(), vpcOferingId);
+        VpcOfferingServiceMapVO mapForVpn = vpcOfferingServiceMapDao.findByServiceProviderAndOfferingId(Network.Service.Vpn.getName(), Network.Provider.VPCVirtualRouter.getName(), vpcOferingId);
+        if (mapForSourceNat == null && mapForVpn != null) {
+            // Use Static NAT IP of VPC VR
+            logger.debug(String.format("The VPC VR provides %s Service, however it does not provide %s service, trying to configure using IP of VPC VR", Network.Service.Vpn.getName(), Network.Service.SourceNat.getName()));
+
+            Vpc vpc = _vpcDao.findById(vpcId);
+            IPAddressVO ipAddressForVpcVR = vpcManager.getIpAddressForVpcVr(vpc, requestedIp, true);
+            if (!vpcManager.configStaticNatForVpcVr(vpc, ipAddressForVpcVR)) {
+                throw new CloudRuntimeException("Failed to enable static nat for VPC VR as part of vpn gateway");
+            }
+            return ipAddressForVpcVR;
+        } else {
+            //Use source NAT ip for VPC
+            List<IPAddressVO> ips = _ipAddressDao.listByAssociatedVpc(vpcId, true);
+            if (ips.size() != 1) {
+                throw new CloudRuntimeException("Cannot found source nat ip of vpc " + vpcId);
+            }
+            if (requestedIp != null && requestedIp.getId() != ips.get(0).getId()) {
+                throw new CloudRuntimeException(String.format("Cannot use requested IP %s as it is not the Source NAT IP", requestedIp.getAddress().addr()));
+            }
+            return ips.get(0);
+        }
+    }
+
     protected void checkCustomerGatewayCidrList(String guestCidrList) {
         String[] cidrList = guestCidrList.split(",");
         if (cidrList.length > _subnetsLimit) {
@@ -190,6 +225,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         if (!NetUtils.isValidCidrList(peerCidrList)) {
             throw new InvalidParameterValueException("The customer gateway peer cidr list " + peerCidrList + " contains an invalid cidr!");
         }
+        peerCidrList = NetUtils.getCleanIp4CidrList(peerCidrList);
         String ipsecPsk = cmd.getIpsecPsk();
         String ikePolicy = cmd.getIkePolicy();
         String espPolicy = cmd.getEspPolicy();
@@ -272,7 +308,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         String[] cidrList = customerGateway.getGuestCidrList().split(",");
 
         // Remote sub nets cannot overlap VPC's sub net
-        String vpcCidr = _vpcDao.findById(vpnGateway.getVpcId()).getCidr();
+        Vpc vpc = _vpcDao.findById(vpnGateway.getVpcId());
+        String vpcCidr = vpc.getCidr();
         for (String cidr : cidrList) {
             if (NetUtils.isNetworksOverlap(vpcCidr, cidr)) {
                 throw new InvalidParameterValueException(String.format("The subnets of customer gateway %s subnet %s is overlapped with VPC cidr %s!", customerGateway, cidr, vpcCidr));
@@ -307,6 +344,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         }
 
         _vpnConnectionDao.persist(conn);
+
         return conn;
     }
 
@@ -364,6 +402,13 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
             conn.setState(State.Pending);
             _vpnConnectionDao.persist(conn);
 
+            final Site2SiteVpnGateway vpnGateway = _vpnGatewayDao.findById(conn.getVpnGatewayId());
+            try {
+                vpcManager.applyStaticRouteForVpcVpnIfNeeded(vpnGateway.getVpcId(), false);
+            } catch (ResourceUnavailableException | CloudRuntimeException e) {
+                logger.error("Unable to apply static routes for vpc " + vpnGateway.getVpcId() + "as part of start of VPN connection, due to " + e.getMessage());
+            }
+
             boolean result = true;
             for (Site2SiteVpnServiceProvider element : _s2sProviders) {
                 result = result & element.startSite2SiteVpn(conn);
@@ -466,6 +511,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         if (!NetUtils.isValidCidrList(guestCidrList)) {
             throw new InvalidParameterValueException("The customer gateway peer cidr list " + guestCidrList + " contains an invalid cidr!");
         }
+        guestCidrList = NetUtils.getCleanIp4CidrList(guestCidrList);
         String ipsecPsk = cmd.getIpsecPsk();
         String ikePolicy = cmd.getIkePolicy();
         String espPolicy = cmd.getEspPolicy();
@@ -582,7 +628,19 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         if (conn.getState() != State.Pending) {
             stopVpnConnection(id);
         }
+
+        conn.setState(State.Removed);
+        _vpnConnectionDao.update(id, conn);
+
+        final Site2SiteVpnGateway vpnGateway = _vpnGatewayDao.findById(conn.getVpnGatewayId());
+        try {
+            vpcManager.applyStaticRouteForVpcVpnIfNeeded(vpnGateway.getVpcId(), false);
+        } catch (ResourceUnavailableException | CloudRuntimeException e) {
+            logger.error("Unable to apply static routes for vpc " + vpnGateway.getVpcId() + "as part of deletion of VPN connection, due to " + e.getMessage());
+        }
+
         _vpnConnectionDao.remove(id);
+
         return true;
     }
 
diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
index 0c836d7347d..fce848aa30d 100644
--- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -1055,8 +1055,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
                 NetworkOfferingVO defaultTungstenSharedSGNetworkOffering =
                         new NetworkOfferingVO(NetworkOffering.DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE, "Offering for Tungsten Shared Security group enabled networks",
                                 TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, Network.GuestType.Shared, true, true, false, false, false, false);
-
-                defaultTungstenSharedSGNetworkOffering.setForTungsten(true);
                 defaultTungstenSharedSGNetworkOffering.setState(NetworkOffering.State.Enabled);
                 defaultTungstenSharedSGNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultTungstenSharedSGNetworkOffering);
 
@@ -1200,66 +1198,77 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
                 _networkOfferingDao.persistDefaultL2NetworkOfferings();
 
                 // Offering #9 - network offering for NSX provider - NATTED mode
-                createAndPersistDefaultNsxOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING, "Offering for NSX enabled networks - NAT mode",
-                        NetworkOffering.NetworkMode.NATTED, false, true);
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING, "Offering for NSX enabled networks - NAT mode",
+                        NetworkOffering.NetworkMode.NATTED, false, true, false, Provider.Nsx);
 
                 // Offering #10 - network offering for NSX provider - ROUTED mode
-                createAndPersistDefaultNsxOffering(NetworkOffering.DEFAULT_ROUTED_NSX_OFFERING, "Offering for NSX enabled networks - ROUTED mode",
-                        NetworkOffering.NetworkMode.ROUTED, false, true);
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_ROUTED_NSX_OFFERING, "Offering for NSX enabled networks - ROUTED mode",
+                        NetworkOffering.NetworkMode.ROUTED, false, true, false, Provider.Nsx);
 
                 // Offering #11 - network offering for NSX provider for VPCs - NATTED mode
-                createAndPersistDefaultNsxOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC, "Offering for NSX enabled networks on VPCs - NAT mode",
-                        NetworkOffering.NetworkMode.NATTED, true, true);
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC, "Offering for NSX enabled networks on VPCs - NAT mode",
+                        NetworkOffering.NetworkMode.NATTED, true, true, false, Provider.Nsx);
 
                 // Offering #12 - network offering for NSX provider for VPCs - ROUTED mode
-                createAndPersistDefaultNsxOffering(NetworkOffering.DEFAULT_ROUTED_NSX_OFFERING_FOR_VPC, "Offering for NSX enabled networks on VPCs - ROUTED mode",
-                        NetworkOffering.NetworkMode.ROUTED, true, true);
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_ROUTED_NSX_OFFERING_FOR_VPC, "Offering for NSX enabled networks on VPCs - ROUTED mode",
+                        NetworkOffering.NetworkMode.ROUTED, true, true, false, Provider.Nsx);
 
                 // Offering #13 - network offering for NSX provider for VPCs with Internal LB - NATTED mode
-                createAndPersistDefaultNsxOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC_WITH_ILB, "Offering for NSX enabled networks on VPCs with internal LB - NAT mode",
-                        NetworkOffering.NetworkMode.NATTED, true, false);
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC_WITH_ILB, "Offering for NSX enabled networks on VPCs with internal LB - NAT mode",
+                        NetworkOffering.NetworkMode.NATTED, true, false, false, Provider.Nsx);
+
+                // Offering #14 - network offering for Netris provider for VPCs - ROUTED mode
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_ROUTED_NETRIS_OFFERING_FOR_VPC, "Offering for Netris enabled networks on VPCs - ROUTED mode",
+                        NetworkOffering.NetworkMode.ROUTED, true, true, false, Provider.Netris);
+
+                // Offering #15 - network offering for Netris provider for VPCs - NATTED mode
+                createAndPersistDefaultProviderOffering(NetworkOffering.DEFAULT_NAT_NETRIS_OFFERING_FOR_VPC, "Offering for Netris enabled networks on VPCs - NAT mode",
+                        NetworkOffering.NetworkMode.NATTED, true, true, true, Provider.Netris);
             }
         });
     }
 
-    private void createAndPersistDefaultNsxOffering(String name, String displayText, NetworkOffering.NetworkMode networkMode,
-                                                    boolean forVpc, boolean publicLB) {
-        NetworkOfferingVO defaultNatNSXNetworkOffering =
+    private void createAndPersistDefaultProviderOffering(String name, String displayText, NetworkOffering.NetworkMode networkMode,
+                                                    boolean forVpc, boolean publicLB, boolean supportVmAutoscaling, Provider provider) {
+        NetworkOfferingVO providerNetworkOffering =
                 new NetworkOfferingVO(name, displayText, TrafficType.Guest, false, false, null,
                         null, true, Availability.Optional, null, GuestType.Isolated, false,
                         false, false, false, false, forVpc);
-        defaultNatNSXNetworkOffering.setPublicLb(publicLB);
-        defaultNatNSXNetworkOffering.setInternalLb(!publicLB);
-        defaultNatNSXNetworkOffering.setForNsx(true);
-        defaultNatNSXNetworkOffering.setNetworkMode(networkMode);
-        defaultNatNSXNetworkOffering.setState(NetworkOffering.State.Enabled);
-        defaultNatNSXNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultNatNSXNetworkOffering);
+        providerNetworkOffering.setPublicLb(publicLB);
+        providerNetworkOffering.setInternalLb(!publicLB);
+        providerNetworkOffering.setNetworkMode(networkMode);
+        providerNetworkOffering.setState(NetworkOffering.State.Enabled);
+        providerNetworkOffering.setSupportsVmAutoScaling(supportVmAutoscaling);
+        providerNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(providerNetworkOffering);
 
-        Map<Service, Provider> serviceProviderMap = getServicesAndProvidersForNSXNetwork(networkMode, forVpc, publicLB);
+        Map<Service, Provider> serviceProviderMap = getServicesAndProvidersForProviderNetwork(networkMode, forVpc, provider);
         for (Map.Entry<Network.Service, Network.Provider> service : serviceProviderMap.entrySet()) {
             NetworkOfferingServiceMapVO offService =
-                    new NetworkOfferingServiceMapVO(defaultNatNSXNetworkOffering.getId(), service.getKey(), service.getValue());
+                    new NetworkOfferingServiceMapVO(providerNetworkOffering.getId(), service.getKey(), service.getValue());
             _ntwkOfferingServiceMapDao.persist(offService);
             logger.trace("Added service for the network offering: " + offService);
         }
     }
 
-    private Map<Service, Provider> getServicesAndProvidersForNSXNetwork(NetworkOffering.NetworkMode networkMode, boolean forVpc, boolean publicLB) {
+    private Map<Service, Provider> getServicesAndProvidersForProviderNetwork(NetworkOffering.NetworkMode networkMode, boolean forVpc, Provider provider) {
         final Map<Network.Service, Network.Provider> serviceProviderMap = new HashMap<>();
         Provider routerProvider = forVpc ? Provider.VPCVirtualRouter : Provider.VirtualRouter;
         serviceProviderMap.put(Service.Dhcp, routerProvider);
         serviceProviderMap.put(Service.Dns, routerProvider);
         serviceProviderMap.put(Service.UserData, routerProvider);
         if (forVpc) {
-            serviceProviderMap.put(Service.NetworkACL, Provider.Nsx);
+            serviceProviderMap.put(Service.NetworkACL, provider);
         } else {
-            serviceProviderMap.put(Service.Firewall, Provider.Nsx);
+            serviceProviderMap.put(Service.Firewall, provider);
         }
         if (networkMode == NetworkOffering.NetworkMode.NATTED) {
-            serviceProviderMap.put(Service.SourceNat, Provider.Nsx);
-            serviceProviderMap.put(Service.StaticNat, Provider.Nsx);
-            serviceProviderMap.put(Service.PortForwarding, Provider.Nsx);
-            serviceProviderMap.put(Service.Lb, Provider.Nsx);
+            serviceProviderMap.put(Service.SourceNat, provider);
+            serviceProviderMap.put(Service.StaticNat, provider);
+            serviceProviderMap.put(Service.PortForwarding, provider);
+            serviceProviderMap.put(Service.Lb, provider);
+            if (provider == Provider.Netris) {
+                serviceProviderMap.put(Service.Vpn, routerProvider);
+            }
         }
         return serviceProviderMap;
     }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index ea6c595ae13..650028e1247 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -44,6 +44,13 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.cpu.CPU;
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NsxProviderDao;
+
+import com.cloud.utils.security.CertificateHelper;
 import com.cloud.api.query.dao.ManagementServerJoinDao;
 import com.cloud.api.query.vo.ManagementServerJoinVO;
 import org.apache.cloudstack.acl.ControlledEntity;
@@ -693,7 +700,6 @@ import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManagerImpl;
 import com.cloud.consoleproxy.ConsoleProxyManagementState;
 import com.cloud.consoleproxy.ConsoleProxyManager;
-import com.cloud.cpu.CPU;
 import com.cloud.dc.AccountVlanMapVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
@@ -840,7 +846,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.MacAddress;
 import com.cloud.utils.net.NetUtils;
-import com.cloud.utils.security.CertificateHelper;
 import com.cloud.utils.ssh.SSHKeysHelper;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.DiskProfile;
@@ -904,6 +909,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     private VlanDao _vlanDao;
     @Inject
+    private VlanDetailsDao vlanDetailsDao;
+    @Inject
     private AccountVlanMapDao _accountVlanMapDao;
     @Inject
     private PodVlanMapDao _podVlanMapDao;
@@ -946,7 +953,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     private StoragePoolJoinDao _poolJoinDao;
     @Inject
-    private NetworkDao networkDao;
+    protected NetworkDao networkDao;
     @Inject
     private StorageManager _storageMgr;
     @Inject
@@ -1016,7 +1023,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     private NetworkModel _networkMgr;
     @Inject
-    private VpcDao _vpcDao;
+    protected VpcDao _vpcDao;
     @Inject
     private DomainVlanMapDao _domainVlanMapDao;
     @Inject
@@ -1048,6 +1055,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
     @Inject
     ResourceLimitService resourceLimitService;
+    @Inject
+    NsxProviderDao nsxProviderDao;
+    @Inject
+    NetrisProviderDao netrisProviderDao;
 
     private LockControllerListener _lockControllerListener;
     private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker"));
@@ -2632,6 +2643,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         final String address = cmd.getIpAddress();
         final Boolean forLoadBalancing = cmd.isForLoadBalancing();
         final Map<String, String> tags = cmd.getTags();
+        boolean forProvider = cmd.isForProvider();
 
         sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         sb.and("address", sb.entity().getAddress(), SearchCriteria.Op.EQ);
@@ -2677,13 +2689,21 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         if (isAllocated != null && isAllocated) {
             sb.and("allocated", sb.entity().getAllocatedTime(), SearchCriteria.Op.NNULL);
         }
+
+        if (forProvider) {
+            SearchBuilder<VlanDetailsVO> vlanDetailsSearch = vlanDetailsDao.createSearchBuilder();
+            vlanDetailsSearch.and("name", vlanDetailsSearch.entity().getName(), SearchCriteria.Op.IN);
+            vlanDetailsSearch.and("value", vlanDetailsSearch.entity().getValue(), SearchCriteria.Op.EQ);
+            sb.join("vlanDetailSearch", vlanDetailsSearch, sb.entity().getVlanId(), vlanDetailsSearch.entity().getResourceId(), JoinType.LEFT);
+        }
     }
 
     protected void setParameters(SearchCriteria<IPAddressVO> sc, final ListPublicIpAddressesCmd cmd, VlanType vlanType, Boolean isAllocated) {
         final Object keyword = cmd.getKeyword();
         final Long physicalNetworkId = cmd.getPhysicalNetworkId();
         final Long sourceNetworkId = cmd.getNetworkId();
-        final Long zone = cmd.getZoneId();
+        final Long vpcId = cmd.getVpcId();
+        Long zone = cmd.getZoneId();
         final String address = cmd.getIpAddress();
         final Long vlan = cmd.getVlanId();
         final Long ipId = cmd.getId();
@@ -2692,6 +2712,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         final Boolean forDisplay = cmd.getDisplay();
         final String state = cmd.getState();
         final Boolean forSystemVms = cmd.getForSystemVMs();
+        final boolean forProvider = cmd.isForProvider();
         final Map<String, String> tags = cmd.getTags();
 
         sc.setJoinParameters("vlanSearch", "vlanType", vlanType);
@@ -2757,6 +2778,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         } else {
             sc.setParameters(FOR_SYSTEMVMS, forSystemVms);
         }
+
+        if (forProvider) {
+            sc.setJoinParameters("vlanDetailSearch", "name", ApiConstants.NETRIS_DETAIL_KEY, ApiConstants.NSX_DETAIL_KEY);
+            sc.setJoinParameters("vlanDetailSearch", "value", "true");
+        }
     }
 
     @Override
diff --git a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java
index debe9eee6da..4187586736d 100644
--- a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java
+++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java
@@ -23,15 +23,18 @@ import java.util.Objects;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Vlan;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkDetailVO;
 import com.cloud.network.dao.NetworkDetailsDao;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.dao.DiskOfferingDao;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -94,6 +97,7 @@ public class RouterDeploymentDefinition {
     protected NetworkDao networkDao;
     protected DomainRouterDao routerDao;
     protected NsxProviderDao nsxProviderDao;
+    protected NetrisProviderDao netrisProviderDao;
     protected PhysicalNetworkServiceProviderDao physicalProviderDao;
     protected PhysicalNetworkDao pNtwkDao;
     protected NetworkModel networkModel;
@@ -397,10 +401,11 @@ public class RouterDeploymentDefinition {
         if (Objects.nonNull(zone)) {
             zoneId = zone.getId();
         }
-        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+
+        boolean isExternalProvider = isExternalProviderPresent(zoneId);
 
         if (isPublicNetwork) {
-            if (Objects.isNull(nsxProvider)) {
+            if (!isExternalProvider) {
                 sourceNatIp = ipAddrMgr.assignSourceNatIpAddressToGuestNetwork(owner, guestNetwork);
             } else {
                 sourceNatIp = ipAddrMgr.assignPublicIpAddress(zoneId, getPodId(), owner, Vlan.VlanType.VirtualNetwork, null, null, false, true);
@@ -408,6 +413,16 @@ public class RouterDeploymentDefinition {
         }
     }
 
+    protected boolean isExternalProviderPresent(Long zoneId) {
+        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+        NetrisProviderVO netrisProviderVO = netrisProviderDao.findByZoneId(zoneId);
+
+        if (ObjectUtils.anyNotNull(nsxProvider, netrisProviderVO)) {
+            return true;
+        }
+        return false;
+    }
+
     protected void findDefaultServiceOfferingId() {
         ServiceOfferingVO serviceOffering = serviceOfferingDao.findDefaultSystemOffering(ServiceOffering.routerDefaultOffUniqueName, ConfigurationManagerImpl.SystemVMUseLocalStorage.valueIn(dest.getDataCenter().getId()));
         serviceOfferingId = serviceOffering.getId();
diff --git a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java
index 227ae8d641e..de95956a406 100644
--- a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java
+++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkDetailsDao;
 import com.cloud.network.dao.NsxProviderDao;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -66,6 +67,8 @@ public class RouterDeploymentDefinitionBuilder {
     @Inject
     private NsxProviderDao nsxProviderDao;
     @Inject
+    private NetrisProviderDao netrisProviderDao;
+    @Inject
     private PhysicalNetworkServiceProviderDao physicalProviderDao;
     @Inject
     private NetworkModel networkModel;
@@ -129,6 +132,7 @@ public class RouterDeploymentDefinitionBuilder {
         routerDeploymentDefinition.networkDao = networkDao;
         routerDeploymentDefinition.routerDao = routerDao;
         routerDeploymentDefinition.nsxProviderDao = nsxProviderDao;
+        routerDeploymentDefinition.netrisProviderDao = netrisProviderDao;
         routerDeploymentDefinition.physicalProviderDao = physicalProviderDao;
         routerDeploymentDefinition.networkModel = networkModel;
         routerDeploymentDefinition.vrProviderDao = vrProviderDao;
diff --git a/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java
index b9ff50f369d..063565ebf46 100644
--- a/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java
+++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java
@@ -23,7 +23,6 @@ import java.util.Objects;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.network.dao.IPAddressVO;
-import com.cloud.network.element.NsxProviderVO;
 
 import com.cloud.dc.dao.VlanDao;
 import com.cloud.deploy.DataCenterDeployment;
@@ -125,10 +124,11 @@ public class VpcRouterDeploymentDefinition extends RouterDeploymentDefinition {
         if (Objects.nonNull(zone)) {
             zoneId = zone.getId();
         }
-        NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(zoneId);
+
+        boolean isExternalProvider = isExternalProviderPresent(zoneId);
 
         if (isPublicNetwork) {
-            if (Objects.isNull(nsxProvider)) {
+            if (!isExternalProvider) {
                 sourceNatIp = vpcMgr.assignSourceNatIpAddressToVpc(owner, vpc, null);
             } else {
                 sourceNatIp = vpcMgr.assignSourceNatIpAddressToVpc(owner, vpc, getPodId());
diff --git a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
index e83363877aa..2bddabce719 100644
--- a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
+++ b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
@@ -34,6 +34,7 @@ import com.cloud.network.NetworkModel;
 import com.cloud.network.NetworkService;
 import com.cloud.network.Networks;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.element.NsxProviderVO;
@@ -135,6 +136,8 @@ public class ConfigurationManagerImplTest {
     @Mock
     NsxProviderDao nsxProviderDao;
     @Mock
+    NetrisProviderDao netrisProviderDao;
+    @Mock
     DataCenterDao zoneDao;
     @Mock
     HostDao hostDao;
@@ -418,6 +421,7 @@ public class ConfigurationManagerImplTest {
         DataCenterVO dataCenterVO = Mockito.mock(DataCenterVO.class);
 
         when(nsxProviderDao.findByZoneId(anyLong())).thenReturn(nsxProviderVO);
+        when(netrisProviderDao.findByZoneId(anyLong())).thenReturn(null);
         when(zoneDao.findById(anyLong())).thenReturn(dataCenterVO);
         lenient().when(hostDao.findByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
         when(podDao.listByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
diff --git a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
index 889031f2b50..70bbe2d1b80 100644
--- a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
+++ b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
@@ -30,6 +30,7 @@ import com.cloud.offerings.NetworkOfferingVO;
 import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.net.Ip;
 import org.junit.Assert;
@@ -44,6 +45,7 @@ import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -60,6 +62,8 @@ public class NetworkModelImplTest {
 
     @Mock
     private VpcDao vpcDao;
+    @Inject
+    private NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
 
     @InjectMocks
     private NetworkModelImpl networkModel = new NetworkModelImpl();
@@ -70,8 +74,10 @@ public class NetworkModelImplTest {
     public void setUp() {
         networkOfferingDao = Mockito.mock(NetworkOfferingDao.class);
         networkServiceMapDao = Mockito.mock(NetworkServiceMapDao.class);
+        networkOfferingServiceMapDao = Mockito.mock(NetworkOfferingServiceMapDao.class);
         networkModel._networkOfferingDao = networkOfferingDao;
         networkModel._ntwkSrvcDao = networkServiceMapDao;
+        networkModel._ntwkOfferingSrvcDao = networkOfferingServiceMapDao;
     }
 
     private void prepareMocks(boolean isIp6, Network network, DataCenter zone, VpcVO vpc,
@@ -216,7 +222,6 @@ public class NetworkModelImplTest {
         PublicIpAddress publicIpAddress2 = new PublicIp(ipAddressVO2, vlanVO, 0x0ac00000L);
         NetworkOfferingVO networkOfferingVO = new NetworkOfferingVO();
         networkOfferingVO.setForVpc(true);
-        networkOfferingVO.setForNsx(false);
         Network network = new NetworkVO();
         List<NetworkServiceMapVO> networkServiceMapVOs = new ArrayList<>();
         networkServiceMapVOs.add(new NetworkServiceMapVO(15L, Network.Service.Firewall, Network.Provider.VPCVirtualRouter));
@@ -229,6 +234,7 @@ public class NetworkModelImplTest {
         Map<PublicIpAddress, Set<Network.Service>> ipToServices = new HashMap<>();
         ipToServices.put(publicIpAddress1, services1);
         ipToServices.put(publicIpAddress2, services2);
+        Mockito.when(networkOfferingServiceMapDao.isProviderForNetworkOffering(networkOfferingVO.getId(), Network.Provider.Nsx)).thenReturn(false);
         Map<Network.Provider, ArrayList<PublicIpAddress>> result = networkModel.getProviderToIpList(network, ipToServices);
         Assert.assertNotNull(result);
     }
diff --git a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
index 6b169a89267..510cd7ac1a6 100644
--- a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
@@ -1577,11 +1577,11 @@ public class AutoScaleManagerImplTest {
         when(asVmGroupMock.getState()).thenReturn(AutoScaleVmGroup.State.ENABLED);
         when(asVmGroupMock.getLoadBalancerId()).thenReturn(loadBalancerId);
         Mockito.doReturn(Network.Provider.VirtualRouter).when(autoScaleManagerImplSpy).getLoadBalancerServiceProvider(loadBalancerId);
-        Mockito.doNothing().when(autoScaleManagerImplSpy).checkVirtualRouterAsGroup(asVmGroupMock);
+        Mockito.doNothing().when(autoScaleManagerImplSpy).checkAutoscalingGroup(asVmGroupMock);
 
         autoScaleManagerImplSpy.checkAutoScaleVmGroup(asVmGroupMock);
 
-        Mockito.verify(autoScaleManagerImplSpy).checkVirtualRouterAsGroup(asVmGroupMock);
+        Mockito.verify(autoScaleManagerImplSpy).checkAutoscalingGroup(asVmGroupMock);
         Mockito.verify(autoScaleManagerImplSpy, never()).checkNetScalerAsGroup(asVmGroupMock);
     }
 
@@ -1590,11 +1590,11 @@ public class AutoScaleManagerImplTest {
         when(asVmGroupMock.getState()).thenReturn(AutoScaleVmGroup.State.ENABLED);
         when(asVmGroupMock.getLoadBalancerId()).thenReturn(loadBalancerId);
         Mockito.doReturn(Network.Provider.VPCVirtualRouter).when(autoScaleManagerImplSpy).getLoadBalancerServiceProvider(loadBalancerId);
-        Mockito.doNothing().when(autoScaleManagerImplSpy).checkVirtualRouterAsGroup(asVmGroupMock);
+        Mockito.doNothing().when(autoScaleManagerImplSpy).checkAutoscalingGroup(asVmGroupMock);
 
         autoScaleManagerImplSpy.checkAutoScaleVmGroup(asVmGroupMock);
 
-        Mockito.verify(autoScaleManagerImplSpy).checkVirtualRouterAsGroup(asVmGroupMock);
+        Mockito.verify(autoScaleManagerImplSpy).checkAutoscalingGroup(asVmGroupMock);
         Mockito.verify(autoScaleManagerImplSpy, never()).checkNetScalerAsGroup(asVmGroupMock);
     }
 
@@ -1607,7 +1607,7 @@ public class AutoScaleManagerImplTest {
 
         autoScaleManagerImplSpy.checkAutoScaleVmGroup(asVmGroupMock);
 
-        Mockito.verify(autoScaleManagerImplSpy, never()).checkVirtualRouterAsGroup(asVmGroupMock);
+        Mockito.verify(autoScaleManagerImplSpy, never()).checkAutoscalingGroup(asVmGroupMock);
         Mockito.verify(autoScaleManagerImplSpy).checkNetScalerAsGroup(asVmGroupMock);
     }
 
@@ -1989,7 +1989,7 @@ public class AutoScaleManagerImplTest {
         Mockito.doNothing().when(autoScaleManagerImplSpy).doScaleUp(vmGroupId, 1);
         Mockito.doNothing().when(autoScaleManagerImplSpy).cleanupAsVmGroupStatistics(groupTO);
 
-        autoScaleManagerImplSpy.checkVirtualRouterAsGroup(asVmGroupMock);
+        autoScaleManagerImplSpy.checkAutoscalingGroup(asVmGroupMock);
 
         Mockito.verify(autoScaleManagerImplSpy).doScaleUp(vmGroupId, 1);
     }
@@ -2005,7 +2005,7 @@ public class AutoScaleManagerImplTest {
         Mockito.doNothing().when(autoScaleManagerImplSpy).doScaleDown(vmGroupId);
         Mockito.doNothing().when(autoScaleManagerImplSpy).cleanupAsVmGroupStatistics(groupTO);
 
-        autoScaleManagerImplSpy.checkVirtualRouterAsGroup(asVmGroupMock);
+        autoScaleManagerImplSpy.checkAutoscalingGroup(asVmGroupMock);
 
         Mockito.verify(autoScaleManagerImplSpy).doScaleDown(vmGroupId);
     }
@@ -2225,7 +2225,7 @@ public class AutoScaleManagerImplTest {
         Mockito.doNothing().when(autoScaleManagerImplSpy).getVmStatsFromHosts(groupTO);
         Mockito.doNothing().when(autoScaleManagerImplSpy).getNetworkStatsFromVirtualRouter(groupTO);
 
-        autoScaleManagerImplSpy.monitorVirtualRouterAsGroup(asVmGroupMock);
+        autoScaleManagerImplSpy.monitorAutoscalingGroup(asVmGroupMock);
 
         Mockito.verify(autoScaleManagerImplSpy).getVmStatsFromHosts(groupTO);
         Mockito.verify(autoScaleManagerImplSpy).getNetworkStatsFromVirtualRouter(groupTO);
diff --git a/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java b/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
index c3e8923b943..729d2ea8ff5 100644
--- a/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
+++ b/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
@@ -33,6 +33,7 @@ import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.element.LoadBalancingServiceProvider;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountVO;
 import com.cloud.user.MockAccountManagerImpl;
@@ -52,6 +53,7 @@ import java.util.UUID;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
@@ -63,6 +65,7 @@ public class UpdateLoadBalancerTest {
     private LoadBalancerDao lbDao = Mockito.mock(LoadBalancerDao.class);
     private NetworkDao netDao = Mockito.mock(NetworkDao.class);
     private NetworkModel netModel = Mockito.mock(NetworkModel.class);
+    private NetworkOfferingServiceMapDao ntwkOffServiceMapDao = Mockito.mock(NetworkOfferingServiceMapDao.class);
     private LoadBalancingServiceProvider lbServiceProvider= Mockito.mock(LoadBalancingServiceProvider.class);
 
     private static long domainId = 5L;
@@ -73,6 +76,7 @@ public class UpdateLoadBalancerTest {
         _lbMgr._accountMgr = new MockAccountManagerImpl();
         _lbMgr._autoScaleVmGroupDao = Mockito.mock(AutoScaleVmGroupDao.class);
         _lbMgr._networkDao = netDao;
+        _lbMgr._networkOfferingServiceDao = ntwkOffServiceMapDao;
         _lbMgr._networkModel = netModel;
         _lbMgr._lb2healthcheckDao = Mockito.mock(LBHealthCheckPolicyDao.class);
         _lbMgr._lb2stickinesspoliciesDao = Mockito.mock(LBStickinessPolicyDao.class);
@@ -99,7 +103,8 @@ public class UpdateLoadBalancerTest {
         when(netDao.findById(anyLong())).thenReturn(Mockito.mock(NetworkVO.class));
         when(lbServiceProvider.validateLBRule(any(Network.class), any(LoadBalancingRule.class))).thenReturn(true);
         when(lbDao.update(isNull(), eq(lb))).thenReturn(true);
-
+        when(netDao.findById(nullable(Long.class))).thenReturn(Mockito.mock(NetworkVO.class));
+        when(ntwkOffServiceMapDao.canProviderSupportServiceInNetworkOffering(nullable(Long.class), any(Network.Service.class), any(Network.Provider.class))).thenReturn(false);
         _lbMgr.updateLoadBalancerRule(updateLbRuleCmd);
 
         InOrder inOrder = Mockito.inOrder(lbServiceProvider, lbDao);
diff --git a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java
index cdd902bcebd..2982c19ccdd 100644
--- a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -548,7 +548,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
                                                    Integer networkRate, Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, GuestType type, boolean systemOnly, Long serviceOfferingId,
                                                    boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,
                                                    Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive, Boolean forVpc,
-                                                   Boolean forTungsten, boolean forNsx, NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, NetUtils.InternetProtocol internetProtocol,
+                                                   Boolean forTungsten, boolean forNsx, boolean forNetris, NetworkOffering.NetworkMode networkMode, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, NetUtils.InternetProtocol internetProtocol,
                                                    NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber) {
         // TODO Auto-generated method stub
         return null;
@@ -559,7 +559,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
      */
     @Override
     public Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, boolean forSystemVms, Long podId, String startIP, String endIP,
-                                           String vlanGateway, String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, Account vlanOwner, String startIPv6, String endIPv6, String vlanGatewayv6, String vlanCidrv6, boolean forNsx)
+                                           String vlanGateway, String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, Account vlanOwner, String startIPv6, String endIPv6, String vlanGatewayv6, String vlanCidrv6, Provider provider)
         throws InsufficientCapacityException, ConcurrentOperationException, InvalidParameterValueException {
         // TODO Auto-generated method stub
         return null;
diff --git a/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java
index 6579a892ec6..bcc45ed911f 100644
--- a/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java
+++ b/server/src/test/java/com/cloud/vpc/NetworkACLServiceTest.java
@@ -17,6 +17,7 @@ package com.cloud.vpc;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.NetworkModel;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.vpc.NetworkACLItemDao;
@@ -81,6 +82,8 @@ public class NetworkACLServiceTest extends TestCase {
     private EntityManager _entityMgr;
     @Inject
     private NsxProviderDao nsxProviderDao;
+    @Inject
+    private NetrisProviderDao netrisProviderDao;
 
     private NetworkACLVO acl;
     private NetworkACLItemVO aclItem;
@@ -190,6 +193,9 @@ public class NetworkACLServiceTest extends TestCase {
         @Bean
         public NsxProviderDao nsxProviderDao() { return Mockito.mock(NsxProviderDao.class); }
 
+        @Bean
+        public NetrisProviderDao netrisProviderDao() { return Mockito.mock(NetrisProviderDao.class); }
+
         public static class Library implements TypeFilter {
             @Override
             public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
diff --git a/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
index 5685c504ab2..27aba5c013c 100644
--- a/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
+++ b/server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.vpc.dao;
 
+import com.cloud.network.Network;
 import com.cloud.network.Network.Service;
 import com.cloud.network.vpc.VpcOfferingServiceMapVO;
 import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
@@ -62,6 +63,16 @@ public class MockVpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOffering
         return new VpcOfferingServiceMapVO();
     }
 
+    @Override
+    public boolean isProviderForVpcOffering(Network.Provider provider, long vpcOffering) {
+        return false;
+    }
+
+    @Override
+    public List<VpcOfferingServiceMapVO> listProvidersForServiceForVpcOffering(long vpcOfferingId, Service service) {
+        return List.of();
+    }
+
     @Override
     public VpcOfferingServiceMapVO persist(VpcOfferingServiceMapVO vo) {
         return vo;
diff --git a/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java
index 0b4c48e99b4..3dec0fc2b66 100644
--- a/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java
+++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java
@@ -30,6 +30,7 @@ import com.cloud.network.Network.Service;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.VirtualRouterProvider.Type;
 import com.cloud.network.addr.PublicIp;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
@@ -79,6 +80,8 @@ public class RouterDeploymentDefinitionTest extends RouterDeploymentDefinitionTe
     PhysicalNetworkDao physicalNetworkDao;
     @Mock
     protected NsxProviderDao nsxProviderDao;
+    @Mock
+    protected NetrisProviderDao netrisProviderDao;
 
     protected RouterDeploymentDefinition deployment;
 
diff --git a/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
index d3ab6d8904b..e7f75f5dbbb 100644
--- a/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
+++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
@@ -24,6 +24,7 @@ import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
 import com.cloud.network.addr.PublicIp;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
@@ -65,6 +66,8 @@ public class VpcRouterDeploymentDefinitionTest extends RouterDeploymentDefinitio
     @Mock
     protected NsxProviderDao nsxProviderDao;
     @Mock
+    protected NetrisProviderDao netrisProviderDao;
+    @Mock
     protected PhysicalNetworkDao mockPhNwDao;
     protected PhysicalNetworkServiceProviderDao mockPhProviderDao;
 
diff --git a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
index 2a1a0237009..eab5d3eeffd 100644
--- a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
+++ b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
@@ -131,7 +131,7 @@ public class CreateNetworkOfferingTest extends TestCase {
     public void createSharedNtwkOffWithVlan() {
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared, false,
-                null, false, null, true, false, null, false, null, true, false, false, false,  null,null, null, false, null, null, false);
+                null, false, null, true, false, null, false, null, true, false, false, false,  false,null,null, null, false, null, null, false);
         assertNotNull("Shared network offering with specifyVlan=true failed to create ", off);
     }
 
@@ -139,7 +139,7 @@ public class CreateNetworkOfferingTest extends TestCase {
     public void createSharedNtwkOffWithNoVlan() {
         NetworkOfferingVO off =
                 configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, false, Availability.Optional, 200, null, false, Network.GuestType.Shared,
-                    false, null, false, null, true, false, null, false, null, true, false, false, false, null, null,null, false, null, null, false);
+                    false, null, false, null, true, false, null, false, null, true, false, false, false, false,null, null,null, false, null, null, false);
         assertNotNull("Shared network offering with specifyVlan=false was created", off);
     }
 
@@ -147,7 +147,7 @@ public class CreateNetworkOfferingTest extends TestCase {
     public void createSharedNtwkOffWithSpecifyIpRanges() {
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared, false,
-                null, false, null, true, false, null, false, null, true, false, false, false, null,null, null, false, null, null, false);
+                null, false, null, true, false, null, false, null, true, false, false, false, false,null,null, null, false, null, null, false);
 
         assertNotNull("Shared network offering with specifyIpRanges=true failed to create ", off);
     }
@@ -156,7 +156,7 @@ public class CreateNetworkOfferingTest extends TestCase {
     public void createSharedNtwkOffWithoutSpecifyIpRanges() {
         NetworkOfferingVO off =
                 configMgr.createNetworkOffering("shared", "shared", TrafficType.Guest, null, true, Availability.Optional, 200, null, false, Network.GuestType.Shared,
-                        false, null, false, null, false, false, null, false, null, true, false, false, false, null,null, null, false, null, null, false);
+                        false, null, false, null, false, false, null, false, null, true, false, false, false,false, null,null, null, false, null, null, false);
         assertNull("Shared network offering with specifyIpRanges=false was created", off);
     }
 
@@ -169,7 +169,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         serviceProviderMap.put(Network.Service.SourceNat, vrProvider);
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false,
-                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, false, false, false, null, null, null, false, null, null, false);
+                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, false, false, false, false,null, null, null, false, null, null, false);
 
         assertNotNull("Isolated network offering with specifyIpRanges=false failed to create ", off);
     }
@@ -182,7 +182,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         serviceProviderMap.put(Network.Service.SourceNat, vrProvider);
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false,
-                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, false, false, false, null,null, null, false, null, null, false);
+                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, false, false, false, false,null,null, null, false, null, null, false);
         assertNotNull("Isolated network offering with specifyVlan=true wasn't created", off);
 
     }
@@ -195,7 +195,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         serviceProviderMap.put(Network.Service.SourceNat, vrProvider);
         NetworkOfferingVO off =
                 configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false,
-                        Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true, false, false, false, null,null, null, false, null, null, false);
+                        Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true, false, false, false, false,null,null, null, false, null, null, false);
         assertNull("Isolated network offering with specifyIpRanges=true and source nat service enabled, was created", off);
     }
 
@@ -206,7 +206,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         Set<Network.Provider> vrProvider = new HashSet<Network.Provider>();
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, false, Availability.Optional, 200, serviceProviderMap, false,
-                Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true, false, false, false, null,null, null, false, null, null, false);
+                Network.GuestType.Isolated, false, null, false, null, true, false, null, false, null, true, false, false, false, false,null,null, null, false, null, null, false);
         assertNotNull("Isolated network offering with specifyIpRanges=true and with no sourceNatService, failed to create", off);
 
     }
@@ -224,7 +224,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         serviceProviderMap.put(Network.Service.Lb, vrProvider);
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false,
-                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, null, null, null, false, null, null, false);
+                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false,null, null, null, false, null, null, false);
         // System.out.println("Creating Vpc Network Offering");
         assertNotNull("Vpc Isolated network offering with Vpc provider ", off);
     }
@@ -244,7 +244,7 @@ public class CreateNetworkOfferingTest extends TestCase {
         serviceProviderMap.put(Network.Service.Lb, lbProvider);
         NetworkOfferingVO off =
             configMgr.createNetworkOffering("isolated", "isolated", TrafficType.Guest, null, true, Availability.Optional, 200, serviceProviderMap, false,
-                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, null, null, null, false, null, null, false);
+                Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, false,null, null, null, false, null, null, false);
         // System.out.println("Creating Vpc Network Offering");
         assertNotNull("Vpc Isolated network offering with Vpc and Netscaler provider ", off);
     }
diff --git a/server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java b/server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java
new file mode 100644
index 00000000000..9f590dc1807
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java
@@ -0,0 +1,134 @@
+// 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.
+package org.apache.cloudstack.service;
+
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
+import com.cloud.network.netris.NetrisNetworkRule;
+import com.cloud.network.netris.NetrisService;
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.network.vpc.Vpc;
+
+import java.util.List;
+
+public class NetrisServiceMockTest implements NetrisService {
+    @Override
+    public boolean createIPAMAllocationsForZoneLevelPublicRanges(long zoneId) {
+        return true;
+    }
+
+    @Override
+    public boolean createVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled, String cidr, boolean isVpcNetwork) {
+        return true;
+    }
+
+    @Override
+    public boolean updateVpcResource(long zoneId, long accountId, long domainId, Long vpcId, String vpcName, String previousVpcName) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteVpcResource(long zoneId, long accountId, long domainId, Vpc vpc) {
+        return true;
+    }
+
+    @Override
+    public boolean createVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr, Boolean globalRouting) {
+        return true;
+    }
+
+    @Override
+    public boolean updateVnetResource(Long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String prevNetworkName) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteVnetResource(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr) {
+        return true;
+    }
+
+    @Override
+    public boolean createSnatRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName, long networkId, boolean isForVpc, String vpcCidr, String sourceNatIp) {
+        return true;
+    }
+
+    @Override
+    public boolean createPortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, long vpcId, String networkName, Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule) {
+        return true;
+    }
+
+    @Override
+    public boolean deletePortForwardingRule(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, boolean isForVpc, String vpcCidr, SDNProviderNetworkRule networkRule) {
+        return true;
+    }
+
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        return true;
+    }
+
+    @Override
+    public boolean createStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String vpcCidr, String staticNatIp, String vmIp, long vmId) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteStaticNatRule(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String staticNatIp, long vmId) {
+        return true;
+    }
+
+    @Override
+    public List<StaticRoute> listStaticRoutes(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId) {
+        return List.of();
+    }
+
+    @Override
+    public boolean addFirewallRules(Network network, List<NetrisNetworkRule> firewallRules) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteFirewallRules(Network network, List<NetrisNetworkRule> firewallRules) {
+        return true;
+    }
+
+    @Override
+    public boolean addOrUpdateStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId, boolean updateRoute) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteStaticRoute(long zoneId, long accountId, long domainId, String networkResourceName, Long networkResourceId, boolean isForVpc, String prefix, String nextHop, Long routeId) {
+        return true;
+    }
+
+    @Override
+    public boolean releaseNatIp(long zoneId, String publicIp) {
+        return true;
+    }
+
+    @Override
+    public boolean createOrUpdateLbRule(NetrisNetworkRule rule) {
+        return true;
+    }
+
+    @Override
+    public boolean deleteLbRule(NetrisNetworkRule rule) {
+        return true;
+    }
+}
diff --git a/server/src/test/resources/createNetworkOffering.xml b/server/src/test/resources/createNetworkOffering.xml
index 5a0a51516af..81359cdc72f 100644
--- a/server/src/test/resources/createNetworkOffering.xml
+++ b/server/src/test/resources/createNetworkOffering.xml
@@ -74,6 +74,8 @@
     <bean id="configurationGroupDaoImpl" class="org.apache.cloudstack.framework.config.dao.ConfigurationGroupDaoImpl" />
     <bean id="configurationSubGroupDaoImpl" class="org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDaoImpl" />
     <bean id="nsxControllerDaoImpl" class="com.cloud.network.dao.NsxProviderDaoImpl" />
+    <bean id="netrisProviderDaoImpl" class="com.cloud.network.dao.NetrisProviderDaoImpl" />
+    <bean id="netrisServiceMock" class="org.apache.cloudstack.service.NetrisServiceMockTest" />
     <bean id="vlanDetailsDao" class="com.cloud.dc.dao.VlanDetailsDaoImpl" />
     <bean id="publicIpQuarantineDaoImpl" class="com.cloud.network.dao.PublicIpQuarantineDaoImpl" />
     <bean id="reservationDao" class="org.apache.cloudstack.reservation.dao.ReservationDaoImpl" />
diff --git a/systemvm/debian/opt/cloud/bin/configure.py b/systemvm/debian/opt/cloud/bin/configure.py
index 908f798a665..c3c91d90c5a 100755
--- a/systemvm/debian/opt/cloud/bin/configure.py
+++ b/systemvm/debian/opt/cloud/bin/configure.py
@@ -1024,13 +1024,19 @@ class CsSite2SiteVpn(CsDataBag):
             local_ip = self.dbag[vpn]['local_public_ip']
             dev = CsHelper.get_device(local_ip)
 
+            if not self.config.has_public_network():
+                interface = self.config.address().get_guest_if_by_network_id()
+                if interface:
+                    dev = interface.get_device()
+                    local_ip = interface.get_ip()
+
             if dev == "":
                 logging.error("Request for ipsec to %s not possible because ip is not configured", local_ip)
                 continue
 
             CsHelper.start_if_stopped("ipsec")
-            self.configure_iptables(dev, self.dbag[vpn])
-            self.configure_ipsec(self.dbag[vpn])
+            self.configure_iptables(dev, local_ip, self.dbag[vpn])
+            self.configure_ipsec(local_ip, self.dbag[vpn])
 
         # Delete vpns that are no longer in the configuration
         for ip in self.confips:
@@ -1046,10 +1052,10 @@ class CsSite2SiteVpn(CsDataBag):
         os.remove(vpnsecretsfile)
         CsHelper.execute("ipsec reload")
 
-    def configure_iptables(self, dev, obj):
-        self.fw.append(["", "front", "-A INPUT -i %s -p udp -m udp --dport 500 -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], obj['local_public_ip'])])
-        self.fw.append(["", "front", "-A INPUT -i %s -p udp -m udp --dport 4500 -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], obj['local_public_ip'])])
-        self.fw.append(["", "front", "-A INPUT -i %s -p esp -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], obj['local_public_ip'])])
+    def configure_iptables(self, dev, local_ip, obj):
+        self.fw.append(["", "front", "-A INPUT -i %s -p udp -m udp --dport 500 -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], local_ip)])
+        self.fw.append(["", "front", "-A INPUT -i %s -p udp -m udp --dport 4500 -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], local_ip)])
+        self.fw.append(["", "front", "-A INPUT -i %s -p esp -s %s -d %s -j ACCEPT" % (dev, obj['peer_gateway_ip'], local_ip)])
         self.fw.append(["nat", "front", "-A POSTROUTING -t nat -o %s -m mark --mark 0x525 -j ACCEPT" % dev])
         for net in obj['peer_guest_cidr_list'].lstrip().rstrip().split(','):
             self.fw.append(["mangle", "front",
@@ -1061,7 +1067,7 @@ class CsSite2SiteVpn(CsDataBag):
             self.fw.append(["mangle", "",
                             "-A INPUT -s %s -d %s -j MARK --set-xmark 0x524/0xffffffff" % (net, obj['local_guest_cidr'])])
 
-    def configure_ipsec(self, obj):
+    def configure_ipsec(self, local_ip, obj):
         leftpeer = obj['local_public_ip']
         rightpeer = obj['peer_gateway_ip']
         peerlist = obj['peer_guest_cidr_list'].replace(' ', '')
@@ -1083,7 +1089,8 @@ class CsSite2SiteVpn(CsDataBag):
         file.repopulate()  # This avoids issues when switching off split_connections or removing subnets with split_connections == true
         file.add("#conn for vpn-%s" % rightpeer, 0)
         file.search("conn ", "conn vpn-%s" % rightpeer)
-        file.addeq(" left=%s" % leftpeer)
+        file.addeq(" left=%s" % local_ip)
+        file.addeq(" leftid=%s" % leftpeer)
         file.addeq(" leftsubnet=%s" % obj['local_guest_cidr'])
         file.addeq(" right=%s" % rightpeer)
         file.addeq(" rightsubnet=%s" % peerlist)
@@ -1224,9 +1231,16 @@ class CsRemoteAccessVpn(CsDataBag):
                 logging.debug("Enabling remote access vpn on " + public_ip)
 
                 CsHelper.start_if_stopped("ipsec")
-                self.configure_l2tpIpsec(public_ip, self.dbag[public_ip])
+
                 logging.debug("Remote accessvpn  data bag %s",  self.dbag)
-                self.remoteaccessvpn_iptables(public_ip, self.dbag[public_ip])
+                if not self.config.has_public_network():
+                    interface = self.config.address().get_guest_if_by_network_id()
+                    if interface:
+                        self.configure_l2tpIpsec(interface.get_ip(), self.dbag[public_ip])
+                        self.remoteaccessvpn_iptables(interface.get_device(), interface.get_ip(), self.dbag[public_ip])
+                else:
+                    self.configure_l2tpIpsec(public_ip, self.dbag[public_ip])
+                    self.remoteaccessvpn_iptables(self.dbag[public_ip]['public_interface'], public_ip, self.dbag[public_ip])
 
                 CsHelper.execute("ipsec update")
                 CsHelper.execute("systemctl start xl2tpd")
@@ -1251,6 +1265,7 @@ class CsRemoteAccessVpn(CsDataBag):
         # Left
         l2tpfile = CsFile(l2tpconffile)
         l2tpfile.addeq(" left=%s" % left)
+        l2tpfile.addeq(" leftid=%s" % obj['vpn_server_ip'])
         l2tpfile.commit()
 
         secret = CsFile(vpnsecretfilte)
@@ -1267,8 +1282,7 @@ class CsRemoteAccessVpn(CsDataBag):
         xl2tpoptions.search("ms-dns ", "ms-dns %s" % localip)
         xl2tpoptions.commit()
 
-    def remoteaccessvpn_iptables(self, publicip, obj):
-        publicdev = obj['public_interface']
+    def remoteaccessvpn_iptables(self, publicdev, publicip, obj):
         localcidr = obj['local_cidr']
         local_ip = obj['local_ip']
 
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
index 1c4695df806..3b4ad3d7472 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
@@ -45,6 +45,19 @@ class CsAddress(CsDataBag):
                 interfaces.append(CsInterface(ip, self.config))
         return interfaces
 
+    def get_guest_if_by_network_id(self):
+        guest_interface = None
+        lowest_network_id = 1000
+        for interface in self.get_interfaces():
+            if interface.is_guest() and interface.is_added():
+                if not self.config.is_vpc():
+                    return interface
+                network_id = self.config.guestnetwork().get_network_id(interface.get_device())
+                if network_id and network_id < lowest_network_id:
+                    lowest_network_id = network_id
+                    guest_interface = interface
+        return guest_interface
+
     def get_guest_if(self):
         """
         Return CsInterface object for the lowest in use guest interface
@@ -262,12 +275,15 @@ class CsDevice:
         self.fw = config.get_fw()
         self.cl = config.cmdline()
 
-    def configure_rp(self):
+    def configure_rp(self, enable=True):
         """
         Configure Reverse Path Filtering
         """
         filename = "/proc/sys/net/ipv4/conf/%s/rp_filter" % self.dev
-        CsHelper.updatefile(filename, "1\n", "w")
+        if enable:
+            CsHelper.updatefile(filename, "1\n", "w")
+        else:
+            CsHelper.updatefile(filename, "0\n", "w")
 
     def buildlist(self):
         """
@@ -344,7 +360,7 @@ class CsIP:
 
             interfaces = [CsInterface(address, self.config)]
             CsHelper.reconfigure_interfaces(self.cl, interfaces)
-            if self.get_type() in ['public'] and not self.config.is_routed():
+            if self.get_type() in ['public'] and not self.config.is_routed() and self.config.has_public_network():
                 self.set_mark()
 
             if 'gateway' in self.address:
@@ -361,7 +377,13 @@ class CsIP:
             # The code looks redundant here, but we actually have to cater for routers and
             # VPC routers in a different manner. Please do not remove this block otherwise
             # The VPC default route will be broken.
-            if self.get_type() in ["public"] and address["device"] == CsHelper.PUBLIC_INTERFACES[self.cl.get_type()]:
+            if not self.config.has_public_network():
+                interface = self.config.address().get_guest_if_by_network_id()
+                if interface:
+                    gateway = interface.get_gateway()
+                    route.add_or_change_defaultroute(gateway)
+                    CsDevice(self.dev, self.config).configure_rp(False)
+            elif self.get_type() in ["public"] and address["device"] == CsHelper.PUBLIC_INTERFACES[self.cl.get_type()]:
                 gateway = str(address["gateway"])
                 route.add_defaultroute(gateway)
         else:
@@ -427,7 +449,7 @@ class CsIP:
         self.fw.append(["filter", "", "-P FORWARD DROP"])
 
     def fw_router(self):
-        if self.config.is_vpc() or self.config.is_routed():
+        if self.config.is_vpc() or self.config.is_routed() or self.config.is_dhcp():
             return
 
         self.fw.append(["mangle", "front", "-A PREROUTING " +
@@ -524,20 +546,24 @@ class CsIP:
             self.fw.append(["mangle", "front", "-A PREROUTING " +
                             " -i %s -m state --state RELATED,ESTABLISHED " % self.dev +
                             "-j CONNMARK --restore-mark --nfmask 0xffffffff --ctmask 0xffffffff"])
-            guestNetworkCidr = self.address['network']
-            self.fw.append(["filter", "", "-A FORWARD -d %s -o %s -j ACL_INBOUND_%s" %
-                            (guestNetworkCidr, self.dev, self.dev)])
-            self.fw.append(
-                ["filter", "front", "-A ACL_INBOUND_%s -d 224.0.0.18/32 -j ACCEPT" % self.dev])
-            self.fw.append(
-                ["filter", "front", "-A ACL_INBOUND_%s -d 225.0.0.50/32 -j ACCEPT" % self.dev])
-            self.fw.append(
-                ["filter", "", "-A ACL_INBOUND_%s -j DROP" % self.dev])
 
-            self.fw.append(
-                ["mangle", "front", "-A ACL_OUTBOUND_%s -d 225.0.0.50/32 -j ACCEPT" % self.dev])
-            self.fw.append(
-                ["mangle", "front", "-A ACL_OUTBOUND_%s -d 224.0.0.18/32 -j ACCEPT" % self.dev])
+            guestNetworkCidr = self.address['network']
+            if self.config.has_public_network():
+                self.fw.append(["filter", "", "-A FORWARD -d %s -o %s -j ACL_INBOUND_%s" %
+                                (guestNetworkCidr, self.dev, self.dev)])
+                self.fw.append(
+                    ["filter", "front", "-A ACL_INBOUND_%s -d 224.0.0.18/32 -j ACCEPT" % self.dev])
+                self.fw.append(
+                    ["filter", "front", "-A ACL_INBOUND_%s -d 225.0.0.50/32 -j ACCEPT" % self.dev])
+                self.fw.append(
+                    ["filter", "", "-A ACL_INBOUND_%s -j DROP" % self.dev])
+                self.fw.append(
+                    ["mangle", "front", "-A ACL_OUTBOUND_%s -d 225.0.0.50/32 -j ACCEPT" % self.dev])
+                self.fw.append(
+                    ["mangle", "front", "-A ACL_OUTBOUND_%s -d 224.0.0.18/32 -j ACCEPT" % self.dev])
+            else:
+                self.fw.append(["filter", "", "-A FORWARD -d %s -o %s -j ACCEPT" % (guestNetworkCidr, self.dev)])
+
             self.fw.append(
                 ["filter", "", "-A INPUT -i %s -p udp -m udp --dport 67 -j ACCEPT" % self.dev])
             self.fw.append(
@@ -552,9 +578,11 @@ class CsIP:
                 ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 443 -s %s -m state --state NEW -j ACCEPT" % (self.dev, guestNetworkCidr)])
             self.fw.append(
                 ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 8080 -s %s -m state --state NEW -j ACCEPT" % (self.dev, guestNetworkCidr)])
-            self.fw.append(["mangle", "",
-                            "-A PREROUTING -m state --state NEW -i %s -s %s ! -d %s/32 -j ACL_OUTBOUND_%s" %
-                            (self.dev, guestNetworkCidr, self.address['gateway'], self.dev)])
+
+            if self.config.has_public_network():
+                self.fw.append(["mangle", "",
+                                "-A PREROUTING -m state --state NEW -i %s -s %s ! -d %s/32 -j ACL_OUTBOUND_%s" %
+                                (self.dev, guestNetworkCidr, self.address['gateway'], self.dev)])
 
         if self.is_private_gateway():
             self.fw.append(["filter", "front", "-A FORWARD -d %s -o %s -j ACL_INBOUND_%s" %
@@ -706,6 +734,47 @@ class CsIP:
             self.nft_ipv4_acl.append({'type': "", 'chain': 'FORWARD',
                                       'rule': "iifname %s oifname %s ct state related,established counter accept" % (self.dev, self.dev)})
 
+    def fw_dhcpserver(self):
+        if not self.config.is_dhcp():
+            return
+
+        self.fw.append(["mangle", "front",
+                        "-A POSTROUTING " +
+                        "-p udp -m udp --dport 68 -j CHECKSUM --checksum-fill"])
+
+        self.fw.append(["filter", "", "-A INPUT -d 224.0.0.18/32 -j ACCEPT"])
+        self.fw.append(["filter", "", "-A INPUT -d 225.0.0.50/32 -j ACCEPT"])
+        self.fw.append(["filter", "", "-A INPUT -i %s -m state --state RELATED,ESTABLISHED -j ACCEPT" %
+                        self.dev])
+        self.fw.append(["filter", "", "-A INPUT -p icmp -j ACCEPT"])
+        self.fw.append(["filter", "", "-A INPUT -i lo -j ACCEPT"])
+
+        if self.config.is_vpc():
+            self.fw.append(
+                ["filter", "", "-A INPUT -i eth0 -p tcp -m tcp --dport 3922 -m state --state NEW,ESTABLISHED -j ACCEPT"])
+        else:
+            self.fw.append(
+                ["filter", "", "-A INPUT -i eth1 -p tcp -m tcp --dport 3922 -m state --state NEW,ESTABLISHED -j ACCEPT"])
+
+        if self.get_type() in ["guest"]:
+            guestNetworkCidr = self.address['network']
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p udp -m udp --dport 67 -j ACCEPT" % self.dev])
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p udp -m udp --dport 53 -s %s -j ACCEPT" % (self.dev, guestNetworkCidr)])
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 53 -s %s -j ACCEPT" % (self.dev, guestNetworkCidr)])
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 80 -s %s -m state --state NEW -j ACCEPT" % (self.dev, guestNetworkCidr)])
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 443 -s %s -m state --state NEW -j ACCEPT" % (self.dev, guestNetworkCidr)])
+            self.fw.append(
+                ["filter", "", "-A INPUT -i %s -p tcp -m tcp --dport 8080 -s %s -m state --state NEW -j ACCEPT" % (self.dev, guestNetworkCidr)])
+            self.fw.append(
+                ["filter", "", "-A FORWARD -i %s -o %s -m state --state RELATED,ESTABLISHED -j ACCEPT" % (self.dev, self.dev)])
+            self.fw.append(
+                ["filter", "", "-A FORWARD -i %s -o %s -m state --state NEW -j ACCEPT" % (self.dev, self.dev)])
+
 
     def post_config_change(self, method):
         route = CsRoute()
@@ -755,6 +824,7 @@ class CsIP:
         self.fw_vpcrouter()
         self.fw_router_routing()
         self.fw_vpcrouter_routing()
+        self.fw_dhcpserver()
 
         cmdline = self.config.cmdline()
 
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsConfig.py b/systemvm/debian/opt/cloud/bin/cs/CsConfig.py
index e6e738b042a..549b08f75fc 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsConfig.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsConfig.py
@@ -152,3 +152,6 @@ class CsConfig(object):
             return 'mangle'
         else:
             return ""
+
+    def has_public_network(self):
+        return self.cmdline().idata().get('has_public_network', 'true') == 'true'
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDatabag.py b/systemvm/debian/opt/cloud/bin/cs/CsDatabag.py
index 4c6b61240b8..fdffb4dd288 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsDatabag.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsDatabag.py
@@ -262,3 +262,10 @@ class CsGuestNetwork(CsDataBag):
                 if ip6gateway:
                     return ip6gateway
         return False
+
+    def get_network_id(self, devname):
+        nw = self.get_dev_data(devname)
+        networkidkey = "network_id"
+        if networkidkey not in nw:
+            return False
+        return nw[networkidkey]
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
index 1b34ee7e68d..e74e801f59d 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
@@ -146,9 +146,9 @@ class CsDhcp(CsDataBag):
                 listen_address.append(gateway)
             listen_address.append(ip)
             # Add localized "data-server" records in /etc/hosts for VPC routers
-            if (self.config.is_vpc() or self.config.is_router()) and ('is_vr_guest_gateway' not in gn.data or (not gn.data['is_vr_guest_gateway'])):
+            if (self.config.is_vpc() and gn.is_vr_guest_gateway()) or self.config.is_router():
                 self.add_host(gateway, "%s data-server" % CsHelper.get_hostname())
-            elif self.config.is_dhcp() or (self.config.is_vpc() or self.config.is_router() and gn.data['is_vr_guest_gateway']) :
+            elif self.config.is_dhcp() or (self.config.is_vpc() and not gn.is_vr_guest_gateway()):
                 self.add_host(ip, "%s data-server" % CsHelper.get_hostname())
             idx += 1
 
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py b/systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py
index 65200fb8796..a6667c852fd 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py
@@ -34,6 +34,9 @@ class CsGuestNetwork:
     def is_guestnetwork(self):
         return self.guest
 
+    def is_vr_guest_gateway(self):
+        return self.guest and ('is_vr_guest_gateway' not in self.data or self.data['is_vr_guest_gateway'])
+
     def get_dns(self):
         if not self.guest:
             return self.config.get_dns()
@@ -42,8 +45,11 @@ class CsGuestNetwork:
             return [self.data['router_guest_ip']]
 
         dns = []
-        if 'router_guest_gateway' in self.data and not self.config.use_extdns() and ('is_vr_guest_gateway' not in self.data or not self.data['is_vr_guest_gateway']):
-            dns.append(self.data['router_guest_gateway'])
+        if not self.config.use_extdns():
+            if 'router_guest_gateway' in self.data and self.is_vr_guest_gateway():
+                dns.append(self.data['router_guest_gateway'])
+            elif 'router_guest_ip' in self.data and not self.is_vr_guest_gateway():
+                dns.append(self.data['router_guest_ip'])
 
         if 'dns' in self.data:
             dns.extend(self.data['dns'].split(','))
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRoute.py b/systemvm/debian/opt/cloud/bin/cs/CsRoute.py
index 796ef505722..b0c8bf44ea5 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsRoute.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsRoute.py
@@ -85,6 +85,9 @@ class CsRoute:
         if not found and method == "add":
             logging.info("Add " + cmd)
             cmd = "ip route add " + cmd
+        elif not found and method == "change":
+            logging.info("Change " + cmd)
+            cmd = "ip route change " + cmd
         elif found and method == "delete":
             logging.info("Delete " + cmd)
             cmd = "ip route delete " + cmd
@@ -122,6 +125,24 @@ class CsRoute:
             logging.warn("No default route found!")
             return False
 
+    def add_or_change_defaultroute(self, gateway):
+        """  Add a default route if not found, or change the default route if found
+        :param str gateway
+        :return: bool
+        """
+        if not gateway:
+            raise Exception("Gateway cannot be None.")
+
+        cmd = "default via " + gateway
+        if self.defaultroute_exists():
+            logging.info("Changing default route")
+            self.set_route(cmd, method="change")
+            return True
+        else:
+            logging.info("Adding default route")
+            self.set_route(cmd)
+            return True
+
     def findRule(self, rule):
         for i in CsHelper.execute("ip rule show"):
             if rule in i.strip():
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py b/systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py
index 9e918f94a42..6f1ec62cd08 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py
@@ -58,6 +58,8 @@ class CsVpcGuestNetwork(CsDataBag):
             self.enable_ipv6(entry['device'])
             cidr_size = entry['router_guest_ip6_cidr'].split("/")[-1]
             full_addr = entry['router_guest_ip6_gateway'] + "/" + cidr_size
+            if entry['router_guest_ip6'] != entry['router_guest_ip6_gateway']:
+                full_addr = entry['router_guest_ip6'] + "/" + cidr_size
             if not CsHelper.execute("ip -6 addr show dev %s | grep -w %s" % (entry['device'], full_addr)):
                 CsHelper.execute("ip -6 addr add %s dev %s" % (full_addr, entry['device']))
             if 'router_ip6' in list(entry.keys()) and entry['router_ip6']:
@@ -74,6 +76,8 @@ class CsVpcGuestNetwork(CsDataBag):
         if 'router_guest_ip6' in list(entry.keys()) and entry['router_guest_ip6']:
             cidr_size = entry['router_guest_ip6_cidr'].split("/")[-1]
             full_addr = entry['router_guest_ip6_gateway'] + "/" + cidr_size
+            if entry['router_guest_ip6'] != entry['router_guest_ip6_gateway']:
+                full_addr = entry['router_guest_ip6'] + "/" + cidr_size
             CsHelper.execute("ip -6 addr del %s dev %s" % (full_addr, entry['device']))
             if 'router_ip6' in list(entry.keys()) and entry['router_ip6']:
                 full_public_addr = entry['router_ip6'] + "/" + cidr_size
@@ -103,11 +107,12 @@ class CsVpcGuestNetwork(CsDataBag):
             self.conf.append("    AdvSendAdvert on;")
             self.conf.append("    MinRtrAdvInterval 5;")
             self.conf.append("    MaxRtrAdvInterval 15;")
-            self.conf.append("    prefix %s" % full_addr)
-            self.conf.append("    {")
-            self.conf.append("        AdvOnLink on;")
-            self.conf.append("        AdvAutonomous on;")
-            self.conf.append("    };")
+            if entry['router_guest_ip6'] == entry['router_guest_ip6_gateway']:
+                self.conf.append("    prefix %s" % full_addr)
+                self.conf.append("    {")
+                self.conf.append("        AdvOnLink on;")
+                self.conf.append("        AdvAutonomous on;")
+                self.conf.append("    };")
             if 'dns6' in list(entry.keys()) and entry['dns6']:
                 for dns in entry['dns6'].split(","):
                     self.conf.append("    RDNSS %s" % dns)
diff --git a/systemvm/debian/opt/cloud/bin/passwd_server_ip.py b/systemvm/debian/opt/cloud/bin/passwd_server_ip.py
index 8051951a18f..bf1eab2db02 100755
--- a/systemvm/debian/opt/cloud/bin/passwd_server_ip.py
+++ b/systemvm/debian/opt/cloud/bin/passwd_server_ip.py
@@ -28,6 +28,7 @@
 import binascii
 import cgi
 import os
+import socketserver
 import sys
 import syslog
 import threading
@@ -97,9 +98,17 @@ def removePassword(ip):
             del passMap[ip]
 
 
-class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
-    pass
+class CloudStackPasswordServer(socketserver.TCPServer):
+    allow_reuse_address = 1
+    def server_bind(self):
+        """Override server_bind to store the server name."""
+        socketserver.TCPServer.server_bind(self)
+        host, port = self.server_address[:2]
+        self.server_name = host
+        self.server_port = port
 
+class ThreadedHTTPServer(ThreadingMixIn, CloudStackPasswordServer):
+    pass
 
 class PasswordRequestHandler(BaseHTTPRequestHandler):
     server_version = 'CloudStack Password Server'
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index ea7f740be85..bfb0f0b6d08 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -1707,17 +1707,10 @@ class TestVpnUsage(cloudstackTestCase):
                                 listall=True
                                 )
         if isinstance(networks, list):
-            network = networks[0]
+            cls.network = networks[0]
         else:
             raise Exception("List networks call failed")
 
-        cls.public_ip = PublicIPAddress.create(
-                                           cls.api_client,
-                                           zoneid=cls.zone.zoneid,
-                                           services=cls.services["server"],
-                                           networkid=network.id,
-                                           projectid=cls.project.id
-                                           )
         cls._cleanup = [
                         cls.project,
                         cls.service_offering,
@@ -1760,12 +1753,20 @@ class TestVpnUsage(cloudstackTestCase):
         #    this account in cloud.usage_event table
         # 4. Delete this account.
 
-        self.debug("Created VPN with public IP: %s" %
-                                    self.public_ip.ipaddress.id)
-        #Assign VPN to Public IP
+        # Listing source NAT IP of newly added network
+        ipAddresses = PublicIPAddress.list(
+            self.apiclient,
+            associatednetworkid=self.network.id,
+            projectid=self.project.id,
+            issourcenat=True)
+
+        sourceNatIP = ipAddresses[0]
+        self.debug("Created VPN with source NAT IP: %s" %
+                                    sourceNatIP.id)
+        #Assign VPN to source NAT IP
         vpn = Vpn.create(
                         self.apiclient,
-                        self.public_ip.ipaddress.id,
+                        sourceNatIP.id,
                         projectid=self.project.id
                         )
 
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
index 980e21bba27..ee7a0ea3ee0 100644
--- a/test/integration/component/test_vpn_users.py
+++ b/test/integration/component/test_vpn_users.py
@@ -165,18 +165,18 @@ class TestVPNUsers(cloudstackTestCase):
     def create_VPN(self, public_ip):
         """Creates VPN for the network"""
 
-        self.debug("Creating VPN with public IP: %s" % public_ip.ipaddress.id)
+        self.debug("Creating VPN with public IP: %s" % public_ip.id)
         try:
             # Assign VPN to Public IP
             vpn = Vpn.create(self.apiclient,
-                             self.public_ip.ipaddress.id,
+                             public_ip.id,
                              account=self.account.name,
                              domainid=self.account.domainid)
             self.cleanup.append(vpn)
 
             self.debug("Verifying the remote VPN access")
             vpns = Vpn.list(self.apiclient,
-                            publicipid=public_ip.ipaddress.id,
+                            publicipid=public_ip.id,
                             listall=True)
             self.assertEqual(
                 isinstance(vpns, list),
@@ -244,7 +244,23 @@ class TestVPNUsers(cloudstackTestCase):
         self.debug("Enabling the VPN access for IP: %s" %
                    self.public_ip.ipaddress)
 
-        self.create_VPN(self.public_ip)
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
+
+        self.create_VPN(ip)
         self.debug("Creating %s VPN users" % limit)
         for x in range(limit):
             self.create_VPN_Users()
@@ -296,9 +312,24 @@ class TestVPNUsers(cloudstackTestCase):
         # 3. add a port forward rule for UDP port 1701.  Should result in error
         #    saying that VPN is enabled over port 1701
 
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
         self.debug("Enabling the VPN connection for IP: %s" %
-                   self.public_ip.ipaddress)
-        self.create_VPN(self.public_ip)
+                   ip.address)
+        self.create_VPN(ip)
 
         self.debug("Creating a port forwarding rule on port 1701")
         # Create NAT rule
@@ -307,7 +338,7 @@ class TestVPNUsers(cloudstackTestCase):
                 self.apiclient,
                 self.virtual_machine,
                 self.services["natrule"],
-                self.public_ip.ipaddress.id)
+                ip.id)
 
         self.debug("Create NAT rule failed! Test successful!")
         return
@@ -322,9 +353,25 @@ class TestVPNUsers(cloudstackTestCase):
         # 3. We should be able to successfully establish a VPN connection using
         #    the newly added user credential.
 
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
+
         self.debug("Enabling the VPN connection for IP: %s" %
-                   self.public_ip.ipaddress)
-        self.create_VPN(self.public_ip)
+                   ip.address)
+        self.create_VPN(ip)
 
         try:
             self.debug("Adding new VPN user to account: %s" %
@@ -349,9 +396,24 @@ class TestVPNUsers(cloudstackTestCase):
         # 2. Add a VPN user say "abc"  that already an added user to the VPN.
         # 3. Adding this VPN user should fail.
 
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
         self.debug("Enabling the VPN connection for IP: %s" %
-                   self.public_ip.ipaddress)
-        self.create_VPN(self.public_ip)
+                   ip.address)
+        self.create_VPN(ip)
 
         self.debug("Adding new VPN user to account: %s" %
                    self.account.name)
@@ -379,9 +441,24 @@ class TestVPNUsers(cloudstackTestCase):
         # 2. We should be able to use this newly created user credential to
         #   establish VPN connection that will give access all VMs of this user
 
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
         self.debug("Enabling VPN connection to account: %s" %
                    self.account.name)
-        self.create_VPN(self.public_ip)
+        self.create_VPN(ip)
         self.debug("Creating VPN user for the account: %s" %
                    self.account.name)
         self.create_VPN_Users()
@@ -422,9 +499,24 @@ class TestVPNUsers(cloudstackTestCase):
         # 2. We should be able to use this newly created user credential to
         #   establish VPN connection that will give access all VMs of this user
 
+        network_id = self.virtual_machine.nic[0].networkid
+        src_nat_list = PublicIPAddress.list(
+            self.apiclient,
+            account=self.account.name,
+            domainid=self.account.domainid,
+            listall=True,
+            issourcenat=True,
+            associatednetworkid=network_id
+        )
+        self.assertEqual(
+            validateList(src_nat_list)[0],
+            PASS,
+            "Failed to list source nat ip address"
+        )
+        ip = src_nat_list[0]
         self.debug("Enabling VPN connection to account: %s" %
                    self.account.name)
-        self.create_VPN(self.public_ip)
+        self.create_VPN(ip)
         self.debug("Creating VPN user for the account: %s" %
                    self.account.name)
         self.create_VPN_Users()
diff --git a/test/integration/smoke/test_usage.py b/test/integration/smoke/test_usage.py
index 1a6ff37cedb..a65e4917a46 100644
--- a/test/integration/smoke/test_usage.py
+++ b/test/integration/smoke/test_usage.py
@@ -1732,6 +1732,14 @@ class TestVpnUsage(cloudstackTestCase):
             domainid=cls.virtual_machine.domainid,
             services=cls.services["server"]
         )
+        src_nat_list = PublicIPAddress.list(
+            cls.api_client,
+            accountid=cls.virtual_machine.account,
+            zoneid=cls.virtual_machine.zoneid,
+            domainid=cls.virtual_machine.domainid,
+            issourcenat=True
+        )
+        cls.public_ip = src_nat_list[0]
         return
 
     @classmethod
@@ -1770,11 +1778,11 @@ class TestVpnUsage(cloudstackTestCase):
         # 4. Delete this account.
 
         self.debug("Created VPN with public IP: %s" %
-                   self.public_ip.ipaddress.id)
+                   self.public_ip.ipaddress)
         # Assign VPN to Public IP
         vpn = Vpn.create(
             self.apiclient,
-            self.public_ip.ipaddress.id,
+            self.public_ip.id,
             account=self.account.name,
             domainid=self.account.domainid
         )
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 8d507670ba8..0db89372581 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -98,6 +98,7 @@ known_categories = {
     'listNsxControllers': 'NSX',
     'addNsxController': 'NSX',
     'deleteNsxController': 'NSX',
+    'NetrisProvider': 'Netris',
     'Vpn': 'VPN',
     'Limit': 'Resource Limit',
     'Netscaler': 'Netscaler',
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 93485043010..e26cd4d494e 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -1546,6 +1546,16 @@
 "label.native": "Native",
 "label.ncc": "NCC",
 "label.netmask": "Netmask",
+"label.netris": "Netris",
+"label.netristag": "Netris tag",
+"label.netris.provider": "Netris Provider",
+"label.netris.provider.name": "Netris provider name",
+"label.netris.provider.username": "Netris provider username",
+"label.netris.provider.password": "Netris provider password",
+"label.netris.provider.site": "Netris provider Site name",
+"label.netris.provider.tenant.name": "Netris provider Admin Tenant name",
+"label.netris.provider.tag": "Netris Tag",
+"label.netris.provider.url": "Netris provider URL",
 "label.netscaler": "NetScaler",
 "label.netscaler.mpx": "NetScaler MPX LoadBalancer",
 "label.netscaler.sdx": "NetScaler SDX LoadBalancer",
@@ -1599,6 +1609,7 @@
 "label.newinstance": "New Instance",
 "label.newname": "New name",
 "label.next": "Next",
+"label.nexthop": "Next hop",
 "label.nfs": "NFS",
 "label.nfsmountopts": "NFS mount options",
 "label.nfsserver": "NFS server",
@@ -1841,6 +1852,7 @@
 "label.public.ips": "Public IP addresses",
 "label.public.lb": "Public LB",
 "label.public.traffic": "Public traffic",
+"label.public.traffic.netris": "Netris Public IP Pool",
 "label.public.traffic.nsx": "NSX Public traffic",
 "label.publicinterface": "Public interface",
 "label.publicip": "IP address",
@@ -2160,8 +2172,9 @@
 "label.shutdown": "Shutdown",
 "label.shutdown.provider": "Shutdown provider",
 "label.simplified.chinese.keyboard": "Simplified Chinese keyboard",
+"label.site": "Netris Site",
 "label.site.to.site.vpn": "Site-to-site VPN",
-"label.site.to.site.vpn.connections": "Site-to-site VPN Connections",
+"label.site.to.site.vpn.connections": "VPN Connections",
 "label.size": "Size",
 "label.sizegb": "Size",
 "label.smb.domain": "SMB domain",
@@ -2324,6 +2337,7 @@
 "label.systemvm": "System VM",
 "label.systemvmtype": "System VM type",
 "label.tag": "Tag",
+"label.tag.netris": "netris",
 "label.tag.nsx": "nsx",
 "label.tag.key": "Tag key",
 "label.tag.systemvm": "systemvm",
@@ -2355,6 +2369,7 @@
 "label.templatesubject": "Subject",
 "label.templatetype": "Template type",
 "label.templateversion": "Template version",
+"label.tenantname": "Netris Tenant",
 "label.term.type": "Term type",
 "label.test": "Test",
 "label.test.webhook.delivery": "Test Webhook Delivery",
@@ -2635,6 +2650,7 @@
 "label.volumetype": "Volume Type",
 "label.vpc": "VPC",
 "label.vpcs": "VPCs",
+"label.vpc.gateway.ip": "VPC Gateway IP",
 "label.vpc.id": "VPC ID",
 "label.vpc.offerings": "VPC offerings",
 "label.vpc.virtual.router": "VPC virtual router",
@@ -2859,6 +2875,7 @@
 "message.remove.ip.v6.firewall.rule.failed": "Failed to remove IPv6 firewall rule",
 "message.remove.ip.v6.firewall.rule.processing": "Removing IPv6 firewall rule...",
 "message.remove.ip.v6.firewall.rule.success": "Removed IPv6 firewall rule",
+"message.add.netris.controller": "Add Netris Provider",
 "message.add.nsx.controller": "Add NSX Provider",
 "message.add.network": "Add a new network for zone: <b><span id=\"zone_name\"></span></b>",
 "message.add.network.acl.failed": "Adding network ACL list failed.",
@@ -2949,6 +2966,7 @@
 "message.configuring.guest.traffic": "Configuring guest traffic",
 "message.configuring.physical.networks": "Configuring physical Networks",
 "message.configuring.public.traffic": "Configuring public traffic",
+"message.configuring.netris.public.traffic": "Configuring Netris public traffic",
 "message.configuring.storage.access.failed": "Configuring storage access failed",
 "message.configuring.nsx.public.traffic": "Configuring NSX public traffic",
 "message.configuring.storage.traffic": "Configuring storage traffic",
@@ -3079,6 +3097,7 @@
 "message.delete.vpn.connection": "Please confirm that you want to delete VPN connection.",
 "message.delete.vpn.customer.gateway": "Please confirm that you want to delete this VPN customer gateway.",
 "message.delete.vpn.gateway": "Please confirm that you want to delete this VPN Gateway.",
+"message.delete.vpn.gateway.failed": "Failed to delete VPN Gateway.",
 "message.delete.webhook": "Please confirm that you want to delete this Webhook.",
 "message.delete.webhook.delivery": "Please confirm that you want to delete this Webhook delivery.",
 "message.deleting.firewall.policy": "Deleting Firewall Policy",
@@ -3144,7 +3163,7 @@
 "message.enable.vpn": "Please confirm that you want remote access VPN enabled for this IP address.",
 "message.enable.vpn.failed": "Failed to enable VPN.",
 "message.enable.vpn.processing": "Enabling VPN...",
-"message.enabled.vpn": "Your remote access VPN is currently enabled and can be accessed via the IP.",
+"message.enabled.vpn": "Your remote access VPN is currently enabled and can be accessed via the IP",
 "message.enabled.vpn.ip.sec": "Your IPSec pre-shared key is",
 "message.enabling.security.group.provider": "Enabling security group provider",
 "message.enter.valid.nic.ip": "Please enter a valid IP address for NIC",
@@ -3325,6 +3344,7 @@
 "message.import.volume": "Please specify the domain, account or project name. <br>If not set, the volume will be imported for the caller.",
 "message.info.cloudian.console": "Cloudian Management Console should open in another window.",
 "message.installwizard.cloudstack.helptext.website": " * Project website:\t ",
+"message.infra.setup.netris.description": "This zone must contain a Netris provider because the isolation method is Netris",
 "message.infra.setup.nsx.description": "This zone must contain an NSX provider because the isolation method is NSX",
 "message.infra.setup.tungsten.description": "This zone must contain a Tungsten-Fabric provider because the isolation method is TF",
 "message.installwizard.cloudstack.helptext.document": " * Documentation:\t ",
@@ -3342,6 +3362,13 @@
 "message.installwizard.tooltip.configureguesttraffic.guestgateway": "The gateway that the guests should use.",
 "message.installwizard.tooltip.configureguesttraffic.guestnetmask": "The netmask in use on the subnet that the guests should use.",
 "message.installwizard.tooltip.configureguesttraffic.gueststartip": "The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.",
+"message.installwizard.tooltip.netris.provider.name": "Netris Provider name is required",
+"message.installwizard.tooltip.netris.provider.url": "Netris Provider URL not provided",
+"message.installwizard.tooltip.netris.provider.username": "Netris Provider username not provided",
+"message.installwizard.tooltip.netris.provider.password": "Netris Provider password not provided",
+"message.installwizard.tooltip.netris.provider.site": "Netris Provider Site name not provided",
+"message.installwizard.tooltip.netris.provider.tag": "Netris Tag to be assigned to vNets",
+"message.installwizard.tooltip.netris.provider.tenant.name": "Netris Provider Admin Tenant name not provided",
 "message.installwizard.tooltip.nsx.provider.hostname": "NSX Provider hostname / IP address not provided",
 "message.installwizard.tooltip.nsx.provider.username": "NSX Provider username not provided",
 "message.installwizard.tooltip.nsx.provider.password": "NSX Provider password not provided",
@@ -3644,6 +3671,7 @@
 "message.success.delete.tungsten.router.table": "Successfully removed Router Table",
 "message.success.delete.tungsten.tag": "Successfully removed Tag",
 "message.success.delete.vm": "Successfully deleted Instance",
+"message.success.delete.vpn.gateway": "Successfully deleted VPN gateway",
 "message.success.disable.saml.auth": "Successfully disabled SAML authorization",
 "message.success.disable.vpn": "Successfully disabled VPN",
 "message.success.edit.acl": "Successfully edited ACL rule",
diff --git a/ui/src/components/CheckBoxSelectPair.vue b/ui/src/components/CheckBoxSelectPair.vue
index 4fba1da2556..480e515be29 100644
--- a/ui/src/components/CheckBoxSelectPair.vue
+++ b/ui/src/components/CheckBoxSelectPair.vue
@@ -21,7 +21,7 @@
       <a-col :md="24" :lg="layout === 'horizontal' ? 10 : 24">
         <a-checkbox
           :checked="checked"
-          :disabled="forNsx"
+          :disabled="forExternalNetProvider"
           @change="handleCheckChange">
           {{ checkBoxLabel }}
         </a-checkbox>
@@ -32,7 +32,7 @@
           :label="selectLabel">
           <a-select
             v-model:value="selected"
-            :disabled="forNsx"
+            :disabled="forExternalNetProvider"
             showSearch
             optionFilterProp="label"
             :filterOption="(input, option) => {
@@ -86,7 +86,7 @@ export default {
       type: Boolean,
       default: false
     },
-    forNsx: {
+    forExternalNetProvider: {
       type: Boolean,
       default: false
     }
@@ -123,7 +123,7 @@ export default {
       return this.option || this.selectedOption
     },
     option () {
-      if (this.forNsx) {
+      if (this.forExternalNetProvider) {
         return this.selectOptions[0]?.name || null
       }
       return null
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 450bf83a35d..c5e771de5a6 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -482,7 +482,7 @@
               <div class="resource-detail-item__label">{{ $t('label.vmname') }}</div>
               <div class="resource-detail-item__details">
                 <desktop-outlined />
-                <router-link :to="{ path: createPathBasedOnVmType(resource.vmtype, resource.virtualmachineid) }">{{ resource.vmname || resource.vm || resource.virtualmachinename || resource.virtualmachineid }} </router-link>
+                <router-link :to="{ path: createPathBasedOnVmType(resource.vmtype || resource.virtualmachinetype, resource.virtualmachineid) }">{{ resource.vmname || resource.vm || resource.virtualmachinename || resource.virtualmachineid }} </router-link>
                 <status class="status status--end" :text="resource.vmstate" v-if="resource.vmstate"/>
               </div>
             </div>
diff --git a/ui/src/config/section/infra/phynetworks.js b/ui/src/config/section/infra/phynetworks.js
index 578a12516fa..977fc984d2c 100644
--- a/ui/src/config/section/infra/phynetworks.js
+++ b/ui/src/config/section/infra/phynetworks.js
@@ -57,7 +57,7 @@ export default {
       args: ['name', 'zoneid', 'isolationmethods', 'vlan', 'tags', 'networkspeed', 'broadcastdomainrange'],
       mapping: {
         isolationmethods: {
-          options: ['VLAN', 'VXLAN', 'GRE', 'STT', 'BCF_SEGMENT', 'SSP', 'ODL', 'L3VPN', 'VCS']
+          options: ['VLAN', 'VXLAN', 'GRE', 'STT', 'BCF_SEGMENT', 'SSP', 'ODL', 'L3VPN', 'VCS', 'NSX', 'NETRIS']
         }
       }
     },
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 4e58c7a4cd8..42af53274f7 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -800,7 +800,7 @@ export default {
       }, {
         name: 'vpn',
         component: shallowRef(defineAsyncComponent(() => import('@/views/network/VpnDetails.vue'))),
-        show: (record) => { return record.issourcenat }
+        show: (record) => { return record.issourcenat || record.virtualmachinetype === 'DomainRouter' || !record.hasrules }
       },
       {
         name: 'events',
@@ -1021,7 +1021,6 @@ export default {
       title: 'label.site.to.site.vpn.connections',
       docHelp: 'adminguide/networking_and_traffic.html#setting-up-a-site-to-site-vpn-connection',
       icon: 'sync-outlined',
-      hidden: true,
       permission: ['listVpnConnections'],
       columns: ['publicip', 'state', 'gateway', 'ipsecpsk', 'ikepolicy', 'esppolicy'],
       details: ['publicip', 'gateway', 'passive', 'cidrlist', 'ipsecpsk', 'ikepolicy', 'esppolicy', 'ikelifetime', 'ikeversion', 'esplifetime', 'dpd', 'splitconnections', 'forceencap', 'created'],
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 3199b0cdeeb..ab086cf189f 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -1950,7 +1950,6 @@ export default {
           this.rules[field.name].push(rule)
           break
         case (this.currentAction.mapping && field.name in this.currentAction.mapping && 'options' in this.currentAction.mapping[field.name]):
-          console.log('op: ' + field)
           rule.required = field.required
           rule.message = this.$t('message.error.select')
           this.rules[field.name].push(rule)
@@ -1961,20 +1960,17 @@ export default {
           this.rules[field.name].push(rule)
           break
         case (field.type === 'uuid'):
-          console.log('uuid: ' + field)
           rule.required = field.required
           rule.message = this.$t('message.error.select')
           this.rules[field.name].push(rule)
           break
         case (field.type === 'list'):
-          console.log('list: ' + field)
           rule.type = 'array'
           rule.required = field.required
           rule.message = this.$t('message.error.select')
           this.rules[field.name].push(rule)
           break
         case (field.type === 'long'):
-          console.log(field)
           rule.type = 'number'
           rule.required = field.required
           rule.message = this.$t('message.validate.number')
diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue
index e1137bd0419..61f15ddedc3 100644
--- a/ui/src/views/infra/network/IpRangesTabPublic.vue
+++ b/ui/src/views/infra/network/IpRangesTabPublic.vue
@@ -230,6 +230,16 @@
           <a-form-item name="ip6cidr" ref="ip6cidr" :label="$t('label.cidr')" class="form__item">
             <a-input v-model:value="form.ip6cidr" />
           </a-form-item>
+          <a-form-item name="provider" ref="provider">
+            <template #label>
+              <tooltip-label :title="$t('label.provider')"/>
+            </template>
+            <a-select v-model:value="form.provider">
+              <a-select-option value=""></a-select-option>
+              <a-select-option value="NSX">{{ $t('label.nsx') }}</a-select-option>
+              <a-select-option value="Netris">{{ $t('label.netris') }}</a-select-option>
+            </a-select>
+          </a-form-item>
         </div>
         <div v-else>
           <a-form-item name="gateway" ref="gateway" :label="$t('label.gateway')" class="form__item">
@@ -244,6 +254,16 @@
           <a-form-item name="endip" ref="endip" :label="$t('label.endip')" class="form__item">
             <a-input v-model:value="form.endip" />
           </a-form-item>
+          <a-form-item name="provider" ref="provider">
+            <template #label>
+              <tooltip-label :title="$t('label.provider')"/>
+            </template>
+            <a-select v-model:value="form.provider">
+              <a-select-option value=""></a-select-option>
+              <a-select-option value="NSX">{{ $t('label.nsx') }}</a-select-option>
+              <a-select-option value="Netris">{{ $t('label.netris') }}</a-select-option>
+            </a-select>
+          </a-form-item>
         </div>
         <div class="form__item" v-if="!basicGuestNetwork && form.iptype != 'ip6'">
           <tooltip-label :title="$t('label.set.reservation')" :tooltip="$t('label.set.reservation.desc')" class="tooltip-label-wrapper"/>
@@ -633,6 +653,7 @@ export default {
           params.podid = values.podid
           params.networkid = this.network.id
         }
+        params.provider = values.provider
         postAPI('createVlanIpRange', params).then(() => {
           this.$notification.success({
             message: this.$t('message.success.add.iprange')
diff --git a/ui/src/views/infra/network/ServiceProvidersTab.vue b/ui/src/views/infra/network/ServiceProvidersTab.vue
index 06031b52278..b17b173f962 100644
--- a/ui/src/views/infra/network/ServiceProvidersTab.vue
+++ b/ui/src/views/infra/network/ServiceProvidersTab.vue
@@ -1128,6 +1128,50 @@ export default {
               columns: ['name', 'hostname', 'port', 'tier0gateway', 'edgecluster', 'transportzone']
             }
           ]
+        },
+        {
+          title: 'Netris',
+          details: ['name', 'state', 'id', 'physicalnetworkid', 'servicelist'],
+          actions: [
+            {
+              api: 'updateNetworkServiceProvider',
+              icon: 'stop-outlined',
+              listView: true,
+              label: 'label.disable.provider',
+              confirm: 'message.confirm.disable.provider',
+              show: (record) => { return (record && record.id && record.state === 'Enabled') },
+              mapping: {
+                state: {
+                  value: (record) => { return 'Disabled' }
+                }
+              }
+            },
+            {
+              api: 'updateNetworkServiceProvider',
+              icon: 'play-circle-outlined',
+              listView: true,
+              label: 'label.enable.provider',
+              confirm: 'message.confirm.enable.provider',
+              show: (record) => { return (record && record.id && record.state === 'Disabled') },
+              mapping: {
+                state: {
+                  value: (record) => { return 'Enabled' }
+                }
+              }
+            }
+          ],
+          lists: [
+            {
+              title: 'label.netris.provider',
+              api: 'listNetrisProviders',
+              mapping: {
+                zoneid: {
+                  value: (record) => { return record.zoneid }
+                }
+              },
+              columns: ['name', 'hostname', 'port', 'site', 'tenantname', 'netristag']
+            }
+          ]
         }
       ]
     }
@@ -1168,7 +1212,6 @@ export default {
       this.fetchLoading = true
       getAPI('listNetworkServiceProviders', { physicalnetworkid: this.resource.id, name: name }).then(json => {
         const sps = json.listnetworkserviceprovidersresponse.networkserviceprovider || []
-        console.log(sps)
         if (sps.length > 0) {
           for (const sp of sps) {
             this.nsps[sp.name] = sp
diff --git a/ui/src/views/infra/network/TrafficTypesTab.vue b/ui/src/views/infra/network/TrafficTypesTab.vue
index af5f931fc3e..c65f8ec2aec 100644
--- a/ui/src/views/infra/network/TrafficTypesTab.vue
+++ b/ui/src/views/infra/network/TrafficTypesTab.vue
@@ -21,7 +21,7 @@
       <a-tab-pane v-for="(item, index) in traffictypes" :tab="item.traffictype" :key="index">
         <a-popconfirm
           :title="$t('message.confirm.delete.traffic.type')"
-          @confirm="deleteTrafficType(itemd)"
+          @confirm="deleteTrafficType(item)"
           :okText="$t('label.yes')"
           :cancelText="$t('label.no')" >
           <a-button
diff --git a/ui/src/views/infra/zone/IpAddressRangeForm.vue b/ui/src/views/infra/zone/IpAddressRangeForm.vue
index c39534d7b93..4c9af84a8f8 100644
--- a/ui/src/views/infra/zone/IpAddressRangeForm.vue
+++ b/ui/src/views/infra/zone/IpAddressRangeForm.vue
@@ -30,16 +30,17 @@
         :columns="columns"
         :pagination="false"
         style="margin-bottom: 24px; width: 100%" >
-        <template #bodyCell="{ column, record }">
+        <template #bodyCell="{ column, record, index }">
           <template v-if="column.key === 'gateway'">
             <div> {{  record.gateway }}</div>
             <div v-if="record.fornsx"> <a-tag color="processing"> {{ $t('label.tag.nsx') }} </a-tag> </div>
-            <div v-else-if="isNsxZone"> <a-tag color="processing"> {{ $t('label.tag.systemvm') }}  </a-tag> </div>
+            <div v-else-if="record.fornetris"> <a-tag color="processing"> {{ $t('label.tag.netris') }} </a-tag> </div>
+            <div v-else-if="index === 0 && (isNsxZone || isNetrisZone)"> <a-tag color="processing"> {{ $t('label.tag.systemvm') }}  </a-tag> </div>
           </template>
           <template v-if="column.key === 'actions'">
             <tooltip-button
               :tooltip="$t('label.delete')"
-              :disabled="(record.fornsx && !forNsx) || (!record.fornsx && forNsx)"
+              :disabled="((record.fornsx && !forNsx) || (!record.fornsx && forNsx)) || ((record.fornetris && !forNetris) || (!record.fornetris && forNetris)) "
               type="primary"
               :danger="true"
               icon="delete-outlined"
@@ -76,7 +77,7 @@
                 <a-form-item name="vlan" ref="vlan">
                   <a-input
                     v-model:value="form.vlan"
-                    :disabled="forNsx"
+                    :disabled="forNsx || forNetris"
                     :placeholder="$t('label.vlan')"
                   />
                 </a-form-item>
@@ -175,6 +176,14 @@ export default {
     isNsxZone: {
       type: Boolean,
       default: false
+    },
+    forNetris: {
+      type: Boolean,
+      default: false
+    },
+    isNetrisZone: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -271,7 +280,8 @@ export default {
           startIp: values.startIp,
           endIp: values.endIp,
           fornsx: this.forNsx,
-          forsystemvms: this.isNsxZone && !this.forNsx
+          fornetris: this.forNetris,
+          forsystemvms: (this.isNsxZone && !this.forNsx) || (this.isNetrisZone && !this.forNetris && key === 0) // Set only the first public IP range for system VMs on a Netris Zone creation
         })
         this.formRef.value.resetFields()
       }).catch(error => {
diff --git a/ui/src/views/infra/zone/PhysicalNetworksTab.vue b/ui/src/views/infra/zone/PhysicalNetworksTab.vue
index 17bfd700d9b..cccb8719805 100644
--- a/ui/src/views/infra/zone/PhysicalNetworksTab.vue
+++ b/ui/src/views/infra/zone/PhysicalNetworksTab.vue
@@ -200,7 +200,7 @@ export default {
   },
   computed: {
     isolationMethods () {
-      return ['VLAN', 'VXLAN', 'GRE', 'STT', 'BCF_SEGMENT', 'SSP', 'ODL', 'L3VPN', 'VCS']
+      return ['VLAN', 'VXLAN', 'GRE', 'STT', 'BCF_SEGMENT', 'SSP', 'ODL', 'L3VPN', 'VCS', 'NSX', 'NETRIS']
     }
   },
   methods: {
diff --git a/ui/src/views/infra/zone/ZoneWizard.vue b/ui/src/views/infra/zone/ZoneWizard.vue
index 5ca0792505c..6f49e3e1b8d 100644
--- a/ui/src/views/infra/zone/ZoneWizard.vue
+++ b/ui/src/views/infra/zone/ZoneWizard.vue
@@ -159,7 +159,7 @@ export default {
         {
           name: 'network',
           title: 'label.network',
-          step: ['physicalNetwork', 'nsx', 'tungsten', 'netscaler', 'pod', 'guestTraffic', 'storageTraffic', 'publicTraffic', 'nsxPublicTraffic'],
+          step: ['physicalNetwork', 'nsx', 'netris', 'tungsten', 'netscaler', 'pod', 'guestTraffic', 'storageTraffic', 'publicTraffic', 'nsxPublicTraffic', 'netrisPublicTraffic'],
           description: this.$t('message.network.description'),
           hint: this.$t('message.network.hint')
         },
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index ccd1849978c..1286967643c 100644
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -125,6 +125,7 @@ export default {
         launching: 'message.please.wait.while.zone.is.being.created'
       },
       nsx: false,
+      netris: false,
       isLaunchZone: false,
       processStatus: null,
       messageError: '',
@@ -218,6 +219,7 @@ export default {
       const index = this.steps.findIndex(step => step.index === this.currentStep)
       this.steps[index].status = status
       this.nsx = false
+      this.netris = false
     },
     handleBack (e) {
       this.$emit('backPressed')
@@ -470,7 +472,6 @@ export default {
           if (physicalNetwork.tags) {
             params.tags = physicalNetwork.tags
           }
-
           try {
             if (!this.stepData.stepMove.includes('createPhysicalNetwork' + index)) {
               const physicalNetworkResult = await this.createPhysicalNetwork(params)
@@ -487,7 +488,10 @@ export default {
               if (physicalNetwork.isolationMethod === 'NSX' &&
                 physicalNetwork.traffics.findIndex(traffic => traffic.type === 'public' || traffic.type === 'guest') > -1) {
                 this.stepData.isNsxZone = true
-                this.stepData.tungstenPhysicalNetworkId = physicalNetworkReturned.id
+              }
+              if (physicalNetwork.isolationMethod.toLowerCase() === 'netris' &&
+                physicalNetwork.traffics.findIndex(traffic => traffic.type === 'public' || traffic.type === 'guest') > -1) {
+                this.stepData.isNetrisZone = true
               }
             } else {
               this.stepData.physicalNetworkReturned = this.stepData.physicalNetworkItem['createPhysicalNetwork' + index]
@@ -909,12 +913,14 @@ export default {
         this.addStep(message, trafficType)
         if (trafficType === 'nsxPublicTraffic') {
           this.nsx = false
+        } else if (trafficType === 'netrisPublicTraffic') {
+          this.netris = false
         }
 
         let stopNow = false
         this.stepData.returnedPublicTraffic = this.stepData?.returnedPublicTraffic || []
         let publicIpRanges = this.prefillContent['public-ipranges']
-        publicIpRanges = publicIpRanges.filter(item => item.fornsx === (idx === 1))
+        publicIpRanges = publicIpRanges.filter(item => (item.fornsx || item.fornetris) === (idx === 1))
         for (let index = 0; index < publicIpRanges.length; index++) {
           const publicVlanIpRange = publicIpRanges[index]
           let isExisting = false
@@ -937,16 +943,22 @@ export default {
           params.zoneId = this.stepData.zoneReturned.id
           if (publicVlanIpRange.vlan && publicVlanIpRange.vlan.length > 0) {
             params.vlan = publicVlanIpRange.vlan
-          } else if (publicVlanIpRange.fornsx) {
+          } else if (publicVlanIpRange.fornsx || publicVlanIpRange.fornetris) { // TODO: should this be the same for Netris?
             params.vlan = null
           } else {
             params.vlan = 'untagged'
           }
+          let provider = null
+          if (publicVlanIpRange.fornsx) {
+            provider = 'Nsx'
+          } else if (publicVlanIpRange.fornetris) {
+            provider = 'Netris'
+          }
           params.gateway = publicVlanIpRange.gateway
           params.netmask = publicVlanIpRange.netmask
           params.startip = publicVlanIpRange.startIp
           params.endip = publicVlanIpRange.endIp
-          params.fornsx = publicVlanIpRange.fornsx
+          params.provider = provider
           params.forsystemvms = publicVlanIpRange.forsystemvms
 
           if (this.isBasicZone) {
@@ -979,14 +991,20 @@ export default {
         if (stopNow) {
           return
         }
-
         if (idx === 0) {
-          await this.stepConfigurePublicTraffic('message.configuring.nsx.public.traffic', 'nsxPublicTraffic', 1)
+          const isolationMethods = Object.values(this.stepData.physicalNetworkItem).map(network => network.isolationmethods.toLowerCase())
+          if (isolationMethods.includes('nsx')) {
+            await this.stepConfigurePublicTraffic('message.configuring.nsx.public.traffic', 'nsxPublicTraffic', 1)
+          } else if (isolationMethods.includes('netris')) {
+            await this.stepConfigurePublicTraffic('message.configuring.netris.public.traffic', 'netrisPublicTraffic', 1)
+          }
         } else {
           if (this.stepData.isTungstenZone) {
             await this.stepCreateTungstenFabricPublicNetwork()
           } else if (this.stepData.isNsxZone) {
             await this.stepAddNsxController()
+          } else if (this.stepData.isNetrisZone) {
+            await this.stepAddNetrisProvider()
           } else {
             await this.stepConfigureStorageTraffic()
           }
@@ -1090,6 +1108,37 @@ export default {
         this.setStepStatus(STATUS_FAILED)
       }
     },
+    async stepAddNetrisProvider () {
+      this.setStepStatus(STATUS_FINISH)
+      this.currentStep++
+      this.addStep('message.add.netris.controller', 'netris')
+      if (this.stepData.stepMove.includes('netris')) {
+        await this.stepConfigureStorageTraffic()
+        return
+      }
+      try {
+        if (!this.stepData.stepMove.includes('addNetrisProvider')) {
+          const providerParams = {}
+          providerParams.name = this.prefillContent?.netrisName || ''
+          providerParams.url = this.prefillContent?.url || ''
+          providerParams.username = this.prefillContent?.username || ''
+          providerParams.password = this.prefillContent?.password || ''
+          providerParams.zoneid = this.stepData.zoneReturned.id
+          providerParams.sitename = this.prefillContent?.siteName || ''
+          providerParams.tenantname = this.prefillContent?.tenantName || ''
+          providerParams.netristag = this.prefillContent?.netrisTag || ''
+
+          await this.addNetrisProvider(providerParams)
+          this.stepData.stepMove.push('addNetrisProvider')
+        }
+        this.stepData.stepMove.push('netris')
+        await this.stepConfigureStorageTraffic()
+      } catch (e) {
+        this.messageError = e
+        this.processStatus = STATUS_FAILED
+        this.setStepStatus(STATUS_FAILED)
+      }
+    },
     async stepConfigureStorageTraffic () {
       let targetNetwork = false
       this.prefillContent.physicalNetworks.forEach(physicalNetwork => {
@@ -2257,6 +2306,16 @@ export default {
         })
       })
     },
+    addNetrisProvider (args) {
+      return new Promise((resolve, reject) => {
+        postAPI('addNetrisProvider', args).then(json => {
+          resolve()
+        }).catch(error => {
+          const message = error.response.headers['x-description']
+          reject(message)
+        })
+      })
+    },
     configTungstenFabricService (args) {
       return new Promise((resolve, reject) => {
         postAPI('configTungstenFabricService', args).then(json => {
diff --git a/ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue b/ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue
index b14886cfeed..74d1748976a 100644
--- a/ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue
@@ -51,7 +51,7 @@
       :isFixError="isFixError"
     />
     <ip-address-range-form
-      v-if="steps && ['publicTraffic', 'nsxPublicTraffic'].includes(steps[currentStep].formKey)"
+      v-if="steps && ['publicTraffic', 'nsxPublicTraffic', 'netrisPublicTraffic'].includes(steps[currentStep].formKey)"
       @nextPressed="nextPressed"
       @backPressed="handleBack"
       @fieldsChanged="fieldsChanged"
@@ -62,6 +62,8 @@
       :isFixError="isFixError"
       :forNsx="steps[currentStep].formKey === 'nsxPublicTraffic'"
       :isNsxZone="isNsxZone"
+      :forNetris="steps[currentStep].formKey === 'netrisPublicTraffic'"
+      :isNetrisZone="isNetrisZone"
     />
 
     <static-inputs-form
@@ -88,6 +90,18 @@
       :isFixError="isFixError"
     />
 
+    <static-inputs-form
+      v-if="steps && steps[currentStep].formKey === 'netris'"
+      @nextPressed="nextPressed"
+      @backPressed="handleBack"
+      @fieldsChanged="fieldsChanged"
+      @submitLaunchZone="submitLaunchZone"
+      :fields="netrisFields"
+      :prefillContent="prefillContent"
+      :description="netrisSetupDescription"
+      :isFixError="isFixError"
+    />
+
     <static-inputs-form
       v-if="steps && steps[currentStep].formKey === 'pod'"
       @nextPressed="nextPressed"
@@ -101,7 +115,6 @@
     />
 
     <div v-if="guestTrafficRangeMode">
-      <div>{{ isNsxZone }}</div>
       <static-inputs-form
         v-if="steps && steps[currentStep].formKey === 'guestTraffic'"
         @nextPressed="nextPressed"
@@ -214,8 +227,17 @@ export default {
       }
       return isNsx
     },
+    isNetrisZone () {
+      let isNetris = false
+      if (!this.prefillContent.physicalNetworks) {
+        isNetris = false
+      } else {
+        const netrisIdx = this.prefillContent.physicalNetworks.findIndex(network => network.isolationMethod === 'Netris')
+        isNetris = netrisIdx > -1
+      }
+      return isNetris
+    },
     allSteps () {
-      console.log(this.isNsxZone)
       const steps = []
       steps.push({
         title: 'label.physical.network',
@@ -233,6 +255,12 @@ export default {
           formKey: 'nsx'
         })
       }
+      if (this.isNetrisZone) {
+        steps.push({
+          title: 'label.netris.provider',
+          formKey: 'netris'
+        })
+      }
       if (this.havingNetscaler) {
         steps.push({
           title: 'label.netScaler',
@@ -251,6 +279,13 @@ export default {
           trafficType: 'public'
         })
       }
+      if (this.isNetrisZone) {
+        steps.push({
+          title: 'label.public.traffic.netris',
+          formKey: 'netrisPublicTraffic',
+          trafficType: 'public'
+        })
+      }
       steps.push({
         title: 'label.pod',
         formKey: 'pod'
@@ -440,6 +475,54 @@ export default {
       ]
       return fields
     },
+    netrisFields () {
+      const fields = [
+        {
+          title: 'label.netris.provider.name',
+          key: 'netrisName',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.name',
+          required: true
+        },
+        {
+          title: 'label.netris.provider.url',
+          key: 'url',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.url',
+          required: true
+        },
+        {
+          title: 'label.netris.provider.username',
+          key: 'username',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.username',
+          required: true
+        },
+        {
+          title: 'label.netris.provider.password',
+          key: 'password',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.password',
+          required: true,
+          password: true
+        },
+        {
+          title: 'label.netris.provider.site',
+          key: 'siteName',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.site',
+          required: true
+        },
+        {
+          title: 'label.netris.provider.tenant.name',
+          key: 'tenantName',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.tenant.name',
+          required: true
+        },
+        {
+          title: 'label.netris.provider.tag',
+          key: 'netrisTag',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.tag',
+          required: true
+        }
+      ]
+      return fields
+    },
     guestTrafficFields () {
       const fields = [
         {
@@ -510,6 +593,7 @@ export default {
       podSetupDescription: 'message.add.pod.during.zone.creation',
       tungstenSetupDescription: 'message.infra.setup.tungsten.description',
       nsxSetupDescription: 'message.infra.setup.nsx.description',
+      netrisSetupDescription: 'message.infra.setup.netris.description',
       netscalerSetupDescription: 'label.please.specify.netscaler.info',
       storageTrafficDescription: 'label.zonewizard.traffictype.storage',
       podFields: [
diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
index e4354a6d3b0..9d221bdccc3 100644
--- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
@@ -67,6 +67,7 @@
             <a-select-option value="VCS"> VCS </a-select-option>
             <a-select-option value="TF"> TF </a-select-option>
             <a-select-option v-if="hypervisor === 'VMware'" value="NSX"> NSX </a-select-option>
+            <a-select-option v-if="hypervisor === 'KVM'" value="Netris"> NETRIS </a-select-option>
 
             <template #suffixIcon>
               <a-tooltip
diff --git a/ui/src/views/network/IpAddressesTab.vue b/ui/src/views/network/IpAddressesTab.vue
index f2efb9d2ba4..ee9d1eff42b 100644
--- a/ui/src/views/network/IpAddressesTab.vue
+++ b/ui/src/views/network/IpAddressesTab.vue
@@ -282,10 +282,12 @@ export default {
       acquireLoading: false,
       acquireIp: null,
       listPublicIpAddress: [],
-      changeSourceNat: false
+      changeSourceNat: false,
+      zoneExtNetProvider: ''
     }
   },
-  created () {
+  async created () {
+    await this.fetchZones()
     this.fetchData()
   },
   watch: {
@@ -321,6 +323,9 @@ export default {
       } else {
         params.associatednetworkid = this.resource.id
       }
+      if (['nsx', 'netris'].includes(this.zoneExtNetProvider?.toLowerCase())) {
+        params.forprovider = true
+      }
       this.fetchLoading = true
       getAPI('listPublicIpAddresses', params).then(json => {
         this.totalIps = json.listpublicipaddressesresponse.count || 0
@@ -329,6 +334,16 @@ export default {
         this.fetchLoading = false
       })
     },
+    fetchZones () {
+      return new Promise((resolve, reject) => {
+        getAPI('listZones', {
+          id: this.resource.zoneid
+        }).then(json => {
+          this.zoneExtNetProvider = json?.listzonesresponse?.zone?.[0]?.provider || null
+          resolve(this.zoneExtNetProvider)
+        }).catch(reject)
+      })
+    },
     fetchListPublicIpAddress () {
       return new Promise((resolve, reject) => {
         const params = {
@@ -338,6 +353,9 @@ export default {
           forvirtualnetwork: true,
           allocatedonly: false
         }
+        if (['nsx', 'netris'].includes(this.zoneExtNetProvider?.toLowerCase())) {
+          params.forprovider = true
+        }
         getAPI('listPublicIpAddresses', params).then(json => {
           const listPublicIps = json.listpublicipaddressesresponse.publicipaddress || []
           resolve(listPublicIps)
diff --git a/ui/src/views/network/LoadBalancing.vue b/ui/src/views/network/LoadBalancing.vue
index 61389df19c5..803371ffaa3 100644
--- a/ui/src/views/network/LoadBalancing.vue
+++ b/ui/src/views/network/LoadBalancing.vue
@@ -40,7 +40,7 @@
           <tooltip-label :title="$t('label.sourcecidrlist')" bold :tooltip="createLoadBalancerRuleParams.cidrlist.description" :tooltip-placement="'right'"/>
           <a-input v-model:value="newRule.cidrlist"></a-input>
         </div>
-        <div class="form__item">
+        <div class="form__item" v-if="lbProvider !== 'Netris'">
           <div class="form__label">{{ $t('label.algorithm') }}</div>
           <a-select
             v-model:value="newRule.algorithm"
@@ -64,7 +64,7 @@
             :filterOption="(input, option) => {
               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }" >
-            <a-select-option value="tcp-proxy" :label="$t('label.tcp.proxy')">{{ $t('label.tcp.proxy') }}</a-select-option>
+            <a-select-option v-if="lbProvider !== 'Netris'" value="tcp-proxy" :label="$t('label.tcp.proxy')">{{ $t('label.tcp.proxy') }}</a-select-option>
             <a-select-option value="tcp" :label="$t('label.tcp')">{{ $t('label.tcp') }}</a-select-option>
             <a-select-option value="udp" :label="$t('label.udp')">{{ $t('label.udp') }}</a-select-option>
           </a-select>
@@ -134,7 +134,7 @@
         <template v-if="column.key === 'protocol'">
           {{ getCapitalise(record.protocol) }}
         </template>
-        <template v-if="column.key === 'stickiness'">
+        <template v-if="column.key === 'stickiness' && !this.isNetrisZone">
           <a-button @click="() => openStickinessModal(record.id)">
             {{ returnStickinessLabel(record.id) }}
           </a-button>
@@ -409,7 +409,7 @@
           <p class="edit-rule__label">{{ $t('label.name') }}</p>
           <a-input v-focus="true" v-model:value="editRuleDetails.name" />
         </div>
-        <div class="edit-rule__item">
+        <div v-if="lbProvider !== 'Netris'" class="edit-rule__item">
           <p class="edit-rule__label">{{ $t('label.algorithm') }}</p>
           <a-select
             v-model:value="editRuleDetails.algorithm"
@@ -423,7 +423,7 @@
             <a-select-option value="source" :label="$t('label.lb.algorithm.source')">{{ $t('label.lb.algorithm.source') }}</a-select-option>
           </a-select>
         </div>
-        <div class="edit-rule__item">
+        <div v-if="lbProvider !== 'Netris'" class="edit-rule__item">
           <p class="edit-rule__label">{{ $t('label.protocol') }}</p>
           <a-select
             v-model:value="editRuleDetails.protocol"
@@ -781,9 +781,11 @@ export default {
         vmguestip: [],
         cidrlist: ''
       },
+      lbProvider: null,
       addVmModalVisible: false,
       addVmModalLoading: false,
       addVmModalNicLoading: false,
+      zoneloading: false,
       vms: [],
       nics: [],
       totalCount: 0,
@@ -802,10 +804,6 @@ export default {
           title: this.$t('label.privateport'),
           dataIndex: 'privateport'
         },
-        {
-          key: 'algorithm',
-          title: this.$t('label.algorithm')
-        },
         {
           key: 'cidrlist',
           title: this.$t('label.sourcecidrlist')
@@ -920,7 +918,8 @@ export default {
         expectedcode: undefined,
         urlpath: '/'
       },
-      healthMonitorLoading: false
+      healthMonitorLoading: false,
+      isNetrisZone: false
     }
   },
   computed: {
@@ -979,6 +978,7 @@ export default {
     fetchData () {
       this.fetchListTiers()
       this.fetchLBRules()
+      this.fetchZone()
     },
     fetchListTiers () {
       this.tiers.loading = true
@@ -1073,6 +1073,25 @@ export default {
         })
       })
     },
+    fetchZone () {
+      this.zoneloading = true
+      getAPI('listZones', {
+        id: this.resource.zoneid
+      }).then(response => {
+        this.lbProvider = response?.listzonesresponse?.zone?.[0]?.provider || null
+        if (this.lbProvider != null) {
+          this.isNetrisZone = this.lbProvider === 'Netris'
+        }
+      }).finally(() => {
+        this.zoneloading = false
+        if (this.lbProvider !== 'Netris') {
+          this.column.push({
+            key: 'algorithm',
+            title: this.$t('label.algorithm')
+          })
+        }
+      })
+    },
     returnAlgorithmName (name) {
       switch (name) {
         case 'leastconn':
@@ -1377,7 +1396,7 @@ export default {
       this.selectedRule = rule
       this.editRuleModalVisible = true
       this.editRuleDetails.name = this.selectedRule.name
-      this.editRuleDetails.algorithm = this.selectedRule.algorithm
+      this.editRuleDetails.algorithm = this.lbProvider !== 'Netris' ? this.selectedRule.algorithm : undefined
       this.editRuleDetails.protocol = this.selectedRule.protocol
     },
     handleSubmitEditForm () {
diff --git a/ui/src/views/network/PublicIpResource.vue b/ui/src/views/network/PublicIpResource.vue
index 8654ec363c9..7c25e1c32ba 100644
--- a/ui/src/views/network/PublicIpResource.vue
+++ b/ui/src/views/network/PublicIpResource.vue
@@ -134,21 +134,21 @@ export default {
         this.tabs = this.defaultTabs
         return
       }
-      // VPC IPs with source nat have only VPN
-      if (this.resource && this.resource.vpcid && this.resource.issourcenat) {
-        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
-        return
-      }
-      // VPC IPs with vpnenabled have only VPN
-      if (this.resource && this.resource.vpcid && this.resource.vpnenabled) {
-        this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
-        return
-      }
-      // VPC IPs with static nat have nothing
-      if (this.resource && this.resource.vpcid && this.resource.isstaticnat) {
-        return
-      }
       if (this.resource && this.resource.vpcid) {
+        // VPC IPs with source nat have only VPN
+        if (this.resource.issourcenat) {
+          this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+          return
+        }
+
+        // VPC IPs with static nat have nothing
+        if (this.resource.isstaticnat) {
+          if (this.resource.virtualmachinetype === 'DomainRouter') {
+            this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
+          }
+          return
+        }
+
         // VPC IPs don't have firewall
         let tabs = this.$route.meta.tabs.filter(tab => tab.name !== 'firewall')
 
@@ -194,6 +194,9 @@ export default {
       this.actions = this.$route.meta.actions || []
     },
     fetchNetwork () {
+      if (!this.resource.associatednetworkid) {
+        return null
+      }
       return new Promise((resolve, reject) => {
         getAPI('listNetworks', {
           listAll: true,
diff --git a/ui/src/views/network/StaticRoutesTab.vue b/ui/src/views/network/StaticRoutesTab.vue
index bcdcc913fbf..e3ce561ca21 100644
--- a/ui/src/views/network/StaticRoutesTab.vue
+++ b/ui/src/views/network/StaticRoutesTab.vue
@@ -17,29 +17,44 @@
 
 <template>
   <a-spin :spinning="componentLoading">
-    <div class="new-route" v-ctrl-enter="handleAdd">
-      <a-input v-model:value="newRoute" :placeholder="$t('label.cidr.destination.network')" v-focus="true"></a-input>
+    <div class="form" v-ctrl-enter="handleAdd">
+      <div class="form__label">
+        <a-input v-model:value="newRoute" :placeholder="$t('label.cidr.destination.network')" v-focus="true"></a-input>
+      </div>
+      <div class="form__label" v-if="this.$route.fullPath.startsWith('/vpc')">
+        <div :span="24" class="form__label">via</div>
+      </div>
+      <div class="form__label" v-if="this.$route.fullPath.startsWith('/vpc')">
+        <a-input v-model:value="nexthop" :placeholder="$t('label.nexthop')"></a-input>
+      </div>
       <a-button type="primary" :disabled="!('createStaticRoute' in $store.getters.apis)" @click="handleAdd">{{ $t('label.add.route') }}</a-button>
     </div>
 
-    <div class="list">
-      <div v-for="(route, index) in routes" :key="index" class="list__item">
-        <div class="list__col">
-          <div class="list__label">{{ $t('label.cidr.destination.network') }}</div>
-          <div>{{ route.cidr }}</div>
-        </div>
-        <div class="actions">
-          <tooltip-button :tooltip="$t('label.edit.tags')" icon="tag-outlined" @onClick="() => openTagsModal(route)" />
+    <a-divider/>
+    <a-table
+      size="small"
+      style="overflow-y: auto"
+      :loading="loading"
+      :columns="columns"
+      :dataSource="routes"
+      :pagination="false"
+      :rowKey="record => record.id">
+      <template #bodyCell="{ column, text, record }">
+        <template v-if="column.key === 'vpcgatewayip'">
+          <router-link :to="{ path: '/privategw/' + record.vpcgatewayid }" >{{ text }}</router-link>
+        </template>
+        <template v-if="column.key === 'actions'">
+          <tooltip-button :tooltip="$t('label.edit.tags')" icon="tag-outlined" @onClick="() => openTagsModal(record)" />
           <tooltip-button
             :tooltip="$t('label.delete')"
             :disabled="!('deleteStaticRoute' in $store.getters.apis)"
             icon="delete-outlined"
             type="primary"
             :danger="true"
-            @onClick="() => handleDelete(route)" />
-        </div>
-      </div>
-    </div>
+            @onClick="() => handleDelete(record)" />
+        </template>
+      </template>
+    </a-table>
 
     <a-modal
       :title="$t('label.edit.tags')"
@@ -90,10 +105,12 @@
 import { ref, reactive, toRaw } from 'vue'
 import { getAPI, postAPI } from '@/api'
 import TooltipButton from '@/components/widgets/TooltipButton'
+import TooltipLabel from '@/components/widgets/TooltipLabel.vue'
 
 export default {
   name: 'StaticRoutesTab',
   components: {
+    TooltipLabel,
     TooltipButton
   },
   props: {
@@ -114,7 +131,27 @@ export default {
       tagsModalVisible: false,
       tags: [],
       tagsLoading: false,
-      newRoute: null
+      newRoute: null,
+      nexthop: null,
+      columns: [
+        {
+          title: this.$t('label.cidr.destination.network'),
+          dataIndex: 'cidr'
+        },
+        {
+          title: this.$t('label.vpc.gateway.ip'),
+          key: 'vpcgatewayip',
+          dataIndex: 'vpcgatewayip'
+        },
+        {
+          title: this.$t('label.nexthop'),
+          dataIndex: 'nexthop'
+        },
+        {
+          title: this.$t('label.actions'),
+          key: 'actions'
+        }
+      ]
     }
   },
   created () {
@@ -141,10 +178,15 @@ export default {
     },
     fetchData () {
       this.componentLoading = true
-      getAPI('listStaticRoutes', {
-        gatewayid: this.resource.id,
-        listall: true
-      }).then(json => {
+      var params = {
+        listAll: true
+      }
+      if (this.$route.fullPath.startsWith('/vpc')) {
+        params.vpcid = this.resource.id
+      } else {
+        params.gatewayid = this.resource.id
+      }
+      getAPI('listStaticRoutes', params).then(json => {
         this.routes = json.liststaticroutesresponse.staticroute
       }).catch(error => {
         this.$notifyError(error)
@@ -157,10 +199,18 @@ export default {
       if (!this.newRoute) return
 
       this.componentLoading = true
-      postAPI('createStaticRoute', {
-        cidr: this.newRoute,
-        gatewayid: this.resource.id
-      }).then(response => {
+      var params = {
+        cidr: this.newRoute
+      }
+      if (this.$route.fullPath.startsWith('/vpc')) {
+        params.vpcid = this.resource.id
+        if (this.nexthop) {
+          params.nexthop = this.nexthop
+        }
+      } else {
+        params.gatewayid = this.resource.id
+      }
+      postAPI('createStaticRoute', params).then(response => {
         this.$pollJob({
           jobId: response.createstaticrouteresponse.jobid,
           title: this.$t('message.success.add.static.route'),
@@ -367,20 +417,38 @@ export default {
     margin-left: auto;
   }
 
-  .new-route {
+  .form {
     display: flex;
-    padding-top: 10px;
+    margin-right: -20px;
+    margin-bottom: 20px;
+    flex-direction: column;
+    align-items: flex-start;
 
-    input {
-      margin-right: 10px;
+    @media (min-width: 760px) {
+      flex-direction: row;
     }
 
-    button {
-      &:not(:last-child) {
-        margin-right: 10px;
+    &__item {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      padding-right: 20px;
+      margin-bottom: 20px;
+
+      @media (min-width: 760px) {
+        margin-bottom: 0;
       }
+
+      input,
+      .ant-select {
+        margin-top: auto;
+      }
+
     }
 
+    &__label {
+      font-size: 18px;
+      font-weight: bold;
+    }
   }
-
 </style>
diff --git a/ui/src/views/network/VpcTab.vue b/ui/src/views/network/VpcTab.vue
index a7218746ab2..d2a714570d0 100644
--- a/ui/src/views/network/VpcTab.vue
+++ b/ui/src/views/network/VpcTab.vue
@@ -258,7 +258,7 @@
           type="dashed"
           style="width: 100%"
           :disabled="!('createVpnGateway' in $store.getters.apis)"
-          @click="handleCreateVpnGateway">
+          @click="() => handleOpenModals('vpnGateway')">
           <template #icon><plus-circle-outlined /></template>
           {{ $t('label.create.site.vpn.gateway') }}
         </a-button>
@@ -276,6 +276,42 @@
             </div>
           </a-list-item>
         </a-list>
+        <a-modal
+          :visible="modals.vpnGateway"
+          :title="$t('label.add.vpn.gateway')"
+          :maskClosable="false"
+          :closable="true"
+          :footer="null"
+          @cancel="modals.vpnGateway = false">
+          <a-spin :spinning="modals.vpnGatewayLoading" v-ctrl-enter="handleCreateVpnGateway">
+            <a-form
+              class="form"
+              layout="vertical"
+              :ref="formRef"
+              :model="form"
+              :rules="rules"
+            >
+              <a-form-item :label="$t('label.ip')" ref="ipaddress" name="ipaddress">
+                <a-select
+                  v-focus="true"
+                  v-model:value="form.ipaddress"
+                  showSearch
+                  optionFilterProp="label"
+                  :filterOption="(input, option) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }" >
+                  <a-select-option v-for="(item, index) in publicIps" :key="index" :value="item.id" :label="item.ipaddress">
+                    {{ item.ipaddress }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+              <div :span="24" class="action-button">
+                <a-button @click="modals.vpnGateway = false">{{ $t('label.cancel') }}</a-button>
+                <a-button type="primary" htmlType="submit" @click="handleCreateVpnGateway">{{ $t('label.ok') }}</a-button>
+              </div>
+            </a-form>
+          </a-spin>
+        </a-modal>
       </a-tab-pane>
       <a-tab-pane :tab="$t('label.vpn.connection')" key="vpnc" v-if="'listVpnConnections' in $store.getters.apis">
         <a-button
@@ -360,6 +396,9 @@
           </a-spin>
         </a-modal>
       </a-tab-pane>
+      <a-tab-pane :tab="$t('label.static.routes')" key="staticroutes">
+        <StaticRoutesTab :resource="resource" :loading="loading" />
+      </a-tab-pane>
       <a-tab-pane :tab="$t('label.virtual.routers')" key="vr" v-if="$store.getters.userInfo.roletype === 'Admin'">
         <RoutersTab :resource="resource" :loading="loading" />
       </a-tab-pane>
@@ -393,6 +432,7 @@ import EventsTab from '@/components/view/EventsTab'
 import AnnotationsTab from '@/components/view/AnnotationsTab'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import BgpPeersTab from '@/views/infra/zone/BgpPeersTab.vue'
+import StaticRoutesTab from './StaticRoutesTab'
 
 export default {
   name: 'VpcTab',
@@ -404,6 +444,7 @@ export default {
     RoutersTab,
     VpcTiersTab,
     VnfAppliancesTab,
+    StaticRoutesTab,
     EventsTab,
     AnnotationsTab,
     ResourceIcon
@@ -425,11 +466,14 @@ export default {
       privateGateways: [],
       associatedNetworks: [],
       vpnGateways: [],
+      publicIps: [],
       vpnConnections: [],
       networkAcls: [],
       modals: {
         gateway: false,
         gatewayLoading: false,
+        vpnGateway: false,
+        vpnGatewayLoading: false,
         vpnConnection: false,
         vpnConnectionLoading: false,
         networkAcl: false
@@ -563,6 +607,7 @@ export default {
           break
         case 'vpngw':
           this.fetchVpnGateways()
+          this.fetchPublicIpAddress()
           break
         case 'vpnc':
           this.fetchVpnConnections()
@@ -620,7 +665,7 @@ export default {
       })
     },
     fetchVpnGateways () {
-      this.fetchLoading = true
+      this.modals.vpnGatewayLoading = true
       getAPI('listVpnGateways', {
         vpcid: this.resource.id,
         listAll: true
@@ -629,7 +674,30 @@ export default {
       }).catch(error => {
         this.$notifyError(error)
       }).finally(() => {
-        this.fetchLoading = false
+        this.modals.vpnGatewayLoading = false
+      })
+    },
+    fetchPublicIpAddress () {
+      this.modals.vpnGatewayLoading = true
+      getAPI('listPublicIpAddresses', {
+        vpcid: this.resource.id,
+        listAll: true
+      }).then(json => {
+        this.publicIps = json.listpublicipaddressesresponse.publicipaddress || []
+        const sourceNatIpForProvider = this.publicIps.filter(ip => ip.issourcenat && ip.forprovider) || []
+        if (sourceNatIpForProvider && sourceNatIpForProvider.length > 0) {
+          const publicIpForRouter = this.publicIps.filter(ip => ip.forprovider && ip.virtualmachinetype === 'DomainRouter') || []
+          if (publicIpForRouter && publicIpForRouter.length > 0) {
+            this.publicIps = publicIpForRouter
+          } else {
+            this.publicIps = this.publicIps.filter(ip => ip.forprovider && !ip.issourcenat && !ip.isstaticnat) || []
+          }
+        } else {
+          this.publicIps = this.publicIps.filter(ip => ip.issourcenat) || []
+        }
+        this.form.ipaddress = this.publicIps?.[0]?.id || ''
+      }).finally(() => {
+        this.modals.vpnGatewayLoading = false
       })
     },
     fetchVpnConnections () {
@@ -720,6 +788,14 @@ export default {
           this.fetchAclList()
           this.fetchPhysicalNetworks()
           break
+        case 'vpnGateway':
+          this.rules = {
+            ipaddress: [{ required: true, message: this.$t('label.required') }]
+          }
+          this.modals.vpnGateway = true
+          this.fetchVpnGateways()
+          this.fetchPublicIpAddress()
+          break
         case 'vpnConnection':
           this.modals.vpnConnection = true
           this.fetchVpnCustomerGateways()
@@ -879,31 +955,38 @@ export default {
     },
     handleCreateVpnGateway () {
       this.fetchLoading = true
-      postAPI('createVpnGateway', {
-        vpcid: this.resource.id
-      }).then(response => {
-        this.$pollJob({
-          jobId: response.createvpngatewayresponse.jobid,
-          title: this.$t('message.success.add.vpn.gateway'),
-          description: this.resource.id,
-          successMethod: () => {
-            this.fetchLoading = false
-          },
-          errorMessage: this.$t('message.add.vpn.gateway.failed'),
-          errorMethod: () => {
-            this.fetchLoading = false
-          },
-          loadingMessage: this.$t('message.add.vpn.gateway.processing'),
-          catchMessage: this.$t('error.fetching.async.job.result'),
-          catchMethod: () => {
-            this.fetchLoading = false
-          }
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        postAPI('createVpnGateway', {
+          vpcid: this.resource.id,
+          ipaddressid: values.ipaddress
+        }).then(response => {
+          this.$pollJob({
+            jobId: response.createvpngatewayresponse.jobid,
+            title: this.$t('message.success.add.vpn.gateway'),
+            description: this.resource.id,
+            successMethod: () => {
+              this.fetchLoading = false
+            },
+            errorMessage: this.$t('message.add.vpn.gateway.failed'),
+            errorMethod: () => {
+              this.fetchLoading = false
+            },
+            loadingMessage: this.$t('message.add.vpn.gateway.processing'),
+            catchMessage: this.$t('error.fetching.async.job.result'),
+            catchMethod: () => {
+              this.fetchLoading = false
+            }
+          })
+        }).catch(error => {
+          this.$notifyError(error)
+        }).finally(() => {
+          this.fetchLoading = false
+          this.handleFetchData()
         })
       }).catch(error => {
-        this.$notifyError(error)
-      }).finally(() => {
+        this.formRef.value.scrollToField(error.errorFields[0].name)
         this.fetchLoading = false
-        this.handleFetchData()
       })
     },
     changePage (page, pageSize) {
diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index d0c2e5a7474..4f6aaef4445 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -460,6 +460,7 @@ export default {
       publicLBExists: false,
       setMTU: false,
       isNsxEnabled: false,
+      zoneExtNetProvider: null,
       isOfferingNatMode: false,
       isOfferingRoutedMode: false,
       displayCollapsible: [],
@@ -536,6 +537,7 @@ export default {
         this.setMTU = json?.listzonesresponse?.zone?.[0]?.allowuserspecifyvrmtu || false
         this.privateMtuMax = json?.listzonesresponse?.zone?.[0]?.routerprivateinterfacemaxmtu || 1500
         this.isNsxEnabled = json?.listzonesresponse?.zone?.[0]?.isnsxenabled || false
+        this.zoneExtNetProvider = json?.listzonesresponse?.zone?.[0]?.provider || null
       })
     },
     fetchNetworkAclList () {
@@ -615,7 +617,7 @@ export default {
         guestiptype: 'Isolated',
         state: 'Enabled'
       }
-      if (!this.isNsxEnabled && !this.isOfferingRoutedMode) {
+      if ((!this.isNsxEnabled || !['netris', 'nsx'].includes(this.zoneExtNetProvider.toLowerCase())) && !this.isOfferingRoutedMode) {
         params.supportedServices = 'SourceNat'
       }
       getAPI('listNetworkOfferings', params).then(json => {
@@ -638,7 +640,7 @@ export default {
           }
         }
         this.networkOfferings = filteredOfferings
-        if (this.isNsxEnabled) {
+        if (this.isNsxEnabled || (this.zoneExtNetProvider && ['netris', 'nsx'].includes(this.zoneExtNetProvider.toLowerCase()))) {
           this.networkOfferings = this.networkOfferings.filter(offering => offering.networkmode === (this.isOfferingNatMode ? 'NATTED' : 'ROUTED'))
         }
         if (this.resource.asnumberid) {
diff --git a/ui/src/views/network/VpnDetails.vue b/ui/src/views/network/VpnDetails.vue
index ece7d23d593..c0cc4c6c2f1 100644
--- a/ui/src/views/network/VpnDetails.vue
+++ b/ui/src/views/network/VpnDetails.vue
@@ -21,7 +21,6 @@
       <p>{{ $t('message.enabled.vpn') }} <strong>{{ remoteAccessVpn.publicip }}</strong></p>
       <p>{{ $t('message.enabled.vpn.ip.sec') }} <strong>{{ remoteAccessVpn.presharedkey }}</strong></p>
       <a-divider/>
-      <a-button><router-link :to="{ path: '/vpnuser'}">{{ $t('label.manage.vpn.user') }}</router-link></a-button>
       <a-button
         style="margin-left: 10px"
         type="primary"
@@ -30,6 +29,7 @@
         :disabled="!('deleteRemoteAccessVpn' in $store.getters.apis)">
         {{ $t('label.disable.vpn') }}
       </a-button>
+      <a-button><router-link :to="{ path: '/vpnuser'}">{{ $t('label.manage.vpn.user') }}</router-link></a-button>
     </div>
 
     <a-modal
@@ -53,7 +53,11 @@
 
   </div>
   <div v-else>
-    <a-button :disabled="!('createRemoteAccessVpn' in $store.getters.apis)" type="primary" @click="enableVpn = true">
+    <a-button
+      :disabled="!('createRemoteAccessVpn' in $store.getters.apis)"
+      type="primary"
+      style="margin-left: 10px"
+      @click="enableVpn = true">
       {{ $t('label.enable.vpn') }}
     </a-button>
 
@@ -77,6 +81,62 @@
     </a-modal>
 
   </div>
+
+  <br>
+  <div v-if="vpnGateway">
+    <div>
+      <a-button
+        :disabled="!('deleteVpnGateway' in $store.getters.apis)"
+        style="margin-left: 10px"
+        danger
+        type="primary"
+        @click="deleteVpnGateway = true">
+        {{ $t('label.delete.vpn.gateway') }}
+      </a-button>
+    </div>
+    <a-modal
+      :visible="deleteVpnGateway"
+      :footer="null"
+      :title="$t('label.enable.vpn')"
+      :maskClosable="false"
+      :closable="true"
+      @cancel="deleteVpnGateway = false">
+      <div v-ctrl-enter="handleDeleteVpnGateway">
+        <p>{{ $t('message.delete.vpn.gateway') }}</p>
+        <div :span="24" class="action-button">
+          <a-button @click="deleteVpnGateway = false">{{ $t('label.cancel') }}</a-button>
+          <a-button :loading="loading" type="primary" @click="handleDeleteVpnGateway" ref="submit">{{ $t('label.ok') }}</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+  <div v-else-if="vpnGatewayEnabled">
+    <div>
+      <a-button
+        :disabled="!('createVpnGateway' in $store.getters.apis)"
+        style="margin-left: 10px"
+        type="primary"
+        @click="createVpnGateway = true">
+        {{ $t('label.add.vpn.gateway') }}
+      </a-button>
+    </div>
+    <a-modal
+      :visible="createVpnGateway"
+      :footer="null"
+      :title="$t('label.add.vpn.gateway')"
+      :maskClosable="false"
+      :closable="true"
+      @cancel="createVpnGateway = false">
+      <div v-ctrl-enter="handleCreateVpnGateway">
+        <p>{{ $t('message.add.vpn.gateway') }}</p>
+        <div :span="24" class="action-button">
+          <a-button @click="createVpnGateway = false">{{ $t('label.cancel') }}</a-button>
+          <a-button :loading="loading" type="primary" @click="handleCreateVpnGateway" ref="submit">{{ $t('label.ok') }}</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+
 </template>
 
 <script>
@@ -94,6 +154,10 @@ export default {
       remoteAccessVpn: null,
       enableVpn: false,
       disableVpn: false,
+      vpnGateway: null,
+      vpnGatewayEnabled: false,
+      createVpnGateway: false,
+      deleteVpnGateway: false,
       isSubmitted: false
     }
   },
@@ -124,6 +188,23 @@ export default {
         console.log(error)
         this.$notifyError(error)
       })
+      if (this.resource.vpcid) {
+        this.vpnGatewayEnabled = true
+        getAPI('listVpnGateways', {
+          vpcid: this.resource.vpcid,
+          listAll: true
+        }).then(response => {
+          const vpnGateways = response.listvpngatewaysresponse.vpngateway || []
+          for (const vpnGateway of vpnGateways) {
+            if (vpnGateway.publicip === this.resource.ipaddress) {
+              this.vpnGateway = vpnGateway
+            }
+          }
+        }).catch(error => {
+          console.log(error)
+          this.$notifyError(error)
+        })
+      }
     },
     handleCreateVpn () {
       if (this.isSubmitted) return
@@ -211,6 +292,85 @@ export default {
         this.parentToggleLoading()
         this.isSubmitted = false
       })
+    },
+    handleCreateVpnGateway () {
+      if (this.isSubmitted) return
+      this.isSubmitted = true
+      this.parentToggleLoading()
+      this.createVpnGateway = false
+      const params = {
+        vpcid: this.resource.vpcid,
+        ipaddressid: this.resource.id
+      }
+      postAPI('createVpnGateway', params).then(response => {
+        this.$pollJob({
+          jobId: response.createvpngatewayresponse.jobid,
+          successMessage: this.$t('message.success.add.vpn.gateway'),
+          successMethod: result => {
+            this.fetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          },
+          errorMessage: this.$t('message.add.vpn.gateway.failed'),
+          errorMethod: () => {
+            this.fetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          },
+          loadingMessage: this.$t('message.add.vpn.gateway.processing'),
+          catchMessage: this.$t('error.fetching.async.job.result'),
+          catchMethod: () => {
+            this.fetchData()
+            this.parentFetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          }
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+        this.fetchData()
+        this.parentFetchData()
+        this.parentToggleLoading()
+        this.isSubmitted = false
+      })
+    },
+    handleDeleteVpnGateway () {
+      if (this.isSubmitted) return
+      this.isSubmitted = true
+      this.parentToggleLoading()
+      this.deleteVpnGateway = false
+      postAPI('deleteVpnGateway', {
+        id: this.vpnGateway.id
+      }).then(response => {
+        this.$pollJob({
+          jobId: response.deletevpngatewayresponse.jobid,
+          successMessage: this.$t('message.success.delete.vpn.gateway'),
+          successMethod: () => {
+            this.fetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          },
+          errorMessage: this.$t('message.delete.vpn.gateway.failed'),
+          errorMethod: () => {
+            this.fetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          },
+          catchMessage: this.$t('error.fetching.async.job.result'),
+          catchMethod: () => {
+            this.fetchData()
+            this.parentFetchData()
+            this.parentToggleLoading()
+            this.isSubmitted = false
+          }
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+        this.fetchData()
+        this.parentFetchData()
+        this.parentToggleLoading()
+        this.isSubmitted = false
+      })
     }
   }
 }
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 699e3ebd4db..6a45e147025 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -41,7 +41,7 @@
             v-model:value="form.displaytext"
             :placeholder="apiParams.displaytext.description"/>
         </a-form-item>
-        <a-form-item name="networkrate" ref="networkrate" v-if="!forNsx">
+        <a-form-item name="networkrate" ref="networkrate" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
           <template #label>
             <tooltip-label :title="$t('label.networkrate')" :tooltip="apiParams.networkrate.description"/>
           </template>
@@ -60,10 +60,10 @@
             <a-radio-button value="isolated">
               {{ $t('label.isolated') }}
             </a-radio-button>
-            <a-radio-button value="l2" v-if="!forNsx">
+            <a-radio-button value="l2" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               {{ $t('label.l2') }}
             </a-radio-button>
-            <a-radio-button value="shared" v-if="!forNsx">
+            <a-radio-button value="shared" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               {{ $t('label.shared') }}
             </a-radio-button>
           </a-radio-group>
@@ -93,7 +93,7 @@
             </a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-row :gutter="12" v-if="!forNsx">
+        <a-row :gutter="12" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
           <a-col :md="12" :lg="12">
             <a-form-item name="specifyvlan" ref="specifyvlan">
               <template #label>
@@ -117,19 +117,31 @@
               <template #label>
                 <tooltip-label :title="$t('label.vpc')" :tooltip="apiParams.forvpc.description"/>
               </template>
-              <a-switch v-model:checked="form.forvpc" @change="val => { handleForVpcChange(val) }" />
+              <a-switch v-model:checked="form.forvpc" @change="handleForVpcChange" />
             </a-form-item>
           </a-col>
           <a-col :md="12" :lg="12">
-            <a-form-item name="fornsx" ref="fornsx" v-if="guestType === 'isolated'">
+            <a-form-item name="provider" ref="provider">
               <template #label>
-                <tooltip-label :title="$t('label.nsx')" :tooltip="apiParams.fornsx.description"/>
+                <tooltip-label :title="$t('label.provider')" :tooltip="apiParams.provider.description"/>
               </template>
-              <a-switch v-model:checked="form.fornsx" @change="val => { handleForNsxChange(val) }" />
+              <a-select
+                v-model:value="form.provider"
+                v-focus="true"
+                @change="handleProviderChange"
+                showSearch
+                optionFilterProp="label"
+                :filterOption="(input, option) => {
+                  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }"
+                :placeholder="apiParams.provider.description" >
+                <a-select-option :value="'NSX'" :label="$t('label.nsx')"> {{ $t('label.nsx') }} </a-select-option>
+                <a-select-option :value="'Netris'" :label="$t('label.netris')"> {{ $t('label.netris') }} </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12" v-if="forNsx">
+        <a-row :gutter="12" v-if="form.provider === 'NSX'">
           <a-col :md="12" :lg="12">
             <a-form-item name="nsxsupportlb" ref="nsxsupportlb" v-if="guestType === 'isolated'">
               <template #label>
@@ -180,7 +192,7 @@
             </a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-row :gutter="12" v-if="routingMode === 'dynamic' && !forVpc && forNsx">
+        <a-row :gutter="12" v-if="routingMode === 'dynamic' && !forVpc && form.provider === 'NSX'">
           <a-col :md="12" :lg="12">
             <a-form-item name="specifyasnumber" ref="specifyasnumber">
               <template #label>
@@ -195,7 +207,7 @@
         </a-form-item>
         <a-row :gutter="12">
           <a-col :md="12" :lg="12">
-            <a-form-item name="promiscuousmode" ref="promiscuousmode" v-if="!forNsx">
+            <a-form-item name="promiscuousmode" ref="promiscuousmode" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               <template #label>
                 <tooltip-label :title="$t('label.promiscuousmode')" :tooltip="$t('message.network.offering.promiscuous.mode')"/>
               </template>
@@ -213,7 +225,7 @@
                 </a-radio-button>
               </a-radio-group>
             </a-form-item>
-            <a-form-item name="macaddresschanges" ref="macaddresschanges" v-if="!forNsx">
+            <a-form-item name="macaddresschanges" ref="macaddresschanges" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               <template #label>
                 <tooltip-label :title="$t('label.macaddresschanges')" :tooltip="$t('message.network.offering.mac.address.changes')"/>
               </template>
@@ -233,7 +245,7 @@
             </a-form-item>
           </a-col>
           <a-col :md="12" :lg="12">
-            <a-form-item name="forgedtransmits" ref="forgedtransmits" v-if="!forNsx">
+            <a-form-item name="forgedtransmits" ref="forgedtransmits" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               <template #label>
                 <tooltip-label :title="$t('label.forgedtransmits')" :tooltip="$t('message.network.offering.forged.transmits')"/>
               </template>
@@ -251,7 +263,7 @@
                 </a-radio-button>
               </a-radio-group>
             </a-form-item>
-            <a-form-item name="maclearning" ref="maclearning" v-if="!forNsx">
+            <a-form-item name="maclearning" ref="maclearning" v-if="form.provider !== 'NSX' && form.provider !== 'Netris'">
               <template #label>
                 <tooltip-label :title="$t('label.maclearning')" :tooltip="$t('message.network.offering.mac.learning')"/>
               </template>
@@ -290,8 +302,8 @@
                   <CheckBoxSelectPair
                     :resourceKey="item.name"
                     :checkBoxLabel="item.description"
-                    :forNsx="forNsx"
-                    :defaultCheckBoxValue="forNsx"
+                    :forExternalNetProvider="form.provider === 'NSX' || form.provider === 'Netris'"
+                    :defaultCheckBoxValue="form.provider === 'NSX' || form.provider === 'Netris'"
                     :selectOptions="!supportedServiceLoading ? item.provider: []"
                     @handle-checkselectpair-change="handleSupportedServiceChange"/>
                 </a-list-item>
@@ -454,7 +466,8 @@
         <a-form-item
           name="conservemode"
           ref="conservemode"
-          v-if="(guestType === 'shared' || guestType === 'isolated') && !forNsx && networkmode !== 'ROUTED'">
+          v-if="(guestType === 'shared' || guestType === 'isolated') &&
+          (form.provider !== 'NSX' && form.provider !== 'Netris') && networkmode !== 'ROUTED'">
           <template #label>
             <tooltip-label :title="$t('label.conservemode')" :tooltip="apiParams.conservemode.description"/>
           </template>
@@ -589,7 +602,7 @@ export default {
       selectedDomains: [],
       selectedZones: [],
       forVpc: false,
-      forNsx: false,
+      provider: '',
       lbType: 'publicLb',
       macLearningValue: '',
       supportedServices: [],
@@ -646,7 +659,13 @@ export default {
         description: 'Nsx',
         enabled: true
       },
-      nsxSupportedServicesMap: {}
+      Netris: {
+        name: 'Netris',
+        description: 'Netris',
+        enabled: true
+      },
+      nsxSupportedServicesMap: {},
+      netrisSupportedServicesMap: {}
     }
   },
   beforeCreate () {
@@ -882,7 +901,7 @@ export default {
       this.supportedServiceLoading = true
       var supportedServices = this.supportedServices
       var self = this
-      if (!this.forNsx) {
+      if (this.provider !== 'NSX' && this.provider !== 'Netris') {
         if (this.networkmode === 'ROUTED' && this.guestType === 'isolated') {
           supportedServices = supportedServices.filter(service => {
             return !['SourceNat', 'StaticNat', 'Lb', 'PortForwarding', 'Vpn'].includes(service.name)
@@ -899,7 +918,7 @@ export default {
                 }
                 provider.enabled = enabledProviders.includes(provider.name)
               } else { // *** non-vpc ***
-                provider.enabled = !['InternalLbVm', 'VpcVirtualRouter', 'Nsx'].includes(provider.name)
+                provider.enabled = !['InternalLbVm', 'VpcVirtualRouter', 'Nsx', 'Netris'].includes(provider.name)
               }
               providers[providerIndex] = provider
             })
@@ -915,11 +934,25 @@ export default {
       } else {
         supportedServices = this.supportedSvcs
         supportedServices = supportedServices.filter(svc => {
-          return Object.keys(this.nsxSupportedServicesMap).includes(svc.name)
+          if (this.provider === 'NSX') {
+            return Object.keys(this.nsxSupportedServicesMap).includes(svc.name)
+          } else if (this.provider === 'Netris') {
+            return Object.keys(this.netrisSupportedServicesMap).includes(svc.name)
+          }
         })
         supportedServices = supportedServices.map(svc => {
           if (!['Dhcp', 'Dns', 'UserData'].includes(svc.name)) {
-            svc.provider = [this.NSX]
+            if (this.provider === 'NSX') {
+              svc.provider = [this.NSX]
+            } else if (this.provider === 'Netris') {
+              svc.provider = [this.Netris]
+            }
+          } else {
+            if (this.forVpc) {
+              svc.provider = [this.VPCVR]
+            } else {
+              svc.provider = [this.VR]
+            }
           }
           return svc
         })
@@ -930,33 +963,67 @@ export default {
     },
     handleForVpcChange (forVpc) {
       this.forVpc = forVpc
-      if (this.forNsx) {
+      if (this.provider === 'NSX') {
         this.nsxSupportedServicesMap = {
           Dhcp: this.forVpc ? this.VPCVR : this.VR,
           Dns: this.forVpc ? this.VPCVR : this.VR,
           UserData: this.forVpc ? this.VPCVR : this.VR,
-          SourceNat: this.NSX,
-          StaticNat: this.NSX,
-          PortForwarding: this.NSX,
-          Lb: this.NSX,
+          ...(this.networkmode === 'NATTED' && {
+            SourceNat: this.NSX,
+            StaticNat: this.NSX,
+            PortForwarding: this.NSX,
+            Lb: this.NSX
+          }),
           ...(forVpc && { NetworkACL: this.NSX }),
           ...(!forVpc && { Firewall: this.NSX })
         }
+      } else if (this.provider === 'Netris') {
+        this.netrisSupportedServicesMap = {
+          Dhcp: this.forVpc ? this.VPCVR : this.VR,
+          Dns: this.forVpc ? this.VPCVR : this.VR,
+          UserData: this.forVpc ? this.VPCVR : this.VR,
+          ...(this.networkmode === 'NATTED' && {
+            SourceNat: this.Netris,
+            StaticNat: this.Netris,
+            PortForwarding: this.Netris,
+            Lb: this.Netris
+          }),
+          ...(forVpc && { NetworkACL: this.Netris }),
+          ...(!forVpc && { Firewall: this.Netris })
+        }
       }
       this.updateSupportedServices()
     },
-    handleForNsxChange (forNsx) {
-      this.forNsx = forNsx
-      this.nsxSupportedServicesMap = {
-        Dhcp: this.forVpc ? this.VPCVR : this.VR,
-        Dns: this.forVpc ? this.VPCVR : this.VR,
-        UserData: this.forVpc ? this.VPCVR : this.VR,
-        SourceNat: this.NSX,
-        StaticNat: this.NSX,
-        PortForwarding: this.NSX,
-        Lb: this.NSX,
-        ...(this.forVpc && { NetworkACL: this.NSX }),
-        ...(!this.forVpc && { Firewall: this.NSX })
+    handleProviderChange (provider) {
+      this.provider = provider
+      if (this.provider === 'NSX') {
+        this.nsxSupportedServicesMap = {
+          Dhcp: this.forVpc ? this.VPCVR : this.VR,
+          Dns: this.forVpc ? this.VPCVR : this.VR,
+          UserData: this.forVpc ? this.VPCVR : this.VR,
+          ...(this.networkmode === 'NATTED' && {
+            SourceNat: this.NSX,
+            StaticNat: this.NSX,
+            PortForwarding: this.NSX,
+            Lb: this.NSX
+          }),
+          ...(this.forVpc && { NetworkACL: this.NSX }),
+          ...(!this.forVpc && { Firewall: this.NSX })
+        }
+      } else if (this.provider === 'Netris') {
+        this.netrisSupportedServicesMap = {
+          Dhcp: this.forVpc ? this.VPCVR : this.VR,
+          Dns: this.forVpc ? this.VPCVR : this.VR,
+          UserData: this.forVpc ? this.VPCVR : this.VR,
+          ...(this.networkmode === 'NATTED' && {
+            SourceNat: this.Netris,
+            StaticNat: this.Netris,
+            PortForwarding: this.Netris,
+            Lb: this.Netris
+          }),
+          ...(this.forVpc && { NetworkACL: this.Netris }),
+          ...(!this.forVpc && { Firewall: this.Netris })
+        }
       }
       this.fetchSupportedServiceData()
     },
@@ -1083,11 +1150,16 @@ export default {
           params.specifyasnumber = values.specifyasnumber
         }
         params.routingmode = values.routingmode
-        if (values.fornsx === true) {
-          params.fornsx = true
+        const forNsx = values.provider === 'NSX'
+        if (forNsx === true) {
+          params.provider = 'NSX'
           params.nsxsupportlb = values.nsxsupportlb
           params.nsxsupportsinternallb = values.nsxsupportsinternallb
         }
+        const forNetris = values.provider === 'Netris'
+        if (forNetris) {
+          params.provider = 'Netris'
+        }
         if (values.guestiptype === 'isolated') {
           params.networkmode = values.networkmode
         }
diff --git a/ui/src/views/offering/AddVpcOffering.vue b/ui/src/views/offering/AddVpcOffering.vue
index c8d09d5f7e8..a069c20fe3b 100644
--- a/ui/src/views/offering/AddVpcOffering.vue
+++ b/ui/src/views/offering/AddVpcOffering.vue
@@ -69,14 +69,26 @@
         </a-form-item>
         <a-row :gutter="12">
           <a-col :md="12" :lg="12">
-            <a-form-item name="fornsx" ref="fornsx">
+            <a-form-item name="provider" ref="provider">
               <template #label>
-                <tooltip-label :title="$t('label.nsx')" :tooltip="apiParams.fornsx.description"/>
+                <tooltip-label :title="$t('label.provider')" :tooltip="apiParams.provider.description"/>
               </template>
-              <a-switch v-model:checked="form.fornsx" @change="val => { handleForNsxChange(val) }" />
+              <a-select
+                v-model:value="form.provider"
+                v-focus="true"
+                @change="val => handleProviderChange(val)"
+                showSearch
+                optionFilterProp="label"
+                :filterOption="(input, option) => {
+                  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }"
+                :placeholder="apiParams.provider.description" >
+                <a-select-option :value="'NSX'" :label="$t('label.nsx')"> {{ $t('label.nsx') }} </a-select-option>
+                <a-select-option :value="'Netris'" :label="$t('label.netris')"> {{ $t('label.netris') }} </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="12" :lg="12" v-if="forNsx">
+          <a-col :md="12" :lg="12" v-if="form.provider === 'NSX'">
             <a-form-item name="nsxsupportlb" ref="nsxsupportlb">
               <template #label>
                 <tooltip-label :title="$t('label.nsx.supports.lb')" :tooltip="apiParams.nsxsupportlb.description"/>
@@ -85,7 +97,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12" v-if="routingMode === 'dynamic' && forNsx">
+        <a-row :gutter="12" v-if="routingMode === 'dynamic' && form.provider === 'NSX'">
           <a-col :md="12" :lg="12">
             <a-form-item name="specifyasnumber" ref="specifyasnumber">
               <template #label>
@@ -139,8 +151,8 @@
                   <CheckBoxSelectPair
                     :resourceKey="item.name"
                     :checkBoxLabel="item.description"
-                    :forNsx="forNsx"
-                    :defaultCheckBoxValue="forNsx"
+                    :forExternalNetProvider="form.provider === 'NSX' || form.provider === 'Netris'"
+                    :defaultCheckBoxValue="form.provider === 'NSX' || form.provider === 'Netris'"
                     :selectOptions="item.provider"
                     @handle-checkselectpair-change="handleSupportedServiceChange"/>
                 </a-list-item>
@@ -273,6 +285,7 @@ export default {
       zones: [],
       zoneLoading: false,
       forNsx: false,
+      provider: '',
       loading: false,
       supportedServices: [],
       supportedServiceLoading: false,
@@ -306,6 +319,11 @@ export default {
         description: 'Nsx',
         enabled: true
       },
+      Netris: {
+        name: 'Netris',
+        description: 'Netris',
+        enabled: true
+      },
       nsxSupportedServicesMap: {}
     }
   },
@@ -402,7 +420,7 @@ export default {
     },
     fetchSupportedServiceData () {
       var services = []
-      if (this.forNsx) {
+      if (this.provider === 'NSX') {
         services.push({
           name: 'Dhcp',
           enabled: true,
@@ -445,6 +463,49 @@ export default {
           enabled: true,
           provider: [{ name: 'VpcVirtualRouter' }]
         })
+      } else if (this.provider === 'Netris') {
+        services.push({
+          name: 'Dhcp',
+          enabled: true,
+          provider: [
+            { name: 'VpcVirtualRouter' }
+          ]
+        })
+        services.push({
+          name: 'Dns',
+          enabled: true,
+          provider: [{ name: 'VpcVirtualRouter' }]
+        })
+        services.push({
+          name: 'Lb',
+          enabled: true,
+          provider: [{ name: 'Netris' }]
+        })
+        services.push({
+          name: 'StaticNat',
+          enabled: true,
+          provider: [{ name: 'Netris' }]
+        })
+        services.push({
+          name: 'SourceNat',
+          enabled: true,
+          provider: [{ name: 'Netris' }]
+        })
+        services.push({
+          name: 'NetworkACL',
+          enabled: true,
+          provider: [{ name: 'Netris' }]
+        })
+        services.push({
+          name: 'PortForwarding',
+          enabled: true,
+          provider: [{ name: 'Netris' }]
+        })
+        services.push({
+          name: 'UserData',
+          enabled: true,
+          provider: [{ name: 'VpcVirtualRouter' }]
+        })
       } else {
         services.push({
           name: 'Dhcp',
@@ -528,6 +589,13 @@ export default {
         services = services.filter(service => {
           return !['SourceNat', 'StaticNat', 'Lb', 'PortForwarding', 'Vpn'].includes(service.name)
         })
+        if (['NSX', 'Netris'].includes(this.provider)) {
+          services.push({
+            name: 'Gateway',
+            enabled: true,
+            provider: [{ name: this.provider }]
+          })
+        }
       }
       for (var i in services) {
         services[i].description = services[i].name
@@ -538,15 +606,16 @@ export default {
         self.supportedServiceLoading = false
       }, 50)
     },
-    async handleForNsxChange (forNsx) {
-      this.forNsx = forNsx
-      if (forNsx) {
+    async handleProviderChange (value) {
+      this.provider = value
+      if (this.provider === 'NSX') {
         this.form.nsxsupportlb = true
         this.handleNsxLbService(true)
       }
       this.fetchSupportedServiceData()
     },
     handleNsxLbService (supportLb) {
+      console.log(supportLb)
       if (!supportLb) {
         this.supportedServices = this.supportedServices.filter(svc => svc.name !== 'Lb')
       }
@@ -636,10 +705,15 @@ export default {
         if (values.internetprotocol) {
           params.internetprotocol = values.internetprotocol
         }
-        if (values.fornsx === true) {
-          params.fornsx = true
+        const forNsx = values.provider === 'NSX'
+        if (forNsx) {
+          params.provider = 'NSX'
           params.nsxsupportlb = values.nsxsupportlb
         }
+        const forNetris = values.provider === 'Netris'
+        if (forNetris) {
+          params.provider = 'Netris'
+        }
         params.networkmode = values.networkmode
         if (!values.forVpc) {
           params.specifyasnumber = values.specifyasnumber
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
index d41025bd60e..0c7b85f65dd 100644
--- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -645,6 +645,17 @@ public class NetUtils {
         return String.format("%s/%s", long2Ip(start), netmaskSize);
     }
 
+    public static String getCleanIp4CidrList(final String cidrList) {
+        List<String> cleanCidrs = new ArrayList<>();
+        for (String cidr : cidrList.split(",")) {
+            if (!isValidIp4Cidr(cidr.trim())) {
+                throw new CloudRuntimeException("Invalid CIDR: " + cidr);
+            }
+            cleanCidrs.add(getCleanIp4Cidr(cidr.trim()));
+        }
+        return String.join(",", cleanCidrs);
+    }
+
     public static String[] getIpRangeFromCidr(final String cidr, final long size) {
         assert size < MAX_CIDR : "You do know this is not for ipv6 right?  Keep it smaller than 32 but you have " + size;
         final String[] result = new String[2];
@@ -1839,6 +1850,22 @@ public class NetUtils {
         return MAX_CIDR;
     }
 
+    /**
+     Return the size of smallest CIDR which contains the IP range (startIp-endIp).
+     */
+    public static int getBigCidrSizeOfIpRange(long startIp, long endIp) {
+        assert startIp <= MAX_IPv4_ADDR : "Keep startIp smaller than or equals to " + MAX_IPv4_ADDR;
+        assert endIp <= MAX_IPv4_ADDR : "Keep endIp smaller than or equals to " + MAX_IPv4_ADDR;
+        for (int cidrSize = MAX_CIDR; cidrSize >= 1; cidrSize--) {
+            long minStartIp = startIp & (((long) 0xffffffff) >> (MAX_CIDR - cidrSize) << (MAX_CIDR - cidrSize));
+            long maxEndIp = (minStartIp | (((long) 0x1) << (MAX_CIDR - cidrSize)) - 1);
+            if (minStartIp <= startIp && maxEndIp >= endIp) {
+                return cidrSize;
+            }
+        }
+        return MAX_CIDR;
+    }
+
     /**
      Return the list of pairs (Network Address, Network cidrsize)
      */
@@ -1884,4 +1911,11 @@ public class NetUtils {
         final long start = (ip & startNetMask);
         return String.format("%s/%s", long2Ip(start), size);
     }
+
+    public static String getIpv6Gateway(String ipv6Cidr) {
+        IPv6Network network = IPv6Network.fromString(ipv6Cidr);
+        IPv6Address netrisV6Gateway = network.getFirst().add(1);
+        String netmask = network.getNetmask().toString();
+        return netrisV6Gateway.toString() + "/" + netmask;
+    }
 }
diff --git a/utils/src/test/java/com/cloud/utils/LogUtilsTest.java b/utils/src/test/java/com/cloud/utils/LogUtilsTest.java
index 350c9e946cd..e369c0fcac6 100644
--- a/utils/src/test/java/com/cloud/utils/LogUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/LogUtilsTest.java
@@ -24,7 +24,7 @@ public class LogUtilsTest {
 
     @Test
     public void logGsonWithoutExceptionTestLogCorrectlyPrimitives() {
-        String expected = "test primitives: int [1], double [1.11], float [1.2222], boolean [true], null [], char [\"c\"].";
+        String expected = "test primitives: int [1], double [1.11], float [1.2222], boolean [true], null [null], char [\"c\"].";
         String log = LogUtils.logGsonWithoutException("test primitives: int [%s], double [%s], float [%s], boolean [%s], null [%s], char [%s].",
                 1, 1.11d, 1.2222f, true, null, 'c');
         assertEquals(expected, log);
diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
index b4d077974eb..4495a123b07 100644
--- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
@@ -308,6 +308,14 @@ public class NetUtilsTest {
         assertEquals("10.0.144.0/21", NetUtils.getCleanIp4Cidr(cidrThird));;
     }
 
+    @Test
+    public void testGetCleanIp4CidrList() {
+        final String cidrList = " 10.0.151.5/20, 10.0.144.10/21 ";
+        final String cleanCidrList = "10.0.144.0/20,10.0.144.0/21";
+
+        assertEquals(cleanCidrList, NetUtils.getCleanIp4CidrList(cidrList));
+    }
+
     @Test
     public void testIsValidCidrList() throws Exception {
         final String cidrFirst = "10.0.144.0/20,1.2.3.4/32,5.6.7.8/24";
@@ -932,4 +940,15 @@ public class NetUtilsTest {
         Assert.assertEquals("192.168.0.0/24", NetUtils.transformCidr("192.168.0.100/24"));
         Assert.assertEquals("10.10.10.10/32", NetUtils.transformCidr("10.10.10.10/32"));
     }
+
+    @Test
+    public void testVpnIpRange() {
+        String ipRange = "10.1.2.1-10.1.2.8";
+        String startIp = ipRange.split("-")[0];
+        String endIp = ipRange.split("-")[1];
+        int cidrSize = NetUtils.getBigCidrSizeOfIpRange(NetUtils.ip2Long(startIp), NetUtils.ip2Long(endIp));
+        Assert.assertEquals(28, cidrSize);
+        String cidr = NetUtils.transformCidr(startIp + "/" + cidrSize);
+        Assert.assertEquals("10.1.2.0/28", cidr);
+    }
 }

From a4263da8aea93fd12ead37c61489b9e529c0cdbc Mon Sep 17 00:00:00 2001
From: ghernadi <gabor.hernadi@linbit.com>
Date: Fri, 25 Jul 2025 13:51:11 +0200
Subject: [PATCH 67/94] linstor: Use template's uuid if pool's downloadPath is
 null as resource-name (#11053)

Also added an integration test for templates from snapshots
---
 plugins/storage/volume/linstor/CHANGELOG.md   |  6 ++
 .../kvm/storage/LinstorStorageAdaptor.java    |  2 +-
 .../LinstorPrimaryDataStoreDriverImpl.java    | 12 ++-
 .../plugins/linstor/test_linstor_volumes.py   | 73 +++++++++++++++++--
 4 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/plugins/storage/volume/linstor/CHANGELOG.md b/plugins/storage/volume/linstor/CHANGELOG.md
index 2abda3ebc50..a96b7c75b2b 100644
--- a/plugins/storage/volume/linstor/CHANGELOG.md
+++ b/plugins/storage/volume/linstor/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to Linstor CloudStack plugin will be documented in this file
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2025-07-01]
+
+### Fixed
+
+- Regression in 4.19.3 and 4.21.0 with templates from snapshots
+
 ## [2025-05-07]
 
 ### Added
diff --git a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 9de2479b20b..4210008f1c0 100644
--- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@ -619,7 +619,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
             try {
                 templateProps.load(new FileInputStream(propFile.toFile()));
                 String desc = templateProps.getProperty("description");
-                if (desc.startsWith("SystemVM Template")) {
+                if (desc != null && desc.startsWith("SystemVM Template")) {
                     return true;
                 }
             } catch (IOException e) {
diff --git a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
index 3b384831518..71e1b528506 100644
--- a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
@@ -74,12 +74,14 @@ import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.VMTemplateStoragePoolVO;
 import com.cloud.storage.VMTemplateStorageResourceAssoc;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeDetailVO;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.dao.SnapshotDetailsDao;
 import com.cloud.storage.dao.SnapshotDetailsVO;
+import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplatePoolDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.storage.dao.VolumeDetailsDao;
@@ -131,6 +133,7 @@ public class LinstorPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
     ConfigurationDao _configDao;
     @Inject
     private HostDao _hostDao;
+    @Inject private VMTemplateDao _vmTemplateDao;
 
     private long volumeStatsLastUpdate = 0L;
     private final Map<String, Pair<Long, Long>> volumeStats = new HashMap<>();
@@ -668,8 +671,15 @@ public class LinstorPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
             storagePoolVO.getId(), csCloneId, null);
 
         if (tmplPoolRef != null) {
-            final String templateRscName = LinstorUtil.RSC_PREFIX + tmplPoolRef.getLocalDownloadPath();
+            final String templateRscName;
+            if (tmplPoolRef.getLocalDownloadPath() == null) {
+                VMTemplateVO vmTemplateVO = _vmTemplateDao.findById(tmplPoolRef.getTemplateId());
+                templateRscName = LinstorUtil.RSC_PREFIX + vmTemplateVO.getUuid();
+            } else {
+                templateRscName = LinstorUtil.RSC_PREFIX + tmplPoolRef.getLocalDownloadPath();
+            }
             final String rscName = LinstorUtil.RSC_PREFIX + volumeInfo.getUuid();
+
             final DevelopersApi linstorApi = LinstorUtil.getLinstorAPI(storagePoolVO.getHostAddress());
 
             try {
diff --git a/test/integration/plugins/linstor/test_linstor_volumes.py b/test/integration/plugins/linstor/test_linstor_volumes.py
index a2c7978d801..e0ba15a0499 100644
--- a/test/integration/plugins/linstor/test_linstor_volumes.py
+++ b/test/integration/plugins/linstor/test_linstor_volumes.py
@@ -953,9 +953,72 @@ class TestLinstorVolumes(cloudstackTestCase):
 
         snapshot.delete(self.apiClient)
 
+    @attr(tags=['basic'], required_hardware=False)
+    def test_10_create_template_from_snapshot(self):
+        """
+        Create a template from a snapshot and start an instance from it
+        """
+        self.virtual_machine.stop(self.apiClient)
+
+        volume = list_volumes(
+            self.apiClient,
+            virtualmachineid = self.virtual_machine.id,
+            type = "ROOT",
+            listall = True,
+        )
+        snapshot = Snapshot.create(
+            self.apiClient,
+            volume_id=volume[0].id,
+            account=self.account.name,
+            domainid=self.domain.id,
+        )
+        self.cleanup.append(snapshot)
+
+        self.assertIsNotNone(snapshot, "Could not create snapshot")
+
+        services = {
+            "displaytext": "IntegrationTestTemplate",
+            "name": "int-test-template",
+            "ostypeid": self.template.ostypeid,
+            "ispublic": "true"
+        }
+
+        custom_template = Template.create_from_snapshot(
+            self.apiClient,
+            snapshot,
+            services,
+        )
+        self.cleanup.append(custom_template)
+
+        # create VM from custom template
+        test_virtual_machine = VirtualMachine.create(
+            self.apiClient,
+            self.testdata[TestData.virtualMachine2],
+            accountid=self.account.name,
+            zoneid=self.zone.id,
+            serviceofferingid=self.compute_offering.id,
+            templateid=custom_template.id,
+            domainid=self.domain.id,
+            startvm=False,
+            mode='basic',
+        )
+        self.cleanup.append(test_virtual_machine)
+
+        TestLinstorVolumes._start_vm(test_virtual_machine)
+
+        test_virtual_machine.stop(self.apiClient)
+
+        test_virtual_machine.delete(self.apiClient, True)
+        self.cleanup.remove(test_virtual_machine)
+
+        custom_template.delete(self.apiClient)
+        self.cleanup.remove(custom_template)
+        snapshot.delete(self.apiClient)
+        self.cleanup.remove(snapshot)
+
 
     @attr(tags=['advanced', 'migration'], required_hardware=False)
-    def test_10_migrate_volume_to_same_instance_pool(self):
+    def test_11_migrate_volume_to_same_instance_pool(self):
         """Migrate volume to the same instance pool"""
 
         if not self.testdata[TestData.migrationTests]:
@@ -1088,7 +1151,7 @@ class TestLinstorVolumes(cloudstackTestCase):
         test_virtual_machine.delete(self.apiClient, True)
 
     @attr(tags=['advanced', 'migration'], required_hardware=False)
-    def test_11_migrate_volume_to_distinct_instance_pool(self):
+    def test_12_migrate_volume_to_distinct_instance_pool(self):
         """Migrate volume to distinct instance pool"""
 
         if not self.testdata[TestData.migrationTests]:
@@ -1221,7 +1284,7 @@ class TestLinstorVolumes(cloudstackTestCase):
         test_virtual_machine.delete(self.apiClient, True)
 
     @attr(tags=["basic"], required_hardware=False)
-    def test_12_create_vm_snapshots(self):
+    def test_13_create_vm_snapshots(self):
         """Test to create VM snapshots
         """
         vm = TestLinstorVolumes._start_vm(self.virtual_machine)
@@ -1251,7 +1314,7 @@ class TestLinstorVolumes(cloudstackTestCase):
         )
 
     @attr(tags=["basic"], required_hardware=False)
-    def test_13_revert_vm_snapshots(self):
+    def test_14_revert_vm_snapshots(self):
         """Test to revert VM snapshots
         """
 
@@ -1313,7 +1376,7 @@ class TestLinstorVolumes(cloudstackTestCase):
         )
 
     @attr(tags=["basic"], required_hardware=False)
-    def test_14_delete_vm_snapshots(self):
+    def test_15_delete_vm_snapshots(self):
         """Test to delete vm snapshots
         """
 

From 890386e9499f0e8582cb0af15db66ab709731457 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Fri, 25 Jul 2025 09:21:06 -0400
Subject: [PATCH 68/94] Allow custom NTP servers for CPVM (#11210)

---
 .../api/src/main/java/com/cloud/vm/VirtualMachineGuru.java  | 4 ++++
 .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java     | 6 +++++-
 .../secondarystorage/SecondaryStorageManagerImpl.java       | 5 +----
 systemvm/debian/opt/cloud/bin/setup/common.sh               | 6 +++---
 systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh         | 4 ++++
 systemvm/debian/opt/cloud/bin/setup/secstorage.sh           | 1 +
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java
index f8032bf4b0e..76f0830f369 100644
--- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java
+++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java
@@ -24,6 +24,7 @@ import com.cloud.utils.PasswordGenerator;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.ca.CAManager;
 import org.apache.cloudstack.framework.ca.Certificate;
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.utils.security.CertUtils;
 import org.apache.cloudstack.utils.security.KeyStoreUtils;
 
@@ -37,6 +38,9 @@ import java.util.Base64;
  */
 public interface VirtualMachineGuru {
 
+    static final ConfigKey<String> NTPServerConfig = new ConfigKey<String>(String.class, "ntp.server.list", "Advanced", null,
+            "Comma separated list of NTP servers to configure in System VMs", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null);
+
     boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context);
 
     /**
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 5baed2643c9..22cfe785edf 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1276,6 +1276,10 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
             buf.append(" vmpassword=").append(configurationDao.getValue("system.vm.password"));
         }
 
+        if (StringUtils.isNotEmpty(NTPServerConfig.value())) {
+            buf.append(" ntpserverlist=").append(NTPServerConfig.value().replaceAll("\\s+",""));
+        }
+
         for (NicProfile nic : profile.getNics()) {
             int deviceId = nic.getDeviceId();
             if (nic.getIPv4Address() == null) {
@@ -1506,7 +1510,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     public Long[] getScannablePools() {
         List<Long> zoneIds = dataCenterDao.listEnabledNonEdgeZoneIds();
         if (logger.isDebugEnabled()) {
-            logger.debug(String.format("Enabled non-edge zones available for scan: %s", org.apache.commons.lang3.StringUtils.join(zoneIds, ",")));
+            logger.debug(String.format("Enabled non-edge zones available for scan: %s", StringUtils.join(zoneIds, ",")));
         }
         return zoneIds.toArray(Long[]::new);
     }
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 25d43388b65..1c732de6a55 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -268,9 +268,6 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
 
     private final GlobalLock _allocLock = GlobalLock.getInternLock(getAllocLockName());
 
-    static final ConfigKey<String> NTPServerConfig = new ConfigKey<String>(String.class, "ntp.server.list", "Advanced", null,
-            "Comma separated list of NTP servers to configure in Secondary storage VM", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null);
-
     static final ConfigKey<Integer> MaxNumberOfSsvmsForMigration = new ConfigKey<Integer>("Advanced", Integer.class, "max.ssvm.count", "5",
             "Number of additional SSVMs to handle migration of data objects concurrently", true, ConfigKey.Scope.Global);
 
@@ -1178,7 +1175,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
             buf.append(" vmpassword=").append(_configDao.getValue("system.vm.password"));
         }
 
-        if (NTPServerConfig.value() != null) {
+        if (StringUtils.isNotEmpty(NTPServerConfig.value())) {
             buf.append(" ntpserverlist=").append(NTPServerConfig.value().replaceAll("\\s+",""));
         }
 
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh b/systemvm/debian/opt/cloud/bin/setup/common.sh
index 5156d77a6a6..85b78ee16ae 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -683,7 +683,7 @@ getPublicIp() {
 
 setup_ntp() {
     log_it "Setting up NTP"
-    NTP_CONF_FILE="/etc/ntp.conf"
+    NTP_CONF_FILE="/etc/ntpsec/ntp.conf"
     if [ -f $NTP_CONF_FILE ]
     then
         IFS=',' read -a server_list <<< "$NTP_SERVER_LIST"
@@ -692,9 +692,9 @@ setup_ntp() {
         do
             server=$(echo ${server_list[iterator]} | tr -d '\r')
             PATTERN="server $server"
-            sed -i "0,/^#server/s//$PATTERN\n#server/" $NTP_CONF_FILE
+            sed -i "0,/^# server/s//$PATTERN\n# server/" $NTP_CONF_FILE
         done
-        systemctl enable ntp
+        systemctl enable --now --no-block ntp
     else
         log_it "NTP configuration file not found"
     fi
diff --git a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
index 596ad50ab50..d35ac260712 100755
--- a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
@@ -40,6 +40,10 @@ setup_console_proxy() {
   disable_rpfilter
   enable_fwding 0
   enable_irqbalance 0
+  if [[ -n "$NTP_SERVER_LIST" ]]; then
+    setup_ntp
+    systemctl restart ntp
+  fi
   rm -f /etc/logrotate.d/cloud
 
 }
diff --git a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
index c60f70c3cef..b8ed7b54311 100755
--- a/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/secstorage.sh
@@ -82,6 +82,7 @@ HTTP
   enable_fwding 0
   enable_irqbalance 0
   setup_ntp
+  systemctl restart ntp
 
   rm -f /etc/logrotate.d/cloud
 }

From ed6ee6b704ff84eb0efcec92fbcec518a90d30d0 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Fri, 25 Jul 2025 19:31:43 +0530
Subject: [PATCH 69/94] Mark LDAP user query timeout as incorrect login instead
 of disabling user immediately (#11220)

* Mark LDAP user query timeout as incorrect login instead of disabling user immediately

* code improvements
---
 .../api/command/LdapListUsersCmd.java         |  5 +-
 .../cloudstack/ldap/LdapAuthenticator.java    | 58 ++++++++++++-------
 .../cloudstack/ldap/LdapManagerImpl.java      | 22 +++----
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
index e5d434d3810..6bfc70ea139 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
@@ -140,10 +140,11 @@ public class LdapListUsersCmd extends BaseListCmd {
         try {
             final List<LdapUser> users = _ldapManager.getUsers(domainId);
             ldapResponses = createLdapUserResponse(users);
-//            now filter and annotate
+            // now filter and annotate
             ldapResponses = applyUserFilter(ldapResponses);
         } catch (final NoLdapUserMatchingQueryException ex) {
-            // ok, we'll make do with the empty list ldapResponses = new ArrayList<LdapUserResponse>();
+            logger.debug(ex.getMessage());
+            // ok, we'll make do with the empty list
         } finally {
             response.setResponses(ldapResponses);
             response.setResponseName(getCommandName());
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
index b8509881594..36c663566cb 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -45,6 +45,8 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
     @Inject
     private AccountManager _accountManager;
 
+    private static final String LDAP_READ_TIMED_OUT_MESSAGE = "LDAP response read timed out";
+
     public LdapAuthenticator() {
         super();
     }
@@ -74,8 +76,8 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
                     return rc;
                 }
                 List<LdapTrustMapVO> ldapTrustMapVOs = getLdapTrustMapVOS(domainId);
-                if(ldapTrustMapVOs != null && ldapTrustMapVOs.size() > 0) {
-                    if(ldapTrustMapVOs.size() == 1 && ldapTrustMapVOs.get(0).getAccountId() == 0) {
+                if (ldapTrustMapVOs != null && ldapTrustMapVOs.size() > 0) {
+                    if (ldapTrustMapVOs.size() == 1 && ldapTrustMapVOs.get(0).getAccountId() == 0) {
                         if (logger.isTraceEnabled()) {
                             logger.trace("We have a single mapping of a domain to an ldap group or ou");
                         }
@@ -125,11 +127,11 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
             mappedGroups.retainAll(memberships);
             tracelist("actual groups for " + username, mappedGroups);
             // check membership, there must be only one match in this domain
-            if(ldapUser.isDisabled()) {
+            if (ldapUser.isDisabled()) {
                 logAndDisable(userAccount, "attempt to log on using disabled ldap user " + userAccount.getUsername(), false);
-            } else if(mappedGroups.size() > 1) {
+            } else if (mappedGroups.size() > 1) {
                 logAndDisable(userAccount, "user '" + username + "' is mapped to more then one account in domain and will be disabled.", false);
-            } else if(mappedGroups.size() < 1) {
+            } else if (mappedGroups.size() < 1) {
                 logAndDisable(userAccount, "user '" + username + "' is not mapped to an account in domain and will be removed.", true);
             } else {
                 // a valid ldap configured user exists
@@ -137,12 +139,12 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
                 // we could now assert that ldapTrustMapVOs.contains(mapping);
                 // createUser in Account can only be done by account name not by account id;
                 Account account = _accountManager.getAccount(mapping.getAccountId());
-                if(null == account) {
+                if (null == account) {
                     throw new CloudRuntimeException(String.format("account for user (%s) not found by id %d", username, mapping.getAccountId()));
                 }
                 String accountName = account.getAccountName();
                 rc.first(_ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId));
-                if (! rc.first()) {
+                if (!rc.first()) {
                     rc.second(ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
                 }
                 // for security reasons we keep processing on faulty login attempt to not give a way information on userid existence
@@ -162,7 +164,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
                     userAccount = _accountManager.getUserAccountById(user.getId());
                 } else {
                     // not a new user, check if mapped group has changed
-                    if(userAccount.getAccountId() != mapping.getAccountId()) {
+                    if (userAccount.getAccountId() != mapping.getAccountId()) {
                         final Account mappedAccount = _accountManager.getAccount(mapping.getAccountId());
                         if (mappedAccount == null || mappedAccount.getRemoved() != null) {
                             throw new CloudRuntimeException("Mapped account for users does not exist. Please contact your administrator.");
@@ -174,12 +176,21 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
             }
         } catch (NoLdapUserMatchingQueryException e) {
             logger.debug(e.getMessage());
-            disableUserInCloudStack(userAccount);
+            processLdapUserErrorMessage(userAccount, e.getMessage(), rc);
         }
 
         return rc;
     }
 
+    private void processLdapUserErrorMessage(UserAccount user, String errorMessage, Pair<Boolean, ActionOnFailedAuthentication> rc) {
+        if (StringUtils.isNotEmpty(errorMessage) && errorMessage.contains(LDAP_READ_TIMED_OUT_MESSAGE) && !rc.first()) {
+            rc.second(ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
+        } else {
+            // no user in ldap ==>> disable user in cloudstack
+            disableUserInCloudStack(user);
+        }
+    }
+
     private void tracelist(String msg, List<String> listToTrace) {
         if (logger.isTraceEnabled()) {
             StringBuilder logMsg = new StringBuilder();
@@ -197,7 +208,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
         if (logger.isInfoEnabled()) {
             logger.info(msg);
         }
-        if(remove) {
+        if (remove) {
             removeUserInCloudStack(userAccount);
         } else {
             disableUserInCloudStack(userAccount);
@@ -229,23 +240,22 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
             processLdapUser(password, domainId, user, rc, ldapUser, accountType);
         } catch (NoLdapUserMatchingQueryException e) {
             logger.debug(e.getMessage());
-            // no user in ldap ==>> disable user in cloudstack
-            disableUserInCloudStack(user);
+            processLdapUserErrorMessage(user, e.getMessage(), rc);
         }
         return rc;
     }
 
     private void processLdapUser(String password, Long domainId, UserAccount user, Pair<Boolean, ActionOnFailedAuthentication> rc, LdapUser ldapUser, Account.Type accountType) {
-        if(!ldapUser.isDisabled()) {
+        if (!ldapUser.isDisabled()) {
             rc.first(_ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId));
-            if(rc.first()) {
-                if(user == null) {
+            if (rc.first()) {
+                if (user == null) {
                     // import user to cloudstack
                     createCloudStackUserAccount(ldapUser, domainId, accountType);
                 } else {
                     enableUserInCloudStack(user);
                 }
-            } else if(user != null) {
+            } else if (user != null) {
                 rc.second(ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
             }
         } else {
@@ -264,30 +274,34 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
      */
     Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount user) {
         boolean result = false;
+        boolean timedOut = false;
 
-        if(user != null ) {
+        if (user != null ) {
             try {
                 LdapUser ldapUser = _ldapManager.getUser(username, domainId);
-                if(!ldapUser.isDisabled()) {
+                if (!ldapUser.isDisabled()) {
                     result = _ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId);
                 } else {
                     logger.debug("user with principal "+ ldapUser.getPrincipal() + " is disabled in ldap");
                 }
             } catch (NoLdapUserMatchingQueryException e) {
                 logger.debug(e.getMessage());
+                if (e.getMessage().contains(LDAP_READ_TIMED_OUT_MESSAGE)) {
+                    timedOut = true;
+                }
             }
         }
-        return processResultAndAction(user, result);
+        return processResultAndAction(user, result, timedOut);
     }
 
-    private Pair<Boolean, ActionOnFailedAuthentication> processResultAndAction(UserAccount user, boolean result) {
-        return (!result && user != null) ?
+    private Pair<Boolean, ActionOnFailedAuthentication> processResultAndAction(UserAccount user, boolean result, boolean timedOut) {
+        return (!result && (user != null || timedOut)) ?
                 new Pair<Boolean, ActionOnFailedAuthentication>(result, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
                 new Pair<Boolean, ActionOnFailedAuthentication>(result, null);
     }
 
     private void enableUserInCloudStack(UserAccount user) {
-        if(user != null && (user.getState().equalsIgnoreCase(Account.State.DISABLED.toString()))) {
+        if (user != null && (user.getState().equalsIgnoreCase(Account.State.DISABLED.toString()))) {
             _accountManager.enableUser(user.getId());
         }
     }
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
index 2394c0b3d1e..05b8578bb42 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
@@ -166,7 +166,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
 
     private LdapConfigurationResponse addConfigurationInternal(final String hostname, int port, final Long domainId) throws InvalidParameterValueException {
         // TODO evaluate what the right default should be
-        if(port <= 0) {
+        if (port <= 0) {
             port = 389;
         }
 
@@ -210,7 +210,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             // TODO return the right account for this user
             final LdapContext context = _ldapContextFactory.createUserContext(principal, password, domainId);
             closeContext(context);
-            if(logger.isTraceEnabled()) {
+            if (logger.isTraceEnabled()) {
                 logger.trace(String.format("User(%s) authenticated for domain(%s)", principal, domainId));
             }
             return true;
@@ -234,7 +234,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
     @Override
     public LdapConfigurationResponse createLdapConfigurationResponse(final LdapConfigurationVO configuration) {
         String domainUuid = null;
-        if(configuration.getDomainId() != null) {
+        if (configuration.getDomainId() != null) {
             DomainVO domain = domainDao.findById(configuration.getDomainId());
             if (domain != null) {
                 domainUuid = domain.getUuid();
@@ -303,8 +303,8 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(null)).getUser(escapedUsername, context, domainId);
 
         } catch (NamingException | IOException e) {
-            logger.debug("ldap Exception: ",e);
-            throw new NoLdapUserMatchingQueryException("No Ldap User found for username: "+username);
+            logger.debug("LDAP Exception: ", e);
+            throw new NoLdapUserMatchingQueryException("Unable to find LDAP User for username: " + username + ", due to " + e.getMessage());
         } finally {
             closeContext(context);
         }
@@ -324,8 +324,8 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             LdapUserManager userManagerFactory = _ldapUserManagerFactory.getInstance(ldapProvider);
             return userManagerFactory.getUser(escapedUsername, type, name, context, domainId);
         } catch (NamingException | IOException e) {
-            logger.debug("ldap Exception: ",e);
-            throw new NoLdapUserMatchingQueryException("No Ldap User found for username: "+username + " in group: " + name + " of type: " + type);
+            logger.debug("LDAP Exception: ", e);
+            throw new NoLdapUserMatchingQueryException("Unable to find LDAP User for username: " + username + " in group: " + name + " of type: " + type + ", due to " + e.getMessage());
         } finally {
             closeContext(context);
         }
@@ -338,7 +338,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             context = _ldapContextFactory.createBindContext(domainId);
             return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(domainId)).getUsers(context, domainId);
         } catch (NamingException | IOException e) {
-            logger.debug("ldap Exception: ",e);
+            logger.debug("LDAP Exception: ", e);
             throw new NoLdapUserMatchingQueryException("*");
         } finally {
             closeContext(context);
@@ -352,7 +352,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             context = _ldapContextFactory.createBindContext(domainId);
             return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(domainId)).getUsersInGroup(groupName, context, domainId);
         } catch (NamingException | IOException e) {
-            logger.debug("ldap NamingException: ",e);
+            logger.debug("LDAP Exception: ", e);
             throw new NoLdapUserMatchingQueryException("groupName=" + groupName);
         } finally {
             closeContext(context);
@@ -390,7 +390,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
             final String escapedUsername = LdapUtils.escapeLDAPSearchFilter(username);
             return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(null)).getUsers("*" + escapedUsername + "*", context, null);
         } catch (NamingException | IOException e) {
-            logger.debug("ldap Exception: ",e);
+            logger.debug("LDAP Exception: ",e);
             throw new NoLdapUserMatchingQueryException(username);
         } finally {
             closeContext(context);
@@ -481,7 +481,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
     private void clearOldAccountMapping(LinkAccountToLdapCmd cmd) {
         //        first find if exists log warning and update
         LdapTrustMapVO oldVo = _ldapTrustMapDao.findGroupInDomain(cmd.getDomainId(), cmd.getLdapDomain());
-        if(oldVo != null) {
+        if (oldVo != null) {
             // deal with edge cases, i.e. check if the old account is indeed deleted etc.
             if (oldVo.getAccountId() != 0l) {
                 AccountVO oldAcount = accountDao.findByIdIncludingRemoved(oldVo.getAccountId());

From 13892e2ff06e6459dd1f86ea70d24ba3c7b4e309 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Fri, 25 Jul 2025 16:45:54 -0300
Subject: [PATCH 70/94] [CKS] Create Kubernetes ISO support for ARCH optional
 parameter (#10986)

* [CKS] Create Kubernetes ISO support for ARCH optional parameter

* Include arch on the build name

* Refactor

* Fix ISO naming

* Apply suggestions from code review

Co-authored-by: Wei Zhou <weizhou@apache.org>

* Reorder parameters

---------

Co-authored-by: Wei Zhou <weizhou@apache.org>
---
 .../util/create-kubernetes-binaries-iso.sh    | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/scripts/util/create-kubernetes-binaries-iso.sh b/scripts/util/create-kubernetes-binaries-iso.sh
index 535d4b36479..58aec922b7f 100755
--- a/scripts/util/create-kubernetes-binaries-iso.sh
+++ b/scripts/util/create-kubernetes-binaries-iso.sh
@@ -19,11 +19,26 @@
 set -e
 
 if [ $# -lt 6 ]; then
-    echo "Invalid input. Valid usage: ./create-kubernetes-binaries-iso.sh OUTPUT_PATH KUBERNETES_VERSION CNI_VERSION CRICTL_VERSION WEAVENET_NETWORK_YAML_CONFIG DASHBOARD_YAML_CONFIG BUILD_NAME [ETCD_VERSION]"
-    echo "eg: ./create-kubernetes-binaries-iso.sh ./ 1.11.4 0.7.1 1.11.1 https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.11.yaml https://raw.githubusercontent.com/kubernetes/dashboard/v1.10.0/src/deploy/recommended/kubernetes-dashboard.yaml setup-v1.11.4 3.5.1"
+    echo "Invalid input. Valid usage: ./create-kubernetes-binaries-iso.sh OUTPUT_PATH KUBERNETES_VERSION CNI_VERSION CRICTL_VERSION WEAVENET_NETWORK_YAML_CONFIG DASHBOARD_YAML_CONFIG BUILD_NAME [ARCH] [ETCD_VERSION]"
+    echo "eg: ./create-kubernetes-binaries-iso.sh ./ 1.11.4 0.7.1 1.11.1 https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.11.yaml https://raw.githubusercontent.com/kubernetes/dashboard/v1.10.0/src/deploy/recommended/kubernetes-dashboard.yaml setup-v1.11.4 amd64"
     exit 1
 fi
 
+ARCH="amd64"
+ARCH_SUFFIX="x86_64"
+if [ -n "${8}" ]; then
+  if [ "${8}" = "x86_64" ] || [ "${8}" = "amd64" ]; then
+    ARCH="amd64"
+    ARCH_SUFFIX="x86_64"
+  elif [ "${8}" = "aarch64" ] || [ "${8}" = "arm64" ]; then
+    ARCH="arm64"
+    ARCH_SUFFIX="aarch64"
+  else
+    echo "ERROR: ARCH must be 'x86_64' or 'aarch64'. If the optional parameter ARCH is not set then 'x86_64' is used."
+    exit 1
+  fi
+fi
+
 RELEASE="v${2}"
 VAL="1.18.0"
 output_dir="${1}"
@@ -31,29 +46,29 @@ start_dir="$PWD"
 iso_dir="/tmp/iso"
 working_dir="${iso_dir}/"
 mkdir -p "${working_dir}"
-build_name="${7}.iso"
-[ -z "${build_name}" ] && build_name="setup-${RELEASE}.iso"
+build_name="${7}-${ARCH_SUFFIX}.iso"
+[ -z "${build_name}" ] && build_name="setup-${RELEASE}-${ARCH_SUFFIX}.iso"
 
 CNI_VERSION="v${3}"
 echo "Downloading CNI ${CNI_VERSION}..."
 cni_dir="${working_dir}/cni/"
 mkdir -p "${cni_dir}"
-cni_status_code=$(curl -L  --write-out "%{http_code}\n" "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" -o "${cni_dir}/cni-plugins-amd64.tgz")
+cni_status_code=$(curl -L  --write-out "%{http_code}\n" "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz" -o "${cni_dir}/cni-plugins-${ARCH}.tgz")
 if [[ ${cni_status_code} -eq 404 ]] ; then
-  curl -L  --write-out "%{http_code}\n" "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz" -o "${cni_dir}/cni-plugins-amd64.tgz"
+  curl -L  --write-out "%{http_code}\n" "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-${ARCH}-${CNI_VERSION}.tgz" -o "${cni_dir}/cni-plugins-${ARCH}.tgz"
 fi
 
 CRICTL_VERSION="v${4}"
 echo "Downloading CRI tools ${CRICTL_VERSION}..."
 crictl_dir="${working_dir}/cri-tools/"
 mkdir -p "${crictl_dir}"
-curl -L "https://github.com/kubernetes-incubator/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" -o "${crictl_dir}/crictl-linux-amd64.tar.gz"
+curl -L "https://github.com/kubernetes-incubator/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${ARCH}.tar.gz" -o "${crictl_dir}/crictl-linux-${ARCH}.tar.gz"
 
 echo "Downloading Kubernetes tools ${RELEASE}..."
 k8s_dir="${working_dir}/k8s"
 mkdir -p "${k8s_dir}"
 cd "${k8s_dir}"
-curl -L --remote-name-all https://dl.k8s.io/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
+curl -L --remote-name-all https://dl.k8s.io/release/${RELEASE}/bin/linux/${ARCH}/{kubeadm,kubelet,kubectl}
 kubeadm_file_permissions=`stat --format '%a' kubeadm`
 chmod +x kubeadm
 
@@ -148,11 +163,12 @@ chmod ${kubeadm_file_permissions} "${working_dir}/k8s/kubeadm"
 echo "Updating imagePullPolicy to IfNotPresent in yaml files..."
 sed -i "s/imagePullPolicy:.*/imagePullPolicy: IfNotPresent/g" ${working_dir}/*.yaml
 
-if [ -n "${8}" ]; then
+# Optional parameter ETCD_VERSION
+if [ -n "${9}" ]; then
   # Install etcd dependencies
   etcd_dir="${working_dir}/etcd"
   mkdir -p "${etcd_dir}"
-  ETCD_VERSION=v${8}
+  ETCD_VERSION=v${9}
   wget -q --show-progress "https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz" -O ${etcd_dir}/etcd-linux-amd64.tar.gz
 fi
 

From 407072ffd43ab8838bbf8cf11ae99627849338de Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Sat, 26 Jul 2025 12:24:05 +0530
Subject: [PATCH 71/94] schema,framework/db,server: fix user_vm_details usage
 (#11292)

* schema,framework/db,server: fix user_vm_details usage

Continuation of #10736

* python files

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../java/com/cloud/capacity/dao/CapacityDaoImpl.java   |  6 +++---
 .../cloud/configuration/dao/ResourceCountDaoImpl.java  |  2 +-
 .../src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |  6 +++---
 .../cloud/utils/crypt/EncryptionSecretKeyChanger.java  |  2 +-
 .../hypervisor/vmware/resource/VmwareResource.java     |  2 +-
 .../src/main/java/com/cloud/vm/UserVmManagerImpl.java  | 10 +++++-----
 test/integration/component/test_rootvolume_resize.py   |  2 +-
 test/integration/component/test_update_vm.py           |  4 ++--
 test/integration/smoke/test_deploy_vgpu_enabled_vm.py  |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
index d54d1632bd0..91949bded50 100644
--- a/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -204,9 +204,9 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
                 "(CASE WHEN ISNULL(service_offering.speed) THEN custom_speed.value ELSE service_offering.speed end) AS speed, " +
                 "(CASE WHEN ISNULL(service_offering.ram_size) THEN custom_ram_size.value ELSE service_offering.ram_size end) AS ram_size " +
                 "FROM vm_instance vi LEFT JOIN service_offering ON(((vi.service_offering_id = service_offering.id))) " +
-                "LEFT JOIN user_vm_details custom_cpu ON(((custom_cpu.vm_id = vi.id) AND (custom_cpu.name = 'CpuNumber'))) " +
-                "LEFT JOIN user_vm_details custom_speed ON(((custom_speed.vm_id = vi.id) AND (custom_speed.name = 'CpuSpeed'))) " +
-                "LEFT JOIN user_vm_details custom_ram_size ON(((custom_ram_size.vm_id = vi.id) AND (custom_ram_size.name = 'memory'))) ";
+                "LEFT JOIN vm_instance_details custom_cpu ON(((custom_cpu.vm_id = vi.id) AND (custom_cpu.name = 'CpuNumber'))) " +
+                "LEFT JOIN vm_instance_details custom_speed ON(((custom_speed.vm_id = vi.id) AND (custom_speed.name = 'CpuSpeed'))) " +
+                "LEFT JOIN vm_instance_details custom_ram_size ON(((custom_ram_size.vm_id = vi.id) AND (custom_ram_size.name = 'memory'))) ";
 
     private static final String WHERE_STATE_IS_NOT_DESTRUCTIVE =
             "WHERE ISNULL(vi.removed) AND vi.state NOT IN ('Destroyed', 'Error', 'Expunging')";
diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index 65d7fed2d1a..0ab83442337 100644
--- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
@@ -336,7 +336,7 @@ public class ResourceCountDaoImpl extends GenericDaoBase<ResourceCountVO, Long>
             + "    END)) as total "
             + " from vm_instance vm "
             + " join service_offering so on so.id = vm.service_offering_id "
-            + " left join user_vm_details vmd on vmd.vm_id = vm.id and vmd.name = '%s' "
+            + " left join vm_instance_details vmd on vmd.vm_id = vm.id and vmd.name = '%s' "
             + " where vm.type = 'User' and state not in ('Destroyed', 'Error', 'Expunging') and display_vm = true and account_id = ? ";
 
     @Override
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
index 7d7c8de06d6..fc0322c25e7 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -124,8 +124,8 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
             + "left join security_group on security_group_vm_map.security_group_id=security_group.id " + "left join nics on vm_instance.id=nics.instance_id "
             + "left join networks on nics.network_id=networks.id " + "left join user_ip_address on user_ip_address.vm_id=vm_instance.id " + "where vm_instance.id in (";
 
-    private static final String VMS_DETAIL_BY_NAME = "select vm_instance.instance_name, vm_instance.vm_type, vm_instance.id , user_vm_details.value, user_vm_details.name from vm_instance "
-            + "left join user_vm_details on vm_instance.id = user_vm_details.vm_id where (user_vm_details.name is null or user_vm_details.name = ? ) and vm_instance.instance_name in (";
+    private static final String VMS_DETAIL_BY_NAME = "select vm_instance.instance_name, vm_instance.vm_type, vm_instance.id , vm_instance_details.value, vm_instance_details.name from vm_instance "
+            + "left join vm_instance_details on vm_instance.id = vm_instance_details.vm_id where (vm_instance_details.name is null or vm_instance_details.name = ? ) and vm_instance.instance_name in (";
 
     private static final int VM_DETAILS_BATCH_SIZE = 100;
 
@@ -755,7 +755,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
                 while (rs.next()) {
                     vmsDetailByNames.add(new Pair<Pair<String, VirtualMachine.Type>, Pair<Long, String>>(new Pair<String, VirtualMachine.Type>(
                             rs.getString("vm_instance.instance_name"), VirtualMachine.Type.valueOf(rs.getString("vm_type"))),
-                            new Pair<Long, String>(rs.getLong("vm_instance.id"), rs.getString("user_vm_details.value"))));
+                            new Pair<Long, String>(rs.getLong("vm_instance.id"), rs.getString("vm_instance_details.value"))));
                 }
             }
         } catch (SQLException e) {
diff --git a/framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java b/framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
index e96b0a00894..a3e3cce237d 100644
--- a/framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
+++ b/framework/db/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
@@ -632,7 +632,7 @@ public class EncryptionSecretKeyChanger {
 
     private void migrateUserVmDetails(Connection conn) {
         System.out.println("Begin migrate user vm details");
-        migrateDetails(conn, "user_vm_details", PASSWORD);
+        migrateDetails(conn, "vm_instance_details", PASSWORD);
         System.out.println("End migrate user vm details");
     }
 
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 478ccf1d2af..aecfb58d708 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3203,7 +3203,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
     }
 
     /**
-     * Modifies vm vram size if it was set to a different size to the one provided in svga.vramSize (user_vm_details or template_vm_details) on {@code vmConfigSpec}
+     * Modifies vm vram size if it was set to a different size to the one provided in svga.vramSize (vm_instance_details or template_vm_details) on {@code vmConfigSpec}
      *
      * @param videoCard     vm's video card device
      * @param vmMo          virtual machine mo
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index c3f7f53c224..14757bfb30f 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -6324,7 +6324,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
         }
 
-        // Add extraConfig to user_vm_details table
+        // Add extraConfig to vm_instance_details table
         String extraConfig = cmd.getExtraConfig();
         if (StringUtils.isNotBlank(extraConfig)) {
             if (EnableAdditionalVmConfig.valueIn(callerId)) {
@@ -6482,7 +6482,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     }
 
     /**
-     * Persist extra configuration data in the user_vm_details table as key/value pair
+     * Persist extra configuration data in the vm_instance_details table as key/value pair
      * @param decodedUrl String consisting of the extra config data to appended onto the vmx file for VMware instances
      */
     protected void persistExtraConfigVmware(String decodedUrl, UserVm vm) {
@@ -6506,7 +6506,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     }
 
     /**
-     * Used to persist extra configuration settings in user_vm_details table for the XenServer hypervisor
+     * Used to persist extra configuration settings in vm_instance_details table for the XenServer hypervisor
      * persists config as key/value pair e.g key = extraconfig-1 , value="PV-bootloader=pygrub" and so on to extraconfig-N where
      * N denotes the number of extra configuration settings passed by user
      *
@@ -6587,9 +6587,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
     /**
      * Persist extra configuration data on KVM
-     * persisted in the user_vm_details DB as extraconfig-1, and so on depending on the number of configurations
+     * persisted in the vm_instance_details DB as extraconfig-1, and so on depending on the number of configurations
      * For KVM, extra config is passed as XML
-     * @param decodedUrl string containing xml configuration to be persisted into user_vm_details table
+     * @param decodedUrl string containing xml configuration to be persisted into vm_instance_details table
      * @param vm
      */
     protected void persistExtraConfigKvm(String decodedUrl, UserVm vm) {
diff --git a/test/integration/component/test_rootvolume_resize.py b/test/integration/component/test_rootvolume_resize.py
index fa2d4a018cd..971b82d0f1c 100644
--- a/test/integration/component/test_rootvolume_resize.py
+++ b/test/integration/component/test_rootvolume_resize.py
@@ -308,7 +308,7 @@ class TestResizeVolume(cloudstackTestCase):
                 vmid = int(qresultvmuuid[0][0])
                 qresult = self.dbclient.execute(
                     "select rootDiskController from"
-                    " user_vm_details where id = '%s';" % vmid
+                    " vm_instance_details where id = '%s';" % vmid
                 )
                 self.debug("Query result: %s" % qresult)
                 diskcontroller = qresult[0][0]
diff --git a/test/integration/component/test_update_vm.py b/test/integration/component/test_update_vm.py
index 4d167c63330..9629faf0cac 100644
--- a/test/integration/component/test_update_vm.py
+++ b/test/integration/component/test_update_vm.py
@@ -186,7 +186,7 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
         vm_db_id = dbresult[0][0]
         self.debug("VM has database id %d" % vm_db_id)
 
-        self.dbclient.execute("insert into user_vm_details (vm_id, name, value, display) values (%d,'%s','HOST', 0)" % (vm_db_id, hidden_detail_name))
+        self.dbclient.execute("insert into vm_instance_details (vm_id, name, value, display) values (%d,'%s','HOST', 0)" % (vm_db_id, hidden_detail_name))
 
         vm = self.listVmById(self.virtual_machine.id)
         self.debug("VirtualMachine fetched with details: %s of type %s" % (vm.details, type(vm.details)))
@@ -227,7 +227,7 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
 
 
     def detailInDatabase(self, vm_id, detail_name):
-        dbresult = self.dbclient.execute("select id from user_vm_details where vm_id=%s and name='%s'" % (vm_id, detail_name))
+        dbresult = self.dbclient.execute("select id from vm_instance_details where vm_id=%s and name='%s'" % (vm_id, detail_name))
         self.debug("Detail %s for VM %s: %s" % (detail_name, vm_id, dbresult))
         if validateList(dbresult)[0] == PASS:
             return True
diff --git a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
index 7ed4c8a08ca..2808a3ce06e 100644
--- a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
+++ b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
@@ -319,7 +319,7 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
 
         qresultset = self.dbclient.execute("select id from vm_instance where uuid = '%s';" % self.virtual_machine.id)
         vm_id = qresultset[0]
-        qresultset = self.dbclient.execute("select name, value from user_vm_details where vm_id = '%d';" % vm_id)
+        qresultset = self.dbclient.execute("select name, value from vm_instance_details where vm_id = '%d';" % vm_id)
         detailKeys = [x[0] for x in qresultset]
 
         self.assertTrue('mks.enable3d' in detailKeys and 'mks.use3dRenderer' in detailKeys and 'svga.autodetect' in detailKeys and 'svga.vramSize' in detailKeys, "VM details do not contain 3D GPU details")

From 40035f54d0fc7e33b8a19932b63751f97e5ab7ae Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Sat, 26 Jul 2025 04:06:47 -0300
Subject: [PATCH 72/94] [UI] Add dedicated account field dropdown on zone
 creation (#11195)

---
 ui/public/locales/en.json                     |  1 +
 .../infra/zone/ZoneWizardZoneDetailsStep.vue  | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index c36b96cc961..79ea9bb9d8f 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -3168,6 +3168,7 @@
 "message.error.sbdomain.username": "Please enter SMB domain username.",
 "message.error.secret.key": "Please enter secret key.",
 "message.error.select": "Please select option.",
+"message.error.select.account.to.dedicate": "Please select an account to dedicate to.",
 "message.error.select.domain.to.dedicate": "Please select domain to dedicate to.",
 "message.error.select.zone.type": "Please select Zone type below.",
 "message.error.server": "Please enter server.",
diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
index 05c5adc1bd2..584cbe6d1ba 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
@@ -195,7 +195,8 @@
           optionFilterProp="label"
           :filterOption="(input, option) => {
             return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }" >
+          }"
+          @change="val => { fetchDomainAccounts(val) }">
           <a-select-option v-for="dom in domains" :key="dom.id" :label="dom.path">
             {{ dom.path }}
           </a-select-option>
@@ -213,7 +214,20 @@
           :label="$t('label.account')"
           v-bind="formItemLayout"
           v-if="isDedicated">
-          <a-input v-model:value="form.account" />
+          <a-select
+            v-model:value="form.account"
+            v-focus="true"
+            showSearch
+            optionFilterProp="value"
+            :filterOption="(input, option) => {
+              return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :placeholder="$t('message.error.select.account.to.dedicate')"
+            >
+            <a-select-option v-for="(acc, index) in selectedDomainAccounts" :value="acc.name" :key="index">
+              {{ acc.name }}
+            </a-select-option>
+          </a-select>
         </a-form-item>
         <a-form-item
           name="localstorageenabled"
@@ -276,7 +290,8 @@ export default {
     availableNetworkOfferings: null,
     ipV4Regex: /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i,
     ipV6Regex: /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i,
-    formModel: {}
+    formModel: {},
+    selectedDomainAccounts: []
   }),
   created () {
     this.hypervisors = this.prefillContent?.hypervisors || null
@@ -454,6 +469,17 @@ export default {
         hypervisor: [{ required: true, message: this.$t('message.error.hypervisor.type') }]
       })
     },
+    fetchDomainAccounts (domainid) {
+      api('listAccounts', {
+        domainid: domainid
+      }).then(response => {
+        // Clean up the selected account from a previous domain
+        this.form.account = null
+        this.selectedDomainAccounts = response.listaccountsresponse.account || []
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
     fetchData () {
       api('listHypervisors').then(json => {
         this.hypervisors = json.listhypervisorsresponse.hypervisor

From 217ff27650f7738eaf9c3a024f04f3833fdc6487 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Sat, 26 Jul 2025 13:17:31 +0530
Subject: [PATCH 73/94] ui: fix compute offering edit (#11232)

Fixes #11216

There is no parameter named 'storageaccessgroups' in updateServiceOffering API.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/config/section/offering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js
index 024573b84ca..ed519100b19 100644
--- a/ui/src/config/section/offering.js
+++ b/ui/src/config/section/offering.js
@@ -95,7 +95,7 @@ export default {
         label: 'label.edit',
         docHelp: 'adminguide/service_offerings.html#modifying-or-deleting-a-service-offering',
         dataView: true,
-        args: ['name', 'displaytext', 'storageaccessgroups', 'hosttags']
+        args: ['name', 'displaytext', 'storagetags', 'hosttags']
       }, {
         api: 'updateServiceOffering',
         icon: 'lock-outlined',

From cca8b2fef9016bc04cde10f2f2ef4bf6f345155e Mon Sep 17 00:00:00 2001
From: Harikrishna <harikrishna.patnala@gmail.com>
Date: Mon, 28 Jul 2025 10:41:17 +0530
Subject: [PATCH 74/94]  Extensions Framework & Orchestrate Anything (#9752)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Extensions Framework in Apache CloudStack is designed to provide a flexible and standardised mechanism for integrating external systems and custom workflows into CloudStack’s orchestration process. By defining structured hook points during key operations—such as virtual machine deployment, resource preparation, and lifecycle events—the framework allows administrators and developers to extend CloudStack’s behaviour without modifying its core codebase.
---
 .github/workflows/ci.yml                      |    5 +-
 .../java/com/cloud/agent/api/Command.java     |   14 +-
 .../cloud/agent/api/to/VirtualMachineTO.java  |   14 +
 .../main/java/com/cloud/event/EventTypes.java |   28 +-
 .../java/com/cloud/hypervisor/Hypervisor.java |    1 +
 .../java/com/cloud/network/NetworkModel.java  |    2 +
 .../com/cloud/network/NetworkService.java     |    9 +-
 .../com/cloud/network/nsx/NsxService.java     |    4 +-
 .../main/java/com/cloud/storage/Storage.java  |    1 +
 .../template/VirtualMachineTemplate.java      |    2 +
 .../java/com/cloud/vm/VmDetailConstants.java  |    8 +
 .../org/apache/cloudstack/acl/RoleType.java   |   27 +
 .../apache/cloudstack/alert/AlertService.java |    1 +
 .../api/ApiCommandResourceType.java           |    4 +-
 .../apache/cloudstack/api/ApiConstants.java   |   26 +-
 .../org/apache/cloudstack/api/BaseCmd.java    |   11 +
 .../command/admin/cluster/AddClusterCmd.java  |   32 +-
 .../admin/cluster/ListClustersCmd.java        |   37 +-
 .../api/command/admin/host/AddHostCmd.java    |   12 +-
 .../api/command/admin/host/UpdateHostCmd.java |   15 +-
 .../offering/CreateServiceOfferingCmd.java    |   16 +-
 .../offering/UpdateServiceOfferingCmd.java    |   11 +
 .../api/command/admin/vm/MigrateVMCmd.java    |    5 +
 .../user/config/ListCapabilitiesCmd.java      |    1 +
 .../user/template/ListTemplatesCmd.java       |   12 +-
 .../user/template/RegisterTemplateCmd.java    |   23 +-
 .../api/command/user/vm/DeployVMCmd.java      |   73 +-
 .../api/command/user/vm/ListVMsCmd.java       |   10 +
 .../api/response/CapabilitiesResponse.java    |    9 +
 .../api/response/ClusterResponse.java         |   34 +
 .../CreateConsoleEndpointResponse.java        |    2 +-
 ...xtensionCustomActionParameterResponse.java |   58 +
 .../ExtensionCustomActionResponse.java        |  184 ++
 .../response/ExtensionResourceResponse.java   |   95 +
 .../api/response/ExtensionResponse.java       |  182 ++
 .../cloudstack/api/response/HostResponse.java |   35 +-
 .../RouterHealthCheckResultResponse.java      |    2 +-
 .../api/response/TemplateResponse.java        |   22 +
 .../response/UnmanageVMInstanceResponse.java  |    2 +-
 .../extension/CustomActionResultResponse.java |   65 +
 .../cloudstack/extension/Extension.java       |   44 +
 .../extension/ExtensionCustomAction.java      |  386 ++++
 .../cloudstack/extension/ExtensionHelper.java |   24 +
 .../extension/ExtensionResourceMap.java       |   34 +
 .../admin/cluster/ListClustersCmdTest.java    |   83 +
 .../extension/ExtensionCustomActionTest.java  |  484 +++++
 build/replace.properties                      |    1 +
 client/conf/server.properties.in              |    3 +
 client/pom.xml                                |    5 +
 .../PrepareExternalProvisioningAnswer.java    |   51 +
 .../PrepareExternalProvisioningCommand.java   |   39 +
 .../agent/api/RunCustomActionAnswer.java      |   32 +
 .../agent/api/RunCustomActionCommand.java     |   59 +
 .../java/com/cloud/agent/api/StopCommand.java |   17 +-
 debian/cloudstack-common.install              |    1 +
 debian/cloudstack-management.install          |    2 +
 debian/cloudstack-management.postinst         |    3 +
 debian/rules                                  |    3 +
 .../cloud/hypervisor/ExternalProvisioner.java |   61 +
 .../com/cloud/template/TemplateManager.java   |    3 +-
 engine/orchestration/pom.xml                  |    5 +
 .../cloud/agent/manager/AgentManagerImpl.java |   20 +-
 .../manager/ClusteredAgentManagerImpl.java    |    9 +-
 .../cloud/vm/VirtualMachineManagerImpl.java   |  234 ++-
 .../orchestration/NetworkOrchestrator.java    |   24 +-
 .../vm/VirtualMachineManagerImplTest.java     |  315 ++-
 .../java/com/cloud/dc/dao/ClusterDao.java     |    2 +
 .../java/com/cloud/dc/dao/ClusterDaoImpl.java |   25 +
 .../com/cloud/host/dao/HostDetailsDao.java    |    3 +
 .../cloud/host/dao/HostDetailsDaoImpl.java    |   32 +
 .../PhysicalNetworkTrafficTypeDaoImpl.java    |    2 +-
 .../java/com/cloud/storage/VMTemplateVO.java  |   13 +-
 .../com/cloud/storage/dao/VMTemplateDao.java  |    2 +
 .../cloud/storage/dao/VMTemplateDaoImpl.java  |   11 +
 .../resourcedetail/ResourceDetailsDao.java    |    3 +
 .../ResourceDetailsDaoBase.java               |   14 +
 .../META-INF/db/schema-42010to42100.sql       |  315 +++
 .../META-INF/db/views/cloud.template_view.sql |    6 +-
 .../storage/dao/VMTemplateDaoImplTest.java    |   17 +
 .../storage/image/TemplateServiceImpl.java    |    4 +-
 .../storage/image/store/TemplateObject.java   |    5 +
 extensions/HyperV/hyperv.py                   |  302 +++
 extensions/Proxmox/proxmox.sh                 |  413 ++++
 framework/extensions/pom.xml                  |   54 +
 .../extensions/api/AddCustomActionCmd.java    |  175 ++
 .../extensions/api/CreateExtensionCmd.java    |  140 ++
 .../extensions/api/DeleteCustomActionCmd.java |   96 +
 .../extensions/api/DeleteExtensionCmd.java    |  104 +
 .../extensions/api/ListCustomActionCmd.java   |  110 +
 .../extensions/api/ListExtensionsCmd.java     |  114 ++
 .../extensions/api/RegisterExtensionCmd.java  |  118 ++
 .../extensions/api/RunCustomActionCmd.java    |  121 ++
 .../api/UnregisterExtensionCmd.java           |  109 +
 .../extensions/api/UpdateCustomActionCmd.java |  197 ++
 .../extensions/api/UpdateExtensionCmd.java    |  136 ++
 .../command/CleanupExtensionFilesCommand.java |   27 +
 .../command/ExtensionBaseCommand.java         |   63 +
 .../ExtensionRoutingUpdateCommand.java        |   34 +
 .../ExtensionServerActionBaseCommand.java     |   33 +
 .../GetExtensionPathChecksumCommand.java      |   27 +
 .../command/PrepareExtensionPathCommand.java  |   27 +
 .../dao/ExtensionCustomActionDao.java         |   27 +
 .../dao/ExtensionCustomActionDaoImpl.java     |   59 +
 .../dao/ExtensionCustomActionDetailsDao.java  |   26 +
 .../ExtensionCustomActionDetailsDaoImpl.java  |   28 +
 .../extensions/dao/ExtensionDao.java          |   26 +
 .../extensions/dao/ExtensionDaoImpl.java      |   45 +
 .../extensions/dao/ExtensionDetailsDao.java   |   24 +
 .../dao/ExtensionDetailsDaoImpl.java          |   28 +
 .../dao/ExtensionResourceMapDao.java          |   32 +
 .../dao/ExtensionResourceMapDaoImpl.java      |   70 +
 .../dao/ExtensionResourceMapDetailsDao.java   |   26 +
 .../ExtensionResourceMapDetailsDaoImpl.java   |   28 +
 .../extensions/manager/ExtensionsManager.java |   90 +
 .../manager/ExtensionsManagerImpl.java        | 1593 +++++++++++++++
 .../vo/ExtensionCustomActionDetailsVO.java    |   97 +
 .../vo/ExtensionCustomActionVO.java           |  215 ++
 .../extensions/vo/ExtensionDetailsVO.java     |   97 +
 .../vo/ExtensionResourceMapDetailsVO.java     |   97 +
 .../extensions/vo/ExtensionResourceMapVO.java |  122 ++
 .../framework/extensions/vo/ExtensionVO.java  |  179 ++
 ...ring-framework-extensions-core-context.xml |   36 +
 .../api/AddCustomActionCmdTest.java           |  224 ++
 .../api/CreateExtensionCmdTest.java           |   97 +
 .../api/DeleteCustomActionCmdTest.java        |   81 +
 .../api/DeleteExtensionCmdTest.java           |   90 +
 .../api/ListCustomActionCmdTest.java          |  153 ++
 .../extensions/api/ListExtensionsCmdTest.java |   92 +
 .../api/RegisterExtensionCmdTest.java         |  133 ++
 .../api/RunCustomActionCmdTest.java           |  127 ++
 .../api/UnregisterExtensionCmdTest.java       |  124 ++
 .../api/UpdateCustomActionCmdTest.java        |  240 +++
 .../api/UpdateExtensionCmdTest.java           |  168 ++
 .../command/ExtensionBaseCommandTest.java     |   78 +
 .../dao/ExtensionCustomActionDaoImplTest.java |   68 +
 .../extensions/dao/ExtensionDaoImplTest.java  |   51 +
 .../dao/ExtensionResourceMapDaoImplTest.java  |   86 +
 .../manager/ExtensionsManagerImplTest.java    | 1809 +++++++++++++++++
 framework/pom.xml                             |    1 +
 packaging/debian/replace.properties           |    1 +
 packaging/el8/cloud.spec                      |    8 +
 packaging/el8/replace.properties              |    1 +
 plugins/hypervisors/external/pom.xml          |   44 +
 .../agent/manager/ExternalAgentManager.java   |   24 +
 .../manager/ExternalAgentManagerImpl.java     |   55 +
 .../agent/manager/ExternalServerPlanner.java  |  183 ++
 .../manager/ExternalTemplateAdapter.java      |  279 +++
 .../guru/ExternalHypervisorGuru.java          |  114 ++
 .../discoverer/ExternalServerDiscoverer.java  |  294 +++
 .../ExternalPathPayloadProvisioner.java       |  832 ++++++++
 .../external/resource/ExternalResource.java   |  376 ++++
 .../core/spring-external-core-context.xml     |   31 +
 .../external-compute/module.properties        |   18 +
 .../spring-external-compute-context.xml       |   31 +
 .../external-discoverer/module.properties     |   18 +
 .../spring-external-discoverer-context.xml    |   34 +
 .../external-planner/module.properties        |   18 +
 .../spring-external-planner-context.xml       |   34 +
 .../external-storage/module.properties        |   18 +
 .../spring-external-storage-context.xml       |   32 +
 .../manager/ExternalTemplateAdapterTest.java  |  173 ++
 .../ExternalServerDiscovererTest.java         |  182 ++
 .../ExternalPathPayloadProvisionerTest.java   |  750 +++++++
 .../resource/ExternalResourceTest.java        |   93 +
 .../com/cloud/hypervisor/guru/VMwareGuru.java |    2 +-
 .../cloudstack/service/NsxServiceImpl.java    |   33 +-
 plugins/pom.xml                               |    1 +
 .../external/provisioner/provisioner.sh       |  147 ++
 server/pom.xml                                |    6 +
 .../com/cloud/alert/AlertManagerImpl.java     |   14 +-
 .../java/com/cloud/api/ApiResponseHelper.java |    1 +
 .../com/cloud/api/query/QueryManagerImpl.java |   55 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java  |    9 +-
 .../api/query/dao/TemplateJoinDaoImpl.java    |    8 +-
 .../cloud/api/query/vo/TemplateJoinVO.java    |   21 +
 .../cloud/capacity/CapacityManagerImpl.java   |   17 +
 .../java/com/cloud/configuration/Config.java  |    2 +-
 .../ConfigurationManagerImpl.java             |   53 +-
 .../deploy/DeploymentPlanningManagerImpl.java |   12 +-
 .../com/cloud/deploy/FirstFitPlanner.java     |    2 +-
 .../com/cloud/network/NetworkModelImpl.java   |   26 +-
 .../com/cloud/network/NetworkServiceImpl.java |   26 +-
 .../network/as/AutoScaleManagerImpl.java      |    4 +
 .../network/router/NetworkHelperImpl.java     |   12 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java |    1 +
 .../com/cloud/resource/DiscovererBase.java    |   20 +-
 .../cloud/resource/ResourceManagerImpl.java   |  157 +-
 .../cloud/server/ManagementServerImpl.java    |   36 +-
 .../com/cloud/storage/TemplateProfile.java    |   11 +-
 .../cloud/storage/VolumeApiServiceImpl.java   |   24 +-
 .../template/HypervisorTemplateAdapter.java   |  136 +-
 .../com/cloud/template/TemplateAdapter.java   |    5 +-
 .../cloud/template/TemplateAdapterBase.java   |  208 +-
 .../cloud/template/TemplateManagerImpl.java   |   31 +-
 .../java/com/cloud/vm/UserVmManagerImpl.java  |   31 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java    |   15 +-
 .../affinity/AffinityGroupServiceImpl.java    |    7 +
 .../ConsoleAccessManagerImpl.java             |    6 +
 .../spring-server-core-managers-context.xml   |    5 +
 .../cloud/api/query/QueryManagerImplTest.java |  256 ++-
 .../ConfigurationManagerImplTest.java         |   51 +
 .../cloud/network/MockNetworkModelImpl.java   |    5 +
 .../cloud/network/NetworkModelImplTest.java   |  155 +-
 .../cloud/network/NetworkServiceImplTest.java |   51 +
 .../template/TemplateManagerImplTest.java     |   28 +-
 .../com/cloud/vm/UserVmManagerImplTest.java   |    2 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java |   16 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java   |    5 +
 .../smoke/test_extension_custom.py            |  619 ++++++
 .../test_extension_custom_action_lifecycle.py |  281 +++
 .../smoke/test_extension_lifecycle.py         |  480 +++++
 tools/apidoc/gen_toc.py                       |    6 +-
 tools/marvin/marvin/lib/base.py               |  125 ++
 ui/public/locales/en.json                     |   74 +-
 ui/src/components/view/ActionButton.vue       |    4 +-
 ui/src/components/view/DetailsTab.vue         |   37 +-
 ui/src/components/view/InfoCard.vue           |   11 +
 ui/src/components/view/ListView.vue           |   12 +-
 ui/src/components/view/ObjectListTable.vue    |   89 +
 ui/src/components/view/SearchView.vue         |   36 +-
 ui/src/components/widgets/DetailsInput.vue    |  186 ++
 ui/src/components/widgets/Status.vue          |    8 +
 ui/src/config/router.js                       |    4 +
 ui/src/config/section/compute.js              |   45 +-
 ui/src/config/section/extension.js            |  147 ++
 .../config/section/extension/customaction.js  |   94 +
 ui/src/config/section/image.js                |    4 +-
 ui/src/config/section/infra/clusters.js       |   18 +-
 ui/src/config/section/infra/hosts.js          |   14 +-
 ui/src/config/section/offering.js             |   10 +-
 ui/src/core/lazy_lib/icons_use.js             |    4 +
 ui/src/main.js                                |    4 +-
 ui/src/utils/extension.js                     |   30 +
 ui/src/utils/plugins.js                       |   55 +-
 ui/src/views/AutogenView.vue                  |   49 +-
 .../views/compute/CreateKubernetesCluster.vue |    4 +-
 ui/src/views/compute/DeployVM.vue             |  102 +-
 ui/src/views/compute/InstanceTab.vue          |    2 +-
 ui/src/views/extension/AddCustomAction.vue    |  247 +++
 ui/src/views/extension/CreateExtension.vue    |  256 +++
 .../extension/ExtensionCustomActionsTab.vue   |  274 +++
 .../views/extension/ExtensionResourcesTab.vue |  135 ++
 .../ExternalConfigurationDetails.vue          |  115 ++
 ui/src/views/extension/ParametersInput.vue    |  328 +++
 ui/src/views/extension/RegisterExtension.vue  |  200 ++
 ui/src/views/extension/RunCustomAction.vue    |  386 ++++
 ui/src/views/extension/UpdateCustomAction.vue |  232 +++
 ui/src/views/extension/UpdateExtension.vue    |  160 ++
 ui/src/views/iam/CreateRole.vue               |    2 +-
 .../views/image/RegisterOrUploadTemplate.vue  |   79 +-
 ui/src/views/image/UpdateTemplate.vue         |    7 +-
 ui/src/views/infra/ClusterAdd.vue             |  427 ++--
 ui/src/views/infra/HostAdd.vue                |  509 ++---
 ui/src/views/infra/HostUpdate.vue             |   34 +-
 ui/src/views/network/NicsTab.vue              |   10 +-
 ui/src/views/offering/AddComputeOffering.vue  |   33 +-
 .../main/java/com/cloud/utils/FileUtil.java   |   15 +
 .../com/cloud/utils/json/JsonMergeUtil.java   |  108 +
 .../cloud/utils/json/JsonMergeUtilTest.java   |  108 +
 259 files changed, 22845 insertions(+), 1187 deletions(-)
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionParameterResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/extension/Extension.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionCustomAction.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionResourceMap.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/extension/ExtensionCustomActionTest.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/RunCustomActionAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/RunCustomActionCommand.java
 create mode 100644 engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java
 create mode 100755 extensions/HyperV/hyperv.py
 create mode 100755 extensions/Proxmox/proxmox.sh
 create mode 100644 framework/extensions/pom.xml
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/CleanupExtensionFilesCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionRoutingUpdateCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionServerActionBaseCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/GetExtensionPathChecksumCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/PrepareExtensionPathCommand.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDao.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDaoImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionDetailsVO.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionVO.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionDetailsVO.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapDetailsVO.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapVO.java
 create mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionVO.java
 create mode 100644 framework/extensions/src/main/resources/META-INF/cloudstack/core/spring-framework-extensions-core-context.xml
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmdTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommandTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImplTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImplTest.java
 create mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
 create mode 100644 plugins/hypervisors/external/pom.xml
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManager.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManagerImpl.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapter.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/guru/ExternalHypervisorGuru.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java
 create mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/module.properties
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/spring-external-compute-context.xml
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/module.properties
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/spring-external-discoverer-context.xml
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/module.properties
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/spring-external-planner-context.xml
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/module.properties
 create mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/spring-external-storage-context.xml
 create mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapterTest.java
 create mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscovererTest.java
 create mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java
 create mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceTest.java
 create mode 100755 scripts/vm/hypervisor/external/provisioner/provisioner.sh
 create mode 100644 test/integration/smoke/test_extension_custom.py
 create mode 100644 test/integration/smoke/test_extension_custom_action_lifecycle.py
 create mode 100644 test/integration/smoke/test_extension_lifecycle.py
 create mode 100644 ui/src/components/view/ObjectListTable.vue
 create mode 100644 ui/src/components/widgets/DetailsInput.vue
 create mode 100644 ui/src/config/section/extension.js
 create mode 100644 ui/src/config/section/extension/customaction.js
 create mode 100644 ui/src/utils/extension.js
 create mode 100644 ui/src/views/extension/AddCustomAction.vue
 create mode 100644 ui/src/views/extension/CreateExtension.vue
 create mode 100644 ui/src/views/extension/ExtensionCustomActionsTab.vue
 create mode 100644 ui/src/views/extension/ExtensionResourcesTab.vue
 create mode 100644 ui/src/views/extension/ExternalConfigurationDetails.vue
 create mode 100644 ui/src/views/extension/ParametersInput.vue
 create mode 100644 ui/src/views/extension/RegisterExtension.vue
 create mode 100644 ui/src/views/extension/RunCustomAction.vue
 create mode 100644 ui/src/views/extension/UpdateCustomAction.vue
 create mode 100644 ui/src/views/extension/UpdateExtension.vue
 create mode 100644 utils/src/main/java/com/cloud/utils/json/JsonMergeUtil.java
 create mode 100644 utils/src/test/java/com/cloud/utils/json/JsonMergeUtilTest.java

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d101777c70..d1a295e6149 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,7 +89,10 @@ jobs:
                   smoke/test_nested_virtualization
                   smoke/test_set_sourcenat
                   smoke/test_webhook_lifecycle
-                  smoke/test_purge_expunged_vms",
+                  smoke/test_purge_expunged_vms
+                  smoke/test_extension_lifecycle
+                  smoke/test_extension_custom_action_lifecycle
+                  smoke/test_extension_custom",
                 "smoke/test_network
                   smoke/test_network_acl
                   smoke/test_network_ipv6
diff --git a/api/src/main/java/com/cloud/agent/api/Command.java b/api/src/main/java/com/cloud/agent/api/Command.java
index 4766c30ead2..c4e99cb4170 100644
--- a/api/src/main/java/com/cloud/agent/api/Command.java
+++ b/api/src/main/java/com/cloud/agent/api/Command.java
@@ -19,9 +19,10 @@ package com.cloud.agent.api;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.cloud.agent.api.LogLevel.Log4jLevel;
 
 /**
  * implemented by classes that extends the Command class. Command specifies
@@ -60,6 +61,7 @@ public abstract class Command {
     private int wait;  //in second
     private boolean bypassHostMaintenance = false;
     private transient long requestSequence = 0L;
+    protected Map<String, Map<String, String>> externalDetails;
 
     protected Command() {
         this.wait = 0;
@@ -128,6 +130,14 @@ public abstract class Command {
         this.requestSequence = requestSequence;
     }
 
+    public void setExternalDetails(Map<String, Map<String, String>> externalDetails) {
+        this.externalDetails = externalDetails;
+    }
+
+    public Map<String, Map<String, String>> getExternalDetails() {
+        return externalDetails;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
index d67ce679684..cffb9874080 100644
--- a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -19,12 +19,14 @@ package com.cloud.agent.api.to;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.stream.Collectors;
 
 import com.cloud.agent.api.LogLevel;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Type;
+import com.cloud.vm.VmDetailConstants;
 
 public class VirtualMachineTO {
     private long id;
@@ -496,4 +498,16 @@ public class VirtualMachineTO {
     public String toString() {
         return String.format("VM {id: \"%s\", name: \"%s\", uuid: \"%s\", type: \"%s\"}", id, name, uuid, type);
     }
+
+    public Map<String, String> getExternalDetails() {
+        if (details == null) {
+            return new HashMap<>();
+        }
+        return details.entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith(VmDetailConstants.EXTERNAL_DETAIL_PREFIX))
+                .collect(Collectors.toMap(
+                        entry -> entry.getKey().substring(VmDetailConstants.EXTERNAL_DETAIL_PREFIX.length()),
+                        Map.Entry::getValue
+                ));
+    }
 }
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index 1eb1998850f..beed8432df2 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -29,13 +29,15 @@ import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
 import org.apache.cloudstack.ha.HAConfig;
 import org.apache.cloudstack.network.BgpPeer;
 import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
 import org.apache.cloudstack.quota.QuotaTariff;
-import org.apache.cloudstack.storage.sharedfs.SharedFS;
 import org.apache.cloudstack.storage.object.Bucket;
 import org.apache.cloudstack.storage.object.ObjectStore;
+import org.apache.cloudstack.storage.sharedfs.SharedFS;
 import org.apache.cloudstack.usage.Usage;
 import org.apache.cloudstack.vm.schedule.VMSchedule;
 
@@ -806,6 +808,7 @@ public class EventTypes {
     // Management Server
     public static final String EVENT_MANAGEMENT_SERVER_REMOVE = "MANAGEMENT.SERVER.REMOVE";
 
+    // VM Lease
     public static final String VM_LEASE_EXPIRED = "VM.LEASE.EXPIRED";
     public static final String VM_LEASE_DISABLED = "VM.LEASE.DISABLED";
     public static final String VM_LEASE_CANCELLED = "VM.LEASE.CANCELLED";
@@ -816,6 +819,19 @@ public class EventTypes {
     public static final String EVENT_GUI_THEME_REMOVE = "GUI.THEME.REMOVE";
     public static final String EVENT_GUI_THEME_UPDATE = "GUI.THEME.UPDATE";
 
+    // Extension
+    public static final String EVENT_EXTENSION_CREATE = "EXTENSION.CREATE";
+    public static final String EVENT_EXTENSION_UPDATE = "EXTENSION.UPDATE";
+    public static final String EVENT_EXTENSION_DELETE = "EXTENSION.DELETE";
+    public static final String EVENT_EXTENSION_RESOURCE_REGISTER = "EXTENSION.RESOURCE.REGISTER";
+    public static final String EVENT_EXTENSION_RESOURCE_UNREGISTER = "EXTENSION.RESOURCE.UNREGISTER";
+    public static final String EVENT_EXTENSION_CUSTOM_ACTION_ADD = "EXTENSION.CUSTOM.ACTION.ADD";
+    public static final String EVENT_EXTENSION_CUSTOM_ACTION_UPDATE = "EXTENSION.CUSTOM.ACTION.UPDATE";
+    public static final String EVENT_EXTENSION_CUSTOM_ACTION_DELETE = "EXTENSION.CUSTOM.ACTION.DELETE";
+
+    // Custom Action
+    public static final String EVENT_CUSTOM_ACTION = "CUSTOM.ACTION";
+
     static {
 
         // TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@ -1324,6 +1340,16 @@ public class EventTypes {
         entityEventDetails.put(EVENT_GUI_THEME_CREATE, "GuiTheme");
         entityEventDetails.put(EVENT_GUI_THEME_REMOVE, "GuiTheme");
         entityEventDetails.put(EVENT_GUI_THEME_UPDATE, "GuiTheme");
+
+        // Extension
+        entityEventDetails.put(EVENT_EXTENSION_CREATE, Extension.class);
+        entityEventDetails.put(EVENT_EXTENSION_UPDATE, Extension.class);
+        entityEventDetails.put(EVENT_EXTENSION_DELETE, Extension.class);
+        entityEventDetails.put(EVENT_EXTENSION_RESOURCE_REGISTER, Extension.class);
+        entityEventDetails.put(EVENT_EXTENSION_RESOURCE_UNREGISTER, Extension.class);
+        entityEventDetails.put(EVENT_EXTENSION_CUSTOM_ACTION_ADD, ExtensionCustomAction.class);
+        entityEventDetails.put(EVENT_EXTENSION_CUSTOM_ACTION_UPDATE, ExtensionCustomAction.class);
+        entityEventDetails.put(EVENT_EXTENSION_CUSTOM_ACTION_DELETE, ExtensionCustomAction.class);
     }
 
     public static boolean isNetworkEvent(String eventType) {
diff --git a/api/src/main/java/com/cloud/hypervisor/Hypervisor.java b/api/src/main/java/com/cloud/hypervisor/Hypervisor.java
index 27ffef1c370..5baac484772 100644
--- a/api/src/main/java/com/cloud/hypervisor/Hypervisor.java
+++ b/api/src/main/java/com/cloud/hypervisor/Hypervisor.java
@@ -54,6 +54,7 @@ public class Hypervisor {
         public static final HypervisorType Ovm3 = new HypervisorType("Ovm3", ImageFormat.RAW);
         public static final HypervisorType LXC = new HypervisorType("LXC");
         public static final HypervisorType Custom = new HypervisorType("Custom", null, EnumSet.of(RootDiskSizeOverride));
+        public static final HypervisorType External = new HypervisorType("External", null, EnumSet.of(RootDiskSizeOverride));
         public static final HypervisorType Any = new HypervisorType("Any"); /*If you don't care about the hypervisor type*/
         private final String name;
         private final ImageFormat imageFormat;
diff --git a/api/src/main/java/com/cloud/network/NetworkModel.java b/api/src/main/java/com/cloud/network/NetworkModel.java
index a4cd87af008..eb496ac4e0b 100644
--- a/api/src/main/java/com/cloud/network/NetworkModel.java
+++ b/api/src/main/java/com/cloud/network/NetworkModel.java
@@ -305,6 +305,8 @@ public interface NetworkModel {
 
     NicProfile getNicProfile(VirtualMachine vm, long networkId, String broadcastUri);
 
+    NicProfile getNicProfile(VirtualMachine vm, Nic nic, DataCenter dataCenter);
+
     Set<Long> getAvailableIps(Network network, String requestedIp);
 
     String getDomainNetworkDomain(long domainId, long zoneId);
diff --git a/api/src/main/java/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
index 36d58c737cc..fd51cbfa774 100644
--- a/api/src/main/java/com/cloud/network/NetworkService.java
+++ b/api/src/main/java/com/cloud/network/NetworkService.java
@@ -19,7 +19,6 @@ package com.cloud.network;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.dc.DataCenter;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
@@ -39,13 +38,16 @@ import org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;
 import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
 import org.apache.cloudstack.api.response.AcquirePodIpCmdResponse;
 import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 
+import com.cloud.agent.api.to.NicTO;
+import com.cloud.dc.DataCenter;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.Network.IpAddresses;
 import com.cloud.network.Network.Service;
 import com.cloud.network.Networks.TrafficType;
@@ -57,7 +59,6 @@ import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicSecondaryIp;
-import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 
 /**
  * The NetworkService interface is the "public" api to entities that make requests to the orchestration engine
@@ -270,4 +271,6 @@ public interface NetworkService {
     List<InternalLoadBalancerElementService> getInternalLoadBalancerElements();
 
     boolean handleCksIsoOnNetworkVirtualRouter(Long virtualRouterId, boolean mount) throws ResourceUnavailableException;
+
+    String getNicVlanValueForExternalVm(NicTO nic);
 }
diff --git a/api/src/main/java/com/cloud/network/nsx/NsxService.java b/api/src/main/java/com/cloud/network/nsx/NsxService.java
index bc4e6aafbfe..1adb7461cc0 100644
--- a/api/src/main/java/com/cloud/network/nsx/NsxService.java
+++ b/api/src/main/java/com/cloud/network/nsx/NsxService.java
@@ -16,9 +16,10 @@
 // under the License.
 package com.cloud.network.nsx;
 
+import org.apache.cloudstack.framework.config.ConfigKey;
+
 import com.cloud.network.IpAddress;
 import com.cloud.network.vpc.Vpc;
-import org.apache.cloudstack.framework.config.ConfigKey;
 
 public interface NsxService {
 
@@ -33,4 +34,5 @@ public interface NsxService {
 
     boolean createVpcNetwork(Long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled);
     boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
+    String getSegmentId(long domainId, long accountId, long zoneId, Long vpcId, long networkId);
 }
diff --git a/api/src/main/java/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java
index 05b8b3ab7a8..1ad3731b9ea 100644
--- a/api/src/main/java/com/cloud/storage/Storage.java
+++ b/api/src/main/java/com/cloud/storage/Storage.java
@@ -30,6 +30,7 @@ public class Storage {
         OVA(true, true, true, "ova"),
         VHDX(true, true, true, "vhdx"),
         BAREMETAL(false, false, false, "BAREMETAL"),
+        EXTERNAL(false, false, false, "EXTERNAL"),
         VMDK(true, true, false, "vmdk"),
         VDI(true, true, false, "vdi"),
         TAR(false, false, false, "tar"),
diff --git a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
index 89953d225a0..b8c646048b9 100644
--- a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
@@ -153,4 +153,6 @@ public interface VirtualMachineTemplate extends ControlledEntity, Identity, Inte
 
     CPU.CPUArch getArch();
 
+    Long getExtensionId();
+
 }
diff --git a/api/src/main/java/com/cloud/vm/VmDetailConstants.java b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
index 14f15c9fd0f..ea5d209a5d4 100644
--- a/api/src/main/java/com/cloud/vm/VmDetailConstants.java
+++ b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
@@ -114,7 +114,15 @@ public interface VmDetailConstants {
     String GUEST_CPU_MODE = "guest.cpu.mode";
     String GUEST_CPU_MODEL = "guest.cpu.model";
 
+    // Lease related
     String INSTANCE_LEASE_EXPIRY_DATE = "leaseexpirydate";
     String INSTANCE_LEASE_EXPIRY_ACTION = "leaseexpiryaction";
     String INSTANCE_LEASE_EXECUTION = "leaseactionexecution";
+
+    // External orchestrator related
+    String MAC_ADDRESS = "mac_address";
+    String EXPUNGE_EXTERNAL_VM = "expunge.external.vm";
+    String EXTERNAL_DETAIL_PREFIX = "External:";
+    String CLOUDSTACK_VM_DETAILS = "cloudstack.vm.details";
+    String CLOUDSTACK_VLAN = "cloudstack.vlan";
 }
diff --git a/api/src/main/java/org/apache/cloudstack/acl/RoleType.java b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java
index 005d47c85bc..46e4f1bc510 100644
--- a/api/src/main/java/org/apache/cloudstack/acl/RoleType.java
+++ b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java
@@ -23,8 +23,11 @@ import com.google.common.base.Enums;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
+import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 // Enum for default roles in CloudStack
 public enum RoleType {
@@ -100,6 +103,30 @@ public enum RoleType {
         return roleId;
     }
 
+    public static int toCombinedMask(Collection<RoleType> roles) {
+        int combinedMask = 0;
+        if (roles != null) {
+            for (RoleType role : roles) {
+                combinedMask |= role.getMask();
+            }
+        }
+        return combinedMask;
+    }
+
+    public static Set<RoleType> fromCombinedMask(int combinedMask) {
+        Set<RoleType> roles = EnumSet.noneOf(RoleType.class);
+        for (RoleType roleType : RoleType.values()) {
+            if ((combinedMask & roleType.getMask()) != 0) {
+                roles.add(roleType);
+            }
+        }
+        if (roles.isEmpty()) {
+            roles.add(Unknown);
+        }
+        return roles;
+    }
+
+
     /**
      * This method returns the role account type if the role isn't null, else it returns the default account type.
      * */
diff --git a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
index 1250284b5c2..5146e5c38e8 100644
--- a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
+++ b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
@@ -73,6 +73,7 @@ public interface AlertService {
         public static final AlertType ALERT_TYPE_VM_SNAPSHOT = new AlertType((short)32, "ALERT.VM.SNAPSHOT", true);
         public static final AlertType ALERT_TYPE_VR_PUBLIC_IFACE_MTU = new AlertType((short)32, "ALERT.VR.PUBLIC.IFACE.MTU", true);
         public static final AlertType ALERT_TYPE_VR_PRIVATE_IFACE_MTU = new AlertType((short)32, "ALERT.VR.PRIVATE.IFACE.MTU", true);
+        public static final AlertType ALERT_TYPE_EXTENSION_PATH_NOT_READY = new AlertType((short)33, "ALERT.TYPE.EXTENSION.PATH.NOT.READY", true);
 
         public short getType() {
             return type;
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java b/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
index 4cd89c877b2..4d33ba859a5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
@@ -87,7 +87,9 @@ public enum ApiCommandResourceType {
     QuotaTariff(org.apache.cloudstack.quota.QuotaTariff.class),
     KubernetesCluster(com.cloud.kubernetes.cluster.KubernetesCluster.class),
     KubernetesSupportedVersion(null),
-    SharedFS(org.apache.cloudstack.storage.sharedfs.SharedFS.class);
+    SharedFS(org.apache.cloudstack.storage.sharedfs.SharedFS.class),
+    Extension(org.apache.cloudstack.extension.Extension.class),
+    ExtensionCustomAction(org.apache.cloudstack.extension.ExtensionCustomAction.class);
 
     private final Class<?> clazz;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 71bd5c9addc..00382b76f32 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -32,6 +32,7 @@ public class ApiConstants {
     public static final String ALLOCATED_DATE = "allocateddate";
     public static final String ALLOCATED_ONLY = "allocatedonly";
     public static final String ALLOCATED_TIME = "allocated";
+    public static final String ALLOWED_ROLE_TYPES = "allowedroletypes";
     public static final String ALLOW_USER_FORCE_STOP_VM = "allowuserforcestopvm";
     public static final String ANNOTATION = "annotation";
     public static final String API_KEY = "apikey";
@@ -140,6 +141,7 @@ public class ApiConstants {
     public static final String CUSTOMIZED = "customized";
     public static final String CUSTOMIZED_IOPS = "customizediops";
     public static final String CUSTOM_ID = "customid";
+    public static final String CUSTOM_ACTION_ID = "customactionid";
     public static final String CUSTOM_JOB_ID = "customjobid";
     public static final String CURRENT_START_IP = "currentstartip";
     public static final String CURRENT_END_IP = "currentendip";
@@ -164,6 +166,7 @@ public class ApiConstants {
     public static final String DISK = "disk";
     public static final String DISK_OFFERING_ID = "diskofferingid";
     public static final String NEW_DISK_OFFERING_ID = "newdiskofferingid";
+    public static final String ORCHESTRATOR_REQUIRES_PREPARE_VM = "orchestratorrequirespreparevm";
     public static final String OVERRIDE_DISK_OFFERING_ID = "overridediskofferingid";
     public static final String DISK_KBS_READ = "diskkbsread";
     public static final String DISK_KBS_WRITE = "diskkbswrite";
@@ -205,6 +208,7 @@ public class ApiConstants {
     public static final String END_IPV6 = "endipv6";
     public static final String END_PORT = "endport";
     public static final String ENTRY_TIME = "entrytime";
+    public static final String ERROR_MESSAGE = "errormessage";
     public static final String EVENT_ID = "eventid";
     public static final String EVENT_TYPE = "eventtype";
     public static final String EXPIRES = "expires";
@@ -215,6 +219,12 @@ public class ApiConstants {
     public static final String EXTRA_DHCP_OPTION_VALUE = "extradhcpvalue";
     public static final String EXTERNAL = "external";
     public static final String EXTERNAL_UUID = "externaluuid";
+    public static final String EXTERNAL_DETAILS = "externaldetails";
+    public static final String PARAMETERS = "parameters";
+    public static final String EXTENSION = "extension";
+    public static final String EXTENSION_ID = "extensionid";
+    public static final String EXTENSION_NAME = "extensionname";
+    public static final String EXTENSIONS_PATH = "extensionspath";
     public static final String FENCE = "fence";
     public static final String FETCH_LATEST = "fetchlatest";
     public static final String FILESYSTEM = "filesystem";
@@ -351,6 +361,7 @@ public class ApiConstants {
     public static final String MAX_CPU_NUMBER = "maxcpunumber";
     public static final String MAX_MEMORY = "maxmemory";
     public static final String MEMORY_OVERCOMMIT_RATIO = "memoryOvercommitRatio";
+    public static final String MESSAGE = "message";
     public static final String MIN_CPU_NUMBER = "mincpunumber";
     public static final String MIN_MEMORY = "minmemory";
     public static final String MIGRATION_TYPE = "migrationtype";
@@ -412,6 +423,7 @@ public class ApiConstants {
     public static final String PASSWORD_ENABLED = "passwordenabled";
     public static final String SSHKEY_ENABLED = "sshkeyenabled";
     public static final String PATH = "path";
+    public static final String PATH_READY = "pathready";
     public static final String PAYLOAD = "payload";
     public static final String PAYLOAD_URL = "payloadurl";
     public static final String PEERS = "peers";
@@ -434,6 +446,7 @@ public class ApiConstants {
     public static final String POST_URL = "postURL";
     public static final String POWER_STATE = "powerstate";
     public static final String PRECEDENCE = "precedence";
+    public static final String PREPARE_VM = "preparevm";
     public static final String PRIVATE_INTERFACE = "privateinterface";
     public static final String PRIVATE_IP = "privateip";
     public static final String PRIVATE_PORT = "privateport";
@@ -457,6 +470,7 @@ public class ApiConstants {
     public static final String RECOVER = "recover";
     public static final String REPAIR = "repair";
     public static final String REQUIRES_HVM = "requireshvm";
+    public static final String RESOURCES = "resources";
     public static final String RESOURCE_COUNT = "resourcecount";
     public static final String RESOURCE_NAME = "resourcename";
     public static final String RESOURCE_TYPE = "resourcetype";
@@ -529,6 +543,7 @@ public class ApiConstants {
     public static final String POD_STORAGE_ACCESS_GROUPS = "podstorageaccessgroups";
     public static final String ZONE_STORAGE_ACCESS_GROUPS = "zonestorageaccessgroups";
     public static final String SUCCESS = "success";
+    public static final String SUCCESS_MESSAGE = "successmessage";
     public static final String SUITABLE_FOR_VM = "suitableforvirtualmachine";
     public static final String SUPPORTS_STORAGE_SNAPSHOT = "supportsstoragesnapshot";
     public static final String TARGET_IQN = "targetiqn";
@@ -570,7 +585,10 @@ public class ApiConstants {
     public static final String USE_VIRTUAL_NETWORK = "usevirtualnetwork";
     public static final String USE_VIRTUAL_ROUTER_IP_RESOLVER = "userouteripresolver";
     public static final String UPDATE_IN_SEQUENCE = "updateinsequence";
+    public static final String VALIDATION_FORMAT = "validationformat";
     public static final String VALUE = "value";
+    public static final String VALUE_OPTIONS = "valueoptions";
+    public static final String VIRTUAL_MACHINE = "virtualmachine";
     public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
     public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
     public static final String VIRTUAL_MACHINE_NAME = "virtualmachinename";
@@ -669,7 +687,7 @@ public class ApiConstants {
     public static final String NETWORK_DEVICE_PARAMETER_LIST = "networkdeviceparameterlist";
     public static final String ZONE_TOKEN = "zonetoken";
     public static final String DHCP_PROVIDER = "dhcpprovider";
-    public static final String RESULT = "success";
+    public static final String RESULT = "result";
     public static final String RESUME = "resume";
     public static final String LUN_ID = "lunId";
     public static final String IQN = "iqn";
@@ -1063,6 +1081,7 @@ public class ApiConstants {
 
     public static final String RESOURCE_DETAILS = "resourcedetails";
     public static final String RESOURCE_ICON = "icon";
+    public static final String RESOURCE_MAP = "resourcemap";
     public static final String EXPUNGE = "expunge";
     public static final String FOR_DISPLAY = "fordisplay";
     public static final String PASSIVE = "passive";
@@ -1098,6 +1117,7 @@ public class ApiConstants {
     public static final String OVM3_CLUSTER = "ovm3cluster";
     public static final String OVM3_VIP = "ovm3vip";
     public static final String CLEAN_UP_DETAILS = "cleanupdetails";
+    public static final String CLEAN_UP_PARAMETERS = "cleanupparameters";
     public static final String VIRTUAL_SIZE = "virtualsize";
     public static final String NETSCALER_CONTROLCENTER_ID = "netscalercontrolcenterid";
     public static final String NETSCALER_SERVICEPACKAGE_ID = "netscalerservicepackageid";
@@ -1341,6 +1361,10 @@ public class ApiConstants {
         all, resource, min;
     }
 
+    public enum ExtensionDetails {
+        all, resource, external, min;
+    }
+
     public enum ApiKeyAccess {
         DISABLED(false),
         ENABLED(true),
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
index 457afdc8847..317d72eb971 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
@@ -94,6 +94,7 @@ import com.cloud.utils.ReflectUtil;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.db.UUIDManager;
 import com.cloud.vm.UserVmService;
+import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.snapshot.VMSnapshotService;
 
 public abstract class BaseCmd {
@@ -484,4 +485,14 @@ public abstract class BaseCmd {
         }
         return detailsMap;
     }
+
+    public Map<String, String> convertExternalDetailsToMap(Map externalDetails) {
+        Map<String, String> customparameterMap = convertDetailsToMap(externalDetails);
+        Map<String, String> details = new HashMap<>();
+        for (String key : customparameterMap.keySet()) {
+            String value = customparameterMap.get(key);
+            details.put(VmDetailConstants.EXTERNAL_DETAIL_PREFIX + key, value);
+        }
+        return details;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index 15265f561e7..3aef11b92e9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -19,21 +19,22 @@ package org.apache.cloudstack.api.command.admin.cluster;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import com.cloud.cpu.CPU;
-import org.apache.cloudstack.api.ApiCommandResourceType;
+import java.util.Map;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 
+import com.cloud.cpu.CPU;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.org.Cluster;
@@ -43,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
 public class AddClusterCmd extends BaseCmd {
 
-
     @Parameter(name = ApiConstants.CLUSTER_NAME, type = CommandType.STRING, required = true, description = "the cluster name")
     private String clusterName;
 
@@ -65,7 +65,7 @@ public class AddClusterCmd extends BaseCmd {
     @Parameter(name = ApiConstants.HYPERVISOR,
                type = CommandType.STRING,
                required = true,
-               description = "hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator,Ovm3")
+               description = "hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator,Ovm3,External")
     private String hypervisor;
 
     @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
@@ -118,12 +118,26 @@ public class AddClusterCmd extends BaseCmd {
     private String ovm3cluster;
     @Parameter(name = ApiConstants.OVM3_VIP, type = CommandType.STRING, required = false,  description = "Ovm3 vip to use for pool (and cluster)")
     private String ovm3vip;
+
     @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUPS,
             type = CommandType.LIST, collectionType = CommandType.STRING,
             description = "comma separated list of storage access groups for the hosts in the cluster",
             since = "4.21.0")
     private List<String> storageAccessGroups;
 
+
+    @Parameter(name = ApiConstants.EXTENSION_ID,
+            type = CommandType.UUID, entityType = ExtensionResponse.class,
+            description = "UUID of the extension",
+            since = "4.21.0")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs to be added to the extension-resource mapping. Use the format externaldetails[i].<key>=<value>. Example: externaldetails[0].endpoint.url=https://example.com",
+            since = "4.21.0")
+    protected Map externalDetails;
+
     public String getOvm3Pool() {
          return ovm3pool;
     }
@@ -190,6 +204,10 @@ public class AddClusterCmd extends BaseCmd {
         return hypervisor;
     }
 
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
     public String getClusterType() {
         return clusterType;
     }
@@ -224,6 +242,10 @@ public class AddClusterCmd extends BaseCmd {
         return CPU.CPUArch.fromType(arch);
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertDetailsToMap(externalDetails);
+    }
+
     @Override
     public void execute() {
         try {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index 9cc39503fbf..65dd1b232fa 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -17,7 +17,11 @@
 package org.apache.cloudstack.api.command.admin.cluster;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
 
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -27,9 +31,13 @@ import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionHelper;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.cpu.CPU;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;
 
@@ -37,6 +45,8 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListClustersCmd extends BaseListCmd {
 
+    @Inject
+    ExtensionHelper extensionHelper;
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -143,15 +153,38 @@ public class ListClustersCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
+    protected void updateClustersExtensions(final List<ClusterResponse> clusterResponses) {
+        if (CollectionUtils.isEmpty(clusterResponses)) {
+            return;
+        }
+        Map<Long, Extension> idExtensionMap = new HashMap<>();
+        for  (ClusterResponse response : clusterResponses) {
+            if (!Hypervisor.HypervisorType.External.getHypervisorDisplayName().equals(response.getHypervisorType())) {
+                continue;
+            }
+            Long extensionId = extensionHelper.getExtensionIdForCluster(response.getInternalId());
+            if (extensionId == null) {
+                continue;
+            }
+            Extension extension = idExtensionMap.computeIfAbsent(extensionId, id -> extensionHelper.getExtension(id));
+            if (extension == null) {
+                continue;
+            }
+            response.setExtensionId(extension.getUuid());
+            response.setExtensionName(extension.getName());
+        }
+    }
+
     protected Pair<List<ClusterResponse>, Integer> getClusterResponses() {
         Pair<List<? extends Cluster>, Integer> result = _mgr.searchForClusters(this);
-        List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
+        List<ClusterResponse> clusterResponses = new ArrayList<>();
         for (Cluster cluster : result.first()) {
             ClusterResponse clusterResponse = _responseGenerator.createClusterResponse(cluster, showCapacities);
             clusterResponse.setObjectName("cluster");
             clusterResponses.add(clusterResponse);
         }
-        return new Pair<List<ClusterResponse>, Integer>(clusterResponses, result.second());
+        updateClustersExtensions(clusterResponses);
+        return new Pair<>(clusterResponses, result.second());
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index 6531444b52e..cc124ab8106 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -18,7 +18,7 @@ package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.Map;
 
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -81,6 +81,12 @@ public class AddHostCmd extends BaseCmd {
             since = "4.21.0")
     private List<String> storageAccessGroups;
 
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
+            since = "4.21.0")
+    protected Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -129,6 +135,10 @@ public class AddHostCmd extends BaseCmd {
         return allocationState;
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index 397f9c80735..9baea58b7b5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -16,8 +16,9 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.host;
 
-import com.cloud.host.Host;
-import com.cloud.user.Account;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -28,7 +29,8 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 
-import java.util.List;
+import com.cloud.host.Host;
+import com.cloud.user.Account;
 
 @APICommand(name = "updateHost", description = "Updates a host.", responseObject = HostResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -67,6 +69,9 @@ public class UpdateHostCmd extends BaseCmd {
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "Add an annotation to this host", since = "4.11", authorized = {RoleType.Admin})
     private String annotation;
 
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue", since = "4.21.0")
+    protected Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -103,6 +108,10 @@ public class UpdateHostCmd extends BaseCmd {
         return annotation;
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 4cadaad0e47..019ed58febb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -29,16 +29,16 @@ import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.VsphereStoragePoliciesResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.collections.CollectionUtils;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.offering.ServiceOffering;
@@ -263,6 +263,12 @@ public class CreateServiceOfferingCmd extends BaseCmd {
             description = "Lease expiry action, valid values are STOP and DESTROY")
     private String leaseExpiryAction;
 
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
+            since = "4.21.0")
+    private Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -369,9 +375,15 @@ public class CreateServiceOfferingCmd extends BaseCmd {
                 }
             }
         }
+
+        detailsMap.putAll(getExternalDetails());
         return detailsMap;
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
+
     public Long getRootDiskSize() {
         return rootDiskSize;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index e580f0d9f41..7f66ac7058a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.admin.offering;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import com.cloud.offering.ServiceOffering.State;
 import org.apache.cloudstack.api.APICommand;
@@ -94,6 +95,12 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
             since="4.20")
     private Boolean purgeResources;
 
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
+            since = "4.21.0")
+    private Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -194,6 +201,10 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
         return Boolean.TRUE.equals(purgeResources);
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
index 8881a2bc354..0bc993ef1f7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.vm;
 
+import com.cloud.hypervisor.Hypervisor;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 
 import org.apache.cloudstack.api.APICommand;
@@ -145,6 +146,10 @@ public class MigrateVMCmd extends BaseAsyncCmd {
             throw new InvalidParameterValueException("Unable to find the VM by id=" + getVirtualMachineId());
         }
 
+        if (Hypervisor.HypervisorType.External.equals(userVm.getHypervisorType())) {
+            throw new InvalidParameterValueException("Migrate VM instance operation is not allowed for External hypervisor type");
+        }
+
         Host destinationHost = null;
         // OfflineMigration performed when this parameter is specified
         StoragePool destStoragePool = null;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 77a7a7fd8ea..91632b910ff 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -73,6 +73,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
         response.setSharedFsVmMinCpuCount((Integer)capabilities.get(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT));
         response.setSharedFsVmMinRamSize((Integer)capabilities.get(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE));
         response.setInstanceLeaseEnabled((Boolean) capabilities.get(ApiConstants.INSTANCE_LEASE_ENABLED));
+        response.setExtensionsPath((String)capabilities.get(ApiConstants.EXTENSIONS_PATH));
         response.setObjectName("capability");
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index 585114e07ad..4727e395c41 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -28,6 +28,7 @@ import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.command.user.UserCmd;
+import org.apache.cloudstack.api.response.ExtensionResponse;
 import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
@@ -115,11 +116,16 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
             since = "4.20")
     private String arch;
 
-    @Parameter(name = ApiConstants.OS_CATEGORY_ID, type = CommandType.UUID, entityType= GuestOSCategoryResponse.class,
+    @Parameter(name = ApiConstants.OS_CATEGORY_ID, type = CommandType.UUID, entityType = GuestOSCategoryResponse.class,
             description = "the ID of the OS category for the template",
             since = "4.21.0")
     private Long osCategoryId;
 
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, entityType = ExtensionResponse.class,
+            description = "ID of the extension for the template",
+            since = "4.21.0")
+    private Long extensionId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -220,6 +226,10 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
         return osCategoryId;
     }
 
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
     @Override
     public String getCommandName() {
         return s_name;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index 6ea149fd90d..5d5cab219c1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -16,15 +16,12 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
-import com.cloud.cpu.CPU;
-import com.cloud.hypervisor.Hypervisor;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.hypervisor.HypervisorGuru;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -35,6 +32,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.user.UserCmd;
 import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
 import org.apache.cloudstack.api.response.GuestOSResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ProjectResponse;
@@ -43,7 +41,10 @@ import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.exception.ResourceAllocationException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
 import com.cloud.template.VirtualMachineTemplate;
 
 @APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
@@ -183,6 +184,14 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd {
             since = "4.20")
     private String arch;
 
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, entityType = ExtensionResponse.class,
+            description = "ID of the extension",
+            since = "4.21.0")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue", since = "4.21.0")
+    protected Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -312,6 +321,14 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd {
         return CPU.CPUArch.fromType(arch);
     }
 
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index ef3eb900970..afd23cfd871 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -16,28 +16,19 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
-import com.cloud.agent.api.LogLevel;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.Network;
-import com.cloud.network.Network.IpAddresses;
-import com.cloud.offering.DiskOffering;
-import com.cloud.template.VirtualMachineTemplate;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.Dhcp;
-import com.cloud.utils.net.NetUtils;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VmDetailConstants;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
+
+import javax.annotation.Nonnull;
+
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.api.ACL;
@@ -73,15 +64,25 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import com.cloud.agent.api.LogLevel;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.Network;
+import com.cloud.network.Network.IpAddresses;
+import com.cloud.offering.DiskOffering;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.Dhcp;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VmDetailConstants;
 
 @APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
@@ -297,6 +298,13 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
 
     @Parameter(name = ApiConstants.SNAPSHOT_ID, type = CommandType.UUID, entityType = SnapshotResponse.class, since = "4.21")
     private Long snapshotId;
+
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].server.type=typevalue",
+            since = "4.21.0")
+    protected Map externalDetails;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -370,9 +378,16 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
             customparameterMap.put(VmDetailConstants.NIC_PACKED_VIRTQUEUES_ENABLED, BooleanUtils.toStringTrueFalse(nicPackedVirtQueues));
         }
 
+        if (MapUtils.isNotEmpty(externalDetails)) {
+            customparameterMap.putAll(getExternalDetails());
+        }
+
         return customparameterMap;
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertExternalDetailsToMap(externalDetails);
+    }
 
     public ApiConstants.BootMode getBootMode() {
         if (StringUtils.isNotBlank(bootMode)) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index 9fc4258c6d9..8489a0a68a0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -38,6 +38,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.command.user.UserCmd;
 import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
 import org.apache.cloudstack.api.response.InstanceGroupResponse;
 import org.apache.cloudstack.api.response.IsoVmResponse;
 import org.apache.cloudstack.api.response.ListResponse;
@@ -171,6 +172,11 @@ public class ListVMsCmd extends BaseListRetrieveOnlyResourceCountCmd implements
             since = "4.21.0")
     private Boolean onlyLeasedInstances = false;
 
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID,
+            entityType = ExtensionResponse.class, description = "The ID of the Orchestrator extension for the VM",
+            since = "4.21.0")
+    private Long extensionId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -318,6 +324,10 @@ public class ListVMsCmd extends BaseListRetrieveOnlyResourceCountCmd implements
         return BooleanUtils.toBoolean(onlyLeasedInstances);
     }
 
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 74dbfa15a43..b0a82c86fb5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 
@@ -140,6 +141,10 @@ public class CapabilitiesResponse extends BaseResponse {
     @Param(description = "true if instance lease feature is enabled", since = "4.21.0")
     private Boolean instanceLeaseEnabled;
 
+    @SerializedName(ApiConstants.EXTENSIONS_PATH)
+    @Param(description = "The path of the extensions directory", since = "4.21.0", authorized = {RoleType.Admin})
+    private String extensionsPath;
+
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
         this.securityGroupsEnabled = securityGroupsEnabled;
     }
@@ -255,4 +260,8 @@ public class CapabilitiesResponse extends BaseResponse {
     public void setInstanceLeaseEnabled(Boolean instanceLeaseEnabled) {
         this.instanceLeaseEnabled = instanceLeaseEnabled;
     }
+
+    public void setExtensionsPath(String extensionsPath) {
+        this.extensionsPath = extensionsPath;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
index 17c86072b98..202ff4bd870 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
@@ -31,6 +31,8 @@ import com.google.gson.annotations.SerializedName;
 
 @EntityReference(value = Cluster.class)
 public class ClusterResponse extends BaseResponseWithAnnotations {
+    private transient long internalId;
+
     @SerializedName(ApiConstants.ID)
     @Param(description = "the cluster ID")
     private String id;
@@ -107,6 +109,22 @@ public class ClusterResponse extends BaseResponseWithAnnotations {
     @Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
     private String zoneStorageAccessGroups;
 
+    @SerializedName(ApiConstants.EXTENSION_ID)
+    @Param(description="The ID of extension for this cluster", since = "4.21.0")
+    private String extensionId;
+
+    @SerializedName(ApiConstants.EXTENSION_NAME)
+    @Param(description="The name of extension for this cluster", since = "4.21.0")
+    private String extensionName;
+
+    public void setInternalId(long internalId) {
+        this.internalId = internalId;
+    }
+
+    public long getInternalId() {
+        return internalId;
+    }
+
     public String getId() {
         return id;
     }
@@ -295,4 +313,20 @@ public class ClusterResponse extends BaseResponseWithAnnotations {
     public void setZoneStorageAccessGroups(String zoneStorageAccessGroups) {
         this.zoneStorageAccessGroups = zoneStorageAccessGroups;
     }
+
+    public void setExtensionId(String extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    public String getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionName(String extensionName) {
+        this.extensionName = extensionName;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java
index c60917bbe7a..c1e04beee73 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java
@@ -26,7 +26,7 @@ public class CreateConsoleEndpointResponse extends BaseResponse {
     public CreateConsoleEndpointResponse() {
     }
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "true if the console endpoint is generated properly")
     private Boolean result;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionParameterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionParameterResponse.java
new file mode 100644
index 00000000000..d627f8077dc
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionParameterResponse.java
@@ -0,0 +1,58 @@
+// 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.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class ExtensionCustomActionParameterResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the parameter")
+    private String name;
+
+    @SerializedName(ApiConstants.TYPE)
+    @Param(description = "Type of the parameter")
+    private String type;
+
+    @SerializedName(ApiConstants.VALIDATION_FORMAT)
+    @Param(description = "Validation format for value of the parameter. Available for specific types")
+    private String validationFormat;
+
+    @SerializedName(ApiConstants.VALUE_OPTIONS)
+    @Param(description = "Comma-separated list of options for value of the parameter")
+    private List<Object> valueOptions;
+
+    @SerializedName(ApiConstants.REQUIRED)
+    @Param(description = "Whether the parameter is required or not")
+    private Boolean required;
+
+    public ExtensionCustomActionParameterResponse(String name, String type, String validationFormat, List<Object> valueOptions,
+                boolean required) {
+        this.name = name;
+        this.type = type;
+        this.validationFormat = validationFormat;
+        this.valueOptions = valueOptions;
+        this.required = required;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionResponse.java
new file mode 100644
index 00000000000..96edf6d2fd8
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionResponse.java
@@ -0,0 +1,184 @@
+// 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.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = ExtensionCustomAction.class)
+public class ExtensionCustomActionResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the custom action")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the custom action")
+    private String name;
+
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "Description of the custom action")
+    private String description;
+
+    @SerializedName(ApiConstants.EXTENSION_ID)
+    @Param(description = "ID of the extension that this custom action belongs to")
+    private String extensionId;
+
+    @SerializedName(ApiConstants.EXTENSION_NAME)
+    @Param(description = "Name of the extension that this custom action belongs to")
+    private String extensionName;
+
+    @SerializedName(ApiConstants.RESOURCE_TYPE)
+    @Param(description = "Resource type for which the action is available")
+    private String resourceType;
+
+    @SerializedName(ApiConstants.ALLOWED_ROLE_TYPES)
+    @Param(description = "List of role types allowed for the custom action")
+    private List<String> allowedRoleTypes;
+
+    @SerializedName(ApiConstants.SUCCESS_MESSAGE)
+    @Param(description = "Message that will be used on successful execution of the action")
+    private String successMessage;
+
+    @SerializedName(ApiConstants.ERROR_MESSAGE)
+    @Param(description = "Message that will be used on failure during execution of the action")
+    private String errorMessage;
+
+    @SerializedName(ApiConstants.TIMEOUT)
+    @Param(description = "Specifies the timeout in seconds to wait for the action to complete before failing")
+    private Integer timeout;
+
+    @SerializedName(ApiConstants.ENABLED)
+    @Param(description = "Whether the custom action is enabled or not")
+    private Boolean enabled;
+
+    @SerializedName(ApiConstants.DETAILS)
+    @Param(description = "Details of the custom action")
+    private Map<String, String> details;
+
+    @SerializedName(ApiConstants.PARAMETERS)
+    @Param(description = "List of the parameters for the action", responseObject = ExtensionCustomActionParameterResponse.class)
+    private List<ExtensionCustomActionParameterResponse> parameters;
+
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "Creation timestamp of the custom action")
+    private Date created;
+
+    public ExtensionCustomActionResponse(String id, String name, String description) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setExtensionId(String extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    public void setExtensionName(String extensionName) {
+        this.extensionName = extensionName;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public List<String> getAllowedRoleTypes() {
+        return allowedRoleTypes;
+    }
+
+    public void setAllowedRoleTypes(List<String> allowedRoleTypes) {
+        this.allowedRoleTypes = allowedRoleTypes;
+    }
+
+    public void setSuccessMessage(String successMessage) {
+        this.successMessage = successMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setParameters(List<ExtensionCustomActionParameterResponse> parameters) {
+        this.parameters = parameters;
+    }
+
+    public List<ExtensionCustomActionParameterResponse> getParameters() {
+        return parameters;
+    }
+
+    public void setDetails(Map<String, String> details) {
+        this.details = details;
+    }
+
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
new file mode 100644
index 00000000000..aa370887b74
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
@@ -0,0 +1,95 @@
+// 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.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
+import java.util.Date;
+import java.util.Map;
+
+@EntityReference(value = ExtensionResourceMap.class)
+public class ExtensionResourceResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the resource associated with the extension")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the resource associated with this mapping")
+    private String name;
+
+    @SerializedName(ApiConstants.TYPE)
+    @Param(description = "Type of the resource")
+    private String type;
+
+    @SerializedName(ApiConstants.DETAILS)
+    @Param(description = "the details of the resource map")
+    private Map<String, String> details;
+
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "Creation timestamp of the mapping")
+    private Date created;
+
+    public ExtensionResourceResponse() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    public void setDetails(Map<String, String> details) {
+        this.details = details;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResponse.java
new file mode 100644
index 00000000000..fdf1e87df50
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ExtensionResponse.java
@@ -0,0 +1,182 @@
+// 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.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.extension.Extension;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = Extension.class)
+public class ExtensionResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the extension")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the extension")
+    private String name;
+
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "Description of the extension")
+    private String description;
+
+    @SerializedName(ApiConstants.TYPE)
+    @Param(description = "Type of the extension")
+    private String type;
+
+    @SerializedName(ApiConstants.PATH)
+    @Param(description = "The path of the entry point fo the extension")
+    private String path;
+
+    @SerializedName(ApiConstants.PATH_READY)
+    @Param(description = "True if the extension path is in ready state across management servers")
+    private Boolean pathReady;
+
+    @SerializedName(ApiConstants.IS_USER_DEFINED)
+    @Param(description = "True if the extension is added by admin")
+    private Boolean userDefined;
+
+    @SerializedName(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM)
+    @Parameter(description = "Only honored when type is Orchestrator. Whether prepare VM is needed or not")
+    private Boolean orchestratorRequiresPrepareVm;
+
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "The state of the extension")
+    private String state;
+
+    @SerializedName(ApiConstants.DETAILS)
+    @Param(description = "The details of the extension")
+    private Map<String, String> details;
+
+    @SerializedName(ApiConstants.RESOURCES)
+    @Param(description = "List of resources to which extension is registered to", responseObject = ExtensionResourceResponse.class)
+    private List<ExtensionResourceResponse> resources;
+
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "Creation timestamp of the extension")
+    private Date created;
+
+    @SerializedName(ApiConstants.REMOVED)
+    @Param(description = "Removal timestamp of the extension, if applicable")
+    private Date removed;
+
+    public ExtensionResponse(String id, String name, String description, String type) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+        this.type = type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Boolean isPathReady() {
+        return pathReady;
+    }
+
+    public Boolean isUserDefined() {
+        return userDefined;
+    }
+
+    public Boolean isOrchestratorRequiresPrepareVm() {
+        return orchestratorRequiresPrepareVm;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public void setPathReady(Boolean pathReady) {
+        this.pathReady = pathReady;
+    }
+
+    public void setUserDefined(Boolean userDefined) {
+        this.userDefined = userDefined;
+    }
+
+    public void setOrchestratorRequiresPrepareVm(Boolean orchestratorRequiresPrepareVm) {
+        this.orchestratorRequiresPrepareVm = orchestratorRequiresPrepareVm;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public void setDetails(Map<String, String> details) {
+        this.details = details;
+    }
+
+    public List<ExtensionResourceResponse> getResources() {
+        return resources;
+    }
+
+    public void setResources(List<ExtensionResourceResponse> resources) {
+        this.resources = resources;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index 342a1eb7df3..692779b0e30 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -90,7 +90,6 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @SerializedName(ApiConstants.HYPERVISOR)
     @Param(description = "the host hypervisor")
     private String hypervisor;
-
     @SerializedName("cpusockets")
     @Param(description = "the number of CPU sockets on the host")
     private Integer cpuSockets;
@@ -198,6 +197,8 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Param(description = "the management server name of the host", since = "4.21.0")
     private String managementServerName;
 
+    private transient long clusterInternalId;
+
     @SerializedName("clusterid")
     @Param(description = "the cluster ID of the host")
     private String clusterId;
@@ -318,6 +319,14 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
     private String zoneStorageAccessGroups;
 
+    @SerializedName(ApiConstants.EXTENSION_ID)
+    @Param(description="The ID of extension for this cluster", since = "4.21.0")
+    private String extensionId;
+
+    @SerializedName(ApiConstants.EXTENSION_NAME)
+    @Param(description="The name of extension for this cluster", since = "4.21.0")
+    private String extensionName;
+
     @Override
     public String getObjectId() {
         return this.getId();
@@ -471,6 +480,14 @@ public class HostResponse extends BaseResponseWithAnnotations {
         this.managementServerName = managementServerName;
     }
 
+    public long getClusterInternalId() {
+        return clusterInternalId;
+    }
+
+    public void setClusterInternalId(long clusterInternalId) {
+        this.clusterInternalId = clusterInternalId;
+    }
+
     public void setClusterId(String clusterId) {
         this.clusterId = clusterId;
     }
@@ -942,4 +959,20 @@ public class HostResponse extends BaseResponseWithAnnotations {
     public Boolean getInstanceConversionSupported() {
         return instanceConversionSupported;
     }
+
+    public void setExtensionId(String extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    public String getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionName(String extensionName) {
+        this.extensionName = extensionName;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
index f98cf0acd5d..00f1e4e3bb0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
@@ -34,7 +34,7 @@ public class RouterHealthCheckResultResponse extends BaseResponse {
     @Param(description = "the type of the health check - basic or advanced")
     private String checkType;
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "result of the health check")
     private boolean result;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
index 57970368d7e..a94dbd95a56 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -254,6 +254,12 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     @SerializedName(ApiConstants.USER_DATA_PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in userdata", since = "4.18.0")
     private String userDataParams;
 
+    @SerializedName(ApiConstants.EXTENSION_ID) @Param(description="The ID of extension linked to this template", since = "4.21.0")
+    private String extensionId;
+
+    @SerializedName(ApiConstants.EXTENSION_NAME) @Param(description="The name of extension linked to this template", since = "4.21.0")
+    private String extensionName;
+
     public TemplateResponse() {
         tags = new LinkedHashSet<>();
     }
@@ -547,4 +553,20 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     public void setArch(String arch) {
         this.arch = arch;
     }
+
+    public String getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionId(String extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
+
+    public void setExtensionName(String extensionName) {
+        this.extensionName = extensionName;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UnmanageVMInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UnmanageVMInstanceResponse.java
index cec70f20cff..e9d45cb506a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UnmanageVMInstanceResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UnmanageVMInstanceResponse.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseResponse;
 
 public class UnmanageVMInstanceResponse extends BaseResponse {
 
-    @SerializedName(ApiConstants.RESULT)
+    @SerializedName(ApiConstants.SUCCESS)
     @Param(description = "result of the unmanage VM operation")
     private boolean success;
 
diff --git a/api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java b/api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java
new file mode 100644
index 00000000000..33ff70fcace
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java
@@ -0,0 +1,65 @@
+// 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.
+
+package org.apache.cloudstack.extension;
+
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class CustomActionResultResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the action")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "Name of the action")
+    private String name;
+
+    @SerializedName(ApiConstants.SUCCESS)
+    @Param(description = "Whether custom action succeed or not")
+    private Boolean success;
+
+    @SerializedName(ApiConstants.RESULT)
+    @Param(description = "Result of the action execution")
+    private Map<String, String> result;
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setResult(Map<String, String> result) {
+        this.result = result;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/extension/Extension.java b/api/src/main/java/org/apache/cloudstack/extension/Extension.java
new file mode 100644
index 00000000000..3068612ed6f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/extension/Extension.java
@@ -0,0 +1,44 @@
+//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.
+
+package org.apache.cloudstack.extension;
+
+import java.util.Date;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface Extension extends InternalIdentity, Identity {
+    enum Type {
+        Orchestrator
+    }
+    enum State {
+        Enabled, Disabled;
+    };
+    String getName();
+    String getDescription();
+    Type getType();
+    String getRelativePath();
+    boolean isPathReady();
+    boolean isUserDefined();
+    State getState();
+    Date getCreated();
+
+    static String getDirectoryName(String name) {
+        return name.replaceAll("[^a-zA-Z0-9._-]", "_").toLowerCase();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/extension/ExtensionCustomAction.java b/api/src/main/java/org/apache/cloudstack/extension/ExtensionCustomAction.java
new file mode 100644
index 00000000000..776b42f671b
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/extension/ExtensionCustomAction.java
@@ -0,0 +1,386 @@
+//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.
+
+package org.apache.cloudstack.extension;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.DateUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+
+public interface ExtensionCustomAction extends InternalIdentity, Identity {
+    enum ResourceType {
+        VirtualMachine(com.cloud.vm.VirtualMachine.class);
+
+        private final Class<?> clazz;
+
+        ResourceType(Class<?> clazz) {
+            this.clazz = clazz;
+        }
+
+        public Class<?> getAssociatedClass() {
+            return this.clazz;
+        }
+    }
+
+    String getName();
+
+    String getDescription();
+
+    long getExtensionId();
+
+    ResourceType getResourceType();
+
+    Integer getAllowedRoleTypes();
+
+    String getSuccessMessage();
+
+    String getErrorMessage();
+
+    int getTimeout();
+
+    boolean isEnabled();
+
+    Date getCreated();
+
+
+    class Parameter {
+
+        public enum Type {
+            STRING(true),
+            NUMBER(true),
+            BOOLEAN(false),
+            DATE(false);
+
+            private final boolean supportsOptions;
+
+            Type(boolean supportsOptions) {
+                this.supportsOptions = supportsOptions;
+            }
+
+            public boolean canSupportsOptions() {
+                return supportsOptions;
+            }
+        }
+
+        public enum ValidationFormat {
+            // Universal default format
+            NONE(null),
+
+            // String formats
+            UUID(Type.STRING),
+            EMAIL(Type.STRING),
+            PASSWORD(Type.STRING),
+            URL(Type.STRING),
+
+            // Number formats
+            DECIMAL(Type.NUMBER);
+
+            private final Type baseType;
+
+            ValidationFormat(Type baseType) {
+                this.baseType = baseType;
+            }
+
+            public Type getBaseType() {
+                return baseType;
+            }
+        }
+
+        private static final Gson gson = new GsonBuilder()
+                .registerTypeAdapter(Parameter.class, new ParameterDeserializer())
+                .setPrettyPrinting()
+                .create();
+
+        private final String name;
+        private final Type type;
+        private final ValidationFormat validationformat;
+        private final List<Object> valueoptions;
+        private final boolean required;
+
+        public Parameter(String name, Type type, ValidationFormat validationformat, List<Object> valueoptions, boolean required) {
+            this.name = name;
+            this.type = type;
+            this.validationformat = validationformat;
+            this.valueoptions = valueoptions;
+            this.required = required;
+        }
+
+        /**
+         * Parses a CSV string into a list of validated options.
+         */
+        private static List<Object> parseValueOptions(String name, String csv, Type parsedType, ValidationFormat parsedFormat) {
+            if (StringUtils.isBlank(csv)) {
+                return null;
+            }
+            List<String> values = Arrays.stream(csv.split(","))
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .collect(Collectors.toList());
+            switch (parsedType) {
+                case STRING:
+                    if (parsedFormat != null && parsedFormat != ValidationFormat.NONE) {
+                        for (String value : values) {
+                            if (!isValidStringValue(value, parsedFormat)) {
+                                throw new InvalidParameterValueException(String.format("Invalid value options with validation format: %s for parameter: %s", parsedFormat.name(), name));
+                            }
+                        }
+                    }
+                    return new ArrayList<>(values);
+                case NUMBER:
+                    try {
+                        return values.stream()
+                                .map(v -> parseNumber(v, parsedFormat))
+                                .collect(Collectors.toList());
+                    } catch (NumberFormatException ignored) {
+                        throw new InvalidParameterValueException(String.format("Invalid value options with validation format: %s for parameter: %s", parsedFormat.name(), name));
+                    }
+                default:
+                    throw new InvalidParameterValueException(String.format("Options not supported for type: %s for parameter: %s", parsedType, name));
+            }
+        }
+
+        private static Object parseNumber(String value, ValidationFormat parsedFormat) {
+            if (parsedFormat == ValidationFormat.DECIMAL) {
+                return Float.parseFloat(value);
+            }
+            return Integer.parseInt(value);
+        }
+
+        private static boolean isValidStringValue(String value, ValidationFormat validationFormat ) {
+            switch (validationFormat) {
+                case NONE:
+                    return true;
+                case UUID:
+                    try {
+                        UUID.fromString(value);
+                        return true;
+                    } catch (Exception ignored) {
+                        return false;
+                    }
+                case EMAIL:
+                    return value.matches("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$");
+                case PASSWORD:
+                    return !value.trim().isEmpty();
+                case URL:
+                    try {
+                        new java.net.URL(value);
+                        return true;
+                    } catch (Exception ignored) {
+                        return false;
+                    }
+                default:
+                    return false;
+            }
+        }
+
+        public static Parameter fromMap(Map<String, String> map) throws InvalidParameterValueException {
+            final String name = map.get(ApiConstants.NAME);
+            final String typeStr = map.get(ApiConstants.TYPE);
+            final String validationFormatStr = map.get(ApiConstants.VALIDATION_FORMAT);
+            final String required = map.get(ApiConstants.REQUIRED);
+            final String valueOptionsStr = map.get(ApiConstants.VALUE_OPTIONS);
+            if (StringUtils.isBlank(name)) {
+                throw new InvalidParameterValueException("Invalid parameter specified with empty name");
+            }
+            if (StringUtils.isBlank(typeStr)) {
+                throw new InvalidParameterValueException(String.format("No type specified for parameter: %s", name));
+            }
+            Type parsedType = EnumUtils.getEnumIgnoreCase(Type.class, typeStr);
+            if (parsedType == null) {
+                throw new InvalidParameterValueException(String.format("Invalid type: %s specified for parameter: %s",
+                        typeStr, name));
+            }
+            ValidationFormat parsedFormat = StringUtils.isBlank(validationFormatStr) ?
+                    ValidationFormat.NONE : EnumUtils.getEnumIgnoreCase(ValidationFormat.class, validationFormatStr);
+            if (parsedFormat == null || (!ValidationFormat.NONE.equals(parsedFormat) &&
+                    parsedFormat.getBaseType() != parsedType)) {
+                throw new InvalidParameterValueException(
+                        String.format("Invalid validation format: %s specified for type: %s",
+                                parsedFormat, parsedType.name()));
+            }
+            List<Object> valueOptions = parseValueOptions(name, valueOptionsStr, parsedType, parsedFormat);
+            return new Parameter(name, parsedType, parsedFormat, valueOptions, Boolean.parseBoolean(required));
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Type getType() {
+            return type;
+        }
+
+        public ValidationFormat getValidationFormat() {
+            return validationformat;
+        }
+
+        public List<Object> getValueOptions() {
+            return valueoptions;
+        }
+
+        public boolean isRequired() {
+            return required;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("Parameter %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this,
+                    ApiConstants.NAME, ApiConstants.TYPE, ApiConstants.REQUIRED));
+        }
+
+        public static String toJsonFromList(List<Parameter> parameters) {
+            return gson.toJson(parameters);
+        }
+
+        public static List<Parameter> toListFromJson(String json) {
+            java.lang.reflect.Type listType = new TypeToken<List<Parameter>>() {}.getType();
+            return gson.fromJson(json, listType);
+        }
+
+        private void validateValueInOptions(Object value) {
+            if (CollectionUtils.isNotEmpty(valueoptions) && !valueoptions.contains(value)) {
+                throw new InvalidParameterValueException("Invalid value for parameter '" + name + "': " + value +
+                        ". Valid options are: " + valueoptions.stream().map(Object::toString).collect(Collectors.joining(", ")));
+            }
+        }
+
+        public Object validatedValue(String value) {
+            if (StringUtils.isBlank(value)) {
+                throw new InvalidParameterValueException("Empty value for parameter '" + name + "': " + value);
+            }
+            try {
+                switch (type) {
+                    case BOOLEAN:
+                        if (!Arrays.asList("true", "false").contains(value)) {
+                            throw new IllegalArgumentException();
+                        }
+                        return Boolean.parseBoolean(value);
+                    case DATE:
+                        return DateUtil.parseTZDateString(value);
+                    case NUMBER:
+                        Object obj = parseNumber(value, validationformat);
+                        validateValueInOptions(obj);
+                        return obj;
+                    default:
+                        if (!isValidStringValue(value, validationformat)) {
+                            throw new IllegalArgumentException();
+                        }
+                        validateValueInOptions(value);
+                        return value;
+                }
+            } catch (Exception e) {
+                throw new InvalidParameterValueException("Invalid value for parameter '" + name + "': " + value);
+            }
+        }
+
+        public static Map<String, Object> validateParameterValues(List<Parameter> parameterDefinitions,
+                   Map<String, String> suppliedValues) throws InvalidParameterValueException {
+            if (suppliedValues == null) {
+                suppliedValues = new HashMap<>();
+            }
+            for (Parameter param : parameterDefinitions) {
+                String value = suppliedValues.get(param.getName());
+                if (param.isRequired()) {
+                    if (value == null || value.trim().isEmpty()) {
+                        throw new InvalidParameterValueException("Missing or empty required parameter: " + param.getName());
+                    }
+                }
+            }
+            Map<String, Object> validatedParams = new HashMap<>();
+            for (Map.Entry<String, String> entry : suppliedValues.entrySet()) {
+                String name = entry.getKey();
+                String value = entry.getValue();
+                Parameter param = parameterDefinitions.stream()
+                        .filter(p -> p.getName().equals(name))
+                        .findFirst()
+                        .orElse(null);
+                if (param != null) {
+                    validatedParams.put(name, param.validatedValue(value));
+                } else  {
+                    validatedParams.put(name, value);
+                }
+            }
+            return validatedParams;
+        }
+
+        static class ParameterDeserializer implements JsonDeserializer<Parameter> {
+
+            @Override
+            public Parameter deserialize(JsonElement json, java.lang.reflect.Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                JsonObject obj = json.getAsJsonObject();
+                String name = obj.get(ApiConstants.NAME).getAsString();
+                String typeStr = obj.get(ApiConstants.TYPE).getAsString();
+                String validationFormatStr = obj.has(ApiConstants.VALIDATION_FORMAT) ? obj.get(ApiConstants.VALIDATION_FORMAT).getAsString() : null;
+                boolean required = obj.has(ApiConstants.REQUIRED) && obj.get(ApiConstants.REQUIRED).getAsBoolean();
+
+                Parameter.Type typeEnum = Parameter.Type.valueOf(typeStr);
+                Parameter.ValidationFormat validationFormatEnum = (validationFormatStr != null)
+                        ? Parameter.ValidationFormat.valueOf(validationFormatStr)
+                        : Parameter.ValidationFormat.NONE;
+
+                List<Object> valueOptions = null;
+                if (obj.has(ApiConstants.VALUE_OPTIONS) && obj.get(ApiConstants.VALUE_OPTIONS).isJsonArray()) {
+                    JsonArray valueOptionsArray = obj.getAsJsonArray(ApiConstants.VALUE_OPTIONS);
+                    valueOptions = new ArrayList<>();
+                    for (JsonElement el : valueOptionsArray) {
+                        switch (typeEnum) {
+                            case STRING:
+                                valueOptions.add(el.getAsString());
+                                break;
+                            case NUMBER:
+                                if (validationFormatEnum == Parameter.ValidationFormat.DECIMAL) {
+                                    valueOptions.add(el.getAsFloat());
+                                } else {
+                                    valueOptions.add(el.getAsInt());
+                                }
+                                break;
+                            default:
+                                throw new JsonParseException("Unsupported type for value options");
+                        }
+                    }
+                }
+
+                return new Parameter(name, typeEnum, validationFormatEnum, valueOptions, required);
+            }
+        }
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java b/api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java
new file mode 100644
index 00000000000..f50f841ed74
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java
@@ -0,0 +1,24 @@
+// 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.
+
+package org.apache.cloudstack.extension;
+
+public interface ExtensionHelper {
+    Long getExtensionIdForCluster(long clusterId);
+    Extension getExtension(long id);
+    Extension getExtensionForCluster(long clusterId);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/extension/ExtensionResourceMap.java b/api/src/main/java/org/apache/cloudstack/extension/ExtensionResourceMap.java
new file mode 100644
index 00000000000..40ebc19eb5e
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/extension/ExtensionResourceMap.java
@@ -0,0 +1,34 @@
+//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.
+
+package org.apache.cloudstack.extension;
+
+import java.util.Date;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface ExtensionResourceMap extends InternalIdentity, Identity {
+    enum ResourceType {
+        Cluster
+    }
+
+    long getExtensionId();
+    long getResourceId();
+    ResourceType getResourceType();
+    Date getCreated();
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmdTest.java
new file mode 100644
index 00000000000..af53a539e67
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmdTest.java
@@ -0,0 +1,83 @@
+// 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.
+
+package org.apache.cloudstack.api.command.admin.cluster;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionHelper;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.hypervisor.Hypervisor;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ListClustersCmdTest {
+
+    ExtensionHelper extensionHelper;
+    ListClustersCmd listClustersCmd = new ListClustersCmd();
+
+    @Before
+    public void setUp() {
+        extensionHelper = mock(ExtensionHelper.class);
+        listClustersCmd.extensionHelper = extensionHelper;
+    }
+
+    @Test
+    public void updateClustersExtensions_emptyList_noAction() {
+        listClustersCmd.updateClustersExtensions(Collections.emptyList());
+        // No exception, nothing to verify
+    }
+
+    @Test
+    public void updateClustersExtensions_nullList_noAction() {
+        listClustersCmd.updateClustersExtensions(null);
+        // No exception, nothing to verify
+    }
+
+    @Test
+    public void updateClustersExtensions_withClusterResponses_setsExtension() {
+        ClusterResponse cluster1 = mock(ClusterResponse.class);
+        ClusterResponse cluster2 = mock(ClusterResponse.class);
+        when(cluster1.getInternalId()).thenReturn(1L);
+        when(cluster1.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External.name());
+        when(cluster2.getInternalId()).thenReturn(2L);
+        when(cluster2.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External.name());
+        Extension ext1 = mock(Extension.class);
+        when(ext1.getUuid()).thenReturn("a");
+        Extension ext2 = mock(Extension.class);
+        when(ext2.getUuid()).thenReturn("b");
+        when(extensionHelper.getExtensionIdForCluster(anyLong())).thenAnswer(invocation -> invocation.getArguments()[0]);
+        when(extensionHelper.getExtension(1L)).thenReturn(ext1);
+        when(extensionHelper.getExtension(2L)).thenReturn(ext2);
+        List<ClusterResponse> clusters = Arrays.asList(cluster1, cluster2);
+        listClustersCmd.updateClustersExtensions(clusters);
+        verify(cluster1).setExtensionId("a");
+        verify(cluster2).setExtensionId("b");
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/extension/ExtensionCustomActionTest.java b/api/src/test/java/org/apache/cloudstack/extension/ExtensionCustomActionTest.java
new file mode 100644
index 00000000000..ae4314aa11a
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/extension/ExtensionCustomActionTest.java
@@ -0,0 +1,484 @@
+//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.
+
+package org.apache.cloudstack.extension;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.junit.Test;
+
+import com.cloud.exception.InvalidParameterValueException;
+
+public class ExtensionCustomActionTest {
+
+    @Test
+    public void testResourceType() {
+        ExtensionCustomAction.ResourceType vmType = ExtensionCustomAction.ResourceType.VirtualMachine;
+        assertEquals(com.cloud.vm.VirtualMachine.class, vmType.getAssociatedClass());
+    }
+
+    @Test
+    public void testParameterTypeSupportsOptions() {
+        assertTrue(ExtensionCustomAction.Parameter.Type.STRING.canSupportsOptions());
+        assertTrue(ExtensionCustomAction.Parameter.Type.NUMBER.canSupportsOptions());
+        assertFalse(ExtensionCustomAction.Parameter.Type.BOOLEAN.canSupportsOptions());
+        assertFalse(ExtensionCustomAction.Parameter.Type.DATE.canSupportsOptions());
+    }
+
+    @Test
+    public void testValidationFormatBaseType() {
+        assertEquals(ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.UUID.getBaseType());
+        assertEquals(ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.EMAIL.getBaseType());
+        assertEquals(ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.PASSWORD.getBaseType());
+        assertEquals(ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.URL.getBaseType());
+        assertEquals(ExtensionCustomAction.Parameter.Type.NUMBER,
+            ExtensionCustomAction.Parameter.ValidationFormat.DECIMAL.getBaseType());
+        assertNull(ExtensionCustomAction.Parameter.ValidationFormat.NONE.getBaseType());
+    }
+
+    @Test
+    public void testParameterFromMapValid() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "STRING");
+        map.put(ApiConstants.VALIDATION_FORMAT, "EMAIL");
+        map.put(ApiConstants.REQUIRED, "true");
+        map.put(ApiConstants.VALUE_OPTIONS, "test@example.com,another@test.com");
+
+        ExtensionCustomAction.Parameter param = ExtensionCustomAction.Parameter.fromMap(map);
+
+        assertEquals("testParam", param.getName());
+        assertEquals(ExtensionCustomAction.Parameter.Type.STRING, param.getType());
+        assertEquals(ExtensionCustomAction.Parameter.ValidationFormat.EMAIL, param.getValidationFormat());
+        assertTrue(param.isRequired());
+        assertEquals(2, param.getValueOptions().size());
+        assertTrue(param.getValueOptions().contains("test@example.com"));
+        assertTrue(param.getValueOptions().contains("another@test.com"));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapEmptyName() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "");
+        map.put(ApiConstants.TYPE, "STRING");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapNoType() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapInvalidType() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "INVALID_TYPE");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapInvalidValidationFormat() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "STRING");
+        map.put(ApiConstants.VALIDATION_FORMAT, "INVALID_FORMAT");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapMismatchedTypeAndFormat() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "STRING");
+        map.put(ApiConstants.VALIDATION_FORMAT, "DECIMAL");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test
+    public void testParameterFromMapWithNumberOptions() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "NUMBER");
+        map.put(ApiConstants.VALIDATION_FORMAT, "DECIMAL");
+        map.put(ApiConstants.VALUE_OPTIONS, "1.5,2.7,3.0");
+
+        ExtensionCustomAction.Parameter param = ExtensionCustomAction.Parameter.fromMap(map);
+
+        assertEquals(ExtensionCustomAction.Parameter.Type.NUMBER, param.getType());
+        assertEquals(ExtensionCustomAction.Parameter.ValidationFormat.DECIMAL, param.getValidationFormat());
+        assertEquals(3, param.getValueOptions().size());
+        assertTrue(param.getValueOptions().contains(1.5f));
+        assertTrue(param.getValueOptions().contains(2.7f));
+        assertTrue(param.getValueOptions().contains(3.0f));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapInvalidNumberOptions() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "NUMBER");
+        map.put(ApiConstants.VALUE_OPTIONS, "1.5,invalid,3.0");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testParameterFromMapInvalidEmailOptions() {
+        Map<String, String> map = new HashMap<>();
+        map.put(ApiConstants.NAME, "testParam");
+        map.put(ApiConstants.TYPE, "STRING");
+        map.put(ApiConstants.VALIDATION_FORMAT, "EMAIL");
+        map.put(ApiConstants.VALUE_OPTIONS, "valid@email.com,invalid-email");
+
+        ExtensionCustomAction.Parameter.fromMap(map);
+    }
+
+    @Test
+    public void testValidatedValueString() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.EMAIL,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("test@example.com");
+        assertEquals("test@example.com", result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueInvalidEmail() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.EMAIL,
+            null,
+            false
+        );
+
+        param.validatedValue("invalid-email");
+    }
+
+    @Test
+    public void testValidatedValueUUID() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.UUID,
+            null,
+            false
+        );
+
+        String validUUID = "550e8400-e29b-41d4-a716-446655440000";
+        Object result = param.validatedValue(validUUID);
+        assertEquals(validUUID, result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueInvalidUUID() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.UUID,
+            null,
+            false
+        );
+
+        param.validatedValue("invalid-uuid");
+    }
+
+    @Test
+    public void testValidatedValueURL() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.URL,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("https://example.com");
+        assertEquals("https://example.com", result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueInvalidURL() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.URL,
+            null,
+            false
+        );
+
+        param.validatedValue("not-a-url");
+    }
+
+    @Test
+    public void testValidatedValuePassword() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.PASSWORD,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("mypassword");
+        assertEquals("mypassword", result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueEmptyPassword() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.PASSWORD,
+            null,
+            false
+        );
+
+        param.validatedValue("   ");
+    }
+
+    @Test
+    public void testValidatedValueNumber() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.NUMBER,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("42");
+        assertEquals(42, result);
+    }
+
+    @Test
+    public void testValidatedValueDecimal() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.NUMBER,
+            ExtensionCustomAction.Parameter.ValidationFormat.DECIMAL,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("3.14");
+        assertEquals(3.14f, result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueInvalidNumber() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.NUMBER,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            null,
+            false
+        );
+
+        param.validatedValue("not-a-number");
+    }
+
+    @Test
+    public void testValidatedValueBoolean() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.BOOLEAN,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("true");
+        assertEquals(true, result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueInvalidBoolean() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.BOOLEAN,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            null,
+            false
+        );
+
+        Object result = param.validatedValue("maybe");
+    }
+
+    @Test
+    public void testValidatedValueWithOptions() {
+        List<Object> options = Arrays.asList("option1", "option2", "option3");
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            options,
+            false
+        );
+
+        Object result = param.validatedValue("option2");
+        assertEquals("option2", result);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueNotInOptions() {
+        List<Object> options = Arrays.asList("option1", "option2", "option3");
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            options,
+            false
+        );
+
+        param.validatedValue("option4");
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidatedValueEmpty() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+            null,
+            false
+        );
+
+        param.validatedValue("");
+    }
+
+    @Test
+    public void testValidateParameterValues() {
+        List<ExtensionCustomAction.Parameter> paramDefs = Arrays.asList(
+            new ExtensionCustomAction.Parameter("required1", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, true),
+            new ExtensionCustomAction.Parameter("required2", ExtensionCustomAction.Parameter.Type.NUMBER,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, true),
+            new ExtensionCustomAction.Parameter("optional", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, false)
+        );
+
+        Map<String, String> suppliedValues = new HashMap<>();
+        suppliedValues.put("required1", "value1");
+        suppliedValues.put("required2", "42");
+        suppliedValues.put("optional", "optionalValue");
+
+        Map<String, Object> result = ExtensionCustomAction.Parameter.validateParameterValues(paramDefs, suppliedValues);
+
+        assertEquals("value1", result.get("required1"));
+        assertEquals(42, result.get("required2"));
+        assertEquals("optionalValue", result.get("optional"));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateParameterValuesMissingRequired() {
+        List<ExtensionCustomAction.Parameter> paramDefs = Arrays.asList(
+            new ExtensionCustomAction.Parameter("required1", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, true)
+        );
+
+        Map<String, String> suppliedValues = new HashMap<>();
+
+        ExtensionCustomAction.Parameter.validateParameterValues(paramDefs, suppliedValues);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateParameterValuesEmptyRequired() {
+        List<ExtensionCustomAction.Parameter> paramDefs = Arrays.asList(
+            new ExtensionCustomAction.Parameter("required1", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, true)
+        );
+
+        Map<String, String> suppliedValues = new HashMap<>();
+        suppliedValues.put("required1", "   ");
+
+        ExtensionCustomAction.Parameter.validateParameterValues(paramDefs, suppliedValues);
+    }
+
+    @Test
+    public void testValidateParameterValuesNullSupplied() {
+        List<ExtensionCustomAction.Parameter> paramDefs = Arrays.asList(
+            new ExtensionCustomAction.Parameter("optional", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.NONE, null, false)
+        );
+
+        Map<String, Object> result = ExtensionCustomAction.Parameter.validateParameterValues(paramDefs, null);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    public void testJsonSerializationDeserialization() {
+        List<ExtensionCustomAction.Parameter> originalParams = Arrays.asList(
+            new ExtensionCustomAction.Parameter("param1", ExtensionCustomAction.Parameter.Type.STRING,
+                ExtensionCustomAction.Parameter.ValidationFormat.EMAIL, Arrays.asList("test@example.com"), true),
+            new ExtensionCustomAction.Parameter("param2", ExtensionCustomAction.Parameter.Type.NUMBER,
+                ExtensionCustomAction.Parameter.ValidationFormat.DECIMAL, Arrays.asList(1.5f, 2.7f), false)
+        );
+
+        String json = ExtensionCustomAction.Parameter.toJsonFromList(originalParams);
+        List<ExtensionCustomAction.Parameter> deserializedParams = ExtensionCustomAction.Parameter.toListFromJson(json);
+
+        assertEquals(originalParams.size(), deserializedParams.size());
+        assertEquals(originalParams.get(0).getName(), deserializedParams.get(0).getName());
+        assertEquals(originalParams.get(0).getType(), deserializedParams.get(0).getType());
+        assertEquals(originalParams.get(0).getValidationFormat(), deserializedParams.get(0).getValidationFormat());
+        assertEquals(originalParams.get(0).isRequired(), deserializedParams.get(0).isRequired());
+        assertEquals(originalParams.get(0).getValueOptions(), deserializedParams.get(0).getValueOptions());
+    }
+
+    @Test
+    public void testToString() {
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter(
+            "testParam",
+            ExtensionCustomAction.Parameter.Type.STRING,
+            ExtensionCustomAction.Parameter.ValidationFormat.EMAIL,
+            null,
+            true
+        );
+
+        String result = param.toString();
+        assertTrue(result.contains("testParam"));
+        assertTrue(result.contains("STRING"));
+        assertTrue(result.contains("true"));
+    }
+}
diff --git a/build/replace.properties b/build/replace.properties
index ce38727b80a..8c3812eb7d2 100644
--- a/build/replace.properties
+++ b/build/replace.properties
@@ -28,3 +28,4 @@ MSMNTDIR=/mnt
 COMPONENTS-SPEC=components.xml
 REMOTEHOST=localhost
 COMMONLIBDIR=client/target/common/
+EXTENSIONSDEPLOYMENTMODE=developer
diff --git a/client/conf/server.properties.in b/client/conf/server.properties.in
index 0a6078048d3..fd75c9d3ea0 100644
--- a/client/conf/server.properties.in
+++ b/client/conf/server.properties.in
@@ -55,3 +55,6 @@ webapp.dir=/usr/share/cloudstack-management/webapp
 
 # The path to access log file
 access.log=/var/log/cloudstack/management/access.log
+
+# The deployment mode for the extensions
+extensions.deployment.mode=@EXTENSIONSDEPLOYMENTMODE@
diff --git a/client/pom.xml b/client/pom.xml
index 38a4c405120..81e2b780934 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -337,6 +337,11 @@
             <artifactId>cloud-plugin-hypervisor-hyperv</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-plugin-hypervisor-external</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-storage-allocator-random</artifactId>
diff --git a/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningAnswer.java b/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningAnswer.java
new file mode 100644
index 00000000000..b94d18c537e
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningAnswer.java
@@ -0,0 +1,51 @@
+//
+// 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.
+//
+package com.cloud.agent.api;
+
+import java.util.Map;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+public class PrepareExternalProvisioningAnswer extends Answer {
+
+    Map<String, String> serverDetails;
+    VirtualMachineTO virtualMachineTO;
+
+    public PrepareExternalProvisioningAnswer() {
+        super();
+    }
+
+    public PrepareExternalProvisioningAnswer(PrepareExternalProvisioningCommand cmd, Map<String, String> externalDetails, VirtualMachineTO virtualMachineTO, String details) {
+        super(cmd, true, details);
+        this.serverDetails = externalDetails;
+        this.virtualMachineTO = virtualMachineTO;
+    }
+
+    public PrepareExternalProvisioningAnswer(PrepareExternalProvisioningCommand cmd, boolean success, String details) {
+        super(cmd, success, details);
+    }
+
+    public Map<String, String> getServerDetails() {
+        return serverDetails;
+    }
+
+    public VirtualMachineTO getVirtualMachineTO() {
+        return virtualMachineTO;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningCommand.java b/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningCommand.java
new file mode 100644
index 00000000000..44f57607eba
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningCommand.java
@@ -0,0 +1,39 @@
+//
+// 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.
+//
+package com.cloud.agent.api;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+public class PrepareExternalProvisioningCommand extends Command {
+
+    VirtualMachineTO virtualMachineTO;
+
+    public PrepareExternalProvisioningCommand(VirtualMachineTO vmTO) {
+        this.virtualMachineTO = vmTO;
+    }
+
+    public VirtualMachineTO getVirtualMachineTO() {
+        return virtualMachineTO;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/RunCustomActionAnswer.java b/core/src/main/java/com/cloud/agent/api/RunCustomActionAnswer.java
new file mode 100644
index 00000000000..1deb789c995
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/RunCustomActionAnswer.java
@@ -0,0 +1,32 @@
+//
+// 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.
+//
+
+package com.cloud.agent.api;
+
+public class RunCustomActionAnswer extends Answer {
+
+    public RunCustomActionAnswer(RunCustomActionCommand cmd, boolean success, String details) {
+        super(cmd, success, details);
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/RunCustomActionCommand.java b/core/src/main/java/com/cloud/agent/api/RunCustomActionCommand.java
new file mode 100644
index 00000000000..36489ad4fa5
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/RunCustomActionCommand.java
@@ -0,0 +1,59 @@
+//
+// 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.
+//
+
+package com.cloud.agent.api;
+
+import java.util.Map;
+
+public class RunCustomActionCommand extends Command {
+
+    String actionName;
+    Long vmId;
+    Map<String, Object> parameters;
+
+    public RunCustomActionCommand(String actionName) {
+        this.actionName = actionName;
+        this.setWait(5);
+    }
+
+    public String getActionName() {
+        return actionName;
+    }
+
+    public Long getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(Long vmId) {
+        this.vmId = vmId;
+    }
+
+    public Map<String, Object> getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Map<String, Object> parameters) {
+        this.parameters = parameters;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/StopCommand.java b/core/src/main/java/com/cloud/agent/api/StopCommand.java
index 3923a35bd0a..d07ffa2e31f 100644
--- a/core/src/main/java/com/cloud/agent/api/StopCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/StopCommand.java
@@ -19,14 +19,14 @@
 
 package com.cloud.agent.api;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import com.cloud.agent.api.to.DpdkTO;
 import com.cloud.agent.api.to.GPUDeviceTO;
 import com.cloud.vm.VirtualMachine;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
 public class StopCommand extends RebootCommand {
     private boolean isProxy = false;
     private String urlPort = null;
@@ -37,6 +37,7 @@ public class StopCommand extends RebootCommand {
     boolean forceStop = false;
     private Map<String, DpdkTO> dpdkInterfaceMapping;
     Map<String, Boolean> vlanToPersistenceMap;
+    boolean expungeVM = false;
 
     public Map<String, DpdkTO> getDpdkInterfaceMapping() {
         return dpdkInterfaceMapping;
@@ -138,4 +139,12 @@ public class StopCommand extends RebootCommand {
     public void setVlanToPersistenceMap(Map<String, Boolean> vlanToPersistenceMap) {
         this.vlanToPersistenceMap = vlanToPersistenceMap;
     }
+
+    public boolean isExpungeVM() {
+        return expungeVM;
+    }
+
+    public void setExpungeVM(boolean expungeVM) {
+        this.expungeVM = expungeVM;
+    }
 }
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index 08f56d4f117..51fc5bf2a66 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -27,6 +27,7 @@
 /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
 /usr/share/cloudstack-common/scripts/vm/hypervisor/vmware/*
 /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
+/usr/share/cloudstack-common/scripts/vm/hypervisor/external/provisioner/*
 /usr/share/cloudstack-common/lib/*
 /usr/share/cloudstack-common/vms/*
 /usr/bin/cloudstack-set-guest-password
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index 3d0d7e23814..b2a32bd93c1 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -22,6 +22,8 @@
 /etc/cloudstack/management/java.security.ciphers
 /etc/cloudstack/management/log4j-cloud.xml
 /etc/cloudstack/management/config.json
+/etc/cloudstack/extensions/Proxmox/proxmox.sh
+/etc/cloudstack/extensions/HyperV/hyperv.py
 /etc/default/cloudstack-management
 /etc/security/limits.d/cloudstack-limits.conf
 /etc/sudoers.d/cloudstack
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index d5d50a4718c..fde3ba96de0 100755
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -59,6 +59,9 @@ if [ "$1" = configure ]; then
     chown -R cloud:cloud /usr/share/cloudstack-management/templates
     find /usr/share/cloudstack-management/templates -type d -exec chmod 0770 {} \;
 
+    chmod -R 0755 /etc/cloudstack/extensions
+    chown -R cloud:cloud /etc/cloudstack/extensions
+
     ln -sf ${CONFDIR}/log4j-cloud.xml ${CONFDIR}/log4j2.xml
 
     # Add jdbc MySQL driver settings to db.properties if not present
diff --git a/debian/rules b/debian/rules
index d178afa6730..89943408544 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ override_dh_auto_install:
 	# cloudstack-management
 	mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server
 	mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management
+	mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/extensions
 	mkdir -p $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
 	mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/
 	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
@@ -81,6 +82,7 @@ override_dh_auto_install:
 	cp -r client/target/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp
 	cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
 	cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
+	cp -r extensions/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/extensions/
 	cp client/target/cloud-client-ui-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/cloudstack-$(VERSION).jar
 	cp client/target/lib/*jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/
 	cp -r engine/schema/dist/systemvm-templates/* $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/
@@ -106,6 +108,7 @@ override_dh_auto_install:
 	# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
 	# This should all be in /etc/cloudstack/management
 	ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
+	ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/extensions $(DESTDIR)/usr/share/$(PACKAGE)-management/extensions
 	ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs
 
 	install -d -m0755 debian/$(PACKAGE)-management/lib/systemd/system
diff --git a/engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java b/engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java
new file mode 100644
index 00000000000..a22ea421113
--- /dev/null
+++ b/engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java
@@ -0,0 +1,61 @@
+// 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.
+package com.cloud.hypervisor;
+
+import java.util.Map;
+
+import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.PrepareExternalProvisioningCommand;
+import com.cloud.agent.api.RebootAnswer;
+import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.agent.api.RunCustomActionCommand;
+import com.cloud.agent.api.StartAnswer;
+import com.cloud.agent.api.StartCommand;
+import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.StopCommand;
+import com.cloud.utils.component.Manager;
+
+public interface ExternalProvisioner extends Manager {
+
+    String getExtensionsPath();
+
+    String getExtensionPath(String relativePath);
+
+    String getChecksumForExtensionPath(String extensionName, String relativePath);
+
+    void prepareExtensionPath(String extensionName, boolean userDefined, String extensionRelativePath);
+
+    void cleanupExtensionPath(String extensionName, String extensionRelativePath);
+
+    void cleanupExtensionData(String extensionName, int olderThanDays, boolean cleanupDirectory);
+
+    PrepareExternalProvisioningAnswer prepareExternalProvisioning(String hostGuid, String extensionName, String extensionRelativePath, PrepareExternalProvisioningCommand cmd);
+
+    StartAnswer startInstance(String hostGuid, String extensionName, String extensionRelativePath, StartCommand cmd);
+
+    StopAnswer stopInstance(String hostGuid, String extensionName, String extensionRelativePath, StopCommand cmd);
+
+    RebootAnswer rebootInstance(String hostGuid, String extensionName, String extensionRelativePath, RebootCommand cmd);
+
+    StopAnswer expungeInstance(String hostGuid, String extensionName, String extensionRelativePath, StopCommand cmd);
+
+    Map<String, HostVmStateReportEntry> getHostVmStateReport(long hostId, String extensionName, String extensionRelativePath);
+
+    RunCustomActionAnswer runCustomAction(String hostGuid, String extensionName, String extensionRelativePath, RunCustomActionCommand cmd);
+}
diff --git a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
index b8912526fdf..28f41c677cb 100644
--- a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
+++ b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
@@ -29,6 +29,7 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.StorageUnavailableException;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.Storage.TemplateType;
 import com.cloud.storage.StoragePool;
@@ -141,7 +142,7 @@ public interface TemplateManager {
     public static final String MESSAGE_REGISTER_PUBLIC_TEMPLATE_EVENT = "Message.RegisterPublicTemplate.Event";
     public static final String MESSAGE_RESET_TEMPLATE_PERMISSION_EVENT = "Message.ResetTemplatePermission.Event";
 
-    TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones);
+    TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, Hypervisor.HypervisorType hypervisorType);
 
     List<DatadiskTO> getTemplateDisksOnImageStore(VirtualMachineTemplate template, DataStoreRole role, String configurationId);
 
diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml
index 437c98dac87..151f95ff944 100755
--- a/engine/orchestration/pom.xml
+++ b/engine/orchestration/pom.xml
@@ -73,6 +73,11 @@
             <artifactId>cloud-plugin-maintenance</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-plugin-hypervisor-external</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
index dc7852ed82b..75e9fb20e5a 100644
--- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
@@ -676,17 +676,17 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
     protected Status investigate(final AgentAttache agent) {
         final Long hostId = agent.getId();
         final HostVO host = _hostDao.findById(hostId);
-        if (host != null && host.getType() != null && !host.getType().isVirtual()) {
-            logger.debug("Checking if agent ({}) is alive", host);
-            final Answer answer = easySend(hostId, new CheckHealthCommand());
-            if (answer != null && answer.getResult()) {
-                final Status status = Status.Up;
-                logger.debug("Agent ({}) responded to checkHealthCommand, reporting that agent is {}", host, status);
-                return status;
-            }
-            return _haMgr.investigate(hostId);
+        if (host == null || host.getType() == null || host.getType().isVirtual()) {
+            return Status.Alert;
         }
-        return Status.Alert;
+        logger.debug("Checking if agent ({}) is alive", host);
+        final Answer answer = easySend(hostId, new CheckHealthCommand());
+        if (answer != null && answer.getResult()) {
+            final Status status = Status.Up;
+            logger.debug("Agent ({}) responded to checkHealthCommand, reporting that agent is {}", host, status);
+            return status;
+        }
+        return _haMgr.investigate(hostId);
     }
 
     protected AgentAttache getAttache(final Long hostId) throws AgentUnavailableException {
diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index a7dca34f032..c6448982803 100644
--- a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -47,6 +47,8 @@ import org.apache.cloudstack.ca.CAManager;
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.extensions.command.ExtensionServerActionBaseCommand;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.cloudstack.ha.dao.HAConfigDao;
 import org.apache.cloudstack.maintenance.ManagementServerMaintenanceManager;
 import org.apache.cloudstack.maintenance.command.BaseShutdownManagementServerHostCommand;
@@ -61,6 +63,7 @@ import org.apache.cloudstack.management.ManagementServerHost;
 import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 import org.apache.cloudstack.utils.security.SSLUtils;
+import org.apache.commons.collections.CollectionUtils;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CancelCommand;
@@ -106,8 +109,6 @@ import com.cloud.utils.nio.Link;
 import com.cloud.utils.nio.Task;
 import com.google.gson.Gson;
 
-import org.apache.commons.collections.CollectionUtils;
-
 public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService {
     private static ScheduledExecutorService s_transferExecutor = Executors.newScheduledThreadPool(2, new NamedThreadFactory("Cluster-AgentRebalancingExecutor"));
     private final long rebalanceTimeOut = 300000; // 5 mins - after this time remove the agent from the transfer list
@@ -147,6 +148,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     private ManagementServerMaintenanceManager managementServerMaintenanceManager;
     @Inject
     private DataCenterDao dcDao;
+    @Inject
+    ExtensionsManager extensionsManager;
 
     protected ClusteredAgentManagerImpl() {
         super();
@@ -1320,6 +1323,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
             } else if (cmds.length == 1 && cmds[0] instanceof BaseShutdownManagementServerHostCommand) {
                 final BaseShutdownManagementServerHostCommand cmd = (BaseShutdownManagementServerHostCommand) cmds[0];
                 return handleShutdownManagementServerHostCommand(cmd);
+            } else if (cmds.length == 1 && cmds[0] instanceof ExtensionServerActionBaseCommand) {
+                return extensionsManager.handleExtensionServerCommands((ExtensionServerActionBaseCommand)cmds[0]);
             }
 
             try {
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 45dcbd0cb53..b57643323dc 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -72,6 +72,9 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.framework.ca.Certificate;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDetailsDao;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionDetailsVO;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobExecutionContext;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
@@ -99,6 +102,7 @@ import org.apache.cloudstack.vm.UnmanagedVMsManager;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
@@ -123,6 +127,8 @@ import com.cloud.agent.api.ModifyTargetsCommand;
 import com.cloud.agent.api.PingRoutingCommand;
 import com.cloud.agent.api.PlugNicAnswer;
 import com.cloud.agent.api.PlugNicCommand;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.PrepareExternalProvisioningCommand;
 import com.cloud.agent.api.PrepareForMigrationAnswer;
 import com.cloud.agent.api.PrepareForMigrationCommand;
 import com.cloud.agent.api.RebootAnswer;
@@ -203,12 +209,14 @@ import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorGuru;
 import com.cloud.hypervisor.HypervisorGuruBase;
 import com.cloud.hypervisor.HypervisorGuruManager;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
+import com.cloud.network.NetworkService;
 import com.cloud.network.Networks;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDetailVO;
@@ -335,6 +343,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     private HostDao _hostDao;
     @Inject
+    private HostDetailsDao hostDetailsDao;
+    @Inject
     private AlertManager _alertMgr;
     @Inject
     private GuestOSCategoryDao _guestOsCategoryDao;
@@ -417,6 +427,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     private DomainDao domainDao;
     @Inject
+    public NetworkService networkService;
+    @Inject
     ResourceCleanupService resourceCleanupService;
     @Inject
     VmWorkJobDao vmWorkJobDao;
@@ -433,6 +445,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
     @Inject
     private VolumeDataFactory volumeDataFactory;
+    @Inject
+    ExtensionsManager extensionsManager;
+    @Inject
+    ExtensionDetailsDao extensionDetailsDao;
 
 
     VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
@@ -594,8 +610,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             if (template.getFormat() == ImageFormat.ISO) {
                 volumeMgr.allocateRawVolume(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(),
                         rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), vm, template, owner, null);
-            } else if (template.getFormat() == ImageFormat.BAREMETAL) {
-                logger.debug("%s has format [{}]. Skipping ROOT volume [{}] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName);
+            } else if (Arrays.asList(ImageFormat.BAREMETAL, ImageFormat.EXTERNAL).contains(template.getFormat())) {
+                logger.debug("{} has format [{}]. Skipping ROOT volume [{}] allocation.", template, template.getFormat(), rootVolumeName);
             } else {
                 volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
                         rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vm, owner, volume, snapshot);
@@ -655,6 +671,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             return;
         }
 
+        if (HypervisorType.External.equals(vm.getHypervisorType())) {
+            UserVmVO userVM = _userVmDao.findById(vm.getId());
+            _userVmDao.loadDetails(userVM);
+            userVM.setDetail(VmDetailConstants.EXPUNGE_EXTERNAL_VM, Boolean.TRUE.toString());
+            _userVmDao.saveDetails(userVM);
+        }
+
         advanceStop(vm.getUuid(), VmDestroyForcestop.value());
         vm = _vmDao.findByUuid(vm.getUuid());
 
@@ -1147,6 +1170,141 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         vmTO.setMetadataProductName(metadataProduct);
     }
 
+    protected void updateExternalVmDetailsFromPrepareAnswer(VirtualMachineTO vmTO, UserVmVO userVmVO,
+                            Map<String, String> newDetails) {
+        if (newDetails == null || newDetails.equals(vmTO.getDetails())) {
+            return;
+        }
+        vmTO.setDetails(newDetails);
+        userVmVO.setDetails(newDetails);
+        _userVmDao.saveDetails(userVmVO);
+    }
+
+    protected void updateExternalVmDataFromPrepareAnswer(VirtualMachineTO vmTO, VirtualMachineTO updatedTO) {
+        final String vncPassword = updatedTO.getVncPassword();
+        final Map<String, String> details = updatedTO.getDetails();
+        if ((vncPassword == null || vncPassword.equals(vmTO.getVncPassword())) &&
+                (details == null || details.equals(vmTO.getDetails()))) {
+            return;
+        }
+        UserVmVO userVmVO = _userVmDao.findById(vmTO.getId());
+        if (userVmVO == null) {
+            return;
+        }
+        if (vncPassword != null && !vncPassword.equals(userVmVO.getPassword())) {
+            userVmVO.setVncPassword(vncPassword);
+            vmTO.setVncPassword(vncPassword);
+        }
+        updateExternalVmDetailsFromPrepareAnswer(vmTO, userVmVO, updatedTO.getDetails());
+    }
+
+    protected void updateExternalVmNicsFromPrepareAnswer(VirtualMachineTO vmTO, VirtualMachineTO updatedTO) {
+        if (ObjectUtils.anyNull(vmTO.getNics(), updatedTO.getNics())) {
+            return;
+        }
+        Map<String, NicTO> originalNicsByUuid = new HashMap<>();
+        for (NicTO nic : vmTO.getNics()) {
+            originalNicsByUuid.put(nic.getNicUuid(), nic);
+        }
+        for (NicTO updatedNicTO : updatedTO.getNics()) {
+            final String nicUuid = updatedNicTO.getNicUuid();
+            NicTO originalNicTO = originalNicsByUuid.get(nicUuid);
+            if (originalNicTO == null) {
+                continue;
+            }
+            final String mac = updatedNicTO.getMac();
+            final String ip4 = updatedNicTO.getIp();
+            final String ip6 = updatedNicTO.getIp6Address();
+            if (Objects.equals(mac, originalNicTO.getMac()) &&
+                    Objects.equals(ip4, originalNicTO.getIp()) &&
+                    Objects.equals(ip6, originalNicTO.getIp6Address())) {
+                continue;
+            }
+            NicVO nicVO = _nicsDao.findByUuid(nicUuid);
+            if (nicVO == null) {
+                continue;
+            }
+            logger.debug("Updating {} during External VM preparation", nicVO);
+            if (ip4 != null && !ip4.equals(nicVO.getIPv4Address())) {
+                nicVO.setIPv4Address(ip4);
+                originalNicTO.setIp(ip4);
+            }
+            if (ip6 != null && !ip6.equals(nicVO.getIPv6Address())) {
+                nicVO.setIPv6Address(ip6);
+                originalNicTO.setIp6Address(ip6);
+            }
+            if (mac != null && !mac.equals(nicVO.getMacAddress())) {
+                nicVO.setMacAddress(mac);
+                originalNicTO.setMac(mac);
+            }
+            _nicsDao.update(nicVO.getId(), nicVO);
+        }
+    }
+
+    protected void updateExternalVmFromPrepareAnswer(VirtualMachineTO vmTO, VirtualMachineTO updatedTO) {
+        if (updatedTO == null) {
+            return;
+        }
+        updateExternalVmDataFromPrepareAnswer(vmTO, updatedTO);
+        updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+        return;
+    }
+
+    protected void processPrepareExternalProvisioning(boolean firstStart, Host host,
+                 VirtualMachineProfile vmProfile, DataCenter dataCenter) throws CloudRuntimeException {
+        VirtualMachineTemplate template = vmProfile.getTemplate();
+        if (!firstStart || host == null || !HypervisorType.External.equals(host.getHypervisorType()) ||
+                template.getExtensionId() == null) {
+            return;
+        }
+        ExtensionDetailsVO detailsVO = extensionDetailsDao.findDetail(template.getExtensionId(),
+                ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM);
+        if (detailsVO == null || !Boolean.parseBoolean(detailsVO.getValue())) {
+            return;
+        }
+        logger.debug("Sending PrepareExternalProvisioningCommand for {}", vmProfile);
+        VirtualMachineTO virtualMachineTO = toVmTO(vmProfile);
+        if (virtualMachineTO.getNics() == null || virtualMachineTO.getNics().length == 0) {
+            List<NicVO> nics = _nicsDao.listByVmId(vmProfile.getId());
+            NicTO[] nicTOs = new NicTO[nics.size()];
+            nics.forEach(nicVO -> {
+                NicTO nicTO = toNicTO(_networkModel.getNicProfile(vmProfile.getVirtualMachine(), nicVO, dataCenter),
+                        HypervisorType.External);
+                nicTOs[nicTO.getDeviceId()] = nicTO;
+            });
+            virtualMachineTO.setNics(nicTOs);
+        }
+        Map<String, String> vmDetails = virtualMachineTO.getExternalDetails();
+        Map<String, Map<String, String>> externalDetails = extensionsManager.getExternalAccessDetails(host,
+                vmDetails);
+        PrepareExternalProvisioningCommand cmd = new PrepareExternalProvisioningCommand(virtualMachineTO);
+        cmd.setExternalDetails(externalDetails);
+        Answer answer = null;
+        CloudRuntimeException cre = new CloudRuntimeException("Failed to prepare VM");
+        try {
+            answer = _agentMgr.send(host.getId(), cmd);
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.error("Failed PrepareExternalProvisioningCommand due to : {}", e.getMessage(), e);
+            throw cre;
+        }
+        if (answer == null) {
+            logger.error("Invalid answer received for PrepareExternalProvisioningCommand");
+            throw cre;
+        }
+        if (!(answer instanceof PrepareExternalProvisioningAnswer)) {
+            logger.error("Unexpected answer received for PrepareExternalProvisioningCommand: [result: {}, details: {}]",
+                    answer.getResult(), answer.getDetails());
+            throw cre;
+        }
+        PrepareExternalProvisioningAnswer prepareAnswer = (PrepareExternalProvisioningAnswer)answer;
+        if (!prepareAnswer.getResult()) {
+            logger.error("Unexpected answer received for PrepareExternalProvisioningCommand: [result: {}, details: {}]",
+                    answer.getResult(), answer.getDetails());
+            throw cre;
+        }
+        updateExternalVmFromPrepareAnswer(virtualMachineTO, prepareAnswer.getVirtualMachineTO());
+    }
+
     @Override
     public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfile.Param, Object> params, final DeploymentPlan planToDeploy, final DeploymentPlanner planner)
             throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
@@ -1158,6 +1316,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
         VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
 
+        final boolean firstStart = vm.getUpdated() == 0;
+
         final VirtualMachineGuru vmGuru = getVmGuru(vm);
 
         final Account owner = _entityMgr.findById(Account.class, vm.getAccountId());
@@ -1257,7 +1417,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                     }
                 }
 
-                final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm, template, offering, owner, params);
+                VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm, template, offering, owner, params);
                 logBootModeParameters(params);
                 DeployDestination dest = null;
                 try {
@@ -1300,8 +1460,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
                 try {
                     resetVmNicsDeviceId(vm.getId());
+
+                    processPrepareExternalProvisioning(firstStart, dest.getHost(), vmProfile, dest.getDataCenter());
+
                     _networkMgr.prepare(vmProfile, dest, ctx);
-                    if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+                    if (vm.getHypervisorType() != HypervisorType.BareMetal && vm.getHypervisorType() != HypervisorType.External) {
                         checkAndAttemptMigrateVmAcrossCluster(vm, clusterId, dest.getStorageForDisks());
                         volumeMgr.prepare(vmProfile, dest);
                     }
@@ -1320,13 +1483,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                     handlePath(vmTO.getDisks(), vm.getHypervisorType());
                     setVmNetworkDetails(vm, vmTO);
 
-
                     Commands cmds = new Commands(Command.OnError.Stop);
                     final Map<String, String> sshAccessDetails = _networkMgr.getSystemVMAccessDetails(vm);
                     final Map<String, String> ipAddressDetails = new HashMap<>(sshAccessDetails);
                     ipAddressDetails.remove(NetworkElementCommand.ROUTER_NAME);
 
                     StartCommand command = new StartCommand(vmTO, dest.getHost(), getExecuteInSequence(vm.getHypervisorType()));
+                    updateStartCommandWithExternalDetails(dest.getHost(), vmTO, command);
                     cmds.addCommand(command);
 
                     vmGuru.finalizeDeployment(cmds, vmProfile, dest, ctx);
@@ -1499,6 +1662,53 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         }
     }
 
+    protected void updateStartCommandWithExternalDetails(Host host, VirtualMachineTO vmTO, StartCommand command) {
+        if (!HypervisorType.External.equals(host.getHypervisorType())) {
+            return;
+        }
+        Map<String, String> vmExternalDetails = vmTO.getExternalDetails();
+        for (NicTO nic : vmTO.getNics()) {
+            if (!nic.isDefaultNic()) {
+                continue;
+            }
+            vmExternalDetails.put(VmDetailConstants.CLOUDSTACK_VLAN, networkService.getNicVlanValueForExternalVm(nic));
+        }
+        Map<String, Map<String, String>> externalDetails = extensionsManager.getExternalAccessDetails(host, vmExternalDetails);
+        command.setExternalDetails(externalDetails);
+    }
+
+    protected void updateStopCommandForExternalHypervisorType(final HypervisorType hypervisorType,
+                  final VirtualMachineProfile vmProfile, final StopCommand stopCommand) {
+        if (!HypervisorType.External.equals(hypervisorType) || vmProfile.getHostId() == null) {
+            return;
+        }
+        Host host = _hostDao.findById(vmProfile.getHostId());
+        if (host == null) {
+            return;
+        }
+        VirtualMachineTO vmTO = ObjectUtils.defaultIfNull(stopCommand.getVirtualMachine(), toVmTO(vmProfile));
+        if (MapUtils.isEmpty(vmTO.getGuestOsDetails())) {
+            vmTO.setGuestOsDetails(null);
+        }
+        if (MapUtils.isEmpty(vmTO.getExtraConfig())) {
+            vmTO.setExtraConfig(null);
+        }
+        if (MapUtils.isEmpty(vmTO.getNetworkIdToNetworkNameMap())) {
+            vmTO.setNetworkIdToNetworkNameMap(null);
+        }
+        Map<String, Map<String, String>> externalDetails = extensionsManager.getExternalAccessDetails(host, vmTO.getExternalDetails());
+        stopCommand.setVirtualMachine(vmTO);
+        stopCommand.setExternalDetails(externalDetails);
+    }
+
+    protected void updateRebootCommandWithExternalDetails(Host host, VirtualMachineTO vmTO, RebootCommand rebootCmd) {
+        if (!HypervisorType.External.equals(host.getHypervisorType())) {
+            return;
+        }
+        Map<String, Map<String, String>> externalDetails = extensionsManager.getExternalAccessDetails(host, vmTO.getExternalDetails());
+        rebootCmd.setExternalDetails(externalDetails);
+    }
+
     public void setVmNetworkDetails(VMInstanceVO vm, VirtualMachineTO vmTO) {
         Map<Long, String> networkToNetworkNameMap = new HashMap<>();
         if (VirtualMachine.Type.User.equals(vm.getType())) {
@@ -1886,7 +2096,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     protected boolean sendStop(final VirtualMachineGuru guru, final VirtualMachineProfile profile, final boolean force, final boolean checkBeforeCleanup) {
         final VirtualMachine vm = profile.getVirtualMachine();
         Map<String, Boolean> vlanToPersistenceMap = getVlanToPersistenceMapForVM(vm.getId());
+
         StopCommand stpCmd = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()), checkBeforeCleanup);
+        updateStopCommandForExternalHypervisorType(vm.getHypervisorType(), profile, stpCmd);
         if (MapUtils.isNotEmpty(vlanToPersistenceMap)) {
             stpCmd.setVlanToPersistenceMap(vlanToPersistenceMap);
         }
@@ -2017,7 +2229,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         }
 
         try {
-            if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+            if (vm.getHypervisorType() != HypervisorType.BareMetal && vm.getHypervisorType() != HypervisorType.External) {
                 volumeMgr.release(profile);
                 logger.debug("Successfully released storage resources for the VM {} in {} state", vm, state);
             }
@@ -2214,6 +2426,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         Map<String, Boolean> vlanToPersistenceMap = getVlanToPersistenceMapForVM(vm.getId());
         final StopCommand stop = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()), false, cleanUpEvenIfUnableToStop);
         stop.setControlIp(getControlNicIpForVM(vm));
+        updateStopCommandForExternalHypervisorType(vm.getHypervisorType(), profile, stop);
         if (MapUtils.isNotEmpty(vlanToPersistenceMap)) {
             stop.setVlanToPersistenceMap(vlanToPersistenceMap);
         }
@@ -2263,6 +2476,14 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 } else {
                     logger.warn("Unable to actually stop {} but continue with release because it's a force stop", vm);
                     vmGuru.finalizeStop(profile, answer);
+                    if (HypervisorType.External.equals(profile.getHypervisorType())) {
+                        try {
+                            stateTransitTo(vm, VirtualMachine.Event.OperationSucceeded, null);
+                        } catch (final NoTransitionException e) {
+                            logger.warn("Unable to transition the state " + vm, e);
+                        }
+                    }
+
                 }
             } else {
                 if (VirtualMachine.systemVMs.contains(vm.getType())) {
@@ -3730,6 +3951,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             VirtualMachineTO vmTo = getVmTO(vm.getId());
             checkAndSetEnterSetupMode(vmTo, params);
             rebootCmd.setVirtualMachine(vmTo);
+            updateRebootCommandWithExternalDetails(host, vmTo, rebootCmd);
             cmds.addCommand(rebootCmd);
             _agentMgr.send(host.getId(), cmds);
 
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9d07a5c7df6..07d1a60b7f8 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.engine.orchestration;
 
+import static com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,14 +40,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.dc.ASNumberVO;
-import com.cloud.bgp.BGPService;
-import com.cloud.dc.VlanDetailsVO;
-import com.cloud.dc.dao.ASNumberDao;
-import com.cloud.dc.dao.VlanDetailsDao;
-import com.cloud.network.dao.Ipv6GuestPrefixSubnetNetworkMapDao;
-import com.cloud.network.dao.NetrisProviderDao;
-import com.cloud.network.dao.NsxProviderDao;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -67,6 +61,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
@@ -88,8 +83,10 @@ import com.cloud.agent.api.to.deployasis.OVFNetworkTO;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.query.dao.DomainRouterJoinDao;
 import com.cloud.api.query.vo.DomainRouterJoinVO;
+import com.cloud.bgp.BGPService;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.Resource.ResourceType;
+import com.cloud.dc.ASNumberVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenter.NetworkType;
@@ -97,12 +94,15 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.DataCenterVnetVO;
 import com.cloud.dc.PodVlanMapVO;
 import com.cloud.dc.Vlan;
+import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
+import com.cloud.dc.dao.ASNumberDao;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.DataCenterVnetDao;
 import com.cloud.dc.dao.PodVlanMapDao;
 import com.cloud.dc.dao.VlanDao;
+import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
@@ -153,6 +153,8 @@ import com.cloud.network.dao.AccountGuestVlanMapVO;
 import com.cloud.network.dao.FirewallRulesDao;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.Ipv6GuestPrefixSubnetNetworkMapDao;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkAccountDao;
 import com.cloud.network.dao.NetworkAccountVO;
 import com.cloud.network.dao.NetworkDao;
@@ -163,6 +165,7 @@ import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
 import com.cloud.network.dao.NetworkServiceMapVO;
 import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
@@ -250,8 +253,8 @@ import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachine.Type;
+import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
@@ -263,9 +266,6 @@ import com.cloud.vm.dao.NicSecondaryIpVO;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.googlecode.ipv6.IPv6Address;
-import org.jetbrains.annotations.NotNull;
-
-import static com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
 
 /**
  * NetworkManagerImpl implements NetworkManager.
diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index 6335aae2e0a..a570251cb68 100644
--- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -23,11 +23,14 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
@@ -40,10 +43,14 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.impl.ConfigDepotImpl;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDetailsDao;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionDetailsVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
@@ -65,15 +72,20 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Command;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.StartCommand;
 import com.cloud.agent.api.StopAnswer;
 import com.cloud.agent.api.StopCommand;
 import com.cloud.agent.api.routing.NetworkElementCommand;
+import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
 import com.cloud.api.query.dao.UserVmJoinDao;
 import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
@@ -94,6 +106,7 @@ import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorGuruManager;
+import com.cloud.network.NetworkService;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.vpc.VpcVO;
@@ -130,6 +143,7 @@ import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
@@ -229,6 +243,14 @@ public class VirtualMachineManagerImplTest {
     private ItWorkDao _workDao;
     @Mock
     protected StateMachine2<State, VirtualMachine.Event, VirtualMachine> _stateMachine;
+    @Mock
+    ExtensionsManager extensionsManager;
+    @Mock
+    ExtensionDetailsDao extensionDetailsDao;
+    @Mock
+    NicDao _nicsDao;
+    @Mock
+    NetworkService networkService;
 
     private ConfigDepotImpl configDepotImpl;
     private boolean updatedConfigKeyDepot = false;
@@ -458,8 +480,8 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.executeManagedStorageChecksWhenTargetStoragePoolProvided(storagePoolVoMock, volumeVoMock, Mockito.mock(StoragePoolVO.class));
 
-        Mockito.verify(storagePoolVoMock).isManaged();
-        Mockito.verify(storagePoolVoMock, Mockito.times(0)).getId();
+        verify(storagePoolVoMock).isManaged();
+        verify(storagePoolVoMock, Mockito.times(0)).getId();
     }
 
     @Test
@@ -469,8 +491,8 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.executeManagedStorageChecksWhenTargetStoragePoolProvided(storagePoolVoMock, volumeVoMock, Mockito.mock(StoragePoolVO.class));
 
-        Mockito.verify(storagePoolVoMock).isManaged();
-        Mockito.verify(storagePoolVoMock, Mockito.times(0)).getId();
+        verify(storagePoolVoMock).isManaged();
+        verify(storagePoolVoMock, Mockito.times(0)).getId();
     }
 
     @Test
@@ -485,8 +507,8 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.executeManagedStorageChecksWhenTargetStoragePoolProvided(storagePoolVoMock, volumeVoMock, storagePoolVoMock);
 
-        Mockito.verify(storagePoolVoMock).isManaged();
-        Mockito.verify(storagePoolVoMock, Mockito.times(2)).getId();
+        verify(storagePoolVoMock).isManaged();
+        verify(storagePoolVoMock, Mockito.times(2)).getId();
     }
 
     @Test(expected = CloudRuntimeException.class)
@@ -510,7 +532,7 @@ public class VirtualMachineManagerImplTest {
 
         Assert.assertTrue(volumeToPoolObjectMap.isEmpty());
 
-        Mockito.verify(userDefinedVolumeToStoragePoolMap, times(0)).keySet();
+        verify(userDefinedVolumeToStoragePoolMap, times(0)).keySet();
     }
 
     @Test(expected = CloudRuntimeException.class)
@@ -539,7 +561,7 @@ public class VirtualMachineManagerImplTest {
         assertFalse(volumeToPoolObjectMap.isEmpty());
         assertEquals(storagePoolVoMock, volumeToPoolObjectMap.get(volumeVoMock));
 
-        Mockito.verify(userDefinedVolumeToStoragePoolMap, times(1)).keySet();
+        verify(userDefinedVolumeToStoragePoolMap, times(1)).keySet();
     }
 
     @Test
@@ -566,8 +588,8 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
 
-        Mockito.verify(storagePoolVoMock).isManaged();
-        Mockito.verify(storagePoolHostDaoMock, Mockito.times(0)).findByPoolHost(anyLong(), anyLong());
+        verify(storagePoolVoMock).isManaged();
+        verify(storagePoolHostDaoMock, Mockito.times(0)).findByPoolHost(anyLong(), anyLong());
     }
 
     @Test
@@ -577,8 +599,8 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
 
-        Mockito.verify(storagePoolVoMock).isManaged();
-        Mockito.verify(storagePoolHostDaoMock, Mockito.times(1)).findByPoolHost(storagePoolVoMockId, hostMockId);
+        verify(storagePoolVoMock).isManaged();
+        verify(storagePoolHostDaoMock, Mockito.times(1)).findByPoolHost(storagePoolVoMockId, hostMockId);
     }
 
     @Test(expected = CloudRuntimeException.class)
@@ -677,11 +699,11 @@ public class VirtualMachineManagerImplTest {
 
         Assert.assertTrue(poolList.isEmpty());
 
-        Mockito.verify(storagePoolAllocatorMock).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
+        verify(storagePoolAllocatorMock).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
                 any(ExcludeList.class), Mockito.eq(StoragePoolAllocator.RETURN_UPTO_ALL));
-        Mockito.verify(storagePoolAllocatorMock2).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
+        verify(storagePoolAllocatorMock2).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
                 any(ExcludeList.class), Mockito.eq(StoragePoolAllocator.RETURN_UPTO_ALL));
-        Mockito.verify(storagePoolAllocatorMock3).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
+        verify(storagePoolAllocatorMock3).allocateToPool(any(DiskProfile.class), any(VirtualMachineProfile.class), any(DeploymentPlan.class),
                 any(ExcludeList.class), Mockito.eq(StoragePoolAllocator.RETURN_UPTO_ALL));
     }
 
@@ -739,8 +761,8 @@ public class VirtualMachineManagerImplTest {
         virtualMachineManagerImpl.createStoragePoolMappingsForVolumes(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, allVolumes);
 
         Assert.assertTrue(volumeToPoolObjectMap.isEmpty());
-        Mockito.verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
-        Mockito.verify(virtualMachineManagerImpl).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock, storagePoolVoMock);
+        verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
+        verify(virtualMachineManagerImpl).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock, storagePoolVoMock);
     }
 
     @Test
@@ -758,9 +780,9 @@ public class VirtualMachineManagerImplTest {
         virtualMachineManagerImpl.createStoragePoolMappingsForVolumes(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, allVolumes);
 
         Assert.assertTrue(volumeToPoolObjectMap.isEmpty());
-        Mockito.verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
-        Mockito.verify(virtualMachineManagerImpl).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock, storagePoolVoMock);
-        Mockito.verify(virtualMachineManagerImpl).isStorageCrossClusterMigration(clusterMockId, storagePoolVoMock);
+        verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
+        verify(virtualMachineManagerImpl).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock, storagePoolVoMock);
+        verify(virtualMachineManagerImpl).isStorageCrossClusterMigration(clusterMockId, storagePoolVoMock);
     }
 
     @Test
@@ -779,9 +801,9 @@ public class VirtualMachineManagerImplTest {
         assertFalse(volumeToPoolObjectMap.isEmpty());
         assertEquals(storagePoolVoMock, volumeToPoolObjectMap.get(volumeVoMock));
 
-        Mockito.verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
-        Mockito.verify(virtualMachineManagerImpl).isStorageCrossClusterMigration(clusterMockId, storagePoolVoMock);
-        Mockito.verify(virtualMachineManagerImpl, Mockito.times(0)).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock,
+        verify(virtualMachineManagerImpl).executeManagedStorageChecksWhenTargetStoragePoolNotProvided(hostMock, storagePoolVoMock, volumeVoMock);
+        verify(virtualMachineManagerImpl).isStorageCrossClusterMigration(clusterMockId, storagePoolVoMock);
+        verify(virtualMachineManagerImpl, Mockito.times(0)).createVolumeToStoragePoolMappingIfPossible(virtualMachineProfileMock, dataCenterDeploymentMock, volumeToPoolObjectMap, volumeVoMock,
                 storagePoolVoMock);
     }
 
@@ -1318,7 +1340,7 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(volumeDaoMock, Mockito.never()).findByInstance(Mockito.anyLong());
+        verify(volumeDaoMock, never()).findByInstance(Mockito.anyLong());
     }
 
     @Test
@@ -1328,7 +1350,7 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(agentManagerMock, Mockito.never()).send(Mockito.anyLong(), (Command) any());
+        verify(agentManagerMock, never()).send(Mockito.anyLong(), (Command) any());
     }
 
     @Test (expected = CloudRuntimeException.class)
@@ -1341,7 +1363,7 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
+        verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
     }
 
     @Test (expected = CloudRuntimeException.class)
@@ -1354,7 +1376,7 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
+        verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
     }
 
     @Test
@@ -1367,7 +1389,7 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
+        verify(snapshotManagerMock, Mockito.times(1)).endSnapshotChainForVolume(Mockito.anyLong(),any());
     }
 
     @Test
@@ -1379,6 +1401,241 @@ public class VirtualMachineManagerImplTest {
 
         virtualMachineManagerImpl.recreateCheckpointsKvmOnVmAfterMigration(vmInstanceMock, 0);
 
-        Mockito.verify(snapshotManagerMock, Mockito.never()).endSnapshotChainForVolume(Mockito.anyLong(),any());
+        verify(snapshotManagerMock, never()).endSnapshotChainForVolume(Mockito.anyLong(),any());
+    }
+
+    @Test
+    public void updateStartCommandWithExternalDetails_nonExternalHypervisor_noAction() {
+        Host host = mock(Host.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        StartCommand command = mock(StartCommand.class);
+
+        when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+
+        virtualMachineManagerImpl.updateStartCommandWithExternalDetails(host, vmTO, command);
+
+        verify(command, never()).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateStartCommandWithExternalDetails_externalHypervisor_setsExternalDetails() {
+        Host host = mock(Host.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        StartCommand command = mock(StartCommand.class);
+        NicTO nic = mock(NicTO.class);
+
+        when(host.getHypervisorType()).thenReturn(HypervisorType.External);
+        when(vmTO.getExternalDetails()).thenReturn(new HashMap<>());
+        when(vmTO.getNics()).thenReturn(new NicTO[]{nic});
+        when(nic.isDefaultNic()).thenReturn(true);
+        when(networkService.getNicVlanValueForExternalVm(nic)).thenReturn("segmentName");
+        when(extensionsManager.getExternalAccessDetails(eq(host), any())).thenReturn(new HashMap<>());
+
+        virtualMachineManagerImpl.updateStartCommandWithExternalDetails(host, vmTO, command);
+
+        verify(command).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateStopCommandForExternalHypervisorType_nonExternalHypervisor_noAction() {
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        StopCommand stopCommand = mock(StopCommand.class);
+
+        virtualMachineManagerImpl.updateStopCommandForExternalHypervisorType(HypervisorType.KVM, vmProfile, stopCommand);
+
+        verify(stopCommand, never()).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateStopCommandForExternalHypervisorType_externalHypervisor_setsExternalDetails() {
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        StopCommand stopCommand = mock(StopCommand.class);
+        HostVO host = mock(HostVO.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmProfile.getHostId()).thenReturn(1L);
+        when(hostDaoMock.findById(1L)).thenReturn(host);
+        when(stopCommand.getVirtualMachine()).thenReturn(vmTO);
+        when(vmTO.getExternalDetails()).thenReturn(new HashMap<>());
+        when(extensionsManager.getExternalAccessDetails(eq(host), any())).thenReturn(new HashMap<>());
+        doReturn(mock(VirtualMachineTO.class)).when(virtualMachineManagerImpl).toVmTO(any());
+        virtualMachineManagerImpl.updateStopCommandForExternalHypervisorType(HypervisorType.External, vmProfile, stopCommand);
+        verify(stopCommand).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateRebootCommandWithExternalDetails_nonExternalHypervisor_noAction() {
+        Host host = mock(Host.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        RebootCommand rebootCmd = mock(RebootCommand.class);
+        when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+        virtualMachineManagerImpl.updateRebootCommandWithExternalDetails(host, vmTO, rebootCmd);
+        verify(rebootCmd, never()).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateRebootCommandWithExternalDetails_externalHypervisor_setsExternalDetails() {
+        Host host = mock(Host.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        RebootCommand rebootCmd = mock(RebootCommand.class);
+        when(host.getHypervisorType()).thenReturn(HypervisorType.External);
+        when(vmTO.getExternalDetails()).thenReturn(new HashMap<>());
+        when(extensionsManager.getExternalAccessDetails(eq(host), any())).thenReturn(new HashMap<>());
+        virtualMachineManagerImpl.updateRebootCommandWithExternalDetails(host, vmTO, rebootCmd);
+        verify(rebootCmd).setExternalDetails(any());
+    }
+
+    @Test
+    public void updateExternalVmDetailsFromPrepareAnswer_nullDetails_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        UserVmVO userVmVO = mock(UserVmVO.class);
+        virtualMachineManagerImpl.updateExternalVmDetailsFromPrepareAnswer(vmTO, userVmVO, null);
+        verify(vmTO, never()).setDetails(any());
+        verify(userVmVO, never()).setDetails(any());
+        verify(userVmDaoMock, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updateExternalVmDetailsFromPrepareAnswer_sameDetails_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        UserVmVO userVmVO = mock(UserVmVO.class);
+        Map<String, String> details = new HashMap<>();
+        when(vmTO.getDetails()).thenReturn(details);
+        virtualMachineManagerImpl.updateExternalVmDetailsFromPrepareAnswer(vmTO, userVmVO, details);
+        verify(vmTO, never()).setDetails(any());
+        verify(userVmVO, never()).setDetails(any());
+        verify(userVmDaoMock, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updateExternalVmDataFromPrepareAnswer_vncPasswordUpdated_updatesPassword() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+        UserVmVO userVmVO = mock(UserVmVO.class);
+        when(updatedTO.getVncPassword()).thenReturn("newPassword");
+        when(vmTO.getVncPassword()).thenReturn("oldPassword");
+        when(userVmDaoMock.findById(anyLong())).thenReturn(userVmVO);
+        virtualMachineManagerImpl.updateExternalVmDataFromPrepareAnswer(vmTO, updatedTO);
+        verify(userVmVO).setVncPassword("newPassword");
+        verify(vmTO).setVncPassword("newPassword");
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_nullNics_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+        when(vmTO.getNics()).thenReturn(null);
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+        verify(_nicsDao, never()).findByUuid(anyString());
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_updatesNicsSuccessfully() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+        NicTO nicTO = mock(NicTO.class);
+        NicTO updatedNicTO = mock(NicTO.class);
+
+        when(vmTO.getNics()).thenReturn(new NicTO[]{nicTO});
+        when(updatedTO.getNics()).thenReturn(new NicTO[]{updatedNicTO});
+        when(nicTO.getNicUuid()).thenReturn("nic-uuid");
+        when(nicTO.getMac()).thenReturn("mac-a");
+        when(updatedNicTO.getNicUuid()).thenReturn("nic-uuid");
+        when(updatedNicTO.getMac()).thenReturn("mac-b");
+        when(_nicsDao.findByUuid("nic-uuid")).thenReturn(mock(NicVO.class));
+
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+
+        verify(_nicsDao).findByUuid("nic-uuid");
+        verify(_nicsDao).update(anyLong(), any(NicVO.class));
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_noMatchingNicUuid_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+        NicTO nicTO = mock(NicTO.class);
+        NicTO updatedNicTO = mock(NicTO.class);
+
+        when(vmTO.getNics()).thenReturn(new NicTO[]{nicTO});
+        when(updatedTO.getNics()).thenReturn(new NicTO[]{updatedNicTO});
+        when(nicTO.getNicUuid()).thenReturn("nic-uuid");
+        when(updatedNicTO.getNicUuid()).thenReturn("different-uuid");
+
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+
+        verify(_nicsDao, never()).findByUuid(anyString());
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_nullUpdatedNics_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+
+        when(vmTO.getNics()).thenReturn(new NicTO[]{mock(NicTO.class)});
+        when(updatedTO.getNics()).thenReturn(null);
+
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+
+        verify(_nicsDao, never()).findByUuid(anyString());
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_nullVmNics_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+
+        when(vmTO.getNics()).thenReturn(null);
+        when(updatedTO.getNics()).thenReturn(new NicTO[]{mock(NicTO.class)});
+
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+
+        verify(_nicsDao, never()).findByUuid(anyString());
+    }
+
+    @Test
+    public void updateExternalVmNicsFromPrepareAnswer_emptyNics_noAction() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        VirtualMachineTO updatedTO = mock(VirtualMachineTO.class);
+
+        when(vmTO.getNics()).thenReturn(new NicTO[]{});
+        when(updatedTO.getNics()).thenReturn(new NicTO[]{});
+
+        virtualMachineManagerImpl.updateExternalVmNicsFromPrepareAnswer(vmTO, updatedTO);
+
+        verify(_nicsDao, never()).findByUuid(anyString());
+    }
+
+    @Test
+    public void processPrepareExternalProvisioning_nonExternalHypervisor_noAction() throws OperationTimedoutException, AgentUnavailableException {
+        Host host = mock(Host.class);
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        VirtualMachineTemplate template = mock(VirtualMachineTemplate.class);
+        when(vmProfile.getTemplate()).thenReturn(template);
+        when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+        virtualMachineManagerImpl.processPrepareExternalProvisioning(true, host, vmProfile, mock(DataCenter.class));
+        verify(agentManagerMock, never()).send(anyLong(), any(Command.class));
+    }
+
+    @Test
+    public void processPrepareExternalProvisioning_externalHypervisor_sendsCommand() throws OperationTimedoutException, AgentUnavailableException {
+        Host host = mock(Host.class);
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        VirtualMachineTemplate template = mock(VirtualMachineTemplate.class);
+        when(vmProfile.getTemplate()).thenReturn(template);
+        NicTO[] nics = new NicTO[]{mock(NicTO.class)};
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getNics()).thenReturn(nics);
+        doReturn(vmTO).when(virtualMachineManagerImpl).toVmTO(vmProfile);
+        ExtensionDetailsVO detailsVO = mock(ExtensionDetailsVO.class);
+        when(host.getHypervisorType()).thenReturn(HypervisorType.External);
+        when(template.getExtensionId()).thenReturn(1L);
+        when(extensionDetailsDao.findDetail(eq(1L), eq(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM))).thenReturn(detailsVO);
+        when(detailsVO.getValue()).thenReturn("true");
+        PrepareExternalProvisioningAnswer answer = mock(PrepareExternalProvisioningAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(answer.getVirtualMachineTO()).thenReturn(vmTO);
+        when(agentManagerMock.send(anyLong(), any(Command.class))).thenReturn(answer);
+        virtualMachineManagerImpl.processPrepareExternalProvisioning(true, host, vmProfile, mock(DataCenter.class));
+        verify(agentManagerMock).send(anyLong(), any(Command.class));
     }
 }
diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java
index a6fe3123c4e..1745f5380e2 100644
--- a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java
+++ b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java
@@ -59,4 +59,6 @@ public interface ClusterDao extends GenericDao<ClusterVO, Long> {
     List<ClusterVO> listClustersByArchAndZoneId(long zoneId, CPU.CPUArch arch);
 
     List<String> listDistinctStorageAccessGroups(String name, String keyword);
+
+    List<Long> listEnabledClusterIdsByZoneHypervisorArch(Long zoneId, HypervisorType hypervisorType, CPU.CPUArch arch);
 }
diff --git a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java
index 7c0d0c53814..ea82a10f9c9 100644
--- a/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java
@@ -378,4 +378,29 @@ public class ClusterDaoImpl extends GenericDaoBase<ClusterVO, Long> implements C
 
         return customSearch(sc, null);
     }
+
+    @Override
+    public List<Long> listEnabledClusterIdsByZoneHypervisorArch(Long zoneId, HypervisorType hypervisorType, CPU.CPUArch arch) {
+        GenericSearchBuilder<ClusterVO, Long> sb = createSearchBuilder(Long.class);
+        sb.selectFields(sb.entity().getId());
+        sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        sb.and("allocationState", sb.entity().getAllocationState(), Op.EQ);
+        sb.and("managedState", sb.entity().getManagedState(), Op.EQ);
+        sb.and("hypervisor", sb.entity().getHypervisorType(), Op.EQ);
+        sb.and("arch", sb.entity().getArch(), Op.EQ);
+        sb.done();
+        SearchCriteria<Long> sc = sb.create();
+        sc.setParameters("allocationState", Grouping.AllocationState.Enabled);
+        sc.setParameters("managedState", Managed.ManagedState.Managed);
+        if (zoneId != null) {
+            sc.setParameters("zoneId", zoneId);
+        }
+        if (hypervisorType != null) {
+            sc.setParameters("hypervisor", hypervisorType);
+        }
+        if (arch != null) {
+            sc.setParameters("arch", arch);
+        }
+        return customSearch(sc, null);
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java
index 8dc4efa91f3..5d8bd0a0a3a 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java
@@ -32,4 +32,7 @@ public interface HostDetailsDao extends GenericDao<DetailVO, Long> {
     void deleteDetails(long hostId);
 
     List<DetailVO> findByName(String name);
+
+    void replaceExternalDetails(long hostId, Map<String, String> details);
+
 }
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java
index 9c1340592f9..3eb9faeb1c1 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java
@@ -18,6 +18,7 @@ package com.cloud.host.dao;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +32,7 @@ import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VmDetailConstants;
 
 @Component
 public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implements HostDetailsDao {
@@ -130,4 +132,34 @@ public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implement
         sc.setParameters("name", name);
         return listBy(sc);
     }
+
+    @Override
+    public void replaceExternalDetails(long hostId, Map<String, String> details) {
+        if (details.isEmpty()) {
+            return;
+        }
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
+        txn.start();
+        List<DetailVO> detailVOs = new ArrayList<>();
+        for (Map.Entry<String, String> entry : details.entrySet()) {
+            String name = entry.getKey();
+            String value = entry.getValue();
+            if ("password".equals(entry.getKey())) {
+                value = DBEncryptionUtil.encrypt(value);
+            }
+            detailVOs.add(new DetailVO(hostId, name, value));
+        }
+        SearchBuilder<DetailVO> sb = createSearchBuilder();
+        sb.and("hostId", sb.entity().getHostId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        sb.done();
+        SearchCriteria<DetailVO> sc = sb.create();
+        sc.setParameters("hostId", hostId);
+        sc.setParameters("name", VmDetailConstants.EXTERNAL_DETAIL_PREFIX + "%");
+        remove(sc);
+        for (DetailVO detail : detailVOs) {
+            persist(detail);
+        }
+        txn.commit();
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index 4811b59d31e..09d9f1d7fbf 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -125,7 +125,7 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
             sc = simulatorAllFieldsSearch.create();
         } else if (hType == HypervisorType.Ovm) {
             sc = ovmAllFieldsSearch.create();
-        } else if (hType == HypervisorType.BareMetal) {
+        } else if (hType == HypervisorType.BareMetal || hType == HypervisorType.External) {
             return null;
         } else if (hType == HypervisorType.Hyperv) {
             sc = hypervAllFieldsSearch.create();
diff --git a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
index 93f6a464019..3486bac010e 100644
--- a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
@@ -176,6 +176,9 @@ public class VMTemplateVO implements VirtualMachineTemplate {
     @Convert(converter = CPUArchConverter.class)
     private CPU.CPUArch arch;
 
+    @Column(name = "extension_id")
+    private Long extensionId;
+
     @Override
     public String getUniqueName() {
         return uniqueName;
@@ -218,7 +221,7 @@ public class VMTemplateVO implements VirtualMachineTemplate {
 
     public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable,
                         HypervisorType hyperType, String templateTag, Map<String, String> details, boolean sshKeyEnabled, boolean isDynamicallyScalable, boolean directDownload,
-                        boolean deployAsIs, CPU.CPUArch arch) {
+                        boolean deployAsIs, CPU.CPUArch arch, Long extensionId) {
         this(id,
             name,
             format,
@@ -245,6 +248,7 @@ public class VMTemplateVO implements VirtualMachineTemplate {
         this.directDownload = directDownload;
         this.deployAsIs = deployAsIs;
         this.arch = arch;
+        this.extensionId = extensionId;
     }
 
     public static VMTemplateVO createPreHostIso(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type,
@@ -702,4 +706,11 @@ public class VMTemplateVO implements VirtualMachineTemplate {
         this.arch = arch;
     }
 
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionId(Long extensionId) {
+        this.extensionId = extensionId;
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
index 2835cf3cb3c..d70eeb87653 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
@@ -101,4 +101,6 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long>, StateDao<
     List<VMTemplateVO> listByIds(List<Long> ids);
 
     List<Long> listIdsByTemplateTag(String tag);
+
+    List<Long> listIdsByExtensionId(long extensionId);
 }
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
index 138677927e6..267cef2169a 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -837,6 +837,17 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
         return customSearchIncludingRemoved(sc, null);
     }
 
+    @Override
+    public List<Long> listIdsByExtensionId(long extensionId) {
+        GenericSearchBuilder<VMTemplateVO, Long> sb = createSearchBuilder(Long.class);
+        sb.selectFields(sb.entity().getId());
+        sb.and("extensionId", sb.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        sb.done();
+        SearchCriteria<Long> sc = sb.create();
+        sc.setParameters("extensionId", extensionId);
+        return customSearch(sc, null);
+    }
+
     @Override
     public boolean updateState(
             com.cloud.template.VirtualMachineTemplate.State currentState,
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java
index 6b6fe200c10..7c113a10af4 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.apache.cloudstack.api.ResourceDetail;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
 
 public interface ResourceDetailsDao<R extends ResourceDetail> extends GenericDao<R, Long> {
@@ -94,6 +95,8 @@ public interface ResourceDetailsDao<R extends ResourceDetail> extends GenericDao
 
     Map<String, Boolean> listDetailsVisibility(long resourceId);
 
+    Pair<Map<String, String>, Map<String, String>> listDetailsKeyPairsWithVisibility(long resourceId);
+
     void saveDetails(List<R> details);
 
     void addDetail(long resourceId, String key, String value, boolean display);
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java
index 29d3f88fd90..58b60531e5a 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java
@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 
+import com.cloud.utils.Pair;
 import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
@@ -127,6 +128,19 @@ public abstract class ResourceDetailsDaoBase<R extends ResourceDetail> extends G
         return details;
     }
 
+    @Override
+    public Pair<Map<String, String>, Map<String, String>> listDetailsKeyPairsWithVisibility(long resourceId) {
+        SearchCriteria<R> sc = AllFieldsSearch.create();
+        sc.setParameters("resourceId", resourceId);
+        List<R> results = search(sc, null);
+        Map<Boolean, Map<String, String>> partitioned = results.stream()
+                .collect(Collectors.partitioningBy(
+                        R::isDisplay,
+                        Collectors.toMap(R::getName, R::getValue)
+                ));
+        return new Pair<>(partitioned.get(true), partitioned.get(false));
+    }
+
     public List<R> listDetails(long resourceId) {
         SearchCriteria<R> sc = AllFieldsSearch.create();
         sc.setParameters("resourceId", resourceId);
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index e2389dc9250..275549e5eee 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -282,3 +282,318 @@ ALTER TABLE `cloud`.`vm_instance_details` ADD CONSTRAINT `fk_vm_instance_details
 
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'uuid', 'VARCHAR(40) NOT NULL');
 UPDATE `cloud`.`backup_schedule` SET uuid = UUID();
+
+-- Extension framework
+UPDATE `cloud`.`configuration` SET value = CONCAT(value, ',External') WHERE name = 'hypervisor.list';
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `uuid` varchar(40) NOT NULL UNIQUE,
+  `name` varchar(255) NOT NULL,
+  `description` varchar(4096),
+  `type` varchar(255) NOT NULL COMMENT 'Type of the extension: Orchestrator, etc',
+  `relative_path` varchar(2048) NOT NULL COMMENT 'Path for the extension relative to the root extensions directory',
+  `path_ready` tinyint(1) DEFAULT '0' COMMENT 'True if the extension path is in ready state across management servers',
+  `is_user_defined` tinyint(1) DEFAULT '0' COMMENT 'True if the extension is added by admin',
+  `state` char(32) NOT NULL COMMENT 'State of the extension - Enabled or Disabled',
+  `created` datetime NOT NULL,
+  `removed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension_details` (
+  `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `extension_id` bigint unsigned NOT NULL COMMENT 'extension to which the detail is related to',
+  `name` varchar(255) NOT NULL COMMENT 'name of the detail',
+  `value` varchar(255) NOT NULL COMMENT 'value of the detail',
+  `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user',
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_extension_details__extension_id` FOREIGN KEY (`extension_id`)
+    REFERENCES `extension` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension_resource_map` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `extension_id` bigint(20) unsigned NOT NULL,
+  `resource_id` bigint(20) unsigned NOT NULL,
+  `resource_type` char(255) NOT NULL,
+  `created` datetime NOT NULL,
+  `removed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_extension_resource_map__extension_id` FOREIGN KEY (`extension_id`)
+      REFERENCES `cloud`.`extension`(`id`) ON DELETE CASCADE,
+  INDEX `idx_extension_resource` (`resource_id`, `resource_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension_resource_map_details` (
+  `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `extension_resource_map_id` bigint unsigned NOT NULL COMMENT 'mapping to which the detail is related',
+  `name` varchar(255) NOT NULL COMMENT 'name of the detail',
+  `value` varchar(255) NOT NULL COMMENT 'value of the detail',
+  `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user',
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_extension_resource_map_details__map_id` FOREIGN KEY (`extension_resource_map_id`)
+    REFERENCES `extension_resource_map` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension_custom_action` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `uuid` varchar(255) NOT NULL UNIQUE,
+  `name` varchar(255) NOT NULL,
+  `description` varchar(4096),
+  `extension_id` bigint(20) unsigned NOT NULL,
+  `resource_type` varchar(255),
+  `allowed_role_types` int unsigned NOT NULL DEFAULT '1',
+  `success_message` varchar(4096),
+  `error_message` varchar(4096),
+  `enabled` boolean DEFAULT true,
+  `timeout` int unsigned NOT NULL DEFAULT '5' COMMENT 'The timeout in seconds to wait for the action to complete before failing',
+  `created` datetime NOT NULL,
+  `removed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_extension_custom_action__extension_id` FOREIGN KEY (`extension_id`)
+    REFERENCES `cloud`.`extension`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`extension_custom_action_details` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `extension_custom_action_id` bigint(20) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `value` TEXT NOT NULL,
+  `display` tinyint(1) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_custom_action_details__action_id` FOREIGN KEY (`extension_custom_action_id`)
+    REFERENCES `cloud`.`extension_custom_action`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vm_template', 'extension_id', 'bigint unsigned DEFAULT NULL COMMENT "id of the extension"');
+
+-- Add built-in Extensions and Custom Actions
+
+DROP PROCEDURE IF EXISTS `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`;
+CREATE PROCEDURE `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`(
+    IN ext_name VARCHAR(255),
+    IN ext_desc VARCHAR(255),
+    IN ext_path VARCHAR(255)
+)
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1 FROM `cloud`.`extension` WHERE `name` = ext_name
+    ) THEN
+        INSERT INTO `cloud`.`extension` (
+            `uuid`, `name`, `description`, `type`,
+            `relative_path`, `path_ready`,
+            `is_user_defined`, `state`, `created`, `removed`
+        )
+        VALUES (
+            UUID(), ext_name, ext_desc, 'Orchestrator',
+            ext_path, 1, 0, 'Enabled', NOW(), NULL
+        )
+;   END IF
+;END;
+
+DROP PROCEDURE IF EXISTS `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`;
+CREATE PROCEDURE `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`(
+    IN ext_name VARCHAR(255),
+    IN detail_key VARCHAR(255),
+    IN detail_value TEXT,
+    IN display TINYINT(1)
+)
+BEGIN
+    DECLARE ext_id BIGINT
+;   SELECT `id` INTO ext_id FROM `cloud`.`extension` WHERE `name` = ext_name LIMIT 1
+;   IF NOT EXISTS (
+        SELECT 1 FROM `cloud`.`extension_details`
+        WHERE `extension_id` = ext_id AND `name` = detail_key
+    ) THEN
+        INSERT INTO `cloud`.`extension_details` (
+            `extension_id`, `name`, `value`, `display`
+        )
+        VALUES (
+            ext_id, detail_key, detail_value, display
+        )
+;   END IF
+;END;
+
+CALL `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`('Proxmox', 'Sample extension for Proxmox written in bash', 'Proxmox/proxmox.sh');
+CALL `cloud`.`INSERT_EXTENSION_DETAIL_IF_NOT_EXISTS`('Proxmox', 'orchestratorrequirespreparevm', 'true', 0);
+
+CALL `cloud`.`INSERT_EXTENSION_IF_NOT_EXISTS`('HyperV', 'Sample extension for HyperV written in python', 'HyperV/hyperv.py');
+
+DROP PROCEDURE IF EXISTS `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`;
+CREATE PROCEDURE `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`(
+    IN ext_name VARCHAR(255),
+    IN action_name VARCHAR(255),
+    IN action_desc VARCHAR(4096),
+    IN resource_type VARCHAR(255),
+    IN allowed_roles INT UNSIGNED,
+    IN success_msg VARCHAR(4096),
+    IN error_msg VARCHAR(4096),
+    IN timeout_seconds INT UNSIGNED
+)
+BEGIN
+    DECLARE ext_id BIGINT
+;   SELECT `id` INTO ext_id FROM `cloud`.`extension` WHERE `name` = ext_name LIMIT 1
+;   IF NOT EXISTS (
+        SELECT 1 FROM `cloud`.`extension_custom_action` WHERE `name` = action_name AND `extension_id` = ext_id
+    ) THEN
+        INSERT INTO `cloud`.`extension_custom_action` (
+            `uuid`, `name`, `description`, `extension_id`, `resource_type`,
+            `allowed_role_types`, `success_message`, `error_message`,
+            `enabled`, `timeout`, `created`, `removed`
+        )
+        VALUES (
+            UUID(), action_name, action_desc, ext_id, resource_type,
+            allowed_roles, success_msg, error_msg,
+            1, timeout_seconds, NOW(), NULL
+        )
+;   END IF
+;END;
+
+DROP PROCEDURE IF EXISTS `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`;
+CREATE PROCEDURE `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS` (
+    IN ext_name VARCHAR(255),
+    IN action_name VARCHAR(255),
+    IN param_json TEXT
+)
+BEGIN
+    DECLARE action_id BIGINT UNSIGNED
+;   SELECT `eca`.`id` INTO action_id FROM `cloud`.`extension_custom_action` `eca`
+    JOIN `cloud`.`extension` `e` ON `e`.`id` = `eca`.`extension_id`
+    WHERE `eca`.`name` = action_name AND `e`.`name` = ext_name LIMIT 1
+;   IF NOT EXISTS (
+        SELECT 1 FROM `cloud`.`extension_custom_action_details`
+        WHERE `extension_custom_action_id` = action_id
+          AND `name` = 'parameters'
+    ) THEN
+        INSERT INTO `cloud`.`extension_custom_action_details` (
+            `extension_custom_action_id`,
+            `name`,
+            `value`,
+            `display`
+        ) VALUES (
+            action_id,
+            'parameters',
+            param_json,
+            0
+        )
+;   END IF
+;END;
+
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('Proxmox', 'ListSnapshots', 'List Instance snapshots', 'VirtualMachine', 15, 'Snapshots fetched for {{resourceName}} in {{extensionName}}', 'List Snapshots failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('Proxmox', 'CreateSnapshot', 'Create an Instance snapshot', 'VirtualMachine', 15, 'Snapshot created for {{resourceName}} in {{extensionName}}', 'Snapshot creation failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('Proxmox', 'RestoreSnapshot', 'Restore Instance to the specific snapshot', 'VirtualMachine', 15, 'Successfully restored snapshot for {{resourceName}} in {{extensionName}}', 'Restore snapshot failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('Proxmox', 'DeleteSnapshot', 'Delete the specified snapshot', 'VirtualMachine', 15, 'Successfully deleted snapshot for {{resourceName}} in {{extensionName}}', 'Delete snapshot failed for {{resourceName}}', 60);
+
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'Proxmox',
+    'ListSnapshots',
+    '[]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'Proxmox',
+    'CreateSnapshot',
+    '[
+      {
+        "name": "snap_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      },
+      {
+        "name": "snap_description",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": false
+      },
+      {
+        "name": "snap_save_memory",
+        "type": "BOOLEAN",
+        "validationformat": "NONE",
+        "required": false
+      }
+    ]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'Proxmox',
+    'RestoreSnapshot',
+    '[
+      {
+        "name": "snap_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      }
+    ]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'Proxmox',
+    'DeleteSnapshot',
+    '[
+      {
+        "name": "snap_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      }
+    ]'
+);
+
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'ListSnapshots', 'List checkpoints/snapshots for the Instance', 'VirtualMachine', 15, 'Snapshots fetched for {{resourceName}} in {{extensionName}}', 'List Snapshots failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'CreateSnapshot', 'Create a checkpoint/snapshot for the Instance', 'VirtualMachine', 15, 'Snapshot created for {{resourceName}} in {{extensionName}}', 'Snapshot creation failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'RestoreSnapshot', 'Restore Instance to the specified snapshot', 'VirtualMachine', 15, 'Successfully restored snapshot for {{resourceName}} in {{extensionName}}', 'Restore snapshot failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'DeleteSnapshot', 'Delete the specified snapshot', 'VirtualMachine', 15, 'Successfully deleted snapshot for {{resourceName}} in {{extensionName}}', 'Delete snapshot failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'Suspend', 'Suspend the Instance by freezing its current state in RAM', 'VirtualMachine', 15, 'Successfully suspended {{resourceName}} in {{extensionName}}', 'Suspend failed for {{resourceName}}', 60);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_IF_NOT_EXISTS`('HyperV', 'Resume', 'Resumes a suspended Instance, restoring CPU execution from memory.', 'VirtualMachine', 15, 'Successfully resumed {{resourceName}} in {{extensionName}}', 'Resume failed for {{resourceName}}', 60);
+
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'ListSnapshots',
+    '[]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'CreateSnapshot',
+    '[
+      {
+        "name": "snapshot_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      }
+    ]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'RestoreSnapshot',
+    '[
+      {
+        "name": "snapshot_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      }
+    ]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'DeleteSnapshot',
+    '[
+      {
+        "name": "snapshot_name",
+        "type": "STRING",
+        "validationformat": "NONE",
+        "required": true
+      }
+    ]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'Suspend',
+    '[]'
+);
+CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
+    'HyperV',
+    'Resume',
+    '[]'
+);
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql
index 6bfcdaddbcc..76a8be16bda 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql
@@ -106,7 +106,10 @@ SELECT
     `user_data`.`uuid` AS `user_data_uuid`,
     `user_data`.`name` AS `user_data_name`,
     `user_data`.`params` AS `user_data_params`,
-    `vm_template`.`user_data_link_policy` AS `user_data_policy`
+    `vm_template`.`user_data_link_policy` AS `user_data_policy`,
+    `extension`.`id` AS `extension_id`,
+    `extension`.`uuid` AS `extension_uuid`,
+    `extension`.`name` AS `extension_name`
 FROM
     (((((((((((((`vm_template`
         JOIN `guest_os` ON ((`guest_os`.`id` = `vm_template`.`guest_os_id`)))
@@ -129,6 +132,7 @@ FROM
             OR (`template_zone_ref`.`zone_id` = `data_center`.`id`))))
         LEFT JOIN `launch_permission` ON ((`launch_permission`.`template_id` = `vm_template`.`id`)))
         LEFT JOIN `user_data` ON ((`user_data`.`id` = `vm_template`.`user_data_id`))
+        LEFT JOIN `extension` ON ((`extension`.`id` = `vm_template`.`extension_id`))
         LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` = `vm_template`.`id`)
         AND ((`resource_tags`.`resource_type` = 'Template')
             OR (`resource_tags`.`resource_type` = 'ISO')))));
diff --git a/engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java b/engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java
index 96f60547f50..7f151730c9c 100644
--- a/engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java
+++ b/engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
@@ -299,4 +300,20 @@ public class VMTemplateDaoImplTest {
         verify(searchBuilder, times(1)).join(eq("templateZoneSearch"), any(), any(), any(), eq(JoinBuilder.JoinType.INNER));
         verify(templateDao, times(1)).customSearch(searchCriteria, null);
     }
+
+    @Test
+    public void testListIdsByExtensionId_ReturnsIds() {
+        long extensionId = 42L;
+        List<Long> expectedIds = Arrays.asList(1L, 2L, 3L);
+        GenericSearchBuilder<VMTemplateVO, Long> searchBuilder = mock(GenericSearchBuilder.class);
+        SearchCriteria<Long> searchCriteria = mock(SearchCriteria.class);
+        when(templateDao.createSearchBuilder(Long.class)).thenReturn(searchBuilder);
+        when(searchBuilder.entity()).thenReturn(mock(VMTemplateVO.class));
+        when(searchBuilder.create()).thenReturn(searchCriteria);
+        doReturn(expectedIds).when(templateDao).customSearchIncludingRemoved(eq(searchCriteria), isNull());
+        List<Long> result = templateDao.listIdsByExtensionId(extensionId);
+        assertEquals(expectedIds, result);
+        verify(searchCriteria).setParameters("extensionId", extensionId);
+        verify(templateDao).customSearchIncludingRemoved(eq(searchCriteria), isNull());
+    }
 }
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index 38e0d0d081c..3092b00bac2 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -236,6 +236,7 @@ public class TemplateServiceImpl implements TemplateService {
         }
         /* Baremetal need not to download any template */
         availHypers.remove(HypervisorType.BareMetal);
+        availHypers.remove(HypervisorType.External);
         availHypers.add(HypervisorType.None); // bug 9809: resume ISO
         // download.
 
@@ -526,6 +527,7 @@ public class TemplateServiceImpl implements TemplateService {
                         }
                         /* Baremetal need not to download any template */
                         availHypers.remove(HypervisorType.BareMetal);
+                        availHypers.remove(HypervisorType.External);
                         availHypers.add(HypervisorType.None); // bug 9809: resume ISO
                         // download.
                         for (VMTemplateVO tmplt : toBeDownloaded) {
@@ -817,7 +819,7 @@ public class TemplateServiceImpl implements TemplateService {
         String templateName = dataDiskTemplate.isIso() ? dataDiskTemplate.getPath().substring(dataDiskTemplate.getPath().lastIndexOf(File.separator) + 1) : template.getName() + suffix + diskCount;
         VMTemplateVO templateVO = new VMTemplateVO(templateId, templateName, format, false, false, false, ttype, template.getUrl(),
                 template.requiresHvm(), template.getBits(), template.getAccountId(), null, templateName, false, guestOsId, false, template.getHypervisorType(), null,
-                null, false, false, false, false, template.getArch());
+                null, false, false, false, false, template.getArch(), template.getExtensionId());
         if (dataDiskTemplate.isIso()){
             templateVO.setUniqueName(templateName);
         }
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java
index 0dbe4fd7246..5cb500f5e6c 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -358,6 +358,11 @@ public class TemplateObject implements TemplateInfo {
         return imageVO.getArch();
     }
 
+    @Override
+    public Long getExtensionId() {
+        return imageVO.getExtensionId();
+    }
+
     @Override
     public DataTO getTO() {
         DataTO to = null;
diff --git a/extensions/HyperV/hyperv.py b/extensions/HyperV/hyperv.py
new file mode 100755
index 00000000000..83109ebb03a
--- /dev/null
+++ b/extensions/HyperV/hyperv.py
@@ -0,0 +1,302 @@
+#!/usr/bin/env python3
+# 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.
+
+import json
+import sys
+import winrm
+
+
+def fail(message):
+    print(json.dumps({"error": message}))
+    sys.exit(1)
+
+
+def succeed(data):
+    print(json.dumps(data))
+    sys.exit(0)
+
+
+class HyperVManager:
+    def __init__(self, config_path):
+        self.config_path = config_path
+        self.data = self.parse_json()
+        self.session = self.init_winrm_session()
+
+    def parse_json(self):
+        try:
+            with open(self.config_path, 'r') as f:
+                json_data = json.load(f)
+
+            external_host_details = json_data["externaldetails"].get("host", [])
+            data = {
+                "url": external_host_details["url"],
+                "username": external_host_details["username"],
+                "password": external_host_details["password"],
+                "network_switch": external_host_details["network_switch"],
+                "vhd_path": external_host_details["vhd_path"],
+                "vm_path": external_host_details["vm_path"],
+                "cert_validation": "validate" if external_host_details.get("verify_tls_certificate", "true").lower() == "true" else "ignore"
+            }
+
+            external_vm_details = json_data["externaldetails"].get("virtualmachine", [])
+            if external_vm_details:
+                data["template_type"] = external_vm_details["template_type"]
+                data["generation"] = external_vm_details.get("generation", 1)
+                data["template_path"] = external_vm_details.get("template_path", "")
+                data["iso_path"] = external_vm_details.get("iso_path", "")
+                data["vhd_size_gb"] = external_vm_details.get("vhd_size_gb", "")
+
+            data["cpus"] = json_data["cloudstack.vm.details"]["cpus"]
+            data["memory"] = json_data["cloudstack.vm.details"]["minRam"]
+            data["vmname"] = json_data["cloudstack.vm.details"]["name"]
+
+            nics = json_data["cloudstack.vm.details"].get("nics", [])
+            data["nics"] = []
+            for nic in nics:
+                data["nics"].append({
+                    "mac": nic["mac"],
+                    "vlan": nic["broadcastUri"].replace("vlan://", "")
+                })
+
+            parameters = json_data.get("parameters", [])
+            if parameters:
+                data["snapshot_name"] = parameters.get("snapshot_name", "")
+
+            return data
+
+        except KeyError as e:
+            fail(f"Missing required field in JSON: {str(e)}")
+        except Exception as e:
+            fail(f"Error parsing JSON: {str(e)}")
+
+    def init_winrm_session(self):
+        return winrm.Session(
+            f"https://{self.data['url']}:5986/wsman",
+            auth=(self.data["username"], self.data["password"]),
+            transport='ntlm',
+            server_cert_validation=self.data["cert_validation"]
+        )
+
+    def run_ps_int(self, command):
+        r = self.session.run_ps(command)
+        if r.status_code != 0:
+            raise Exception(r.std_err.decode())
+        return r.std_out.decode()
+
+    def run_ps(self, command):
+        try:
+            output = self.run_ps_int(command)
+            return output
+        except Exception as e:
+            fail(str(e))
+
+    def vm_not_present(self, exception):
+        vm_not_present_str = f'Hyper-V was unable to find a virtual machine with name "{self.data["vmname"]}"'
+        return vm_not_present_str in str(exception)
+
+    def create(self):
+        vm_name = self.data["vmname"]
+        cpus = self.data["cpus"]
+        memory = self.data["memory"]
+        memory_mb = int(memory) / 1024 / 1024
+        template_path = self.data["template_path"]
+        vhd_path = self.data["vhd_path"] + "\\" + vm_name + ".vhdx"
+        vhd_size_gb = self.data["vhd_size_gb"]
+        generation = self.data["generation"]
+        iso_path = self.data["iso_path"]
+        network_switch = self.data["network_switch"]
+        vm_path = self.data["vm_path"]
+        template_type = self.data.get("template_type", "template")
+
+        vhd_created = False
+        vm_created = False
+        vm_started = False
+        try:
+            command = (
+                f'New-VM -Name "{vm_name}" -MemoryStartupBytes {memory_mb}MB '
+                f'-Generation {generation}  -Path "{vm_path}" '
+            )
+            if template_type == "iso":
+                if (iso_path == ""):
+                    fail("Missing required field in JSON: iso_path")
+                if (vhd_size_gb == ""):
+                    fail("Missing required field in JSON: vhd_size_gb")
+                command += (
+                    f'-NewVHDPath "{vhd_path}" -NewVHDSizeBytes {vhd_size_gb}GB; '
+                    f'Add-VMDvdDrive -VMName "{vm_name}" -Path "{iso_path}"; '
+                )
+            else:
+                if (template_path == ""):
+                    fail("Missing required field in JSON: template_path")
+                self.run_ps_int(f'Copy-Item "{template_path}" "{vhd_path}"')
+                vhd_created = True
+                command += f'-VHDPath "{vhd_path}"; '
+
+            self.run_ps_int(command)
+            vm_created = True
+
+            command = f'Remove-VMNetworkAdapter -VMName "{vm_name}" -Name "Network Adapter" -ErrorAction SilentlyContinue; '
+            self.run_ps_int(command)
+
+            command = f'Set-VMProcessor -VMName "{vm_name}" -Count "{cpus}"; '
+            if (generation == 2):
+                command += f'Set-VMFirmware -VMName "{vm_name}" -EnableSecureBoot Off; '
+
+            self.run_ps_int(command)
+
+            for idx, nic in enumerate(self.data["nics"]):
+                adapter_name = f"NIC{idx+1}"
+                self.run_ps_int(f'Add-VMNetworkAdapter -VMName "{vm_name}" -SwitchName "{network_switch}" -Name "{adapter_name}"')
+                self.run_ps_int(f'Set-VMNetworkAdapter -VMName "{vm_name}" -Name "{adapter_name}" -StaticMacAddress "{nic["mac"]}"')
+                self.run_ps_int(f'Set-VMNetworkAdapterVlan -VMName "{vm_name}" -VMNetworkAdapterName "{adapter_name}" -Access -VlanId "{nic["vlan"]}"')
+
+            self.run_ps_int(f'Start-VM -Name "{vm_name}"')
+            vm_started = True
+
+            succeed({"status": "success", "message": "Instance created"})
+
+        except Exception as e:
+            if vm_started:
+                self.run_ps_int(f'Stop-VM -Name "{vm_name}" -Force -TurnOff')
+            if vm_created:
+                self.run_ps_int(f'Remove-VM -Name "{vm_name}" -Force')
+            if vhd_created:
+                self.run_ps_int(f'Remove-Item -Path "{vhd_path}" -Force')
+            fail(str(e))
+
+    def start(self):
+        self.run_ps(f'Start-VM -Name "{self.data["vmname"]}"')
+        succeed({"status": "success", "message": "Instance started"})
+
+    def stop(self):
+        try:
+            self.run_ps_int(f'Stop-VM -Name "{self.data["vmname"]}" -Force')
+        except Exception as e:
+            if self.vm_not_present(e):
+                succeed({"status": "success", "message": "Instance stopped"})
+            else:
+                fail(str(e))
+        succeed({"status": "success", "message": "Instance stopped"})
+
+    def reboot(self):
+        self.run_ps(f'Restart-VM -Name "{self.data["vmname"]}" -Force')
+        succeed({"status": "success", "message": "Instance rebooted"})
+
+    def status(self):
+        command = f'(Get-VM -Name "{self.data["vmname"]}").State'
+        state = self.run_ps(command)
+        if state.lower() == "running":
+            power_state = "poweron"
+        elif state.lower() == "off":
+            power_state = "poweroff"
+        else:
+            power_state = "unknown"
+        succeed({"status": "success", "power_state": power_state})
+
+    def delete(self):
+        try:
+            self.run_ps_int(f'Remove-VM -Name "{self.data["vmname"]}" -Force')
+        except Exception as e:
+            if self.vm_not_present(e):
+                succeed({"status": "success", "message": "Instance deleted"})
+            else:
+                fail(str(e))
+        succeed({"status": "success", "message": "Instance deleted"})
+
+    def suspend(self):
+        self.run_ps(f'Suspend-VM -Name "{self.data["vmname"]}"')
+        succeed({"status": "success", "message": "Instance suspended"})
+
+    def resume(self):
+        self.run_ps(f'Resume-VM -Name "{self.data["vmname"]}"')
+        succeed({"status": "success", "message": "Instance resumed"})
+
+    def create_snapshot(self):
+        snapshot_name = self.data["snapshot_name"]
+        if snapshot_name == "":
+            fail("Missing required field in JSON: snapshot_name")
+        command = f'Checkpoint-VM -VMName "{self.data["vmname"]}" -SnapshotName "{snapshot_name}"'
+        self.run_ps(command)
+        succeed({"status": "success", "message": f"Snapshot '{snapshot_name}' created"})
+
+    def list_snapshots(self):
+        command = (
+            f'Get-VMSnapshot -VMName "{self.data["vmname"]}" '
+            '| Select-Object Name, @{Name="CreationTime";Expression={$_.CreationTime.ToString("s")}} '
+            '| ConvertTo-Json'
+        )
+        snapshots = json.loads(self.run_ps(command))
+        succeed({"status": "success", "printmessage": "true", "message": snapshots})
+
+    def restore_snapshot(self):
+        snapshot_name = self.data["snapshot_name"]
+        if snapshot_name == "":
+            fail("Missing required field in JSON: snapshot_name")
+        command = f'Restore-VMSnapshot -VMName "{self.data["vmname"]}" -Name "{snapshot_name}" -Confirm:$false'
+        self.run_ps(command)
+        succeed({"status": "success", "message": f"Snapshot '{snapshot_name}' restored"})
+
+    def delete_snapshot(self):
+        snapshot_name = self.data["snapshot_name"]
+        if snapshot_name == "":
+            fail("Missing required field in JSON: snapshot_name")
+        command = f'Remove-VMSnapshot -VMName "{self.data["vmname"]}" -Name "{snapshot_name}" -Confirm:$false'
+        self.run_ps(command)
+        succeed({"status": "success", "message": f"Snapshot '{snapshot_name}' deleted"})
+
+
+def main():
+    if len(sys.argv) < 3:
+        fail("Usage: script.py <operation> '<json-file-path>'")
+
+    operation = sys.argv[1].lower()
+    json_file_path = sys.argv[2]
+
+    try:
+        manager = HyperVManager(json_file_path)
+    except FileNotFoundError:
+        fail(f"JSON file not found: {json_file_path}")
+    except json.JSONDecodeError:
+        fail("Invalid JSON in file")
+
+    operations = {
+        "create": manager.create,
+        "start": manager.start,
+        "stop": manager.stop,
+        "reboot": manager.reboot,
+        "delete": manager.delete,
+        "status": manager.status,
+        "suspend": manager.suspend,
+        "resume": manager.resume,
+        "listsnapshots": manager.list_snapshots,
+        "createsnapshot": manager.create_snapshot,
+        "restoresnapshot": manager.restore_snapshot,
+        "deletesnapshot": manager.delete_snapshot
+    }
+
+    if operation not in operations:
+        fail("Invalid action")
+
+    try:
+        operations[operation]()
+    except Exception as e:
+        fail(str(e))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/extensions/Proxmox/proxmox.sh b/extensions/Proxmox/proxmox.sh
new file mode 100755
index 00000000000..dbfdae1b972
--- /dev/null
+++ b/extensions/Proxmox/proxmox.sh
@@ -0,0 +1,413 @@
+#!/usr/bin/env bash
+# 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.
+
+parse_json() {
+    local json_string="$1"
+    echo "$json_string" | jq '.' > /dev/null || { echo '{"error":"Invalid JSON input"}'; exit 1; }
+
+    local -A details
+    while IFS="=" read -r key value; do
+        details[$key]="$value"
+    done < <(echo "$json_string" | jq -r '{
+        "extension_url":    (.externaldetails.extension.url // ""),
+        "extension_user":   (.externaldetails.extension.user // ""),
+        "extension_token":  (.externaldetails.extension.token // ""),
+        "extension_secret": (.externaldetails.extension.secret // ""),
+        "host_url":         (.externaldetails.host.url // ""),
+        "host_user":        (.externaldetails.host.user // ""),
+        "host_token":       (.externaldetails.host.token // ""),
+        "host_secret":      (.externaldetails.host.secret // ""),
+        "node":             (.externaldetails.host.node // ""),
+        "network_bridge":   (.externaldetails.host.network_bridge // ""),
+        "verify_tls_certificate": (.externaldetails.host.verify_tls_certificate // "true"),
+        "vm_name":          (.externaldetails.virtualmachine.vm_name // ""),
+        "template_id":      (.externaldetails.virtualmachine.template_id // ""),
+        "template_type":    (.externaldetails.virtualmachine.template_type // ""),
+        "iso_path":         (.externaldetails.virtualmachine.iso_path // ""),
+        "snap_name":        (.parameters.snap_name // ""),
+        "snap_description": (.parameters.snap_description // ""),
+        "snap_save_memory": (.parameters.snap_save_memory // ""),
+        "vmid":             (."cloudstack.vm.details".details.proxmox_vmid // ""),
+        "vm_internal_name": (."cloudstack.vm.details".name // ""),
+        "vmmemory":         (."cloudstack.vm.details".minRam // ""),
+        "vmcpus":           (."cloudstack.vm.details".cpus // ""),
+        "vlans":            ([."cloudstack.vm.details".nics[]?.broadcastUri // "" | sub("vlan://"; "")] | join(",")),
+        "mac_addresses":    ([."cloudstack.vm.details".nics[]?.mac // ""] | join(","))
+    } | to_entries | .[] | "\(.key)=\(.value)"')
+
+    for key in "${!details[@]}"; do
+        declare -g "$key=${details[$key]}"
+    done
+
+    # set url, user, token, secret to host values if present, otherwise use extension values
+    url="${host_url:-$extension_url}"
+    user="${host_user:-$extension_user}"
+    token="${host_token:-$extension_token}"
+    secret="${host_secret:-$extension_secret}"
+
+    check_required_fields vm_internal_name url user token secret node
+}
+
+urlencode() {
+    encoded_data=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''$1'''))")
+    echo "$encoded_data"
+}
+
+check_required_fields() {
+    local missing=()
+    for varname in "$@"; do
+        local value="${!varname}"
+        if [[ -z "$value" ]]; then
+            missing+=("$varname")
+        fi
+    done
+
+    if [[ ${#missing[@]} -gt 0 ]]; then
+        echo "{\"error\":\"Missing required fields: ${missing[*]}\"}"
+        exit 1
+    fi
+}
+
+validate_name() {
+    local entity="$1"
+    local name="$2"
+    if [[ ! "$name" =~ ^[a-zA-Z0-9-]+$ ]]; then
+        echo "{\"error\":\"Invalid $entity name '$name'. Only alphanumeric characters and dashes (-) are allowed.\"}"
+        exit 1
+    fi
+}
+
+call_proxmox_api() {
+    local method=$1
+    local path=$2
+    local data=$3
+
+    curl_opts=(
+      -s
+      --fail
+      -X "$method"
+      -H "Authorization: PVEAPIToken=${user}!${token}=${secret}"
+    )
+
+    if [[ "$verify_tls_certificate" == "false" ]]; then
+      curl_opts+=(-k)
+    fi
+
+    if [[ -n "$data" ]]; then
+      curl_opts+=(-d "$data")
+    fi
+
+    #echo curl "${curl_opts[@]}" "https://${url}:8006/api2/json${path}" >&2
+    response=$(curl "${curl_opts[@]}" "https://${url}:8006/api2/json${path}")
+    echo "$response"
+}
+
+wait_for_proxmox_task() {
+    local upid="$1"
+    local timeout="${2:-$wait_time}"
+    local interval="${3:-1}"
+
+    local start_time
+    start_time=$(date +%s)
+
+    while true; do
+        local now
+        now=$(date +%s)
+        if (( now - start_time > timeout )); then
+            echo '{"error":"Timeout while waiting for async task"}'
+            exit 1
+        fi
+
+        local status_response
+        status_response=$(call_proxmox_api GET "/nodes/${node}/tasks/$(urlencode "$upid")/status")
+
+        if [[ -z "$status_response" || "$status_response" == *'"errors":'* ]]; then
+            local msg
+            msg=$(echo "$status_response" | jq -r '.message // "Unknown error"')
+            echo "{\"error\":\"$msg\"}"
+            exit 1
+        fi
+
+        local task_status
+        task_status=$(echo "$status_response" | jq -r '.data.status')
+
+        if [[ "$task_status" == "stopped" ]]; then
+            local exit_status
+            exit_status=$(echo "$status_response" | jq -r '.data.exitstatus')
+            if [[ "$exit_status" != "OK" ]]; then
+                echo "{\"error\":\"Task failed with exit status: $exit_status\"}"
+                exit 1
+            fi
+            return 0
+        fi
+
+        sleep "$interval"
+    done
+}
+
+execute_and_wait() {
+    local method="$1"
+    local path="$2"
+    local data="$3"
+    local response upid msg
+
+    response=$(call_proxmox_api "$method" "$path" "$data")
+    upid=$(echo "$response" | jq -r '.data // ""')
+
+    if [[ -z "$upid" ]]; then
+        msg=$(echo "$response" | jq -r '.message // "Unknown error"')
+        echo "{\"error\":\"Failed to execute API or retrieve UPID. Message: $msg\"}"
+        exit 1
+    fi
+
+    wait_for_proxmox_task "$upid"
+}
+
+vm_not_present() {
+    response=$(call_proxmox_api GET "/cluster/nextid?vmid=$vmid")
+    vmid_result=$(echo "$response" | jq -r '.data // empty')
+    if [[ "$vmid_result" == "$vmid" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+prepare() {
+    response=$(call_proxmox_api GET "/cluster/nextid")
+    vmid=$(echo "$response" | jq -r '.data // ""')
+
+    echo "{\"details\":{\"proxmox_vmid\": \"$vmid\"}}"
+}
+
+create() {
+    if [[ -z "$vm_name" ]]; then
+        vm_name="$vm_internal_name"
+    fi
+    validate_name "VM" "$vm_name"
+    check_required_fields vmid network_bridge vmcpus vmmemory
+
+    if [[ "${template_type^^}" == "ISO" ]]; then
+        check_required_fields iso_path
+        local data="vmid=$vmid"
+        data+="&name=$vm_name"
+        data+="&ide2=$(urlencode "$iso_path,media=cdrom")"
+        data+="&ostype=l26"
+        data+="&scsihw=virtio-scsi-single"
+        data+="&scsi0=$(urlencode "local-lvm:64,iothread=on")"
+        data+="&sockets=1"
+        data+="&cores=$vmcpus"
+        data+="&numa=0"
+        data+="&cpu=x86-64-v2-AES"
+        data+="&memory=$((vmmemory / 1024 / 1024))"
+
+        execute_and_wait POST "/nodes/${node}/qemu/" "$data"
+        cleanup_vm=1
+
+    else
+        check_required_fields template_id
+        local data="newid=$vmid"
+        data+="&name=$vm_name"
+        execute_and_wait POST "/nodes/${node}/qemu/${template_id}/clone" "$data"
+        cleanup_vm=1
+
+        data="cores=$vmcpus"
+        data+="&memory=$((vmmemory / 1024 / 1024))"
+        execute_and_wait POST "/nodes/${node}/qemu/${vmid}/config" "$data"
+    fi
+
+    IFS=',' read -ra vlan_array <<< "$vlans"
+    IFS=',' read -ra mac_array <<< "$mac_addresses"
+    for i in "${!vlan_array[@]}"; do
+        network="net${i}=$(urlencode "virtio=${mac_array[i]},bridge=${network_bridge},tag=${vlan_array[i]},firewall=0")"
+        call_proxmox_api PUT "/nodes/${node}/qemu/${vmid}/config/" "$network" > /dev/null
+    done
+
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/status/start"
+
+    cleanup_vm=0
+    echo '{"status": "success", "message": "Instance created"}'
+}
+
+start() {
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/status/start"
+    echo '{"status": "success", "message": "Instance started"}'
+}
+
+delete() {
+    if vm_not_present; then
+        echo '{"status": "success", "message": "Instance deleted"}'
+        return 0
+    fi
+    execute_and_wait DELETE "/nodes/${node}/qemu/${vmid}"
+    echo '{"status": "success", "message": "Instance deleted"}'
+}
+
+stop() {
+    if vm_not_present; then
+        echo '{"status": "success", "message": "Instance stopped"}'
+        return 0
+    fi
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/status/stop"
+    echo '{"status": "success", "message": "Instance stopped"}'
+}
+
+reboot() {
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/status/reboot"
+    echo '{"status": "success", "message": "Instance rebooted"}'
+}
+
+status() {
+    local status_response vm_status powerstate
+    status_response=$(call_proxmox_api GET "/nodes/${node}/qemu/${vmid}/status/current")
+    vm_status=$(echo "$status_response" | jq -r '.data.status')
+    case "$vm_status" in
+        running)  powerstate="poweron"  ;;
+        stopped)  powerstate="poweroff" ;;
+        *)        powerstate="unknown"  ;;
+    esac
+
+    echo "{\"status\": \"success\", \"power_state\": \"$powerstate\"}"
+}
+
+list_snapshots() {
+    snapshot_response=$(call_proxmox_api GET "/nodes/${node}/qemu/${vmid}/snapshot")
+    echo "$snapshot_response" | jq '
+      def to_date:
+        if . == "-" then "-"
+        elif . == null then "-"
+        else (. | tonumber | strftime("%Y-%m-%d %H:%M:%S"))
+        end;
+
+      {
+        status: "success",
+        printmessage: "true",
+        message: [.data[] | {
+          name: .name,
+          snaptime: ((.snaptime // "-") | to_date),
+          description: .description,
+          parent: (.parent // "-"),
+          vmstate: (.vmstate // "-")
+        }]
+      }
+    '
+}
+
+create_snapshot() {
+    check_required_fields snap_name
+    validate_name "Snapshot" "$snap_name"
+
+    local data vmstate
+    data="snapname=$snap_name"
+    if [[ -n "$snap_description" ]]; then
+        data+="&description=$snap_description"
+    fi
+    if [[ -n "$snap_save_memory" && "$snap_save_memory" == "true" ]]; then
+        vmstate="1"
+    else
+        vmstate="0"
+    fi
+    data+="&vmstate=$vmstate"
+
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/snapshot" "$data"
+    echo '{"status": "success", "message": "Instance Snapshot created"}'
+}
+
+restore_snapshot() {
+    check_required_fields snap_name
+    validate_name "Snapshot" "$snap_name"
+
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/snapshot/${snap_name}/rollback"
+
+    execute_and_wait POST "/nodes/${node}/qemu/${vmid}/status/start"
+
+    echo '{"status": "success", "message": "Instance Snapshot restored"}'
+}
+
+delete_snapshot() {
+    check_required_fields snap_name
+    validate_name "Snapshot" "$snap_name"
+
+    execute_and_wait DELETE "/nodes/${node}/qemu/${vmid}/snapshot/${snap_name}"
+    echo '{"status": "success", "message": "Instance Snapshot deleted"}'
+}
+
+action=$1
+parameters_file="$2"
+wait_time=$3
+
+if [[ -z "$action" || -z "$parameters_file" ]]; then
+    echo '{"error":"Missing required arguments"}'
+    exit 1
+fi
+
+# Read file content as parameters (assumes space-separated arguments)
+parameters=$(<"$parameters_file")
+
+parse_json "$parameters" || exit 1
+
+cleanup_vm=0
+cleanup() {
+  if (( cleanup_vm == 1 )); then
+    execute_and_wait DELETE "/nodes/${node}/qemu/${vmid}"
+  fi
+}
+
+trap cleanup EXIT
+
+case $action in
+    prepare)
+        prepare
+        ;;
+    create)
+        create
+        ;;
+    delete)
+        delete
+        ;;
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    reboot)
+        reboot
+        ;;
+    status)
+        status
+        ;;
+    ListSnapshots)
+        list_snapshots
+        ;;
+    CreateSnapshot)
+        create_snapshot
+        ;;
+    RestoreSnapshot)
+        restore_snapshot
+        ;;
+    DeleteSnapshot)
+        delete_snapshot
+        ;;
+    *)
+        echo '{"error":"Invalid action"}'
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/framework/extensions/pom.xml b/framework/extensions/pom.xml
new file mode 100644
index 00000000000..d3b8f81bc71
--- /dev/null
+++ b/framework/extensions/pom.xml
@@ -0,0 +1,54 @@
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cloud-framework-extensions</artifactId>
+    <name>Apache CloudStack Framework - Extensions</name>
+    <parent>
+        <groupId>org.apache.cloudstack</groupId>
+        <artifactId>cloudstack-framework</artifactId>
+        <version>4.21.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-engine-schema</artifactId>
+            <version>4.21.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-engine-components-api</artifactId>
+            <version>4.21.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
new file mode 100644
index 00000000000..dcea754430c
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
@@ -0,0 +1,175 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.user.Account;
+
+@APICommand(name = "addCustomAction",
+        description = "Add a custom action for an extension",
+        responseObject = ExtensionCustomActionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {ExtensionCustomAction.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class AddCustomActionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, required = true,
+            entityType = ExtensionResponse.class, description = "The ID of the extension to associate the action with")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the action")
+    private String name;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Description of the action")
+    private String description;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE,
+            type = CommandType.STRING,
+            description = "Resource type for which the action is available")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.ALLOWED_ROLE_TYPES,
+            type = CommandType.LIST,
+            collectionType = CommandType.STRING,
+            description = "List of role types allowed for the action")
+    private List<String> allowedRoleTypes;
+
+    @Parameter(name = ApiConstants.PARAMETERS, type = CommandType.MAP,
+            description = "Parameters mapping for the action using keys - name, type, required. " +
+                    "'name' is mandatory. If 'type' is not specified then STRING will be used. " +
+                    "If 'required' is not specified then false will be used. "
+                    + "Example: parameters[0].name=xxx&parameters[0].type=BOOLEAN&parameters[0].required=true")
+    protected Map parameters;
+
+    @Parameter(name = ApiConstants.SUCCESS_MESSAGE, type = CommandType.STRING,
+            description = "Success message that will be used on successful execution of the action. " +
+                    "Name of the action, extension, resource can be used as - actionName, extensionName, resourceName. "
+                    + "Example: Successfully complete {{actionName}} for {{resourceName}} with {{extensionName}}")
+    protected String successMessage;
+
+    @Parameter(name = ApiConstants.ERROR_MESSAGE, type = CommandType.STRING,
+            description = "Error message that will be used on failure during execution of the action. " +
+                    "Name of the action, extension, resource can be used as - actionName, extensionName, resourceName. "
+                    + "Example: Failed to complete {{actionName}} for {{resourceName}} with {{extensionName}}")
+    protected String errorMessage;
+
+    @Parameter(name = ApiConstants.TIMEOUT,
+            type = CommandType.INTEGER,
+            description = "Specifies the timeout in seconds to wait for the action to complete before failing. Default value is 5 seconds")
+    private Integer timeout;
+
+    @Parameter(name = ApiConstants.ENABLED,
+            type = CommandType.BOOLEAN,
+            description = "Whether the action is enabled or not. Default is disabled.")
+    private Boolean enabled;
+
+    @Parameter(name = ApiConstants.DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format details[i].keyname=keyvalue. "
+                    + "Example: details[0].vendor=xxx&&details[0].version=2.0")
+    protected Map details;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public List<String> getAllowedRoleTypes() {
+        return allowedRoleTypes;
+    }
+
+    public Map getParametersMap() {
+        return parameters;
+    }
+
+    public String getSuccessMessage() {
+        return successMessage;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public boolean isEnabled() {
+        return Boolean.TRUE.equals(enabled);
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() {
+        ExtensionCustomAction extensionCustomAction = extensionsManager.addCustomAction(this);
+        ExtensionCustomActionResponse response = extensionsManager.createCustomActionResponse(extensionCustomAction);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.ExtensionCustomAction;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
new file mode 100644
index 00000000000..5ab54149645
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
@@ -0,0 +1,140 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "createExtension",
+        description = "Create an extension",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {Extension.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class CreateExtensionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true,
+            description = "Name of the extension")
+    private String name;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING,
+            description = "Description of the extension")
+    private String description;
+
+    @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, required = true,
+            description = "Type of the extension")
+    private String type;
+
+    @Parameter(name = ApiConstants.PATH, type = CommandType.STRING,
+            description = "Relative path for the extension")
+    private String path;
+
+    @Parameter(name = ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM,
+            type = CommandType.BOOLEAN,
+            description = "Only honored when type is Orchestrator. Whether prepare VM is needed or not")
+    private Boolean orchestratorRequiresPrepareVm;
+
+    @Parameter(name = ApiConstants.STATE, type = CommandType.STRING,
+            description = "State of the extension")
+    private String state;
+
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
+            description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
+    protected Map details;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Boolean isOrchestratorRequiresPrepareVm() {
+        return orchestratorRequiresPrepareVm;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+        Extension extension = extensionsManager.createExtension(this);
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension,
+                EnumSet.of(ApiConstants.ExtensionDetails.all));
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Extension;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmd.java
new file mode 100644
index 00000000000..6f2153ad6bc
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmd.java
@@ -0,0 +1,96 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "deleteCustomAction",
+        description = "Delete the custom action",
+        responseObject = SuccessResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {ExtensionCustomAction.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class DeleteCustomActionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+            entityType = ExtensionCustomActionResponse.class, description = "uuid of the custom action")
+    private Long id;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        boolean result = extensionsManager.deleteCustomAction(this);
+        if (result) {
+            SuccessResponse response = new SuccessResponse(getCommandName());
+            response.setSuccess(result);
+            setResponseObject(response);
+        } else {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete extension custom action");
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.ExtensionCustomAction;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmd.java
new file mode 100644
index 00000000000..cdae48fdb3a
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmd.java
@@ -0,0 +1,104 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "deleteExtension",
+        description = "Delete the extensions",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {Extension.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class DeleteExtensionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+            entityType = ExtensionResponse.class, description = "ID of the extension")
+    private Long id;
+
+    @Parameter(name = ApiConstants.CLEANUP, type = CommandType.BOOLEAN,
+            entityType = ExtensionResponse.class, description = "Whether cleanup entry-point files for the extension")
+    private Boolean cleanup;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public boolean isCleanup() {
+        return Boolean.TRUE.equals(cleanup);
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        boolean result = extensionsManager.deleteExtension(this);
+        if (result) {
+            SuccessResponse response = new SuccessResponse(getCommandName());
+            response.setSuccess(result);
+            setResponseObject(response);
+        } else {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete extension");
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Extension;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmd.java
new file mode 100644
index 00000000000..4f492bd20a6
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmd.java
@@ -0,0 +1,110 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+@APICommand(name = "listCustomActions",
+        description = "Lists the custom actions",
+        responseObject = ExtensionCustomActionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {ExtensionCustomAction.class},
+        authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User},
+        since = "4.21.0")
+public class ListCustomActionCmd extends BaseListCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+            entityType = ExtensionCustomActionResponse.class, description = "uuid of the custom action")
+    private Long id;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "Name of the custom action")
+    private String name;
+
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID,
+            entityType = ExtensionResponse.class, description = "uuid of the extension")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE,
+            type = CommandType.STRING,
+            description = "Type of the resource for actions")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID,
+            type = CommandType.STRING,
+            description = "ID of a resource for actions")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.ENABLED,
+            type = CommandType.BOOLEAN,
+            description = "List actions whether they are enabled or not")
+    private Boolean enabled;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public Boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public void execute() throws ServerApiException {
+        List<ExtensionCustomActionResponse> responses = extensionsManager.listCustomActions(this);
+        ListResponse<ExtensionCustomActionResponse> response = new ListResponse<>();
+        response.setResponses(responses, responses.size());
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmd.java
new file mode 100644
index 00000000000..4426f259380
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmd.java
@@ -0,0 +1,114 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.commons.collections.CollectionUtils;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+
+@APICommand(name = "listExtensions",
+        description = "Lists extensions",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {Extension.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class ListExtensionsCmd extends BaseListCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "Name of the extension")
+    private String name;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+            entityType = ExtensionResponse.class, description = "uuid of the extension")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.DETAILS,
+            type = CommandType.LIST,
+            collectionType = CommandType.STRING,
+            description = "comma separated list of extension details requested, "
+                    + "value can be a list of [all, resources, external, min]."
+                    + " When no parameters are passed, all the details are returned.")
+    private List<String> details;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public EnumSet<ApiConstants.ExtensionDetails> getDetails() throws InvalidParameterValueException {
+        if (CollectionUtils.isEmpty(details)) {
+            return EnumSet.of(ApiConstants.ExtensionDetails.all);
+        }
+        try {
+            Set<ApiConstants.ExtensionDetails> detailsSet = new HashSet<>();
+            for (String detail : details) {
+                detailsSet.add(ApiConstants.ExtensionDetails.valueOf(detail));
+            }
+            return EnumSet.copyOf(detailsSet);
+        } catch (IllegalArgumentException e) {
+            throw new InvalidParameterValueException("The details parameter contains a non permitted value." +
+                    "The allowed values are " + EnumSet.allOf(ApiConstants.ExtensionDetails.class));
+        }
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        List<ExtensionResponse> responses = extensionsManager.listExtensions(this);
+
+        ListResponse<ExtensionResponse> response = new ListResponse<>();
+        response.setResponses(responses, responses.size());
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
new file mode 100644
index 00000000000..e8f71d7ac8c
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
@@ -0,0 +1,118 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "registerExtension",
+        description = "Register an extension with a resource",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {Extension.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class RegisterExtensionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, required = true,
+            entityType = ExtensionResponse.class, description = "ID of the extension")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true,
+            description = "ID of the resource to register the extension with")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true,
+            description = "Type of the resource")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
+            description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
+    protected Map details;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        Extension extension = extensionsManager.registerExtensionWithResource(this);
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension,
+                EnumSet.of(ApiConstants.ExtensionDetails.all));
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Extension;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getExtensionId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmd.java
new file mode 100644
index 00000000000..dea09cf1683
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmd.java
@@ -0,0 +1,121 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.extension.CustomActionResultResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "runCustomAction",
+        description = "Run the custom action",
+        responseObject = CustomActionResultResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {ExtensionCustomAction.class},
+        authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User},
+        since = "4.21.0")
+public class RunCustomActionCmd extends BaseAsyncCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.CUSTOM_ACTION_ID, type = CommandType.UUID, required = true,
+            entityType = ExtensionCustomActionResponse.class, description = "ID of the custom action")
+    private Long customActionId;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING,
+            description = "Type of the resource")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true,
+            description = "ID of the instance")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.PARAMETERS, type = CommandType.MAP,
+            description = "Parameters in key/value pairs using format parameters[i].keyname=keyvalue. Example: parameters[0].endpoint.url=urlvalue")
+    protected Map parameters;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getCustomActionId() {
+        return customActionId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public Map<String, String> getParameters() {
+        return convertDetailsToMap(parameters);
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        CustomActionResultResponse response = extensionsManager.runCustomAction(this);
+        if (response != null) {
+            response.setResponseName(getCommandName());
+            setResponseObject(response);
+        } else {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to run custom action");
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_CUSTOM_ACTION;
+    }
+
+    @Override
+    public String getEventDescription() {
+        return "Running custom action";
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmd.java
new file mode 100644
index 00000000000..0edc7a247fd
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmd.java
@@ -0,0 +1,109 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.EnumSet;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.user.Account;
+
+@APICommand(name = "unregisterExtension",
+        description = "Unregister an extension with a resource",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        entityType = {Extension.class},
+        authorized = {RoleType.Admin},
+        since = "4.21.0")
+public class UnregisterExtensionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID, required = true,
+            entityType = ExtensionResponse.class, description = "ID of the extension")
+    private Long extensionId;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true,
+            description = "ID of the resource to register the extension with")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true,
+            description = "Type of the resource")
+    private String resourceType;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException, ConcurrentOperationException {
+        Extension extension = extensionsManager.unregisterExtensionWithResource(this);
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension,
+                EnumSet.of(ApiConstants.ExtensionDetails.all));
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Extension;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getExtensionId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
new file mode 100644
index 00000000000..bb03be00c5d
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
@@ -0,0 +1,197 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.user.Account;
+
+@APICommand(name = "updateCustomAction",
+        description = "Update the custom action",
+        responseObject = SuccessResponse.class,
+        responseHasSensitiveInfo = false, since = "4.21.0")
+public class UpdateCustomActionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    @Parameter(name = ApiConstants.ID,
+            type = CommandType.UUID,
+            required = true,
+            entityType = ExtensionCustomActionResponse.class,
+            description = "ID of the custom action")
+    private Long id;
+
+    @Parameter(name = ApiConstants.DESCRIPTION,
+            type = CommandType.STRING,
+            description = "The description of the command")
+    private String description;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE,
+            type = CommandType.STRING,
+            description = "Type of the resource for actions")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.ALLOWED_ROLE_TYPES,
+            type = CommandType.LIST,
+            collectionType = CommandType.STRING,
+            description = "List of role types allowed for the action")
+    private List<String> allowedRoleTypes;
+
+    @Parameter(name = ApiConstants.ENABLED,
+            type = CommandType.BOOLEAN,
+            description = "Whether the action is enabled or not")
+    private Boolean enabled;
+
+    @Parameter(name = ApiConstants.PARAMETERS, type = CommandType.MAP,
+            description = "Parameters mapping for the action using keys - name, type, required. " +
+                    "'name' is mandatory. If 'type' is not specified then STRING will be used. " +
+                    "If 'required' is not specified then false will be used. "
+                    + "Example: parameters[0].name=xxx&parameters[0].type=BOOLEAN&parameters[0].required=true")
+    protected Map parameters;
+
+    @Parameter(name = ApiConstants.CLEAN_UP_PARAMETERS,
+            type = CommandType.BOOLEAN,
+            description = "Optional boolean field, which indicates if parameters should be cleaned up or not " +
+                    "(If set to true, parameters will be removed for this action, parameters field ignored; " +
+                    "if false or not set, no action)")
+    private Boolean cleanupParameters;
+
+    @Parameter(name = ApiConstants.SUCCESS_MESSAGE, type = CommandType.STRING,
+            description = "Success message that will be used on successful execution of the action. " +
+                    "Name of the action and and extension can be used in the - actionName, extensionName. "
+                    + "Example: Successfully complete {{actionName}} for {{extensionName")
+    protected String successMessage;
+
+    @Parameter(name = ApiConstants.ERROR_MESSAGE, type = CommandType.STRING,
+            description = "Error message that will be used on failure during execution of the action. " +
+                    "Name of the action and and extension can be used in the - actionName, extensionName. "
+                    + "Example: Failed to complete {{actionName}} for {{extensionName")
+    protected String errorMessage;
+
+    @Parameter(name = ApiConstants.TIMEOUT,
+            type = CommandType.INTEGER,
+            description = "Specifies the timeout in seconds to wait for the action to complete before failing. Default value is 3 seconds")
+    private Integer timeout;
+
+    @Parameter(name = ApiConstants.DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs using format details[i].keyname=keyvalue. "
+                    + "Example: details[0].vendor=xxx&&details[0].version=2.0")
+    protected Map details;
+
+    @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
+            type = CommandType.BOOLEAN,
+            description = "Optional boolean field, which indicates if details should be cleaned up or not " +
+                    "(If set to true, details removed for this action, details field ignored; " +
+                    "if false or not set, no action)")
+    private Boolean cleanupDetails;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public long getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public List<String> getAllowedRoleTypes() {
+        return allowedRoleTypes;
+    }
+
+    public Map getParametersMap() {
+        return parameters;
+    }
+
+    public Boolean isCleanupParameters() {
+        return cleanupParameters;
+    }
+
+    public String getSuccessMessage() {
+        return successMessage;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public Boolean isEnabled() {
+        return enabled;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    public Boolean isCleanupDetails() {
+        return cleanupDetails;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException {
+        ExtensionCustomAction extensionCustomAction = extensionsManager.updateCustomAction(this);
+        ExtensionCustomActionResponse response = extensionsManager.createCustomActionResponse(extensionCustomAction);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.ExtensionCustomAction;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
new file mode 100644
index 00000000000..713e7550a1e
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
@@ -0,0 +1,136 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+
+import com.cloud.user.Account;
+
+@APICommand(name = "updateExtension",
+        description = "Update the extension",
+        responseObject = ExtensionResponse.class,
+        responseHasSensitiveInfo = false,
+        since = "4.21.0")
+public class UpdateExtensionCmd extends BaseCmd {
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+            entityType = ExtensionResponse.class,
+            required = true,
+            description = "The ID of the extension")
+    private Long id;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING,
+            description = "Description of the extension")
+    private String description;
+
+    @Parameter(name = ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM,
+            type = CommandType.BOOLEAN,
+            description = "Only honored when type is Orchestrator. Whether prepare VM is needed or not")
+    private Boolean orchestratorRequiresPrepareVm;
+
+    @Parameter(name = ApiConstants.STATE, type = CommandType.STRING,
+            description = "State of the extension")
+    private String state;
+
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
+            description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
+    protected Map details;
+
+    @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
+            type = CommandType.BOOLEAN,
+            description = "Optional boolean field, which indicates if details should be cleaned up or not " +
+                    "(If set to true, details removed for this action, details field ignored; " +
+                    "if false or not set, no action)")
+    private Boolean cleanupDetails;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Boolean isOrchestratorRequiresPrepareVm() {
+        return orchestratorRequiresPrepareVm;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    public Boolean isCleanupDetails() {
+        return cleanupDetails;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public void execute() throws ServerApiException {
+        Extension extension = extensionsManager.updateExtension(this);
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension,
+                EnumSet.of(ApiConstants.ExtensionDetails.all));
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.Extension;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/CleanupExtensionFilesCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/CleanupExtensionFilesCommand.java
new file mode 100644
index 00000000000..ba542d52e85
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/CleanupExtensionFilesCommand.java
@@ -0,0 +1,27 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+public class CleanupExtensionFilesCommand extends ExtensionServerActionBaseCommand {
+
+    public CleanupExtensionFilesCommand(long msId, Extension extension) {
+        super(msId, extension);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommand.java
new file mode 100644
index 00000000000..ead3c2e4012
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommand.java
@@ -0,0 +1,63 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+import com.cloud.agent.api.Command;
+
+public class ExtensionBaseCommand extends Command {
+    private final long extensionId;
+    private final String extensionName;
+    private final boolean extensionUserDefined;
+    private final String extensionRelativePath;
+    private final Extension.State extensionState;
+
+    protected ExtensionBaseCommand(Extension extension) {
+        this.extensionId = extension.getId();
+        this.extensionName = extension.getName();
+        this.extensionUserDefined = extension.isUserDefined();
+        this.extensionRelativePath = extension.getRelativePath();
+        this.extensionState = extension.getState();
+    }
+
+    public long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
+
+    public boolean isExtensionUserDefined() {
+        return extensionUserDefined;
+    }
+
+    public String getExtensionRelativePath() {
+        return extensionRelativePath;
+    }
+
+    public Extension.State getExtensionState() {
+        return extensionState;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionRoutingUpdateCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionRoutingUpdateCommand.java
new file mode 100644
index 00000000000..3e041112435
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionRoutingUpdateCommand.java
@@ -0,0 +1,34 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+public class ExtensionRoutingUpdateCommand extends ExtensionBaseCommand {
+
+    final boolean removed;
+
+    public ExtensionRoutingUpdateCommand(Extension extension, boolean removed) {
+        super(extension);
+        this.removed = removed;
+    }
+
+    public boolean isRemoved() {
+        return removed;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionServerActionBaseCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionServerActionBaseCommand.java
new file mode 100644
index 00000000000..870dc8e2b7e
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionServerActionBaseCommand.java
@@ -0,0 +1,33 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+public class ExtensionServerActionBaseCommand  extends ExtensionBaseCommand {
+    private final long msId;
+
+    protected ExtensionServerActionBaseCommand(long msId, Extension extension) {
+        super(extension);
+        this.msId = msId;
+    }
+
+    public long getMsId() {
+        return msId;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/GetExtensionPathChecksumCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/GetExtensionPathChecksumCommand.java
new file mode 100644
index 00000000000..13f503d67ba
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/GetExtensionPathChecksumCommand.java
@@ -0,0 +1,27 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+public class GetExtensionPathChecksumCommand extends ExtensionServerActionBaseCommand {
+
+    public GetExtensionPathChecksumCommand(long msId, Extension extension) {
+        super(msId, extension);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/PrepareExtensionPathCommand.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/PrepareExtensionPathCommand.java
new file mode 100644
index 00000000000..4c8b920b2f3
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/PrepareExtensionPathCommand.java
@@ -0,0 +1,27 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import org.apache.cloudstack.extension.Extension;
+
+public class PrepareExtensionPathCommand extends ExtensionServerActionBaseCommand {
+
+    public PrepareExtensionPathCommand(long msId, Extension extension) {
+        super(msId, extension);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDao.java
new file mode 100644
index 00000000000..6db0a02d976
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDao.java
@@ -0,0 +1,27 @@
+// 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.
+package org.apache.cloudstack.framework.extensions.dao;
+
+import java.util.List;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionVO;
+
+public interface ExtensionCustomActionDao extends GenericDao<ExtensionCustomActionVO, Long> {
+    ExtensionCustomActionVO findByNameAndExtensionId(long extensionId, String name);
+    List<Long> listIdsByExtensionId(long extensionId);
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImpl.java
new file mode 100644
index 00000000000..cd7731d2051
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImpl.java
@@ -0,0 +1,59 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import java.util.List;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionVO;
+
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
+public class ExtensionCustomActionDaoImpl extends GenericDaoBase<ExtensionCustomActionVO, Long> implements ExtensionCustomActionDao {
+
+    private final SearchBuilder<ExtensionCustomActionVO> AllFieldSearch;
+
+    public ExtensionCustomActionDaoImpl() {
+        AllFieldSearch = createSearchBuilder();
+        AllFieldSearch.and("name", AllFieldSearch.entity().getName(), SearchCriteria.Op.EQ);
+        AllFieldSearch.and("extensionId", AllFieldSearch.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        AllFieldSearch.done();
+    }
+
+    @Override
+    public ExtensionCustomActionVO findByNameAndExtensionId(long extensionId, String name) {
+        SearchCriteria<ExtensionCustomActionVO> sc = AllFieldSearch.create();
+        sc.setParameters("extensionId", extensionId);
+        sc.setParameters("name", name);
+
+        return findOneBy(sc);
+    }
+
+    @Override
+    public List<Long> listIdsByExtensionId(long extensionId) {
+        GenericSearchBuilder<ExtensionCustomActionVO, Long> sb = createSearchBuilder(Long.class);
+        sb.selectFields(sb.entity().getId());
+        sb.and("extensionId", sb.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        sb.done();
+        SearchCriteria<Long> sc = sb.create();
+        sc.setParameters("extensionId", extensionId);
+        return customSearch(sc, null);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDao.java
new file mode 100644
index 00000000000..a34eb0082d1
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDao.java
@@ -0,0 +1,26 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+
+public interface ExtensionCustomActionDetailsDao extends GenericDao<ExtensionCustomActionDetailsVO, Long>, ResourceDetailsDao<ExtensionCustomActionDetailsVO> {
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDaoImpl.java
new file mode 100644
index 00000000000..80add008341
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDaoImpl.java
@@ -0,0 +1,28 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
+public class ExtensionCustomActionDetailsDaoImpl extends ResourceDetailsDaoBase<ExtensionCustomActionDetailsVO> implements ExtensionCustomActionDetailsDao {
+    @Override
+    public void addDetail(long resourceId, String key, String value, boolean display) {
+        super.addDetail(new ExtensionCustomActionDetailsVO(resourceId, key, value, display));
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java
new file mode 100644
index 00000000000..3355457ed25
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java
@@ -0,0 +1,26 @@
+// 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.
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface ExtensionDao extends GenericDao<ExtensionVO, Long> {
+
+    ExtensionVO findByName(String name);
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java
new file mode 100644
index 00000000000..8e17199de6c
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java
@@ -0,0 +1,45 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
+public class ExtensionDaoImpl extends GenericDaoBase<ExtensionVO, Long> implements ExtensionDao {
+
+    private final SearchBuilder<ExtensionVO> AllFieldSearch;
+
+    public ExtensionDaoImpl() {
+        AllFieldSearch = createSearchBuilder();
+        AllFieldSearch.and("name", AllFieldSearch.entity().getName(), SearchCriteria.Op.EQ);
+        AllFieldSearch.and("type", AllFieldSearch.entity().getType(), SearchCriteria.Op.EQ);
+        AllFieldSearch.and("state", AllFieldSearch.entity().getState(), SearchCriteria.Op.EQ);
+        AllFieldSearch.done();
+    }
+
+    @Override
+    public ExtensionVO findByName(String name) {
+        SearchCriteria<ExtensionVO> sc = AllFieldSearch.create();
+        sc.setParameters("name", name);
+
+        return findOneBy(sc);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDao.java
new file mode 100644
index 00000000000..a23a4eb7442
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDao.java
@@ -0,0 +1,24 @@
+// 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.
+package org.apache.cloudstack.framework.extensions.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+
+public interface ExtensionDetailsDao extends GenericDao<ExtensionDetailsVO, Long>, ResourceDetailsDao<ExtensionDetailsVO> {
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDaoImpl.java
new file mode 100644
index 00000000000..1989db49c24
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDaoImpl.java
@@ -0,0 +1,28 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
+public class ExtensionDetailsDaoImpl extends ResourceDetailsDaoBase<ExtensionDetailsVO> implements ExtensionDetailsDao {
+    @Override
+    public void addDetail(long resourceId, String key, String value, boolean display) {
+        super.addDetail(new ExtensionDetailsVO(resourceId, key, value, display));
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDao.java
new file mode 100644
index 00000000000..930ef867553
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDao.java
@@ -0,0 +1,32 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+
+import java.util.List;
+
+public interface ExtensionResourceMapDao extends GenericDao<ExtensionResourceMapVO, Long> {
+    List<ExtensionResourceMapVO> listByExtensionId(long extensionId);
+
+    ExtensionResourceMapVO findByResourceIdAndType(long resourceId, ExtensionResourceMap.ResourceType resourceType);
+
+    List<Long> listResourceIdsByExtensionIdAndType(long extensionId,ExtensionResourceMap.ResourceType resourceType);
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImpl.java
new file mode 100644
index 00000000000..6f19ef8b8b6
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImpl.java
@@ -0,0 +1,70 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+
+import java.util.List;
+
+public class ExtensionResourceMapDaoImpl extends GenericDaoBase<ExtensionResourceMapVO, Long> implements ExtensionResourceMapDao {
+    private final SearchBuilder<ExtensionResourceMapVO> genericSearch;
+
+    public ExtensionResourceMapDaoImpl() {
+        super();
+
+        genericSearch = createSearchBuilder();
+        genericSearch.and("extensionId", genericSearch.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        genericSearch.and("resourceId", genericSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
+        genericSearch.and("resourceType", genericSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
+        genericSearch.done();
+    }
+
+    @Override
+    public List<ExtensionResourceMapVO> listByExtensionId(long extensionId) {
+        SearchCriteria<ExtensionResourceMapVO> sc = genericSearch.create();
+        sc.setParameters("extensionId", extensionId);
+        return listBy(sc);
+    }
+
+    @Override
+    public ExtensionResourceMapVO findByResourceIdAndType(long resourceId,
+              ExtensionResourceMap.ResourceType resourceType) {
+        SearchCriteria<ExtensionResourceMapVO> sc = genericSearch.create();
+        sc.setParameters("resourceId", resourceId);
+        sc.setParameters("resourceType", resourceType);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public List<Long> listResourceIdsByExtensionIdAndType(long extensionId, ExtensionResourceMap.ResourceType resourceType) {
+        GenericSearchBuilder<ExtensionResourceMapVO, Long> sb = createSearchBuilder(Long.class);
+        sb.selectFields(sb.entity().getResourceId());
+        sb.and("extensionId", sb.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        sb.and("resourceType", sb.entity().getResourceType(), SearchCriteria.Op.EQ);
+        sb.done();
+        SearchCriteria<Long> sc = sb.create();
+        sc.setParameters("extensionId", extensionId);
+        sc.setParameters("resourceType", resourceType);
+        return customSearch(sc, null);
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDao.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDao.java
new file mode 100644
index 00000000000..11d445b2242
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDao.java
@@ -0,0 +1,26 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+
+public interface ExtensionResourceMapDetailsDao extends GenericDao<ExtensionResourceMapDetailsVO, Long>, ResourceDetailsDao<ExtensionResourceMapDetailsVO> {
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDaoImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDaoImpl.java
new file mode 100644
index 00000000000..cff01495054
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDaoImpl.java
@@ -0,0 +1,28 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapDetailsVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
+public class ExtensionResourceMapDetailsDaoImpl extends ResourceDetailsDaoBase<ExtensionResourceMapDetailsVO> implements ExtensionResourceMapDetailsDao {
+    @Override
+    public void addDetail(long resourceId, String key, String value, boolean display) {
+        super.addDetail(new ExtensionResourceMapDetailsVO(resourceId, key, value, display));
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
new file mode 100644
index 00000000000..8b9ad96b3c4
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
@@ -0,0 +1,90 @@
+//
+// 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.
+//
+
+package org.apache.cloudstack.framework.extensions.manager;
+
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.CustomActionResultResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.extensions.api.AddCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.CreateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListExtensionsCmd;
+import org.apache.cloudstack.framework.extensions.api.RegisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.RunCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UnregisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.command.ExtensionServerActionBaseCommand;
+
+import com.cloud.host.Host;
+import com.cloud.org.Cluster;
+import com.cloud.utils.component.Manager;
+
+public interface ExtensionsManager extends Manager {
+
+    String getExtensionsPath();
+
+    Extension createExtension(CreateExtensionCmd cmd);
+
+    boolean prepareExtensionPathAcrossServers(Extension extension);
+
+    List<ExtensionResponse> listExtensions(ListExtensionsCmd cmd);
+
+    boolean deleteExtension(DeleteExtensionCmd cmd);
+
+    Extension unregisterExtensionWithResource(UnregisterExtensionCmd cmd);
+
+    Extension updateExtension(UpdateExtensionCmd cmd);
+
+    Extension registerExtensionWithResource(RegisterExtensionCmd cmd);
+
+    ExtensionResponse createExtensionResponse(Extension extension, EnumSet<ApiConstants.ExtensionDetails> viewDetails);
+
+    ExtensionResourceMap registerExtensionWithCluster(Cluster cluster, Extension extension, Map<String, String> externalDetails);
+
+    void unregisterExtensionWithCluster(Cluster cluster, Long extensionId);
+
+    CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd);
+
+    ExtensionCustomAction addCustomAction(AddCustomActionCmd cmd);
+
+    boolean deleteCustomAction(DeleteCustomActionCmd cmd);
+
+    List<ExtensionCustomActionResponse> listCustomActions(ListCustomActionCmd cmd);
+
+    ExtensionCustomAction updateCustomAction(UpdateCustomActionCmd cmd);
+
+    ExtensionCustomActionResponse createCustomActionResponse(ExtensionCustomAction customAction);
+
+    Map<String, Map<String, String>> getExternalAccessDetails(Host host, Map<String, String> vmDetails);
+
+    String handleExtensionServerCommands(ExtensionServerActionBaseCommand cmd);
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
new file mode 100644
index 00000000000..3087f184dde
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
@@ -0,0 +1,1593 @@
+//
+// 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.
+//
+
+package org.apache.cloudstack.framework.extensions.manager;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.acl.Role;
+import org.apache.cloudstack.acl.RoleService;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.response.ExtensionCustomActionParameterResponse;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ExtensionResourceResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.extension.CustomActionResultResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.extension.ExtensionHelper;
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.extensions.api.AddCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.CreateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListExtensionsCmd;
+import org.apache.cloudstack.framework.extensions.api.RegisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.RunCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UnregisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.command.CleanupExtensionFilesCommand;
+import org.apache.cloudstack.framework.extensions.command.ExtensionRoutingUpdateCommand;
+import org.apache.cloudstack.framework.extensions.command.ExtensionServerActionBaseCommand;
+import org.apache.cloudstack.framework.extensions.command.GetExtensionPathChecksumCommand;
+import org.apache.cloudstack.framework.extensions.command.PrepareExtensionPathCommand;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDetailsDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDetailsDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDetailsDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionDetailsVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionDetailsVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapDetailsVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.management.ManagementServerHost;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.agent.api.RunCustomActionCommand;
+import com.cloud.alert.AlertManager;
+import com.cloud.cluster.ClusterManager;
+import com.cloud.cluster.ManagementServerHostVO;
+import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
+import com.cloud.hypervisor.ExternalProvisioner;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.org.Cluster;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.user.Account;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.concurrency.NamedThreadFactory;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallbackWithException;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.VMInstanceDao;
+
+public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsManager, ExtensionHelper, PluggableService, Configurable {
+
+    ConfigKey<Integer> PathStateCheckInterval = new ConfigKey<>("Advanced", Integer.class,
+            "extension.path.state.check.interval", "300",
+            "Interval (in seconds) for checking entry-point state of extensions",
+            false, ConfigKey.Scope.Global);
+
+    @Inject
+    ExtensionDao extensionDao;
+
+    @Inject
+    ExtensionDetailsDao extensionDetailsDao;
+
+    @Inject
+    ExtensionResourceMapDao extensionResourceMapDao;
+
+    @Inject
+    ExtensionResourceMapDetailsDao extensionResourceMapDetailsDao;
+
+    @Inject
+    ClusterDao clusterDao;
+
+    @Inject
+    AgentManager agentMgr;
+
+    @Inject
+    HostDao hostDao;
+
+    @Inject
+    HostDetailsDao hostDetailsDao;
+
+    @Inject
+    ExternalProvisioner externalProvisioner;
+
+    @Inject
+    ExtensionCustomActionDao extensionCustomActionDao;
+
+    @Inject
+    ExtensionCustomActionDetailsDao extensionCustomActionDetailsDao;
+
+    @Inject
+    VMInstanceDao vmInstanceDao;
+
+    @Inject
+    VirtualMachineManager virtualMachineManager;
+
+    @Inject
+    EntityManager entityManager;
+
+    @Inject
+    ManagementServerHostDao managementServerHostDao;
+
+    @Inject
+    ClusterManager clusterManager;
+
+    @Inject
+    AlertManager alertManager;
+
+    @Inject
+    VMTemplateDao templateDao;
+
+    @Inject
+    RoleService roleService;
+
+    private ScheduledExecutorService extensionPathStateCheckExecutor;
+
+    protected String getDefaultExtensionRelativePath(String name) {
+        String safeName = Extension.getDirectoryName(name);
+        return String.format("%s%s%s.sh", safeName, File.separator, safeName);
+    }
+
+    protected String getValidatedExtensionRelativePath(String name, String relativePathPath) {
+        String safeName = Extension.getDirectoryName(name);
+        String normalizedPath = relativePathPath.replace("\\", "/");
+        if (normalizedPath.startsWith("/")) {
+            normalizedPath = normalizedPath.substring(1);
+        }
+        if (normalizedPath.equals(safeName)) {
+            normalizedPath = safeName + "/" + safeName;
+        } else if (!normalizedPath.startsWith(safeName + "/")) {
+            normalizedPath = safeName + "/" + normalizedPath;
+        }
+        Path pathObj = Paths.get(normalizedPath);
+        int subDirCount = pathObj.getNameCount() - 1;
+        if (subDirCount > 2) {
+            throw new InvalidParameterException("Entry point path cannot be nested more than two sub-directories deep");
+        }
+        return normalizedPath;
+    }
+
+    protected Pair<Boolean, String> getResultFromAnswersString(String answersStr, Extension extension,
+                   ManagementServerHostVO msHost, String op) {
+        Answer[] answers = null;
+        try {
+            answers = GsonHelper.getGson().fromJson(answersStr, Answer[].class);
+        } catch (Exception e) {
+            logger.error("Failed to parse answer JSON during {} for {} on {}: {}",
+                    op, extension, msHost, e.getMessage(), e);
+            return new Pair<>(false, e.getMessage());
+        }
+        Answer answer = answers != null && answers.length > 0 ? answers[0] : null;
+        boolean result = false;
+        String details = "Unknown error";
+        if (answer != null) {
+            result = answer.getResult();
+            details = answer.getDetails();
+        }
+        if (!result) {
+            logger.error("Failed to {} for {} on {} due to {}", op, extension, msHost, details);
+            return new Pair<>(false, details);
+        }
+        return new Pair<>(true, details);
+    }
+
+    protected boolean prepareExtensionPathOnMSPeer(Extension extension, ManagementServerHostVO msHost) {
+        final String msPeer = Long.toString(msHost.getMsid());
+        logger.debug("Sending prepare extension entry-point for {} command to MS: {}", extension, msPeer);
+        final Command[] commands = new Command[1];
+        commands[0] = new PrepareExtensionPathCommand(ManagementServerNode.getManagementServerId(), extension);
+        String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(commands), true);
+        return getResultFromAnswersString(answersStr, extension, msHost, "prepare entry-point").first();
+    }
+
+    protected Pair<Boolean, String> prepareExtensionPathOnCurrentServer(String name, boolean userDefined,
+                                                                              String relativePath) {
+        try {
+            externalProvisioner.prepareExtensionPath(name, userDefined, relativePath);
+        } catch (CloudRuntimeException e) {
+            logger.error("Failed to prepare entry-point for Extension [name: {}, userDefined: {}, relativePath: {}] on this server",
+                    name, userDefined, relativePath, e);
+            return new Pair<>(false, e.getMessage());
+        }
+        return new Pair<>(true, null);
+    }
+
+    protected boolean cleanupExtensionFilesOnMSPeer(Extension extension, ManagementServerHostVO msHost) {
+        final String msPeer = Long.toString(msHost.getMsid());
+        logger.debug("Sending cleanup extension entry-point for {} command to MS: {}", extension, msPeer);
+        final Command[] commands = new Command[1];
+        commands[0] = new CleanupExtensionFilesCommand(ManagementServerNode.getManagementServerId(), extension);
+        String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(commands), true);
+        return getResultFromAnswersString(answersStr, extension, msHost, "cleanup entry-point").first();
+    }
+
+    protected Pair<Boolean, String> cleanupExtensionFilesOnCurrentServer(String name, String relativePath) {
+        try {
+            externalProvisioner.cleanupExtensionPath(name, relativePath);
+            externalProvisioner.cleanupExtensionData(name, 0, true);
+        } catch (CloudRuntimeException e) {
+            logger.error("Failed to cleanup entry-point files for Extension [name: {}, relativePath: {}] on this server",
+                    name, relativePath, e);
+            return new Pair<>(false, e.getMessage());
+        }
+        return new Pair<>(true, null);
+    }
+
+    protected void cleanupExtensionFilesAcrossServers(Extension extension) {
+        boolean cleanup = true;
+        List<ManagementServerHostVO> msHosts = managementServerHostDao.listBy(ManagementServerHost.State.Up);
+        for (ManagementServerHostVO msHost : msHosts) {
+            if (msHost.getMsid() == ManagementServerNode.getManagementServerId()) {
+                cleanup = cleanup && cleanupExtensionFilesOnCurrentServer(extension.getName(),
+                        extension.getRelativePath()).first();
+                continue;
+            }
+            cleanup = cleanup && cleanupExtensionFilesOnMSPeer(extension, msHost);
+        }
+        if (!cleanup) {
+            throw new CloudRuntimeException("Extension is deleted but its entry-point files are not cleaned up across servers");
+        }
+    }
+
+    protected Pair<Boolean, String> getChecksumForExtensionPathOnMSPeer(Extension extension, ManagementServerHostVO msHost) {
+        final String msPeer = Long.toString(msHost.getMsid());
+        logger.debug("Retrieving checksum for {} from MS: {}", extension, msPeer);
+        final Command[] cmds = new Command[1];
+        cmds[0] = new GetExtensionPathChecksumCommand(ManagementServerNode.getManagementServerId(),
+                extension);
+        String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(cmds), true);
+        return getResultFromAnswersString(answersStr, extension, msHost, "prepare entry-point");
+    }
+
+    protected List<ExtensionCustomAction.Parameter> getParametersListFromMap(String actionName, Map parametersMap) {
+        if (MapUtils.isEmpty(parametersMap)) {
+            return Collections.emptyList();
+        }
+        List<ExtensionCustomAction.Parameter> parameters = new ArrayList<>();
+        for (Map<String, String> entry : (Collection<Map<String, String>>)parametersMap.values()) {
+            ExtensionCustomAction.Parameter parameter = ExtensionCustomAction.Parameter.fromMap(entry);
+            logger.debug("Adding {} for custom action [{}]", parameter, actionName);
+            parameters.add(parameter);
+        }
+        return parameters;
+    }
+
+    protected void unregisterExtensionWithCluster(String clusterUuid, Long extensionId) {
+        ClusterVO cluster = clusterDao.findByUuid(clusterUuid);
+        if (cluster == null) {
+            throw new InvalidParameterValueException("Unable to find cluster with given ID");
+        }
+        unregisterExtensionWithCluster(cluster, extensionId);
+    }
+
+    protected Extension getExtensionFromResource(ExtensionCustomAction.ResourceType resourceType, String resourceUuid) {
+        Object object = entityManager.findByUuid(resourceType.getAssociatedClass(), resourceUuid);
+        if (object == null) {
+            return null;
+        }
+        Long clusterId = null;
+        if (resourceType == ExtensionCustomAction.ResourceType.VirtualMachine) {
+            VirtualMachine vm = (VirtualMachine) object;
+            Pair<Long, Long> clusterHostId = virtualMachineManager.findClusterAndHostIdForVm(vm, false);
+            clusterId = clusterHostId.first();
+        }
+        if (clusterId == null) {
+            return null;
+        }
+        ExtensionResourceMapVO mapVO =
+                extensionResourceMapDao.findByResourceIdAndType(clusterId, ExtensionResourceMap.ResourceType.Cluster);
+        if (mapVO == null) {
+            return null;
+        }
+        return extensionDao.findById(mapVO.getExtensionId());
+    }
+
+    protected String getActionMessage(boolean success, ExtensionCustomAction action, Extension extension,
+                  ExtensionCustomAction.ResourceType resourceType, Object resource) {
+        String  msg = success ? action.getSuccessMessage() : action.getErrorMessage();
+        if (StringUtils.isBlank(msg)) {
+            return success ? String.format("Successfully completed %s", action.getName()) :
+                    String.format("Failed to complete %s", action.getName());
+        }
+        Map<String, String> values = new HashMap<>();
+        values.put("actionName", action.getName());
+        values.put("extensionName", extension.getName());
+        if (msg.contains("{{resourceName}}")) {
+            String resourceName = resourceType.name();
+            try {
+                Method getNameMethod = resource.getClass().getMethod("getName");
+                Object result = getNameMethod.invoke(resource);
+                if (result instanceof String) {
+                    resourceName = (String) result;
+                }
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                logger.trace("Failed to get name for given resource of type: {}", resourceType, e);
+            }
+            values.put("resourceName", resourceName);
+        }
+        String result = msg;
+        for (Map.Entry<String, String> entry : values.entrySet()) {
+            result = result.replace("{{" + entry.getKey() + "}}", entry.getValue());
+        }
+        return result;
+    }
+
+    protected Map<String, String> getFilteredExternalDetails(Map<String, String> details) {
+        if (MapUtils.isEmpty(details)) {
+            return new HashMap<>();
+        }
+        return details.entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith(VmDetailConstants.EXTERNAL_DETAIL_PREFIX))
+                .collect(Collectors.toMap(
+                        entry -> entry.getKey().substring(VmDetailConstants.EXTERNAL_DETAIL_PREFIX.length()),
+                        Map.Entry::getValue
+                ));
+    }
+
+    protected void sendExtensionPathNotReadyAlert(Extension extension) {
+        String msg = String.format("Path for %s not ready across management servers",
+                extension);
+        if (!Extension.State.Enabled.equals(extension.getState())) {
+            logger.warn(msg);
+            return;
+        }
+        alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_EXTENSION_PATH_NOT_READY, 0L, 0L, msg, msg);
+    }
+
+    protected void updateExtensionPathReady(Extension extension, boolean ready) {
+        if (!ready) {
+            sendExtensionPathNotReadyAlert(extension);
+        }
+        if (extension.isPathReady() == ready) {
+            return;
+        }
+        ExtensionVO extensionVO = extensionDao.createForUpdate(extension.getId());
+        extensionVO.setPathReady(ready);
+        extensionDao.update(extension.getId(), extensionVO);
+        updateAllExtensionHosts(extension, null, false);
+    }
+
+    protected void disableExtension(long extensionId) {
+        ExtensionVO extensionVO = extensionDao.createForUpdate(extensionId);
+        extensionVO.setState(Extension.State.Disabled);
+        extensionDao.update(extensionId, extensionVO);
+    }
+
+    protected void updateAllExtensionHosts(Extension extension, Long clusterId, boolean remove) {
+        List<Long> hostIds = new ArrayList<>();
+        List<Long> clusterIds = clusterId == null ?
+                extensionResourceMapDao.listResourceIdsByExtensionIdAndType(extension.getId(),
+                        ExtensionResourceMap.ResourceType.Cluster) :
+                Collections.singletonList(clusterId);
+        for (Long cId : clusterIds) {
+            hostIds.addAll(hostDao.listIdsByClusterId(cId));
+        }
+        if (CollectionUtils.isEmpty(hostIds)) {
+            return;
+        }
+        ConcurrentHashMap<Long, Future<Void>> futures = new ConcurrentHashMap<>();
+        ExecutorService executorService = Executors.newFixedThreadPool(3, new NamedThreadFactory("ExtensionHostUpdateWorker"));
+        for (Long hostId : hostIds) {
+            futures.put(hostId, executorService.submit(() -> {
+                ExtensionRoutingUpdateCommand cmd = new ExtensionRoutingUpdateCommand(extension, remove);
+                agentMgr.send(hostId, cmd);
+                return null;
+            }));
+        }
+        for (Map.Entry<Long, Future<Void>> entry: futures.entrySet()) {
+            try {
+                entry.getValue().get();
+            } catch (InterruptedException | ExecutionException e) {
+                logger.error(String.format("Error during updating %s for host: %d due to : %s",
+                        extension, entry.getKey(), e.getMessage()), e);
+            }
+        }
+        executorService.shutdown();
+    }
+
+    protected Map<String, Map<String, String>> getExternalAccessDetails(Map<String, String> actionDetails, long hostId,
+                           ExtensionResourceMap resourceMap) {
+        Map<String, Map<String, String>> externalDetails = new HashMap<>();
+        if (MapUtils.isNotEmpty(actionDetails)) {
+            externalDetails.put(ApiConstants.ACTION, actionDetails);
+        }
+        Map<String, String> hostDetails = getFilteredExternalDetails(hostDetailsDao.findDetails(hostId));
+        if (MapUtils.isNotEmpty(hostDetails)) {
+            externalDetails.put(ApiConstants.HOST, hostDetails);
+        }
+        if (resourceMap == null) {
+            return externalDetails;
+        }
+        Map<String, String> resourceDetails = extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId(), true);
+        if (MapUtils.isNotEmpty(resourceDetails)) {
+            externalDetails.put(ApiConstants.RESOURCE_MAP, resourceDetails);
+        }
+        Map<String, String> extensionDetails = extensionDetailsDao.listDetailsKeyPairs(resourceMap.getExtensionId(), true);
+        if (MapUtils.isNotEmpty(extensionDetails)) {
+            externalDetails.put(ApiConstants.EXTENSION, extensionDetails);
+        }
+        return externalDetails;
+    }
+
+    protected void checkOrchestratorTemplates(Long extensionId) {
+        List<Long> extensionTemplateIds = templateDao.listIdsByExtensionId(extensionId);
+        if (CollectionUtils.isNotEmpty(extensionTemplateIds)) {
+            throw new CloudRuntimeException("Orchestrator extension has associated templates, remove them to delete the extension");
+        }
+    }
+
+    protected void checkExtensionPathState(Extension extension, List<ManagementServerHostVO> msHosts) {
+        String checksum = externalProvisioner.getChecksumForExtensionPath(extension.getName(),
+                extension.getRelativePath());
+        if (StringUtils.isBlank(checksum)) {
+            updateExtensionPathReady(extension, false);
+            return;
+        }
+        if (CollectionUtils.isEmpty(msHosts)) {
+            updateExtensionPathReady(extension, true);
+            return;
+        }
+        for (ManagementServerHostVO msHost : msHosts) {
+            final Pair<Boolean, String> msPeerChecksumResult = getChecksumForExtensionPathOnMSPeer(extension,
+                    msHost);
+            if (!msPeerChecksumResult.first() || !checksum.equals(msPeerChecksumResult.second())) {
+                logger.error("Entry-point checksum for {} is different [msid: {}, checksum: {}] and [msid: {}, checksum: {}]",
+                        extension, ManagementServerNode.getManagementServerId(), checksum, msHost.getMsid(),
+                        (msPeerChecksumResult.first() ? msPeerChecksumResult.second() : "unknown"));
+                updateExtensionPathReady(extension, false);
+                return;
+            }
+        }
+        updateExtensionPathReady(extension, true);
+    }
+
+    @Override
+    public String getExtensionsPath() {
+        return externalProvisioner.getExtensionsPath();
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_CREATE, eventDescription = "creating extension")
+    public Extension createExtension(CreateExtensionCmd cmd) {
+        final String name = cmd.getName();
+        final String description = cmd.getDescription();
+        final String typeStr = cmd.getType();
+        String relativePath = cmd.getPath();
+        final Boolean orchestratorRequiresPrepareVm = cmd.isOrchestratorRequiresPrepareVm();
+        final String stateStr = cmd.getState();
+        ExtensionVO extensionByName = extensionDao.findByName(name);
+        if (extensionByName != null) {
+            throw new CloudRuntimeException("Extension by name already exists");
+        }
+        final Extension.Type type = EnumUtils.getEnum(Extension.Type.class, typeStr);
+        if (type == null) {
+            throw new CloudRuntimeException(String.format("Invalid type specified - %s", typeStr));
+        }
+        if (StringUtils.isBlank(relativePath)) {
+            relativePath = getDefaultExtensionRelativePath(name);
+        } else {
+            relativePath = getValidatedExtensionRelativePath(name, relativePath);
+        }
+        Extension.State state = Extension.State.Enabled;
+        if (StringUtils.isNotEmpty(stateStr)) {
+            try {
+                state = Extension.State.valueOf(stateStr);
+            } catch (IllegalArgumentException iae) {
+                throw new InvalidParameterValueException("Invalid state specified");
+            }
+        }
+        if (orchestratorRequiresPrepareVm != null && !Extension.Type.Orchestrator.equals(type)) {
+            throw new InvalidParameterValueException(String.format("%s is applicable only with %s type",
+                    ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM, type.name()));
+        }
+        final String relativePathFinal = relativePath;
+        final Extension.State stateFinal = state;
+        ExtensionVO extensionVO = Transaction.execute((TransactionCallbackWithException<ExtensionVO, CloudRuntimeException>) status -> {
+            ExtensionVO extension = new ExtensionVO(name, description, type,
+                    relativePathFinal, stateFinal);
+            if (!Extension.State.Enabled.equals(stateFinal)) {
+                extension.setPathReady(false);
+            }
+            extension = extensionDao.persist(extension);
+
+            Map<String, String> details = cmd.getDetails();
+            List<ExtensionDetailsVO> detailsVOList = new ArrayList<>();
+            if (MapUtils.isNotEmpty(details)) {
+                for (Map.Entry<String, String> entry : details.entrySet()) {
+                    detailsVOList.add(new ExtensionDetailsVO(extension.getId(), entry.getKey(), entry.getValue()));
+                }
+            }
+            if (orchestratorRequiresPrepareVm != null) {
+                detailsVOList.add(new ExtensionDetailsVO(extension.getId(),
+                        ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM, String.valueOf(orchestratorRequiresPrepareVm),
+                        false));
+            }
+            if (CollectionUtils.isNotEmpty(detailsVOList)) {
+                extensionDetailsDao.saveDetails(detailsVOList);
+            }
+            CallContext.current().setEventResourceId(extension.getId());
+            return extension;
+        });
+        if (Extension.State.Enabled.equals(extensionVO.getState()) &&
+                !prepareExtensionPathAcrossServers(extensionVO)) {
+            disableExtension(extensionVO.getId());
+            throw new CloudRuntimeException(String.format(
+                    "Failed to enable extension: %s as it entry-point is not ready",
+                    extensionVO.getName()));
+        }
+        return extensionVO;
+    }
+
+    @Override
+    public boolean prepareExtensionPathAcrossServers(Extension extension) {
+        boolean prepared = true;
+        List<ManagementServerHostVO> msHosts = managementServerHostDao.listBy(ManagementServerHost.State.Up);
+        for (ManagementServerHostVO msHost : msHosts) {
+            if (msHost.getMsid() == ManagementServerNode.getManagementServerId()) {
+                prepared = prepared && prepareExtensionPathOnCurrentServer(extension.getName(), extension.isUserDefined(),
+                        extension.getRelativePath()).first();
+                continue;
+            }
+            prepared = prepared && prepareExtensionPathOnMSPeer(extension, msHost);
+        }
+        if (extension.isPathReady() != prepared) {
+            ExtensionVO updateExtension = extensionDao.createForUpdate(extension.getId());
+            updateExtension.setPathReady(prepared);
+            extensionDao.update(extension.getId(), updateExtension);
+        }
+        return prepared;
+    }
+
+    @Override
+    public List<ExtensionResponse> listExtensions(ListExtensionsCmd cmd) {
+        Long id = cmd.getExtensionId();
+        String name = cmd.getName();
+        String keyword = cmd.getKeyword();
+        final SearchBuilder<ExtensionVO> sb = extensionDao.createSearchBuilder();
+        final Filter searchFilter = new Filter(ExtensionVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
+
+        sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
+        sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        final SearchCriteria<ExtensionVO> sc = sb.create();
+
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+
+        if (name != null) {
+            sc.setParameters("name", name);
+        }
+
+        if (keyword != null) {
+            sc.setParameters("keyword",  "%" + keyword + "%");
+        }
+
+        final Pair<List<ExtensionVO>, Integer> result = extensionDao.searchAndCount(sc, searchFilter);
+        List<ExtensionResponse> responses = new ArrayList<>();
+        for (ExtensionVO extension : result.first()) {
+            ExtensionResponse response = createExtensionResponse(extension, cmd.getDetails());
+            responses.add(response);
+        }
+
+        return responses;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_UPDATE, eventDescription = "updating extension")
+    public Extension updateExtension(UpdateExtensionCmd cmd) {
+        final long id = cmd.getId();
+        final String description = cmd.getDescription();
+        final Boolean orchestratorRequiresPrepareVm = cmd.isOrchestratorRequiresPrepareVm();
+        final String stateStr = cmd.getState();
+        final Map<String, String> details = cmd.getDetails();
+        final Boolean cleanupDetails = cmd.isCleanupDetails();
+        final ExtensionVO extensionVO = extensionDao.findById(id);
+        if (extensionVO == null) {
+            throw new InvalidParameterValueException("Failed to find the extension");
+        }
+        boolean updateNeeded = false;
+        if (description != null && !description.equals(extensionVO.getDescription())) {
+            extensionVO.setDescription(description);
+            updateNeeded = true;
+        }
+        if (orchestratorRequiresPrepareVm != null && !Extension.Type.Orchestrator.equals(extensionVO.getType())) {
+            throw new InvalidParameterValueException(String.format("%s is applicable only with %s type",
+                    ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM, extensionVO.getType()));
+        }
+        if (StringUtils.isNotBlank(stateStr) && !stateStr.equalsIgnoreCase(extensionVO.getState().name())) {
+            try {
+                Extension.State state = Extension.State.valueOf(stateStr);
+                extensionVO.setState(state);
+                updateNeeded = true;
+            } catch (IllegalArgumentException iae) {
+                throw new InvalidParameterValueException("Invalid state specified");
+            }
+        }
+        final boolean updateNeededFinal = updateNeeded;
+        ExtensionVO result = Transaction.execute((TransactionCallbackWithException<ExtensionVO, CloudRuntimeException>) status -> {
+            if (updateNeededFinal && !extensionDao.update(id, extensionVO)) {
+                throw new CloudRuntimeException(String.format("Failed to updated the extension: %s",
+                        extensionVO.getName()));
+            }
+            updateExtensionsDetails(cleanupDetails, details, orchestratorRequiresPrepareVm, id);
+            return extensionVO;
+        });
+        if (StringUtils.isNotBlank(stateStr)) {
+            if (Extension.State.Enabled.equals(result.getState()) &&
+                !prepareExtensionPathAcrossServers(result)) {
+                disableExtension(result.getId());
+                throw new CloudRuntimeException(String.format(
+                        "Failed to enable extension: %s as it entry-point is not ready",
+                        extensionVO.getName()));
+            }
+            updateAllExtensionHosts(extensionVO, null, false);
+        }
+        return result;
+    }
+
+    protected void updateExtensionsDetails(Boolean cleanupDetails, Map<String, String> details, Boolean orchestratorRequiresPrepareVm, long id) {
+        final boolean needToUpdateAllDetails = Boolean.TRUE.equals(cleanupDetails) || MapUtils.isNotEmpty(details);
+        if (!needToUpdateAllDetails && orchestratorRequiresPrepareVm == null) {
+            return;
+        }
+        if (needToUpdateAllDetails) {
+            Map<String, String> hiddenDetails =
+                    extensionDetailsDao.listDetailsKeyPairs(id, false);
+            List<ExtensionDetailsVO> detailsVOList = new ArrayList<>();
+            if (orchestratorRequiresPrepareVm != null) {
+                hiddenDetails.put(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM,
+                        String.valueOf(orchestratorRequiresPrepareVm));
+            }
+            if (MapUtils.isNotEmpty(hiddenDetails)) {
+                hiddenDetails.forEach((key, value) -> detailsVOList.add(
+                        new ExtensionDetailsVO(id, key, value, false)));
+            }
+            if (!Boolean.TRUE.equals(cleanupDetails) && MapUtils.isNotEmpty(details)) {
+                details.forEach((key, value) -> detailsVOList.add(
+                        new ExtensionDetailsVO(id, key, value)));
+            }
+            if (CollectionUtils.isNotEmpty(detailsVOList)) {
+                extensionDetailsDao.saveDetails(detailsVOList);
+            } else if (Boolean.TRUE.equals(cleanupDetails)) {
+                extensionDetailsDao.removeDetails(id);
+            }
+        } else {
+            ExtensionDetailsVO detailsVO = extensionDetailsDao.findDetail(id,
+                    ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM);
+            if (detailsVO == null) {
+                extensionDetailsDao.persist(new ExtensionDetailsVO(id,
+                        ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM,
+                        String.valueOf(orchestratorRequiresPrepareVm), false));
+            } else if (Boolean.parseBoolean(detailsVO.getValue()) != orchestratorRequiresPrepareVm) {
+                detailsVO.setValue(String.valueOf(orchestratorRequiresPrepareVm));
+                extensionDetailsDao.update(detailsVO.getId(), detailsVO);
+            }
+        }
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_DELETE, eventDescription = "deleting extension")
+    public boolean deleteExtension(DeleteExtensionCmd cmd) {
+        Long extensionId = cmd.getId();
+        final boolean cleanup = cmd.isCleanup();
+        ExtensionVO extension = extensionDao.findById(extensionId);
+        if (extension == null) {
+            throw new InvalidParameterValueException("Unable to find the extension with the specified id");
+        }
+        if (!extension.isUserDefined()) {
+            throw new InvalidParameterValueException("System extension can not be deleted");
+        }
+        List<ExtensionResourceMapVO> registeredResources = extensionResourceMapDao.listByExtensionId(extensionId);
+        if (CollectionUtils.isNotEmpty(registeredResources)) {
+            throw new CloudRuntimeException("Extension has associated resources, unregister them to delete the extension");
+        }
+        List<Long> customActionIds = extensionCustomActionDao.listIdsByExtensionId(extensionId);
+        if (CollectionUtils.isNotEmpty(customActionIds)) {
+            throw new CloudRuntimeException(String.format("Extension has %d custom actions, delete them to delete the extension",
+                    customActionIds.size()));
+        }
+        checkOrchestratorTemplates(extensionId);
+
+        boolean result = Transaction.execute((TransactionCallbackWithException<Boolean, CloudRuntimeException>) status -> {
+            extensionDetailsDao.removeDetails(extensionId);
+            extensionDao.remove(extensionId);
+            return true;
+        });
+        if (result && cleanup) {
+            cleanupExtensionFilesAcrossServers(extension);
+        }
+        return true;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_RESOURCE_REGISTER, eventDescription = "registering extension resource")
+    public Extension registerExtensionWithResource(RegisterExtensionCmd cmd) {
+        String resourceId = cmd.getResourceId();
+        Long extensionId = cmd.getExtensionId();
+        String resourceType = cmd.getResourceType();
+        if (!EnumUtils.isValidEnum(ExtensionResourceMap.ResourceType.class, resourceType)) {
+            throw new InvalidParameterValueException(
+                    String.format("Currently only [%s] can be used to register an extension of type Orchestrator",
+                            EnumSet.allOf(ExtensionResourceMap.ResourceType.class)));
+        }
+        ClusterVO clusterVO = clusterDao.findByUuid(resourceId);
+        if (clusterVO == null) {
+            throw new InvalidParameterValueException("Invalid cluster ID specified");
+        }
+        ExtensionVO extension = extensionDao.findById(extensionId);
+        if (extension == null) {
+            throw new InvalidParameterValueException("Invalid extension specified");
+        }
+        ExtensionResourceMap extensionResourceMap = registerExtensionWithCluster(clusterVO, extension, cmd.getDetails());
+        return extensionDao.findById(extensionResourceMap.getExtensionId());
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_RESOURCE_REGISTER, eventDescription = "registering extension resource")
+    public ExtensionResourceMap registerExtensionWithCluster(Cluster cluster, Extension extension,
+                  Map<String, String> details) {
+        if (!Hypervisor.HypervisorType.External.equals(cluster.getHypervisorType())) {
+            throw new CloudRuntimeException(
+                    String.format("Cluster ID: %s is not of %s hypervisor type", cluster.getId(),
+                            cluster.getHypervisorType()));
+        }
+        final ExtensionResourceMap.ResourceType resourceType = ExtensionResourceMap.ResourceType.Cluster;
+        ExtensionResourceMapVO existing =
+                extensionResourceMapDao.findByResourceIdAndType(cluster.getId(), resourceType);
+        if (existing != null) {
+            if (existing.getExtensionId() == extension.getId()) {
+                throw new CloudRuntimeException(String.format(
+                        "Extension: %s is already registered with this cluster: %s",
+                        extension.getName(), cluster.getName()));
+            } else {
+                throw new CloudRuntimeException(String.format(
+                        "An extension is already registered with this cluster: %s", cluster.getName()));
+            }
+        }
+        ExtensionResourceMap result = Transaction.execute((TransactionCallbackWithException<ExtensionResourceMap, CloudRuntimeException>) status -> {
+            ExtensionResourceMapVO extensionMap = new ExtensionResourceMapVO(extension.getId(), cluster.getId(), resourceType);
+            ExtensionResourceMapVO savedExtensionMap = extensionResourceMapDao.persist(extensionMap);
+            List<ExtensionResourceMapDetailsVO> detailsVOList = new ArrayList<>();
+            if (MapUtils.isNotEmpty(details)) {
+                for (Map.Entry<String, String> entry : details.entrySet()) {
+                    detailsVOList.add(new ExtensionResourceMapDetailsVO(savedExtensionMap.getId(),
+                            entry.getKey(), entry.getValue()));
+                }
+                extensionResourceMapDetailsDao.saveDetails(detailsVOList);
+            }
+            return extensionMap;
+        });
+        updateAllExtensionHosts(extension, cluster.getId(), false);
+        return result;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_RESOURCE_UNREGISTER, eventDescription = "unregistering extension resource")
+    public Extension unregisterExtensionWithResource(UnregisterExtensionCmd cmd) {
+        final String resourceId = cmd.getResourceId();
+        final Long extensionId = cmd.getExtensionId();
+        final String resourceType = cmd.getResourceType();
+        if (!EnumUtils.isValidEnum(ExtensionResourceMap.ResourceType.class, resourceType)) {
+            throw new InvalidParameterValueException(
+                    String.format("Currently only [%s] can be used to unregister an extension of type Orchestrator",
+                            EnumSet.allOf(ExtensionResourceMap.ResourceType.class)));
+        }
+        unregisterExtensionWithCluster(resourceId, extensionId);
+        return extensionDao.findById(extensionId);
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_RESOURCE_UNREGISTER, eventDescription = "unregistering extension resource")
+    public void unregisterExtensionWithCluster(Cluster cluster, Long extensionId) {
+        ExtensionResourceMapVO existing = extensionResourceMapDao.findByResourceIdAndType(cluster.getId(),
+                ExtensionResourceMap.ResourceType.Cluster);
+        if (existing == null) {
+            return;
+        }
+        extensionResourceMapDao.remove(existing.getId());
+        extensionResourceMapDetailsDao.removeDetails(existing.getId());
+        ExtensionVO extensionVO = extensionDao.findById(extensionId);
+        if (extensionVO != null) {
+            updateAllExtensionHosts(extensionVO, cluster.getId(), true);
+        }
+    }
+
+    @Override
+    public ExtensionResponse createExtensionResponse(Extension extension,
+                 EnumSet<ApiConstants.ExtensionDetails> viewDetails) {
+        ExtensionResponse response = new ExtensionResponse(extension.getUuid(), extension.getName(),
+                extension.getDescription(), extension.getType().name());
+        response.setCreated(extension.getCreated());
+        response.setPath(externalProvisioner.getExtensionPath(extension.getRelativePath()));
+        response.setPathReady(extension.isPathReady());
+        response.setUserDefined(extension.isUserDefined());
+        response.setState(extension.getState().name());
+        if (viewDetails.contains(ApiConstants.ExtensionDetails.all) ||
+                viewDetails.contains(ApiConstants.ExtensionDetails.resource)) {
+            List<ExtensionResourceResponse> resourcesResponse = new ArrayList<>();
+            List<ExtensionResourceMapVO> extensionResourceMapVOs =
+                    extensionResourceMapDao.listByExtensionId(extension.getId());
+            for (ExtensionResourceMapVO extensionResourceMapVO : extensionResourceMapVOs) {
+                ExtensionResourceResponse extensionResourceResponse = new ExtensionResourceResponse();
+                extensionResourceResponse.setType(extensionResourceMapVO.getResourceType().name());
+                extensionResourceResponse.setCreated(extensionResourceMapVO.getCreated());
+                if (ExtensionResourceMap.ResourceType.Cluster.equals(extensionResourceMapVO.getResourceType())) {
+                    Cluster cluster = clusterDao.findById(extensionResourceMapVO.getResourceId());
+                    extensionResourceResponse.setId(cluster.getUuid());
+                    extensionResourceResponse.setName(cluster.getName());
+                }
+                Map<String, String> details = extensionResourceMapDetailsDao.listDetailsKeyPairs(
+                        extensionResourceMapVO.getId(), true);
+                if (MapUtils.isNotEmpty(details)) {
+                    extensionResourceResponse.setDetails(details);
+                }
+                resourcesResponse.add(extensionResourceResponse);
+            }
+            if (CollectionUtils.isNotEmpty(resourcesResponse)) {
+                response.setResources(resourcesResponse);
+            }
+        }
+        Map<String, String> hiddenDetails;
+        if (viewDetails.contains(ApiConstants.ExtensionDetails.all) ||
+                viewDetails.contains(ApiConstants.ExtensionDetails.external)) {
+            Pair<Map<String, String>, Map<String, String>> extensionDetails =
+                    extensionDetailsDao.listDetailsKeyPairsWithVisibility(extension.getId());
+            if (MapUtils.isNotEmpty(extensionDetails.first())) {
+                response.setDetails(extensionDetails.first());
+            }
+            hiddenDetails = extensionDetails.second();
+        } else {
+            hiddenDetails = extensionDetailsDao.listDetailsKeyPairs(extension.getId(),
+                    List.of(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM));
+        }
+        if (hiddenDetails.containsKey(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM)) {
+            response.setOrchestratorRequiresPrepareVm(Boolean.parseBoolean(
+                    hiddenDetails.get(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM)));
+        }
+        response.setObjectName(Extension.class.getSimpleName().toLowerCase());
+        return response;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_CUSTOM_ACTION_ADD, eventDescription = "adding extension custom action")
+    public ExtensionCustomAction addCustomAction(AddCustomActionCmd cmd) {
+        String name = cmd.getName();
+        String description = cmd.getDescription();
+        Long extensionId = cmd.getExtensionId();
+        String resourceTypeStr = cmd.getResourceType();
+        List<String> rolesStrList = cmd.getAllowedRoleTypes();
+        final int timeout = ObjectUtils.defaultIfNull(cmd.getTimeout(), 3);
+        final boolean enabled = cmd.isEnabled();
+        Map parametersMap = cmd.getParametersMap();
+        final String successMessage = cmd.getSuccessMessage();
+        final String errorMessage = cmd.getErrorMessage();
+        Map<String, String> details = cmd.getDetails();
+        if (name == null || !name.matches("^[a-zA-Z0-9 _-]+$")) {
+            throw new InvalidParameterValueException(String.format("Invalid action name: %s. It can contain " +
+                    "only alphabets, numbers, hyphen, underscore and space", name));
+        }
+        ExtensionCustomActionVO existingCustomAction = extensionCustomActionDao.findByNameAndExtensionId(extensionId, name);
+        if (existingCustomAction != null) {
+            throw new CloudRuntimeException("Action by name already exists");
+        }
+        ExtensionVO extensionVO = extensionDao.findById(extensionId);
+        if (extensionVO == null) {
+            throw new InvalidParameterValueException("Specified extension can not be found");
+        }
+        List<ExtensionCustomAction.Parameter> parameters = getParametersListFromMap(name, parametersMap);
+        ExtensionCustomAction.ResourceType resourceType = null;
+        if (StringUtils.isNotBlank(resourceTypeStr)) {
+            resourceType = EnumUtils.getEnumIgnoreCase(ExtensionCustomAction.ResourceType.class, resourceTypeStr);
+            if (resourceType == null) {
+                throw new InvalidParameterValueException(
+                        String.format("Invalid resource type specified: %s. Valid values are: %s", resourceTypeStr,
+                        EnumSet.allOf(ExtensionCustomAction.ResourceType.class)));
+            }
+        }
+        if (resourceType == null && Extension.Type.Orchestrator.equals(extensionVO.getType())) {
+            resourceType = ExtensionCustomAction.ResourceType.VirtualMachine;
+        }
+        final Set<RoleType> roleTypes = new HashSet<>();
+        if (CollectionUtils.isNotEmpty(rolesStrList)) {
+            for (String roleTypeStr : rolesStrList) {
+                try {
+                    RoleType roleType = RoleType.fromString(roleTypeStr);
+                    roleTypes.add(roleType);
+                } catch (IllegalStateException ignored) {
+                    throw new InvalidParameterValueException(String.format("Invalid role specified - %s", roleTypeStr));
+                }
+            }
+        }
+        roleTypes.add(RoleType.Admin);
+        final ExtensionCustomAction.ResourceType resourceTypeFinal = resourceType;
+        return Transaction.execute((TransactionCallbackWithException<ExtensionCustomActionVO, CloudRuntimeException>) status -> {
+            ExtensionCustomActionVO customAction =
+                    new ExtensionCustomActionVO(name, description, extensionId, successMessage, errorMessage, timeout, enabled);
+            if (resourceTypeFinal != null) {
+                customAction.setResourceType(resourceTypeFinal);
+            }
+            customAction.setAllowedRoleTypes(RoleType.toCombinedMask(roleTypes));
+            ExtensionCustomActionVO savedAction = extensionCustomActionDao.persist(customAction);
+            List<ExtensionCustomActionDetailsVO> detailsVOList = new ArrayList<>();
+            detailsVOList.add(new ExtensionCustomActionDetailsVO(
+                    savedAction.getId(),
+                    ApiConstants.PARAMETERS,
+                    ExtensionCustomAction.Parameter.toJsonFromList(parameters),
+                    false
+            ));
+            if (MapUtils.isNotEmpty(details)) {
+                details.forEach((key, value) -> detailsVOList.add(
+                        new ExtensionCustomActionDetailsVO(savedAction.getId(), key, value)));
+            }
+            if (CollectionUtils.isNotEmpty(detailsVOList)) {
+                extensionCustomActionDetailsDao.saveDetails(detailsVOList);
+            }
+            CallContext.current().setEventResourceId(savedAction.getId());
+            return savedAction;
+        });
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_CUSTOM_ACTION_DELETE, eventDescription = "deleting extension custom action")
+    public boolean deleteCustomAction(DeleteCustomActionCmd cmd) {
+        Long customActionId = cmd.getId();
+        ExtensionCustomActionVO customActionVO = extensionCustomActionDao.findById(customActionId);
+        if (customActionVO == null) {
+            throw new InvalidParameterValueException("Unable to find the custom action with the specified id");
+        }
+        return Transaction.execute((TransactionCallbackWithException<Boolean, CloudRuntimeException>) status -> {
+            extensionCustomActionDetailsDao.removeDetails(customActionId);
+            if (!extensionCustomActionDao.remove(customActionId)) {
+                throw new CloudRuntimeException("Failed to delete custom action");
+            }
+            return true;
+        });
+    }
+
+    @Override
+    public List<ExtensionCustomActionResponse> listCustomActions(ListCustomActionCmd cmd) {
+        Long id = cmd.getId();
+        String name = cmd.getName();
+        Long extensionId = cmd.getExtensionId();
+        String keyword = cmd.getKeyword();
+        final String resourceTypeStr = cmd.getResourceType();
+        final String resourceId = cmd.getResourceId();
+        final Boolean enabled = cmd.isEnabled();
+        final SearchBuilder<ExtensionCustomActionVO> sb = extensionCustomActionDao.createSearchBuilder();
+        final Filter searchFilter = new Filter(ExtensionCustomActionVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
+        final Account caller = CallContext.current().getCallingAccount();
+
+        ExtensionCustomAction.ResourceType resourceType = null;
+        if (StringUtils.isNotBlank(resourceTypeStr)) {
+            resourceType = EnumUtils.getEnum(ExtensionCustomAction.ResourceType.class, resourceTypeStr);
+            if (resourceType == null) {
+                throw new InvalidParameterValueException("Invalid resource type specified");
+            }
+        }
+
+        if (extensionId == null && resourceType != null && StringUtils.isNotBlank(resourceId)) {
+            Extension extension = getExtensionFromResource(resourceType, resourceId);
+            if (extension == null) {
+                logger.error("No extension found for the specified resource [type: {}, id: {}]", resourceTypeStr, resourceId);
+                throw new InvalidParameterValueException("Internal error listing custom actions with specified resource");
+            }
+            extensionId = extension.getId();
+        }
+
+        final Role role = roleService.findRole(caller.getRoleId());
+
+        sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        sb.and("extensionId", sb.entity().getExtensionId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
+        sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
+        sb.and("enabled", sb.entity().isEnabled(), SearchCriteria.Op.EQ);
+        if (resourceType != null) {
+            sb.and().op("resourceTypeNull", sb.entity().getResourceType(), SearchCriteria.Op.NULL);
+            sb.or("resourceType", sb.entity().getResourceType(), SearchCriteria.Op.EQ);
+            sb.cp();
+        }
+        if (!RoleType.Admin.equals(role.getRoleType())) {
+            sb.and("roleType", sb.entity().getAllowedRoleTypes(), SearchCriteria.Op.BINARY_OR);
+        }
+        sb.done();
+        final SearchCriteria<ExtensionCustomActionVO> sc = sb.create();
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+        if (extensionId != null) {
+            sc.setParameters("extensionId", extensionId);
+        }
+        if (StringUtils.isNotBlank(name)) {
+            sc.setParameters("name", name);
+        }
+        if (StringUtils.isNotBlank(keyword)) {
+            sc.setParameters("keyword",  "%" + keyword + "%");
+        }
+        if (enabled != null) {
+            sc.setParameters("enabled",  true);
+        }
+        if (resourceType != null) {
+            sc.setParameters("resourceType",  resourceType);
+        }
+        if (!RoleType.Admin.equals(role.getRoleType())) {
+            sc.setParameters("roleType", role.getRoleType().getMask());
+        }
+        final Pair<List<ExtensionCustomActionVO>, Integer> result = extensionCustomActionDao.searchAndCount(sc, searchFilter);
+        List<ExtensionCustomActionResponse> responses = new ArrayList<>();
+        for (ExtensionCustomActionVO customAction : result.first()) {
+            responses.add(createCustomActionResponse(customAction));
+        }
+
+        return responses;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_EXTENSION_CUSTOM_ACTION_UPDATE, eventDescription = "updating extension custom action")
+    public ExtensionCustomAction updateCustomAction(UpdateCustomActionCmd cmd) {
+        final long id = cmd.getId();
+        String description = cmd.getDescription();
+        String resourceTypeStr = cmd.getResourceType();
+        List<String> rolesStrList = cmd.getAllowedRoleTypes();
+        Boolean enabled = cmd.isEnabled();
+        Map parametersMap = cmd.getParametersMap();
+        Boolean cleanupParameters = cmd.isCleanupParameters();
+        final String successMessage = cmd.getSuccessMessage();
+        final String errorMessage = cmd.getErrorMessage();
+        final Integer timeout = cmd.getTimeout();
+        Map<String, String> details = cmd.getDetails();
+        Boolean cleanupDetails = cmd.isCleanupDetails();
+
+        ExtensionCustomActionVO customAction = extensionCustomActionDao.findById(id);
+        if (customAction == null) {
+            throw new CloudRuntimeException("Action not found");
+        }
+
+        boolean needUpdate = false;
+        if (StringUtils.isNotBlank(description)) {
+            customAction.setDescription(description);
+            needUpdate = true;
+        }
+        if (resourceTypeStr != null) {
+            ExtensionCustomAction.ResourceType resourceType =
+                    EnumUtils.getEnumIgnoreCase(ExtensionCustomAction.ResourceType.class, resourceTypeStr);
+            if (resourceType == null) {
+                throw new InvalidParameterValueException(
+                        String.format("Invalid resource type specified: %s. Valid values are: %s", resourceTypeStr,
+                                EnumSet.allOf(ExtensionCustomAction.ResourceType.class)));
+            }
+            customAction.setResourceType(resourceType);
+            needUpdate = true;
+        }
+        if (CollectionUtils.isNotEmpty(rolesStrList)) {
+            Set<RoleType> roles = new HashSet<>();
+            for (String roleTypeStr : rolesStrList) {
+                try {
+                    RoleType roleType = RoleType.fromString(roleTypeStr);
+                    roles.add(roleType);
+                } catch (IllegalStateException ignored) {
+                    throw new InvalidParameterValueException(String.format("Invalid role specified - %s", roleTypeStr));
+                }
+            }
+            customAction.setAllowedRoleTypes(RoleType.toCombinedMask(roles));
+            needUpdate = true;
+        }
+        if (successMessage != null) {
+            customAction.setSuccessMessage(successMessage);
+            needUpdate = true;
+        }
+        if (errorMessage != null) {
+            customAction.setErrorMessage(errorMessage);
+            needUpdate = true;
+        }
+        if (timeout != null) {
+            customAction.setTimeout(timeout);
+            needUpdate = true;
+        }
+        if (enabled != null) {
+            customAction.setEnabled(enabled);
+            needUpdate = true;
+        }
+
+        List<ExtensionCustomAction.Parameter> parameters = null;
+        if (!Boolean.TRUE.equals(cleanupParameters) && MapUtils.isNotEmpty(parametersMap)) {
+            parameters = getParametersListFromMap(customAction.getName(), parametersMap);
+        }
+
+        final boolean needUpdateFinal = needUpdate;
+        final List<ExtensionCustomAction.Parameter> parametersFinal = parameters;
+        return Transaction.execute((TransactionCallbackWithException<ExtensionCustomAction, CloudRuntimeException>) status -> {
+            if (needUpdateFinal) {
+                boolean result = extensionCustomActionDao.update(id, customAction);
+                if (!result) {
+                    throw new CloudRuntimeException(String.format("Failed to update custom action: %s",
+                            customAction.getName()));
+                }
+            }
+            updatedCustomActionDetails(id, cleanupDetails, details, cleanupParameters, parametersFinal);
+            return customAction;
+        });
+    }
+
+    protected void updatedCustomActionDetails(long id, Boolean cleanupDetails, Map<String, String> details,
+            Boolean cleanupParameters, List<ExtensionCustomAction.Parameter> parametersFinal) {
+        final boolean needToUpdateAllDetails = Boolean.TRUE.equals(cleanupDetails) || MapUtils.isNotEmpty(details);
+        final boolean needToUpdateParameters = Boolean.TRUE.equals(cleanupParameters) || CollectionUtils.isNotEmpty(parametersFinal);
+        if (!needToUpdateAllDetails && !needToUpdateParameters) {
+            return;
+        }
+        if (needToUpdateAllDetails) {
+            Map<String, String> hiddenDetails =
+                    extensionCustomActionDetailsDao.listDetailsKeyPairs(id, false);
+            List<ExtensionCustomActionDetailsVO> detailsVOList = new ArrayList<>();
+            if (Boolean.TRUE.equals(cleanupParameters)) {
+                hiddenDetails.remove(ApiConstants.PARAMETERS);
+            } else if (CollectionUtils.isNotEmpty(parametersFinal)) {
+                hiddenDetails.put(ApiConstants.PARAMETERS,
+                        ExtensionCustomAction.Parameter.toJsonFromList(parametersFinal));
+            }
+            if (MapUtils.isNotEmpty(hiddenDetails)) {
+                hiddenDetails.forEach((key, value) -> detailsVOList.add(
+                        new ExtensionCustomActionDetailsVO(id, key, value, false)));
+            }
+            if (!Boolean.TRUE.equals(cleanupDetails) && MapUtils.isNotEmpty(details)) {
+                details.forEach((key, value) -> detailsVOList.add(
+                        new ExtensionCustomActionDetailsVO(id, key, value)));
+            }
+            if (CollectionUtils.isNotEmpty(detailsVOList)) {
+                extensionCustomActionDetailsDao.saveDetails(detailsVOList);
+            } else if (Boolean.TRUE.equals(cleanupDetails)) {
+                extensionCustomActionDetailsDao.removeDetails(id);
+            }
+        } else {
+            if (Boolean.TRUE.equals(cleanupParameters)) {
+                extensionCustomActionDetailsDao.removeDetail(id, ApiConstants.PARAMETERS);
+            } else if (CollectionUtils.isNotEmpty(parametersFinal)) {
+                ExtensionCustomActionDetailsVO detailsVO = extensionCustomActionDetailsDao.findDetail(id,
+                        ApiConstants.PARAMETERS);
+                if (detailsVO == null) {
+                    extensionCustomActionDetailsDao.persist(new ExtensionCustomActionDetailsVO(id,
+                            ApiConstants.PARAMETERS,
+                            ExtensionCustomAction.Parameter.toJsonFromList(parametersFinal), false));
+                } else {
+                    detailsVO.setValue(ExtensionCustomAction.Parameter.toJsonFromList(parametersFinal));
+                    extensionCustomActionDetailsDao.update(detailsVO.getId(), detailsVO);
+                }
+            }
+        }
+    }
+
+    @Override
+    public CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd) {
+        final Long id =  cmd.getCustomActionId();
+        final String resourceTypeStr = cmd.getResourceType();
+        final String resourceUuid = cmd.getResourceId();
+        Map<String, String> cmdParameters = cmd.getParameters();
+        final Account caller = CallContext.current().getCallingAccount();
+
+        String error = "Internal error running action";
+        ExtensionCustomActionVO customActionVO = extensionCustomActionDao.findById(id);
+        if (customActionVO == null) {
+            logger.error("Invalid custom action specified with ID: {}", id);
+            throw new InvalidParameterValueException(error);
+        }
+        final Role role = roleService.findRole(caller.getRoleId());
+        if (!RoleType.Admin.equals(role.getRoleType())) {
+            final Set<RoleType> allowedRoles = RoleType.fromCombinedMask(customActionVO.getAllowedRoleTypes());
+            if (!allowedRoles.contains(role.getRoleType())) {
+                logger.error("Caller does not have permission to run {} with {} having role: {}",
+                        customActionVO, caller, role.getRoleType().name());
+                throw new InvalidParameterValueException(error);
+            }
+        }
+        if (!customActionVO.isEnabled()) {
+            logger.error("Failed to run {} as it is not enabled", customActionVO);
+            throw new InvalidParameterValueException(error);
+        }
+        final String actionName = customActionVO.getName();
+        RunCustomActionCommand runCustomActionCommand = new RunCustomActionCommand(actionName);
+        final long extensionId = customActionVO.getExtensionId();
+        final ExtensionVO extensionVO = extensionDao.findById(extensionId);
+        if (extensionVO == null) {
+            logger.error("Unable to find extension for {}", customActionVO);
+            throw new CloudRuntimeException(error);
+        }
+        if (!Extension.State.Enabled.equals(extensionVO.getState())) {
+            logger.error("{} is not in enabled state for running {}", extensionVO, customActionVO);
+            throw new CloudRuntimeException(error);
+        }
+        ExtensionCustomAction.ResourceType actionResourceType = customActionVO.getResourceType();
+        if (actionResourceType == null && StringUtils.isBlank(resourceTypeStr)) {
+            throw new InvalidParameterValueException("Resource type not specified for the action");
+        }
+        boolean validType = true;
+        if (StringUtils.isNotBlank(resourceTypeStr)) {
+            ExtensionCustomAction.ResourceType cmdResourceType =
+                    EnumUtils.getEnumIgnoreCase(ExtensionCustomAction.ResourceType.class, resourceTypeStr);
+            validType = cmdResourceType != null && (actionResourceType == null || actionResourceType.equals(cmdResourceType));
+            actionResourceType = cmdResourceType;
+        }
+        if (!validType || actionResourceType == null) {
+            logger.error("Invalid resource type - {} specified for {}", resourceTypeStr, customActionVO);
+            throw new CloudRuntimeException(error);
+        }
+        Object entity = entityManager.findByUuid(actionResourceType.getAssociatedClass(), resourceUuid);
+        if (entity == null) {
+            logger.error("Specified resource does not exist for running {}", customActionVO);
+            throw new CloudRuntimeException(error);
+        }
+        Long clusterId = null;
+        Long hostId = null;
+        if (entity instanceof Cluster) {
+            clusterId = ((Cluster)entity).getId();
+            List<HostVO> hosts = hostDao.listByClusterAndHypervisorType(clusterId, Hypervisor.HypervisorType.External);
+            if (CollectionUtils.isEmpty(hosts)) {
+                logger.error("No hosts found for {} for running {}", entity, customActionVO);
+                throw new CloudRuntimeException(error);
+            }
+            hostId = hosts.get(0).getId();
+        } else if (entity instanceof Host) {
+            Host host = (Host)entity;
+            if (!Hypervisor.HypervisorType.External.equals(host.getHypervisorType())) {
+                logger.error("Invalid {} specified as host resource for running {}", entity, customActionVO);
+                throw new InvalidParameterValueException(error);
+            }
+            hostId = host.getId();
+            clusterId = host.getClusterId();
+        } else if (entity instanceof VirtualMachine) {
+            VirtualMachine virtualMachine = (VirtualMachine)entity;
+            runCustomActionCommand.setVmId(virtualMachine.getId());
+            if (!Hypervisor.HypervisorType.External.equals(virtualMachine.getHypervisorType())) {
+                logger.error("Invalid {} specified as VM resource for running {}", entity, customActionVO);
+                throw new InvalidParameterValueException(error);
+            }
+            Pair<Long, Long> clusterAndHostId = virtualMachineManager.findClusterAndHostIdForVm(virtualMachine, false);
+            clusterId = clusterAndHostId.first();
+            hostId = clusterAndHostId.second();
+        }
+
+        if (clusterId == null || hostId == null) {
+            logger.error(
+                    "Unable to find cluster or host with the specified resource - cluster ID: {}, host ID: {}",
+                    clusterId, hostId);
+            throw new CloudRuntimeException(error);
+        }
+
+        ExtensionResourceMapVO extensionResource = extensionResourceMapDao.findByResourceIdAndType(clusterId,
+                ExtensionResourceMap.ResourceType.Cluster);
+        if (extensionResource == null) {
+            logger.error("No extension registered with cluster ID: {}", clusterId);
+            throw new CloudRuntimeException(error);
+        }
+
+        List<ExtensionCustomAction.Parameter> actionParameters = null;
+        Pair<Map<String, String>, Map<String, String>> allDetails =
+                extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(customActionVO.getId());
+        if (allDetails.second().containsKey(ApiConstants.PARAMETERS)) {
+            actionParameters =
+                    ExtensionCustomAction.Parameter.toListFromJson(allDetails.second().get(ApiConstants.PARAMETERS));
+        }
+        Map<String, Object> parameters = null;
+        if (CollectionUtils.isNotEmpty(actionParameters)) {
+            parameters = ExtensionCustomAction.Parameter.validateParameterValues(actionParameters, cmdParameters);
+        }
+
+        CustomActionResultResponse response = new CustomActionResultResponse();
+        response.setId(customActionVO.getUuid());
+        response.setName(actionName);
+        response.setObjectName("customactionresult");
+        Map<String, String> result = new HashMap<>();
+        response.setSuccess(false);
+        result.put(ApiConstants.MESSAGE, getActionMessage(false, customActionVO, extensionVO,
+                actionResourceType, entity));
+        Map<String, Map<String, String>> externalDetails =
+                getExternalAccessDetails(allDetails.first(), hostId, extensionResource);
+        runCustomActionCommand.setParameters(parameters);
+        runCustomActionCommand.setExternalDetails(externalDetails);
+        runCustomActionCommand.setWait(customActionVO.getTimeout());
+        try {
+            logger.info("Running custom action: {} with {} parameters", actionName,
+                    (parameters != null ? parameters.keySet().size() : 0));
+            Answer answer = agentMgr.send(hostId, runCustomActionCommand);
+            if (!(answer instanceof RunCustomActionAnswer)) {
+                logger.error("Unexpected answer [{}] received for {}", answer.getClass().getSimpleName(),
+                        RunCustomActionCommand.class.getSimpleName());
+                result.put(ApiConstants.DETAILS, error);
+            } else {
+                RunCustomActionAnswer customActionAnswer = (RunCustomActionAnswer) answer;
+                response.setSuccess(answer.getResult());
+                result.put(ApiConstants.MESSAGE, getActionMessage(answer.getResult(), customActionVO, extensionVO,
+                        actionResourceType, entity));
+                result.put(ApiConstants.DETAILS, customActionAnswer.getDetails());
+            }
+        } catch (AgentUnavailableException e) {
+            String msg = "Unable to run custom action";
+            logger.error("{} due to {}", msg, e.getMessage(), e);
+            result.put(ApiConstants.DETAILS, msg);
+        } catch (OperationTimedoutException e) {
+            String msg = "Running custom action timed out, please try again";
+            logger.error(msg, e);
+            result.put(ApiConstants.DETAILS, msg);
+        }
+        response.setResult(result);
+        return response;
+    }
+
+    @Override
+    public ExtensionCustomActionResponse createCustomActionResponse(ExtensionCustomAction customAction) {
+        ExtensionCustomActionResponse response = new ExtensionCustomActionResponse(customAction.getUuid(),
+                customAction.getName(), customAction.getDescription());
+        if (customAction.getResourceType() != null) {
+            response.setResourceType(customAction.getResourceType().name());
+        }
+        Integer roles = ObjectUtils.defaultIfNull(customAction.getAllowedRoleTypes(), RoleType.Admin.getMask());
+        response.setAllowedRoleTypes(RoleType.fromCombinedMask(roles)
+                .stream()
+                .map(Enum::name)
+                .collect(Collectors.toList()));
+        response.setSuccessMessage(customAction.getSuccessMessage());
+        response.setErrorMessage(customAction.getErrorMessage());
+        response.setTimeout(customAction.getTimeout());
+        response.setEnabled(customAction.isEnabled());
+        response.setCreated(customAction.getCreated());
+        Optional.ofNullable(extensionDao.findById(customAction.getExtensionId())).ifPresent(extensionVO -> {
+            response.setExtensionId(extensionVO.getUuid());
+            response.setExtensionName(extensionVO.getName());
+        });
+        Pair<Map<String, String>, Map<String, String>> allDetails =
+                extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(customAction.getId());
+        Optional.ofNullable(allDetails.second().get(ApiConstants.PARAMETERS))
+                .map(ExtensionCustomAction.Parameter::toListFromJson)
+                .ifPresent(parameters -> {
+                    List<ExtensionCustomActionParameterResponse> paramResponses = parameters.stream()
+                            .map(p -> new ExtensionCustomActionParameterResponse(p.getName(),
+                                    p.getType().name(), p.getValidationFormat().name(), p.getValueOptions(), p.isRequired()))
+                            .collect(Collectors.toList());
+                    response.setParameters(paramResponses);
+                });
+        response.setDetails(allDetails.first());
+        response.setObjectName(ExtensionCustomAction.class.getSimpleName().toLowerCase());
+        return response;
+    }
+
+    @Override
+    public Map<String, Map<String, String>> getExternalAccessDetails(Host host, Map<String, String> vmDetails) {
+        long clusterId = host.getClusterId();
+        ExtensionResourceMapVO resourceMap = extensionResourceMapDao.findByResourceIdAndType(clusterId,
+                ExtensionResourceMap.ResourceType.Cluster);
+        Map<String, Map<String, String>> details = getExternalAccessDetails(null, host.getId(), resourceMap);
+        if (MapUtils.isNotEmpty(vmDetails)) {
+            details.put(ApiConstants.VIRTUAL_MACHINE, vmDetails);
+        }
+        return details;
+    }
+
+    @Override
+    public String handleExtensionServerCommands(ExtensionServerActionBaseCommand command) {
+        final String extensionName = command.getExtensionName();
+        final String extensionRelativePath = command.getExtensionRelativePath();
+        logger.debug("Received {} from MS: {} for extension [id: {}, name: {}, relativePath: {}]",
+                command.getClass().getSimpleName(), command.getMsId(), command.getExtensionId(),
+                extensionName, extensionRelativePath);
+        Answer answer = new Answer(command, false, "Unsupported command");
+        if (command instanceof GetExtensionPathChecksumCommand) {
+            final GetExtensionPathChecksumCommand cmd = (GetExtensionPathChecksumCommand)command;
+            String checksum = externalProvisioner.getChecksumForExtensionPath(extensionName,
+                    extensionRelativePath);
+            answer = new Answer(cmd, StringUtils.isNotBlank(checksum), checksum);
+        } else if (command instanceof PrepareExtensionPathCommand) {
+            final PrepareExtensionPathCommand cmd = (PrepareExtensionPathCommand)command;
+            Pair<Boolean, String> result = prepareExtensionPathOnCurrentServer(
+                    extensionName, cmd.isExtensionUserDefined(), extensionRelativePath);
+            answer = new Answer(cmd, result.first(), result.second());
+        } else if (command instanceof CleanupExtensionFilesCommand) {
+            final CleanupExtensionFilesCommand cmd = (CleanupExtensionFilesCommand)command;
+            Pair<Boolean, String> result = cleanupExtensionFilesOnCurrentServer(extensionName,
+                    extensionRelativePath);
+            answer = new Answer(cmd, result.first(), result.second());
+        }
+        final Answer[] answers = new Answer[1];
+        answers[0] = answer;
+        return GsonHelper.getGson().toJson(answers);
+    }
+
+    @Override
+    public Long getExtensionIdForCluster(long clusterId) {
+        ExtensionResourceMapVO map = extensionResourceMapDao.findByResourceIdAndType(clusterId,
+                ExtensionResourceMap.ResourceType.Cluster);
+        if (map == null) {
+            return null;
+        }
+        return map.getExtensionId();
+    }
+
+    @Override
+    public Extension getExtension(long id) {
+        return extensionDao.findById(id);
+    }
+
+    @Override
+    public Extension getExtensionForCluster(long clusterId) {
+        Long extensionId = getExtensionIdForCluster(clusterId);
+        if (extensionId == null) {
+            return null;
+        }
+        return extensionDao.findById(extensionId);
+    }
+
+    @Override
+    public boolean start() {
+        long pathStateCheckInterval = PathStateCheckInterval.value();
+        long pathStateCheckInitialDelay = Math.min(60, pathStateCheckInterval);
+        logger.debug("Scheduling extensions path state check task with initial delay={}s and interval={}s",
+                pathStateCheckInitialDelay, pathStateCheckInterval);
+        extensionPathStateCheckExecutor.scheduleWithFixedDelay(new PathStateCheckWorker(),
+                pathStateCheckInitialDelay, pathStateCheckInterval, TimeUnit.SECONDS);
+        return true;
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        try {
+            extensionPathStateCheckExecutor = Executors.newScheduledThreadPool(1,
+                    new NamedThreadFactory("Extension-Path-State-Check"));
+        } catch (final Exception e) {
+            throw new ConfigurationException("Unable to to configure ExtensionsManagerImpl");
+        }
+        return true;
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        List<Class<?>> cmds = new ArrayList<>();
+        cmds.add(AddCustomActionCmd.class);
+        cmds.add(ListCustomActionCmd.class);
+        cmds.add(DeleteCustomActionCmd.class);
+        cmds.add(UpdateCustomActionCmd.class);
+        cmds.add(RunCustomActionCmd.class);
+
+        cmds.add(CreateExtensionCmd.class);
+        cmds.add(ListExtensionsCmd.class);
+        cmds.add(DeleteExtensionCmd.class);
+        cmds.add(UpdateExtensionCmd.class);
+        cmds.add(RegisterExtensionCmd.class);
+        cmds.add(UnregisterExtensionCmd.class);
+        return cmds;
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return ExtensionsManager.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey[]{
+                PathStateCheckInterval
+        };
+    }
+
+    public class PathStateCheckWorker extends ManagedContextRunnable {
+
+        protected void runCheckUsingLongestRunningManagementServer() {
+            try {
+                List<ManagementServerHostVO> msHosts = managementServerHostDao.listBy(ManagementServerHost.State.Up);
+                msHosts.sort(Comparator.comparingLong(ManagementServerHostVO::getRunid));
+                ManagementServerHostVO msHost = msHosts.remove(0);
+                if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
+                    logger.debug("Skipping the extensions path state check on this management server");
+                    return;
+                }
+                List<ExtensionVO> extensions = extensionDao.listAll();
+                for (ExtensionVO extension : extensions) {
+                    checkExtensionPathState(extension, msHosts);
+                }
+            } catch (Exception e) {
+                logger.warn("Extensions path state check failed", e);
+            }
+        }
+
+        @Override
+        protected void runInContext() {
+            GlobalLock gcLock = GlobalLock.getInternLock("ExtensionPathStateCheck");
+            try {
+                if (gcLock.lock(3)) {
+                    try {
+                        runCheckUsingLongestRunningManagementServer();
+                    } finally {
+                        gcLock.unlock();
+                    }
+                }
+            } finally {
+                gcLock.releaseRef();
+            }
+        }
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionDetailsVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionDetailsVO.java
new file mode 100644
index 00000000000..15a5af4f60c
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionDetailsVO.java
@@ -0,0 +1,97 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.vo;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "extension_custom_action_details")
+public class ExtensionCustomActionDetailsVO implements ResourceDetail {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "extension_custom_action_id", nullable = false)
+    private long resourceId;
+
+    @Column(name = "name", nullable = false, length = 255)
+    private String name;
+
+    @Column(name = "value", nullable = false, length = 65535)
+    private String value;
+
+    @Column(name = "display")
+    private boolean display = true;
+
+    public ExtensionCustomActionDetailsVO() {
+    }
+
+    public ExtensionCustomActionDetailsVO(long resourceId, String name, String value) {
+        this.resourceId = resourceId;
+        this.name = name;
+        this.value = value;
+    }
+
+    public ExtensionCustomActionDetailsVO(long id, String name, String value, boolean display) {
+        this.resourceId = id;
+        this.name = name;
+        this.value = value;
+        this.display = display;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean isDisplay() {
+        return display;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionVO.java
new file mode 100644
index 00000000000..c5ab288d853
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionVO.java
@@ -0,0 +1,215 @@
+// 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.
+package org.apache.cloudstack.framework.extensions.vo;
+
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import com.cloud.utils.db.GenericDao;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+import java.util.UUID;
+
+@Entity
+@Table(name = "extension_custom_action")
+public class ExtensionCustomActionVO implements ExtensionCustomAction {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "uuid", nullable = false, unique = true)
+    private String uuid;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "description", length = 4096)
+    private String description;
+
+    @Column(name = "extension_id", nullable = false)
+    private Long extensionId;
+
+    @Column(name = "resource_type")
+    @Enumerated(value = EnumType.STRING)
+    private ResourceType resourceType;
+
+    @Column(name = "allowed_role_types")
+    private Integer allowedRoleTypes;
+
+    @Column(name = "success_message", length = 4096)
+    private String successMessage;
+
+    @Column(name = "error_message", length = 4096)
+    private String errorMessage;
+
+    @Column(name = "timeout", nullable = false)
+    private int timeout;
+
+    @Column(name = "enabled")
+    private boolean enabled;
+
+    @Column(name = "created", nullable = false, updatable = false)
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date created;
+
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    private Date removed;
+
+    public ExtensionCustomActionVO() {
+        this.uuid = UUID.randomUUID().toString();
+        this.created = new Date();
+    }
+
+    public ExtensionCustomActionVO(String name, String description, long extensionId, String successMessage,
+           String errorMessage, int timeout, boolean enabled) {
+        this.uuid = UUID.randomUUID().toString();
+        this.created = new Date();
+        this.name = name;
+        this.description = description;
+        this.extensionId = extensionId;
+        this.successMessage = successMessage;
+        this.errorMessage = errorMessage;
+        this.timeout = timeout;
+        this.enabled = enabled;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setAllowedRoleTypes(int allowedRoleTypes) {
+        this.allowedRoleTypes = allowedRoleTypes;
+    }
+
+    @Override
+    public Integer getAllowedRoleTypes() {
+        return allowedRoleTypes;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public long getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionId(Long extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    @Override
+    public ResourceType getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(ResourceType resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public String getSuccessMessage() {
+        return successMessage;
+    }
+
+    public void setSuccessMessage(String successMessage) {
+        this.successMessage = successMessage;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public int getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("Extension Custom Action %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "name", "extensionId", "resourceType"));
+    }
+
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionDetailsVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionDetailsVO.java
new file mode 100644
index 00000000000..535a0f70395
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionDetailsVO.java
@@ -0,0 +1,97 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.vo;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "extension_details")
+public class ExtensionDetailsVO implements ResourceDetail {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "extension_id", nullable = false)
+    private long resourceId;
+
+    @Column(name = "name", nullable = false, length = 255)
+    private String name;
+
+    @Column(name = "value", nullable = false, length = 255)
+    private String value;
+
+    @Column(name = "display")
+    private boolean display = true;
+
+    public ExtensionDetailsVO() {
+    }
+
+    public ExtensionDetailsVO(long resourceId, String name, String value) {
+        this.resourceId = resourceId;
+        this.name = name;
+        this.value = value;
+    }
+
+    public ExtensionDetailsVO(long id, String name, String value, boolean display) {
+        this.resourceId = id;
+        this.name = name;
+        this.value = value;
+        this.display = display;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean isDisplay() {
+        return display;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapDetailsVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapDetailsVO.java
new file mode 100644
index 00000000000..5cb6f7b8511
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapDetailsVO.java
@@ -0,0 +1,97 @@
+// 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.
+package org.apache.cloudstack.framework.extensions.vo;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "extension_resource_map_details")
+public class ExtensionResourceMapDetailsVO implements ResourceDetail {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "extension_resource_map_id", nullable = false)
+    private long resourceId;
+
+    @Column(name = "name", nullable = false, length = 255)
+    private String name;
+
+    @Column(name = "value", nullable = false, length = 255)
+    private String value;
+
+    @Column(name = "display")
+    private boolean display = true;
+
+    public ExtensionResourceMapDetailsVO() {
+    }
+
+    public ExtensionResourceMapDetailsVO(long resourceId, String name, String value) {
+        this.resourceId = resourceId;
+        this.name = name;
+        this.value = value;
+    }
+
+    public ExtensionResourceMapDetailsVO(long id, String name, String value, boolean display) {
+        this.resourceId = id;
+        this.name = name;
+        this.value = value;
+        this.display = display;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean isDisplay() {
+        return display;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapVO.java
new file mode 100644
index 00000000000..48d70b937e3
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapVO.java
@@ -0,0 +1,122 @@
+//
+// 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.
+//
+
+package org.apache.cloudstack.framework.extensions.vo;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+
+@Entity
+@Table(name = "extension_resource_map")
+public class ExtensionResourceMapVO implements ExtensionResourceMap {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "extension_id", nullable = false)
+    private Long extensionId;
+
+    @Column(name = "resource_id", nullable = false)
+    private Long resourceId;
+
+    @Column(name = "resource_type", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private ResourceType resourceType;
+
+    @Column(name = "created", nullable = false, updatable = false)
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date created;
+
+    @Column(name = "removed")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date removed;
+
+    public ExtensionResourceMapVO() {
+    }
+
+    public ExtensionResourceMapVO(long extensionId, long resourceId, ResourceType resourceType) {
+        this.extensionId = extensionId;
+        this.resourceId = resourceId;
+        this.resourceType = resourceType;
+    }
+
+    @Override
+    public long getExtensionId() {
+        return extensionId;
+    }
+
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+
+    @Override
+    public ResourceType getResourceType() {
+        return resourceType;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setExtensionId(Long extensionId) {
+        this.extensionId = extensionId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public void setResourceType(ResourceType resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return null;
+    }
+}
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionVO.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionVO.java
new file mode 100644
index 00000000000..20423764c1c
--- /dev/null
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionVO.java
@@ -0,0 +1,179 @@
+//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.
+
+package org.apache.cloudstack.framework.extensions.vo;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import com.cloud.utils.db.GenericDao;
+
+@Entity
+@Table(name = "extension")
+public class ExtensionVO implements Extension {
+
+    public ExtensionVO() {
+        this.uuid = UUID.randomUUID().toString();
+        this.created = new Date();
+    }
+
+    public ExtensionVO(String name, String description, Type type, String relativePath, State state) {
+        this.uuid = UUID.randomUUID().toString();
+        this.name = name;
+        this.description = description;
+        this.type = type;
+        this.relativePath = relativePath;
+        this.userDefined = true;
+        this.pathReady = true;
+        this.state = state;
+        this.created = new Date();
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "uuid", nullable = false, unique = true)
+    private String uuid;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "description", length = 4096)
+    private String description;
+
+    @Column(name = "type", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Type type;
+
+    @Column(name = "relative_path", nullable = false, length = 2048)
+    private String relativePath;
+
+    @Column(name = "path_ready")
+    private boolean pathReady;
+
+    @Column(name = "is_user_defined")
+    private boolean userDefined;
+
+    @Column(name = "state")
+    @Enumerated(value = EnumType.STRING)
+    private State state;
+
+    @Column(name = "created", nullable = false, updatable = false)
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date created;
+
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    private Date removed;
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public Type getType() {
+        return type;
+    }
+
+    @Override
+    public String getRelativePath() {
+        return relativePath;
+    }
+
+    public void setRelativePath(String relativePath) {
+        this.relativePath = relativePath;
+    }
+
+    @Override
+    public boolean isPathReady() {
+        return pathReady;
+    }
+
+    public void setPathReady(boolean pathReady) {
+        this.pathReady = pathReady;
+    }
+
+    @Override
+    public boolean isUserDefined() {
+        return userDefined;
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("Extension %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "name", "type"));
+    }
+}
diff --git a/framework/extensions/src/main/resources/META-INF/cloudstack/core/spring-framework-extensions-core-context.xml b/framework/extensions/src/main/resources/META-INF/cloudstack/core/spring-framework-extensions-core-context.xml
new file mode 100644
index 00000000000..9d44d8ff7f3
--- /dev/null
+++ b/framework/extensions/src/main/resources/META-INF/cloudstack/core/spring-framework-extensions-core-context.xml
@@ -0,0 +1,36 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+>
+    <bean id="ExternalOrchestratorDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionDaoImpl" />
+    <bean id="ExternalOrchestratorDetailDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionDetailsDaoImpl" />
+    <bean id="ExtensionResourceMapDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDaoImpl" />
+    <bean id="ExtensionResourceMapDetailsDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDetailsDaoImpl" />
+    <bean id="ExtensionsManager" class="org.apache.cloudstack.framework.extensions.manager.ExtensionsManagerImpl" />
+    <bean id="ExtensionCustomActionDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDaoImpl" />
+    <bean id="ExtensionCustomActionDetailsDaoImpl" class="org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDetailsDaoImpl" />
+</beans>
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java
new file mode 100644
index 00000000000..b25de85a69d
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java
@@ -0,0 +1,224 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.commons.collections.MapUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.user.Account;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AddCustomActionCmdTest {
+
+    private AddCustomActionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() throws Exception {
+        cmd = new AddCustomActionCmd();
+        extensionsManager = mock(ExtensionsManager.class);
+        cmd.extensionsManager = extensionsManager;
+    }
+
+    private void setField(String fieldName, Object value) {
+        ReflectionTestUtils.setField(cmd, fieldName, value);
+    }
+
+    @Test
+    public void testGetters() {
+        Long extensionId = 42L;
+        String name = "actionName";
+        String description = "desc";
+        String resourceType = "VM";
+        List<String> allowedRoleTypes = Arrays.asList(RoleType.Admin.name(), RoleType.User.name());
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("name", "param1");
+        String successMessage = "Success!";
+        String errorMessage = "Error!";
+        Integer timeout = 10;
+        Boolean enabled = true;
+        Map<String, Map<String, String>> details = new HashMap<>();
+        Map<String, String> inner = new HashMap<>();
+        inner.put("vendor", "acme");
+        details.put("details", inner);
+        setField("details", details);
+
+        setField("extensionId", extensionId);
+        setField("name", name);
+        setField("description", description);
+        setField("resourceType", resourceType);
+        setField("allowedRoleTypes", allowedRoleTypes);
+        setField("parameters", parameters);
+        setField("successMessage", successMessage);
+        setField("errorMessage", errorMessage);
+        setField("timeout", timeout);
+        setField("enabled", enabled);
+        setField("details", details);
+
+        assertEquals(extensionId, cmd.getExtensionId());
+        assertEquals(name, cmd.getName());
+        assertEquals(description, cmd.getDescription());
+        assertEquals(resourceType, cmd.getResourceType());
+        assertEquals(allowedRoleTypes, cmd.getAllowedRoleTypes());
+        assertEquals(parameters, cmd.getParametersMap());
+        assertEquals(successMessage, cmd.getSuccessMessage());
+        assertEquals(errorMessage, cmd.getErrorMessage());
+        assertEquals(timeout, cmd.getTimeout());
+        assertTrue(cmd.isEnabled());
+        assertTrue(MapUtils.isNotEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void testIsEnabledReturnsFalseWhenNull() {
+        setField("enabled", null);
+        assertFalse(cmd.isEnabled());
+    }
+
+    @Test
+    public void testIsEnabledReturnsFalseWhenFalse() {
+        setField("enabled", Boolean.FALSE);
+        assertFalse(cmd.isEnabled());
+    }
+
+    @Test
+    public void testIsEnabledReturnsTrueWhenTrue() {
+        setField("enabled", Boolean.TRUE);
+        assertTrue(cmd.isEnabled());
+    }
+
+    @Test
+    public void testGetAllowedRoleTypesReturnsNullWhenUnset() {
+        setField("allowedRoleTypes", null);
+        assertNull(cmd.getAllowedRoleTypes());
+    }
+
+    @Test
+    public void testGetAllowedRoleTypesReturnsEmptyList() {
+        setField("allowedRoleTypes", Collections.emptyList());
+        assertEquals(0, cmd.getAllowedRoleTypes().size());
+    }
+
+    @Test
+    public void testGetParametersMapReturnsNullWhenUnset() {
+        setField("parameters", null);
+        assertNull(cmd.getParametersMap());
+    }
+
+    @Test
+    public void testGetParametersMapReturnsMap() {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("foo", "bar");
+        setField("parameters", parameters);
+        assertEquals(parameters, cmd.getParametersMap());
+    }
+
+    @Test
+    public void testGetDetailsReturnsNullWhenUnset() {
+        setField("details", null);
+        assertTrue(MapUtils.isEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void testGetDetailsReturnsMap() {
+        Map<String, Map<String, String>> details = new HashMap<>();
+        Map<String, String> inner = new HashMap<>();
+        inner.put("key", "value");
+        details.put("details", inner);
+        setField("details", details);
+        assertTrue(MapUtils.isNotEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void testGetDescriptionReturnsNullWhenUnset() {
+        setField("description", null);
+        assertNull(cmd.getDescription());
+    }
+
+    @Test
+    public void testGetSuccessMessageReturnsNullWhenUnset() {
+        setField("successMessage", null);
+        assertNull(cmd.getSuccessMessage());
+    }
+
+    @Test
+    public void testGetErrorMessageReturnsNullWhenUnset() {
+        setField("errorMessage", null);
+        assertNull(cmd.getErrorMessage());
+    }
+
+    @Test
+    public void testGetTimeoutReturnsNullWhenUnset() {
+        setField("timeout", null);
+        assertNull(cmd.getTimeout());
+    }
+
+    @Test
+    public void testExecuteCallsExtensionsManagerAndSetsResponse() {
+        ExtensionCustomAction extensionCustomAction = mock(ExtensionCustomAction.class);
+        ExtensionCustomActionResponse response = mock(ExtensionCustomActionResponse.class);
+
+        when(extensionsManager.addCustomAction(any(AddCustomActionCmd.class))).thenReturn(extensionCustomAction);
+        when(extensionsManager.createCustomActionResponse(extensionCustomAction)).thenReturn(response);
+
+        AddCustomActionCmd spyCmd = spy(cmd);
+        doNothing().when(spyCmd).setResponseObject(any());
+
+        spyCmd.execute();
+
+        verify(extensionsManager).addCustomAction(spyCmd);
+        verify(extensionsManager).createCustomActionResponse(extensionCustomAction);
+        verify(response).setResponseName(spyCmd.getCommandName());
+        verify(spyCmd).setResponseObject(response);
+    }
+
+    @Test
+    public void testGetEntityOwnerIdReturnsSystemAccount() {
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+
+    @Test
+    public void testGetApiResourceTypeReturnsExtensionCustomAction() {
+        assertEquals(ApiCommandResourceType.ExtensionCustomAction, cmd.getApiResourceType());
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java
new file mode 100644
index 00000000000..2edb6ea48e3
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java
@@ -0,0 +1,97 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.test.util.ReflectionTestUtils.setField;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.collections.MapUtils;
+import org.junit.Test;
+
+public class CreateExtensionCmdTest {
+    CreateExtensionCmd cmd = new CreateExtensionCmd();
+
+    @Test
+    public void testGetNameReturnsNullWhenUnset() {
+        assertNull(cmd.getName());
+    }
+
+    @Test
+    public void testGetNameReturnsValueWhenSet() {
+        String name = "name";
+        setField(cmd, "name", name);
+        assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void testGetTypeReturnsNullWhenUnset() {
+        setField(cmd, "type", null);
+        assertNull(cmd.getType());
+    }
+
+    @Test
+    public void testGetDescriptionReturnsValueWhenSet() {
+        String description = "description";
+        setField(cmd, "description", description);
+        assertEquals(description, cmd.getDescription());
+    }
+
+    @Test
+    public void testGetPathReturnsValueWhenSet() {
+        String path = "/entry";
+        setField(cmd, "path", path);
+        assertEquals(path, cmd.getPath());
+    }
+
+    @Test
+    public void testGetStateReturnsNullWhenUnset() {
+        setField(cmd, "state", null);
+        assertNull(cmd.getState());
+    }
+
+    @Test
+    public void testIsOrchestratorRequiresPrepareVm() {
+        assertNull(cmd.isOrchestratorRequiresPrepareVm());
+        setField(cmd, "orchestratorRequiresPrepareVm", true);
+        assertTrue(cmd.isOrchestratorRequiresPrepareVm());
+        setField(cmd, "orchestratorRequiresPrepareVm", false);
+        assertFalse(cmd.isOrchestratorRequiresPrepareVm());
+    }
+
+    @Test
+    public void testGetDetailsReturnsNullWhenUnset() {
+        setField(cmd, "details", null);
+        assertTrue(MapUtils.isEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void testGetDetailsReturnsMap() {
+        Map<String, Map<String, String>> details = new HashMap<>();
+        Map<String, String> inner = new HashMap<>();
+        inner.put("key", "value");
+        details.put("details", inner);
+        setField(cmd, "details", details);
+        assertTrue(MapUtils.isNotEmpty(cmd.getDetails()));
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java
new file mode 100644
index 00000000000..3a217d009fa
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java
@@ -0,0 +1,81 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class DeleteCustomActionCmdTest {
+
+    private DeleteCustomActionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() throws Exception {
+        cmd = Mockito.spy(new DeleteCustomActionCmd());
+        extensionsManager = Mockito.mock(ExtensionsManager.class);
+        java.lang.reflect.Field field = DeleteCustomActionCmd.class.getDeclaredField("extensionsManager");
+        field.setAccessible(true);
+        field.set(cmd, extensionsManager);
+    }
+
+    @Test
+    public void getIdReturnsNullWhenUnset() throws Exception {
+        java.lang.reflect.Field field = DeleteCustomActionCmd.class.getDeclaredField("id");
+        field.setAccessible(true);
+        field.set(cmd, null);
+        assertNull(cmd.getId());
+    }
+
+    @Test
+    public void getIdReturnsValueWhenSet() throws Exception {
+        Long id = 12345L;
+        java.lang.reflect.Field field = DeleteCustomActionCmd.class.getDeclaredField("id");
+        field.setAccessible(true);
+        field.set(cmd, id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void executeSetsSuccessResponseWhenManagerReturnsTrue() throws Exception {
+        Mockito.when(extensionsManager.deleteCustomAction(cmd)).thenReturn(true);
+        Mockito.doNothing().when(cmd).setResponseObject(Mockito.any());
+        cmd.execute();
+        Mockito.verify(extensionsManager).deleteCustomAction(cmd);
+        Mockito.verify(cmd).setResponseObject(Mockito.any(SuccessResponse.class));
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerReturnsFalse() throws Exception {
+        Mockito.when(extensionsManager.deleteCustomAction(cmd)).thenReturn(false);
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals("Failed to delete extension custom action", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java
new file mode 100644
index 00000000000..9078a05dfda
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java
@@ -0,0 +1,90 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class DeleteExtensionCmdTest {
+
+    private DeleteExtensionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new DeleteExtensionCmd());
+        extensionsManager = Mockito.mock(ExtensionsManager.class);
+        cmd.extensionsManager = extensionsManager;
+    }
+
+    @Test
+    public void getIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "id", null);
+        assertNull(cmd.getId());
+    }
+
+    @Test
+    public void getIdReturnsValueWhenSet() {
+        Long id = 12345L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void isCleanupReturnsFalseWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "cleanup", null);
+        assertFalse(cmd.isCleanup());
+    }
+
+    @Test
+    public void isCleanupReturnsTrueWhenSetTrue() {
+        ReflectionTestUtils.setField(cmd, "cleanup", true);
+        assertTrue(cmd.isCleanup());
+    }
+
+    @Test
+    public void executeSetsSuccessResponseWhenManagerReturnsTrue() {
+        Mockito.when(extensionsManager.deleteExtension(cmd)).thenReturn(true);
+        Mockito.doNothing().when(cmd).setResponseObject(Mockito.any());
+        cmd.execute();
+        Mockito.verify(extensionsManager).deleteExtension(cmd);
+        Mockito.verify(cmd).setResponseObject(Mockito.any(SuccessResponse.class));
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerReturnsFalse() {
+        Mockito.when(extensionsManager.deleteExtension(cmd)).thenReturn(false);
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals("Failed to delete extension", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java
new file mode 100644
index 00000000000..6648b840c1c
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java
@@ -0,0 +1,153 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class ListCustomActionCmdTest {
+
+    private ListCustomActionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = new ListCustomActionCmd();
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    private void setField(String fieldName, Object value) {
+        ReflectionTestUtils.setField(cmd, fieldName, value);
+    }
+
+    @Test
+    public void getIdReturnsNullWhenUnset() {
+        setField("id", null);
+        assertNull(cmd.getId());
+    }
+
+    @Test
+    public void getIdReturnsValueWhenSet() {
+        Long id = 42L;
+        setField("id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getNameReturnsNullWhenUnset() {
+        setField("name", null);
+        assertNull(cmd.getName());
+    }
+
+    @Test
+    public void getNameReturnsValueWhenSet() {
+        String name = "customAction";
+        setField("name", name);
+        assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void getExtensionIdReturnsNullWhenUnset() {
+        setField("extensionId", null);
+        assertNull(cmd.getExtensionId());
+    }
+
+    @Test
+    public void getExtensionIdReturnsValueWhenSet() {
+        Long extensionId = 99L;
+        setField("extensionId", extensionId);
+        assertEquals(extensionId, cmd.getExtensionId());
+    }
+
+    @Test
+    public void getResourceTypeReturnsNullWhenUnset() {
+        setField("resourceType", null);
+        assertNull(cmd.getResourceType());
+    }
+
+    @Test
+    public void getResourceTypeReturnsValueWhenSet() {
+        String resourceType = "VM";
+        setField("resourceType", resourceType);
+        assertEquals(resourceType, cmd.getResourceType());
+    }
+
+    @Test
+    public void getResourceIdReturnsNullWhenUnset() {
+        setField("resourceId", null);
+        assertNull(cmd.getResourceId());
+    }
+
+    @Test
+    public void getResourceIdReturnsValueWhenSet() {
+        String resourceId = "abc-123";
+        setField("resourceId", resourceId);
+        assertEquals(resourceId, cmd.getResourceId());
+    }
+
+    @Test
+    public void isEnabledReturnsNullWhenUnset() {
+        setField("enabled", null);
+        assertNull(cmd.isEnabled());
+    }
+
+    @Test
+    public void isEnabledReturnsTrueWhenSetTrue() {
+        setField("enabled", Boolean.TRUE);
+        assertTrue(cmd.isEnabled());
+    }
+
+    @Test
+    public void isEnabledReturnsFalseWhenSetFalse() {
+        setField("enabled", Boolean.FALSE);
+        assertFalse(cmd.isEnabled());
+    }
+
+    @Test
+    public void executeSetsListResponse() {
+        List<ExtensionCustomActionResponse> responses = Arrays.asList(mock(ExtensionCustomActionResponse.class));
+        when(extensionsManager.listCustomActions(cmd)).thenReturn(responses);
+
+        ListCustomActionCmd spyCmd = Mockito.spy(cmd);
+        doNothing().when(spyCmd).setResponseObject(any());
+
+        spyCmd.execute();
+
+        verify(extensionsManager).listCustomActions(spyCmd);
+        verify(spyCmd).setResponseObject(any(ListResponse.class));
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java
new file mode 100644
index 00000000000..1ca601293a3
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java
@@ -0,0 +1,92 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.exception.InvalidParameterValueException;
+
+public class ListExtensionsCmdTest {
+
+    private ListExtensionsCmd cmd;
+
+    @Before
+    public void setUp() {
+        cmd = new ListExtensionsCmd();
+    }
+
+    private void setPrivateField(String fieldName, Object value) {
+        ReflectionTestUtils.setField(cmd, fieldName, value);
+    }
+
+    @Test
+    public void testGetName() {
+        String testName = "testExtension";
+        setPrivateField("name", testName);
+        assertEquals(testName, cmd.getName());
+    }
+
+    @Test
+    public void testGetExtensionId() {
+        Long testId = 123L;
+        setPrivateField("extensionId", testId);
+        assertEquals(testId, cmd.getExtensionId());
+    }
+
+    @Test
+    public void testGetDetailsReturnsAllWhenNull() {
+        setPrivateField("details", null);
+        EnumSet<ApiConstants.ExtensionDetails> result = cmd.getDetails();
+        assertEquals(EnumSet.of(ApiConstants.ExtensionDetails.all), result);
+    }
+
+    @Test
+    public void testGetDetailsReturnsAllWhenEmpty() {
+        setPrivateField("details", Collections.emptyList());
+        EnumSet<ApiConstants.ExtensionDetails> result = cmd.getDetails();
+        assertEquals(EnumSet.of(ApiConstants.ExtensionDetails.all), result);
+    }
+
+    @Test
+    public void testGetDetailsWithValidValues() {
+        List<String> detailsList = Arrays.asList("all", "resource");
+        setPrivateField("details", detailsList);
+        EnumSet<ApiConstants.ExtensionDetails> result = cmd.getDetails();
+        assertTrue(result.contains(ApiConstants.ExtensionDetails.all));
+        assertTrue(result.contains(ApiConstants.ExtensionDetails.resource));
+        assertEquals(2, result.size());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testGetDetailsWithInvalidValueThrowsException() {
+        List<String> detailsList = Arrays.asList("invalidValue");
+        setPrivateField("details", detailsList);
+        cmd.getDetails();
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java
new file mode 100644
index 00000000000..b5281342d4c
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java
@@ -0,0 +1,133 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class RegisterExtensionCmdTest {
+
+    private RegisterExtensionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new RegisterExtensionCmd());
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    @Test
+    public void extensionIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "extensionId", null);
+        assertNull(cmd.getExtensionId());
+    }
+
+    @Test
+    public void extensionIdReturnsValueWhenSet() {
+        Long extensionId = 12345L;
+        ReflectionTestUtils.setField(cmd, "extensionId", extensionId);
+        assertEquals(extensionId, cmd.getExtensionId());
+    }
+
+    @Test
+    public void resourceIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceId", null);
+        assertNull(cmd.getResourceId());
+    }
+
+    @Test
+    public void resourceIdReturnsValueWhenSet() {
+        String resourceId = "resource-123";
+        ReflectionTestUtils.setField(cmd, "resourceId", resourceId);
+        assertEquals(resourceId, cmd.getResourceId());
+    }
+
+    @Test
+    public void resourceTypeReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceType", null);
+        assertNull(cmd.getResourceType());
+    }
+
+    @Test
+    public void resourceTypeReturnsValueWhenSet() {
+        String resourceType = "VM";
+        ReflectionTestUtils.setField(cmd, "resourceType", resourceType);
+        assertEquals(resourceType, cmd.getResourceType());
+    }
+
+    @Test
+    public void detailsReturnsEmptyMapWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "details", null);
+        Map<String, String> details = cmd.getDetails();
+        assertNotNull(details);
+        assertTrue(details.isEmpty());
+    }
+
+    @Test
+    public void executeSetsExtensionResponseWhenManagerSucceeds() {
+        Extension extension = mock(Extension.class);
+        ExtensionResponse response = mock(ExtensionResponse.class);
+        when(extensionsManager.registerExtensionWithResource(cmd)).thenReturn(extension);
+        when(extensionsManager.createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all)))
+                .thenReturn(response);
+
+        doNothing().when(cmd).setResponseObject(any());
+
+        cmd.execute();
+
+        verify(extensionsManager).registerExtensionWithResource(cmd);
+        verify(extensionsManager).createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all));
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerFails() {
+        when(extensionsManager.registerExtensionWithResource(cmd))
+                .thenThrow(new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to register extension"));
+
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals("Failed to register extension", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmdTest.java
new file mode 100644
index 00000000000..0fb4f628d27
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmdTest.java
@@ -0,0 +1,127 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.extension.CustomActionResultResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class RunCustomActionCmdTest {
+
+    private RunCustomActionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new RunCustomActionCmd());
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    @Test
+    public void customActionIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "customActionId", null);
+        assertNull(cmd.getCustomActionId());
+    }
+
+    @Test
+    public void customActionIdReturnsValueWhenSet() {
+        Long customActionId = 12345L;
+        ReflectionTestUtils.setField(cmd, "customActionId", customActionId);
+        assertEquals(customActionId, cmd.getCustomActionId());
+    }
+
+    @Test
+    public void resourceTypeReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceType", null);
+        assertNull(cmd.getResourceType());
+    }
+
+    @Test
+    public void resourceTypeReturnsValueWhenSet() {
+        String resourceType = "VM";
+        ReflectionTestUtils.setField(cmd, "resourceType", resourceType);
+        assertEquals(resourceType, cmd.getResourceType());
+    }
+
+    @Test
+    public void resourceIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceId", null);
+        assertNull(cmd.getResourceId());
+    }
+
+    @Test
+    public void resourceIdReturnsValueWhenSet() {
+        String resourceId = "resource-123";
+        ReflectionTestUtils.setField(cmd, "resourceId", resourceId);
+        assertEquals(resourceId, cmd.getResourceId());
+    }
+
+    @Test
+    public void parametersReturnsEmptyMapWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "parameters", null);
+        Map<String, String> parameters = cmd.getParameters();
+        assertNotNull(parameters);
+        assertTrue(parameters.isEmpty());
+    }
+
+    @Test
+    public void executeSetsCustomActionResultResponseWhenManagerSucceeds() {
+        CustomActionResultResponse response = mock(CustomActionResultResponse.class);
+        when(extensionsManager.runCustomAction(cmd)).thenReturn(response);
+
+        doNothing().when(cmd).setResponseObject(any());
+
+        cmd.execute();
+
+        verify(extensionsManager).runCustomAction(cmd);
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerFails() {
+        when(extensionsManager.runCustomAction(cmd))
+                .thenThrow(new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to run custom action"));
+
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals(ApiErrorCode.INTERNAL_ERROR, e.getErrorCode());
+            assertEquals("Failed to run custom action", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmdTest.java
new file mode 100644
index 00000000000..f3c26f71f70
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmdTest.java
@@ -0,0 +1,124 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.EnumSet;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class UnregisterExtensionCmdTest {
+
+    private UnregisterExtensionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new UnregisterExtensionCmd());
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    @Test
+    public void extensionIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "extensionId", null);
+        assertNull(cmd.getExtensionId());
+    }
+
+    @Test
+    public void extensionIdReturnsValueWhenSet() {
+        Long extensionId = 12345L;
+        ReflectionTestUtils.setField(cmd, "extensionId", extensionId);
+        assertEquals(extensionId, cmd.getExtensionId());
+    }
+
+    @Test
+    public void resourceIdReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceId", null);
+        assertNull(cmd.getResourceId());
+    }
+
+    @Test
+    public void resourceIdReturnsValueWhenSet() {
+        String resourceId = "resource-123";
+        ReflectionTestUtils.setField(cmd, "resourceId", resourceId);
+        assertEquals(resourceId, cmd.getResourceId());
+    }
+
+    @Test
+    public void resourceTypeReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceType", null);
+        assertNull(cmd.getResourceType());
+    }
+
+    @Test
+    public void resourceTypeReturnsValueWhenSet() {
+        String resourceType = "VM";
+        ReflectionTestUtils.setField(cmd, "resourceType", resourceType);
+        assertEquals(resourceType, cmd.getResourceType());
+    }
+
+    @Test
+    public void executeSetsExtensionResponseWhenManagerSucceeds() {
+        Extension extension = mock(Extension.class);
+        ExtensionResponse response = mock(ExtensionResponse.class);
+        when(extensionsManager.unregisterExtensionWithResource(cmd)).thenReturn(extension);
+        when(extensionsManager.createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all)))
+                .thenReturn(response);
+
+        doNothing().when(cmd).setResponseObject(any());
+
+        cmd.execute();
+
+        verify(extensionsManager).unregisterExtensionWithResource(cmd);
+        verify(extensionsManager).createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all));
+        verify(response).setResponseName(cmd.getCommandName());
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerFails() {
+        when(extensionsManager.unregisterExtensionWithResource(cmd))
+                .thenThrow(new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to unregister extension"));
+
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals(ApiErrorCode.INTERNAL_ERROR, e.getErrorCode());
+            assertEquals("Failed to unregister extension", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmdTest.java
new file mode 100644
index 00000000000..5ba17111c1c
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmdTest.java
@@ -0,0 +1,240 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.commons.collections.MapUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class UpdateCustomActionCmdTest {
+
+    private UpdateCustomActionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new UpdateCustomActionCmd());
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    @Test
+    public void idReturnsValueWhenSet() {
+        long id = 12345L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void descriptionReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "description", null);
+        assertNull(cmd.getDescription());
+    }
+
+    @Test
+    public void descriptionReturnsValueWhenSet() {
+        String description = "Custom action description";
+        ReflectionTestUtils.setField(cmd, "description", description);
+        assertEquals(description, cmd.getDescription());
+    }
+
+    @Test
+    public void resourceTypeReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "resourceType", null);
+        assertNull(cmd.getResourceType());
+    }
+
+    @Test
+    public void resourceTypeReturnsValueWhenSet() {
+        String resourceType = "VM";
+        ReflectionTestUtils.setField(cmd, "resourceType", resourceType);
+        assertEquals(resourceType, cmd.getResourceType());
+    }
+
+    @Test
+    public void allowedRoleTypesReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "allowedRoleTypes", null);
+        assertNull(cmd.getAllowedRoleTypes());
+    }
+
+    @Test
+    public void allowedRoleTypesReturnsValueWhenSet() {
+        List<String> roles = Arrays.asList("Admin", "User");
+        ReflectionTestUtils.setField(cmd, "allowedRoleTypes", roles);
+        assertEquals(roles, cmd.getAllowedRoleTypes());
+    }
+
+    @Test
+    public void parametersMapReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "parameters", null);
+        assertNull(cmd.getParametersMap());
+    }
+
+    @Test
+    public void parametersMapReturnsValueWhenSet() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", "param1");
+        ReflectionTestUtils.setField(cmd, "parameters", params);
+        assertEquals(params, cmd.getParametersMap());
+    }
+
+    @Test
+    public void isCleanupParametersReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "cleanupParameters", null);
+        assertNull(cmd.isCleanupParameters());
+    }
+
+    @Test
+    public void isCleanupParametersReturnsValueWhenSet() {
+        ReflectionTestUtils.setField(cmd, "cleanupParameters", Boolean.TRUE);
+        assertTrue(cmd.isCleanupParameters());
+    }
+
+    @Test
+    public void successMessageReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "successMessage", null);
+        assertNull(cmd.getSuccessMessage());
+    }
+
+    @Test
+    public void successMessageReturnsValueWhenSet() {
+        String msg = "Success!";
+        ReflectionTestUtils.setField(cmd, "successMessage", msg);
+        assertEquals(msg, cmd.getSuccessMessage());
+    }
+
+    @Test
+    public void errorMessageReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "errorMessage", null);
+        assertNull(cmd.getErrorMessage());
+    }
+
+    @Test
+    public void errorMessageReturnsValueWhenSet() {
+        String msg = "Error!";
+        ReflectionTestUtils.setField(cmd, "errorMessage", msg);
+        assertEquals(msg, cmd.getErrorMessage());
+    }
+
+    @Test
+    public void timeoutReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "timeout", null);
+        assertNull(cmd.getTimeout());
+    }
+
+    @Test
+    public void timeoutReturnsValueWhenSet() {
+        Integer timeout = 10;
+        ReflectionTestUtils.setField(cmd, "timeout", timeout);
+        assertEquals(timeout, cmd.getTimeout());
+    }
+
+    @Test
+    public void isEnabledReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "enabled", null);
+        assertNull(cmd.isEnabled());
+    }
+
+    @Test
+    public void isEnabledReturnsValueWhenSet() {
+        ReflectionTestUtils.setField(cmd, "enabled", Boolean.FALSE);
+        assertFalse(cmd.isEnabled());
+    }
+
+    @Test
+    public void detailsReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "details", null);
+        assertTrue(MapUtils.isEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void detailsReturnsValueWhenSet() {
+        Map<String, Map<String, String>> details = new HashMap<>();
+        Map<String, String> inner = new HashMap<>();
+        inner.put("vendor", "acme");
+        details.put("details", inner);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        assertTrue(MapUtils.isNotEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void isCleanupDetailsReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "cleanupDetails", null);
+        assertNull(cmd.isCleanupDetails());
+    }
+
+    @Test
+    public void isCleanupDetailsReturnsValueWhenSet() {
+        ReflectionTestUtils.setField(cmd, "cleanupDetails", Boolean.TRUE);
+        assertTrue(cmd.isCleanupDetails());
+    }
+
+    @Test
+    public void executeSetsCustomActionResponseWhenManagerSucceeds() {
+        ExtensionCustomAction customAction = mock(ExtensionCustomAction.class);
+        ExtensionCustomActionResponse response = mock(ExtensionCustomActionResponse.class);
+        when(extensionsManager.updateCustomAction(cmd)).thenReturn(customAction);
+        when(extensionsManager.createCustomActionResponse(customAction)).thenReturn(response);
+
+        doNothing().when(cmd).setResponseObject(any());
+
+        cmd.execute();
+
+        verify(extensionsManager).updateCustomAction(cmd);
+        verify(extensionsManager).createCustomActionResponse(customAction);
+        verify(response).setResponseName(cmd.getCommandName());
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerFails() {
+        when(extensionsManager.updateCustomAction(cmd))
+                .thenThrow(new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update custom action"));
+
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals(ApiErrorCode.INTERNAL_ERROR, e.getErrorCode());
+            assertEquals("Failed to update custom action", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmdTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmdTest.java
new file mode 100644
index 00000000000..f0a3a6fcf21
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmdTest.java
@@ -0,0 +1,168 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.commons.collections.MapUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class UpdateExtensionCmdTest {
+
+    private UpdateExtensionCmd cmd;
+    private ExtensionsManager extensionsManager;
+
+    @Before
+    public void setUp() {
+        cmd = Mockito.spy(new UpdateExtensionCmd());
+        extensionsManager = mock(ExtensionsManager.class);
+        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
+    }
+
+    @Test
+    public void idReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "id", null);
+        assertNull(cmd.getId());
+    }
+
+    @Test
+    public void idReturnsValueWhenSet() {
+        Long id = 12345L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void descriptionReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "description", null);
+        assertNull(cmd.getDescription());
+    }
+
+    @Test
+    public void descriptionReturnsValueWhenSet() {
+        String description = "Extension description";
+        ReflectionTestUtils.setField(cmd, "description", description);
+        assertEquals(description, cmd.getDescription());
+    }
+
+    @Test
+    public void orchestratorRequiresPrepareVmReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "orchestratorRequiresPrepareVm", null);
+        assertNull(cmd.isOrchestratorRequiresPrepareVm());
+    }
+
+    @Test
+    public void orchestratorRequiresPrepareVmReturnsValueWhenSet() {
+        ReflectionTestUtils.setField(cmd, "orchestratorRequiresPrepareVm", Boolean.TRUE);
+        assertTrue(cmd.isOrchestratorRequiresPrepareVm());
+    }
+
+    @Test
+    public void stateReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "state", null);
+        assertNull(cmd.getState());
+    }
+
+    @Test
+    public void stateReturnsValueWhenSet() {
+        String state = "Active";
+        ReflectionTestUtils.setField(cmd, "state", state);
+        assertEquals(state, cmd.getState());
+    }
+
+    @Test
+    public void detailsReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "details", null);
+        assertTrue(MapUtils.isEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void detailsReturnsValueWhenSet() {
+        Map<String, Map<String, String>> details = new HashMap<>();
+        Map<String, String> inner = new HashMap<>();
+        inner.put("vendor", "acme");
+        details.put("details", inner);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        assertTrue(MapUtils.isNotEmpty(cmd.getDetails()));
+    }
+
+    @Test
+    public void isCleanupDetailsReturnsNullWhenUnset() {
+        ReflectionTestUtils.setField(cmd, "cleanupDetails", null);
+        assertNull(cmd.isCleanupDetails());
+    }
+
+    @Test
+    public void isCleanupDetailsReturnsValueWhenSet() {
+        ReflectionTestUtils.setField(cmd, "cleanupDetails", Boolean.TRUE);
+        assertTrue(cmd.isCleanupDetails());
+    }
+
+    @Test
+    public void executeSetsExtensionResponseWhenManagerSucceeds() {
+        Extension extension = mock(Extension.class);
+        ExtensionResponse response = mock(ExtensionResponse.class);
+        when(extensionsManager.updateExtension(cmd)).thenReturn(extension);
+        when(extensionsManager.createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all)))
+                .thenReturn(response);
+
+        doNothing().when(cmd).setResponseObject(any());
+
+        cmd.execute();
+
+        verify(extensionsManager).updateExtension(cmd);
+        verify(extensionsManager).createExtensionResponse(extension, EnumSet.of(ApiConstants.ExtensionDetails.all));
+        verify(response).setResponseName(cmd.getCommandName());
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsServerApiExceptionWhenManagerFails() {
+        when(extensionsManager.updateExtension(cmd))
+                .thenThrow(new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update extension"));
+
+        try {
+            cmd.execute();
+            fail("Expected ServerApiException");
+        } catch (ServerApiException e) {
+            assertEquals(ApiErrorCode.INTERNAL_ERROR, e.getErrorCode());
+            assertEquals("Failed to update extension", e.getDescription());
+        }
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommandTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommandTest.java
new file mode 100644
index 00000000000..ba95cc2da97
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommandTest.java
@@ -0,0 +1,78 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.command;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.cloudstack.extension.Extension;
+import org.junit.Test;
+
+public class ExtensionBaseCommandTest {
+
+    @Test
+    public void extensionIdReturnsCorrectValue() {
+        Extension extension = mock(Extension.class);
+        when(extension.getId()).thenReturn(12345L);
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertEquals(12345L, command.getExtensionId());
+    }
+
+    @Test
+    public void extensionNameReturnsCorrectValue() {
+        Extension extension = mock(Extension.class);
+        when(extension.getName()).thenReturn("TestExtension");
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertEquals("TestExtension", command.getExtensionName());
+    }
+
+    @Test
+    public void extensionUserDefinedReturnsTrueWhenSet() {
+        Extension extension = mock(Extension.class);
+        when(extension.isUserDefined()).thenReturn(true);
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertTrue(command.isExtensionUserDefined());
+    }
+
+    @Test
+    public void extensionRelativePathReturnsCorrectValue() {
+        Extension extension = mock(Extension.class);
+        when(extension.getRelativePath()).thenReturn("/entry/point");
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertEquals("/entry/point", command.getExtensionRelativePath());
+    }
+
+    @Test
+    public void extensionStateReturnsCorrectValue() {
+        Extension extension = mock(Extension.class);
+        Extension.State state = Extension.State.Enabled;
+        when(extension.getState()).thenReturn(state);
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertEquals(state, command.getExtensionState());
+    }
+
+    @Test
+    public void executeInSequenceReturnsFalse() {
+        Extension extension = mock(Extension.class);
+        ExtensionBaseCommand command = new ExtensionBaseCommand(extension);
+        assertFalse(command.executeInSequence());
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImplTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImplTest.java
new file mode 100644
index 00000000000..dccd1ebf1ed
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImplTest.java
@@ -0,0 +1,68 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionVO;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExtensionCustomActionDaoImplTest {
+
+    private ExtensionCustomActionDaoImpl dao;
+
+    @Before
+    public void setUp() {
+        dao = mock(ExtensionCustomActionDaoImpl.class);
+    }
+
+    @Test
+    public void findByNameAndExtensionIdReturnsNullWhenNoMatch() {
+        when(dao.findByNameAndExtensionId(1L, "nonexistent")).thenReturn(null);
+        assertNull(dao.findByNameAndExtensionId(1L, "nonexistent"));
+    }
+
+    @Test
+    public void findByNameAndExtensionIdReturnsCorrectEntity() {
+        ExtensionCustomActionVO expected = new ExtensionCustomActionVO();
+        expected.setName("actionName");
+        expected.setExtensionId(1L);
+        when(dao.findByNameAndExtensionId(1L, "actionName")).thenReturn(expected);
+        assertEquals(expected, dao.findByNameAndExtensionId(1L, "actionName"));
+    }
+
+    @Test
+    public void listIdsByExtensionIdReturnsEmptyListWhenNoMatch() {
+        when(dao.listIdsByExtensionId(999L)).thenReturn(List.of());
+        assertTrue(dao.listIdsByExtensionId(999L).isEmpty());
+    }
+
+    @Test
+    public void listIdsByExtensionIdReturnsCorrectIds() {
+        List<Long> expectedIds = List.of(1L, 2L, 3L);
+        when(dao.listIdsByExtensionId(1L)).thenReturn(expectedIds);
+        assertEquals(expectedIds, dao.listIdsByExtensionId(1L));
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java
new file mode 100644
index 00000000000..545feba0b3d
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java
@@ -0,0 +1,51 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExtensionDaoImplTest {
+
+    private ExtensionDaoImpl dao;
+
+    @Before
+    public void setUp() {
+        dao = mock(ExtensionDaoImpl.class);
+    }
+
+    @Test
+    public void findByNameReturnsNullWhenNoMatch() {
+        when(dao.findByName("nonexistent")).thenReturn(null);
+        assertNull(dao.findByName("nonexistent"));
+    }
+
+    @Test
+    public void findByNameReturnsCorrectEntity() {
+        ExtensionVO expected = new ExtensionVO();
+        expected.setName("extensionName");
+        when(dao.findByName("extensionName")).thenReturn(expected);
+        assertEquals(expected, dao.findByName("extensionName"));
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImplTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImplTest.java
new file mode 100644
index 00000000000..76a0175e757
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImplTest.java
@@ -0,0 +1,86 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.dao;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExtensionResourceMapDaoImplTest {
+
+    private ExtensionResourceMapDaoImpl dao;
+
+    @Before
+    public void setUp() {
+        dao = mock(ExtensionResourceMapDaoImpl.class);
+    }
+
+    @Test
+    public void listByExtensionIdReturnsEmptyListWhenNoMatch() {
+        when(dao.listByExtensionId(999L)).thenReturn(List.of());
+        assertTrue(dao.listByExtensionId(999L).isEmpty());
+    }
+
+    @Test
+    public void listByExtensionIdReturnsCorrectEntities() {
+        ExtensionResourceMapVO entity1 = new ExtensionResourceMapVO();
+        entity1.setExtensionId(1L);
+        ExtensionResourceMapVO entity2 = new ExtensionResourceMapVO();
+        entity2.setExtensionId(1L);
+        List<ExtensionResourceMapVO> expected = List.of(entity1, entity2);
+        when(dao.listByExtensionId(1L)).thenReturn(expected);
+        assertEquals(expected, dao.listByExtensionId(1L));
+    }
+
+    @Test
+    public void findByResourceIdAndTypeReturnsNullWhenNoMatch() {
+        when(dao.findByResourceIdAndType(999L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(null);
+        assertNull(dao.findByResourceIdAndType(999L, ExtensionResourceMap.ResourceType.Cluster));
+    }
+
+    @Test
+    public void findByResourceIdAndTypeReturnsCorrectEntity() {
+        ExtensionResourceMapVO expected = new ExtensionResourceMapVO();
+        expected.setResourceId(123L);
+        expected.setResourceType(ExtensionResourceMap.ResourceType.Cluster);
+        when(dao.findByResourceIdAndType(123L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(expected);
+        assertEquals(expected, dao.findByResourceIdAndType(123L, ExtensionResourceMap.ResourceType.Cluster));
+    }
+
+    @Test
+    public void listResourceIdsByExtensionIdAndTypeReturnsEmptyListWhenNoMatch() {
+        when(dao.listResourceIdsByExtensionIdAndType(999L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(List.of());
+        assertTrue(dao.listResourceIdsByExtensionIdAndType(999L, ExtensionResourceMap.ResourceType.Cluster).isEmpty());
+    }
+
+    @Test
+    public void listResourceIdsByExtensionIdAndTypeReturnsCorrectIds() {
+        List<Long> expectedIds = List.of(1L, 2L, 3L);
+        when(dao.listResourceIdsByExtensionIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(expectedIds);
+        assertEquals(expectedIds, dao.listResourceIdsByExtensionIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster));
+    }
+}
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
new file mode 100644
index 00000000000..00bf915831b
--- /dev/null
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
@@ -0,0 +1,1809 @@
+// 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.
+
+package org.apache.cloudstack.framework.extensions.manager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.cloudstack.acl.Role;
+import org.apache.cloudstack.acl.RoleService;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.extension.CustomActionResultResponse;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.extensions.api.AddCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.CreateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.DeleteExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.ListExtensionsCmd;
+import org.apache.cloudstack.framework.extensions.api.RegisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.RunCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UnregisterExtensionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateCustomActionCmd;
+import org.apache.cloudstack.framework.extensions.api.UpdateExtensionCmd;
+import org.apache.cloudstack.framework.extensions.command.CleanupExtensionFilesCommand;
+import org.apache.cloudstack.framework.extensions.command.ExtensionServerActionBaseCommand;
+import org.apache.cloudstack.framework.extensions.command.GetExtensionPathChecksumCommand;
+import org.apache.cloudstack.framework.extensions.command.PrepareExtensionPathCommand;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionCustomActionDetailsDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDetailsDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDetailsDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionDetailsVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionCustomActionVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.alert.AlertManager;
+import com.cloud.cluster.ClusterManager;
+import com.cloud.cluster.ManagementServerHostVO;
+import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
+import com.cloud.hypervisor.ExternalProvisioner;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.org.Cluster;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.user.Account;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.VMInstanceDao;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ExtensionsManagerImplTest {
+
+    @Spy
+    @InjectMocks
+    private ExtensionsManagerImpl extensionsManager;
+
+    @Mock
+    private ExtensionDao extensionDao;
+    @Mock
+    private ExtensionDetailsDao extensionDetailsDao;
+    @Mock
+    private ExtensionResourceMapDao extensionResourceMapDao;
+    @Mock
+    private ExtensionResourceMapDetailsDao extensionResourceMapDetailsDao;
+    @Mock
+    private ClusterDao clusterDao;
+    @Mock
+    private AgentManager agentMgr;
+    @Mock
+    private HostDao hostDao;
+    @Mock
+    private HostDetailsDao hostDetailsDao;
+    @Mock
+    private ExternalProvisioner externalProvisioner;
+    @Mock
+    private ExtensionCustomActionDao extensionCustomActionDao;
+    @Mock
+    private ExtensionCustomActionDetailsDao extensionCustomActionDetailsDao;
+    @Mock
+    private VMInstanceDao vmInstanceDao;
+    @Mock
+    private VirtualMachineManager virtualMachineManager;
+    @Mock
+    private EntityManager entityManager;
+    @Mock
+    private ManagementServerHostDao managementServerHostDao;
+    @Mock
+    private ClusterManager clusterManager;
+    @Mock
+    private AlertManager alertManager;
+    @Mock
+    private VMTemplateDao templateDao;
+    @Mock
+    private RoleService roleService;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.openMocks(this);
+    }
+
+    @Test
+    public void getDefaultExtensionRelativePathReturnsExpectedPath() {
+        String name = "testExtension";
+        String expected = Extension.getDirectoryName(name) + File.separator + Extension.getDirectoryName(name) + ".sh";
+        String result = extensionsManager.getDefaultExtensionRelativePath(name);
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void getValidatedExtensionRelativePathReturnsNormalizedPath() {
+        String name = "ext";
+        String path = "ext/entry.sh";
+        String result = extensionsManager.getValidatedExtensionRelativePath(name, path);
+        assertTrue(result.startsWith("ext/"));
+    }
+
+    @Test(expected = InvalidParameterException.class)
+    public void getValidatedExtensionRelativePathThrowsForDeepPath() {
+        String name = "ext";
+        String path = "ext/a/b/c/entry.sh";
+        extensionsManager.getValidatedExtensionRelativePath(name, path);
+    }
+
+    @Test
+    public void getResultFromAnswersStringReturnsSuccess() {
+        Extension ext = mock(Extension.class);
+        Answer[] answers = new Answer[]{new Answer(mock(PrepareExtensionPathCommand.class), true, "ok")};
+        String json = GsonHelper.getGson().toJson(answers);
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        Pair<Boolean, String> result = extensionsManager.getResultFromAnswersString(json, ext, msHost, "op");
+        assertTrue(result.first());
+        assertEquals("ok", result.second());
+    }
+
+    @Test
+    public void getResultFromAnswersStringReturnsFailure() {
+        Extension ext = mock(Extension.class);
+        Answer[] answers = new Answer[]{new Answer(mock(PrepareExtensionPathCommand.class), false, "fail")};
+        String json = GsonHelper.getGson().toJson(answers);
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        Pair<Boolean, String> result = extensionsManager.getResultFromAnswersString(json, ext, msHost, "op");
+        assertFalse(result.first());
+        assertEquals("fail", result.second());
+    }
+
+    @Test
+    public void prepareExtensionPathOnMSPeerReturnsTrueOnSuccess() {
+        Extension ext = mock(Extension.class);
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        when(msHost.getMsid()).thenReturn(1L);
+        when(clusterManager.execute(anyString(), anyLong(), anyString(), eq(true)))
+                .thenReturn("answer");
+        doReturn(new Pair<>(true, "ok")).when(extensionsManager).getResultFromAnswersString(anyString(), eq(ext), eq(msHost), anyString());
+        assertTrue(extensionsManager.prepareExtensionPathOnMSPeer(ext, msHost));
+    }
+
+    @Test
+    public void prepareExtensionPathOnCurrentServerReturnsSuccess() {
+        doNothing().when(externalProvisioner).prepareExtensionPath(anyString(), anyBoolean(), anyString());
+        Pair<Boolean, String> result = extensionsManager.prepareExtensionPathOnCurrentServer("name", true, "entry");
+        assertTrue(result.first());
+        assertNull(result.second());
+    }
+
+    @Test
+    public void cleanupExtensionFilesOnMSPeerReturnsTrueOnSuccess() {
+        Extension ext = mock(Extension.class);
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        when(msHost.getMsid()).thenReturn(1L);
+        when(clusterManager.execute(anyString(), anyLong(), anyString(), eq(true)))
+                .thenReturn("answer");
+        doReturn(new Pair<>(true, "ok")).when(extensionsManager).getResultFromAnswersString(anyString(), eq(ext), eq(msHost), anyString());
+        assertTrue(extensionsManager.cleanupExtensionFilesOnMSPeer(ext, msHost));
+    }
+
+    @Test
+    public void cleanupExtensionFilesOnCurrentServerReturnsSuccess() {
+        Pair<Boolean, String> result = extensionsManager.cleanupExtensionFilesOnCurrentServer("name", "entry");
+        assertTrue(result.first());
+    }
+
+    @Test
+    public void getParametersListFromMapReturnsEmptyListForNull() {
+        List<ExtensionCustomAction.Parameter> result = extensionsManager.getParametersListFromMap("action", null);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void unregisterExtensionWithClusterThrowsIfClusterNotFound() {
+        when(clusterDao.findByUuid(anyString())).thenReturn(null);
+        extensionsManager.unregisterExtensionWithCluster("uuid", 1L);
+    }
+
+    @Test
+    public void getExtensionFromResourceReturnsNullIfEntityNotFound() {
+        when(entityManager.findByUuid(any(), anyString())).thenReturn(null);
+        assertNull(extensionsManager.getExtensionFromResource(ExtensionCustomAction.ResourceType.VirtualMachine, "uuid"));
+    }
+
+    @Test
+    public void getActionMessageReturnsDefaultOnBlank() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        Extension ext = mock(Extension.class);
+        when(action.getSuccessMessage()).thenReturn(null);
+        String msg = extensionsManager.getActionMessage(true, action, ext, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+        assertTrue(msg.contains("Successfully completed"));
+    }
+
+    @Test
+    public void getActionMessageReturnsDefaultMessageForSuccessWithoutCustomMessage() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        Extension extension = mock(Extension.class);
+        when(action.getSuccessMessage()).thenReturn(null);
+
+        String result = extensionsManager.getActionMessage(true, action, extension, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+
+        assertTrue(result.contains("Successfully completed"));
+    }
+
+    @Test
+    public void getActionMessageReturnsCustomSuccessMessage() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getName()).thenReturn("actionName");
+        Extension extension = mock(Extension.class);
+        when(extension.getName()).thenReturn("extension");
+        when(action.getSuccessMessage()).thenReturn("Custom success message");
+        String result = extensionsManager.getActionMessage(true, action, extension, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+        assertEquals("Custom success message", result);
+    }
+
+    @Test
+    public void getActionMessageReturnsDefaultMessageForFailureWithoutCustomMessage() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        Extension extension = mock(Extension.class);
+        when(action.getErrorMessage()).thenReturn(null);
+
+        String result = extensionsManager.getActionMessage(false, action, extension, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+
+        assertTrue(result.contains("Failed to complete"));
+    }
+
+    @Test
+    public void getActionMessageReturnsCustomFailureMessage() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getName()).thenReturn("actionName");
+        Extension extension = mock(Extension.class);
+        when(extension.getName()).thenReturn("extension");
+        when(action.getErrorMessage()).thenReturn("Custom failure message");
+        String result = extensionsManager.getActionMessage(false, action, extension, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+        assertEquals("Custom failure message", result);
+    }
+
+    @Test
+    public void getActionMessageHandlesNullActionMessage() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getSuccessMessage()).thenReturn(null);
+        Extension extension = mock(Extension.class);
+        String result = extensionsManager.getActionMessage(true, action, extension, ExtensionCustomAction.ResourceType.VirtualMachine, null);
+        assertTrue(result.contains("Successfully completed"));
+    }
+
+    @Test
+    public void getFilteredExternalDetailsReturnsFilteredMap() {
+        Map<String, String> details = new HashMap<>();
+        String key = "detail.key";
+        details.put(VmDetailConstants.EXTERNAL_DETAIL_PREFIX + key, "value");
+        details.put("other.key", "value2");
+        Map<String, String> filtered = extensionsManager.getFilteredExternalDetails(details);
+        assertTrue(filtered.containsKey(key));
+        assertFalse(filtered.containsKey("other.key"));
+    }
+
+    @Test
+    public void sendExtensionPathNotReadyAlertCallsAlertManager() {
+        Extension ext = mock(Extension.class);
+        when(ext.getState()).thenReturn(Extension.State.Enabled);
+        extensionsManager.sendExtensionPathNotReadyAlert(ext);
+        verify(alertManager, atLeastOnce()).sendAlert(eq(AlertManager.AlertType.ALERT_TYPE_EXTENSION_PATH_NOT_READY),
+                anyLong(), anyLong(), anyString(), anyString());
+    }
+
+    @Test
+    public void sendExtensionPathNotReadyAlertDoesNotCallsAlertManager() {
+        Extension ext = mock(Extension.class);
+        when(ext.getState()).thenReturn(Extension.State.Disabled);
+        extensionsManager.sendExtensionPathNotReadyAlert(ext);
+        verify(alertManager, never()).sendAlert(eq(AlertManager.AlertType.ALERT_TYPE_EXTENSION_PATH_NOT_READY),
+                anyLong(), anyLong(), anyString(), anyString());
+    }
+
+    @Test
+    public void updateExtensionPathReadyUpdatesWhenStateDiffers() {
+        Extension ext = mock(Extension.class);
+        when(ext.getId()).thenReturn(1L);
+        when(ext.isPathReady()).thenReturn(false);
+        ExtensionVO vo = mock(ExtensionVO.class);
+        when(extensionDao.createForUpdate(1L)).thenReturn(vo);
+        when(extensionDao.update(1L, vo)).thenReturn(true);
+        extensionsManager.updateExtensionPathReady(ext, true);
+        verify(extensionDao).update(1L, vo);
+    }
+
+    @Test
+    public void disableExtensionUpdatesState() {
+        ExtensionVO vo = mock(ExtensionVO.class);
+        when(extensionDao.createForUpdate(1L)).thenReturn(vo);
+        when(extensionDao.update(1L, vo)).thenReturn(true);
+        extensionsManager.disableExtension(1L);
+        verify(extensionDao).update(1L, vo);
+    }
+
+    @Test
+    public void getExtensionFromResourceReturnsExtensionForValidResource() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(entityManager.findByUuid(eq(VirtualMachine.class), eq("vm-uuid"))).thenReturn(vm);
+        when(virtualMachineManager.findClusterAndHostIdForVm(vm, false)).thenReturn(new Pair<>(1L, 1L));
+        ExtensionResourceMapVO mapVO = mock(ExtensionResourceMapVO.class);
+        when(mapVO.getExtensionId()).thenReturn(100L);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(mapVO);
+        ExtensionVO extension = mock(ExtensionVO.class);
+        when(extensionDao.findById(100L)).thenReturn(extension);
+
+        Extension result = extensionsManager.getExtensionFromResource(ExtensionCustomAction.ResourceType.VirtualMachine, "vm-uuid");
+
+        assertEquals(extension, result);
+    }
+
+    @Test
+    public void getExtensionFromResourceReturnsNullForInvalidResourceUuid() {
+        when(entityManager.findByUuid(eq(VirtualMachine.class), eq("invalid-uuid"))).thenReturn(null);
+
+        Extension result = extensionsManager.getExtensionFromResource(ExtensionCustomAction.ResourceType.VirtualMachine, "invalid-uuid");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void getExtensionFromResourceReturnsNullForMissingClusterMapping() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(entityManager.findByUuid(eq(VirtualMachine.class), eq("vm-uuid"))).thenReturn(vm);
+        when(virtualMachineManager.findClusterAndHostIdForVm(vm, false)).thenReturn(new Pair<>(null, null));
+
+        Extension result = extensionsManager.getExtensionFromResource(ExtensionCustomAction.ResourceType.VirtualMachine, "vm-uuid");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void getExtensionFromResourceReturnsNullForMissingExtensionMapping() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(entityManager.findByUuid(eq(VirtualMachine.class), eq("vm-uuid"))).thenReturn(vm);
+        when(virtualMachineManager.findClusterAndHostIdForVm(vm, false)).thenReturn(new Pair<>(1L, 1L));
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(null);
+
+        Extension result = extensionsManager.getExtensionFromResource(ExtensionCustomAction.ResourceType.VirtualMachine, "vm-uuid");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void updateExtensionPathReadyUpdatesStateWhenNotReady() {
+        Extension ext = mock(Extension.class);
+        when(ext.getId()).thenReturn(1L);
+        when(ext.isPathReady()).thenReturn(true);
+        ExtensionVO vo = mock(ExtensionVO.class);
+        when(extensionDao.createForUpdate(1L)).thenReturn(vo);
+        when(extensionDao.update(1L, vo)).thenReturn(true);
+
+        extensionsManager.updateExtensionPathReady(ext, false);
+
+        verify(extensionDao).update(1L, vo);
+    }
+
+    @Test
+    public void updateExtensionPathReadyDoesNotUpdateWhenStateUnchanged() {
+        Extension ext = mock(Extension.class);
+        when(ext.isPathReady()).thenReturn(true);
+        extensionsManager.updateExtensionPathReady(ext, true);
+        verify(extensionDao, never()).update(anyLong(), any());
+    }
+
+    @Test
+    public void disableExtensionChangesStateToDisabled() {
+        ExtensionVO vo = mock(ExtensionVO.class);
+        when(extensionDao.createForUpdate(1L)).thenReturn(vo);
+        when(extensionDao.update(1L, vo)).thenReturn(true);
+
+        extensionsManager.disableExtension(1L);
+
+        verify(vo).setState(Extension.State.Disabled);
+        verify(extensionDao).update(1L, vo);
+    }
+
+    @Test
+    public void updateAllExtensionHostsRemovesHostsSuccessfully() throws OperationTimedoutException, AgentUnavailableException {
+        Extension extension = mock(Extension.class);
+        when(extension.getId()).thenReturn(1L);
+        Long clusterId = 100L;
+        Long hostId = 200L;
+        when(hostDao.listIdsByClusterId(clusterId)).thenReturn(List.of(hostId));
+        extensionsManager.updateAllExtensionHosts(extension, clusterId, true);
+        verify(agentMgr).send(eq(hostId), any(Command.class));
+    }
+
+    @Test
+    public void updateAllExtensionHostsAddsHostsSuccessfully() throws OperationTimedoutException, AgentUnavailableException {
+        Extension extension = mock(Extension.class);
+        when(extension.getId()).thenReturn(1L);
+        Long clusterId = 100L;
+        Long hostId = 200L;
+        when(hostDao.listIdsByClusterId(clusterId)).thenReturn(List.of(hostId));
+        extensionsManager.updateAllExtensionHosts(extension, clusterId, false);
+        verify(agentMgr).send(eq(hostId), any(Command.class));
+    }
+
+    @Test
+    public void updateAllExtensionHostsHandlesEmptyHostListGracefully() throws OperationTimedoutException, AgentUnavailableException {
+        Extension extension = mock(Extension.class);
+        Long clusterId = 100L;
+        when(hostDao.listIdsByClusterId(clusterId)).thenReturn(Collections.emptyList());
+        extensionsManager.updateAllExtensionHosts(extension, clusterId, false);
+        verify(agentMgr, never()).send(anyLong(), any(Command.class));
+    }
+
+    @Test
+    public void updateAllExtensionHostsHandlesNullClusterId() throws OperationTimedoutException, AgentUnavailableException {
+        Extension extension = mock(Extension.class);
+        when(extension.getId()).thenReturn(1L);
+        when(extensionResourceMapDao.listResourceIdsByExtensionIdAndType(eq(1L), any())).thenReturn(Collections.emptyList());
+        extensionsManager.updateAllExtensionHosts(extension, null, false);
+        verify(agentMgr, never()).send(anyLong(), any(Command.class));
+    }
+
+    @Test
+    public void getExternalAccessDetailsReturnsMapWithHostAndExtension() {
+        Map<String, String> map = new HashMap<>();
+        map.put("external.detail.key", "value");
+        long hostId = 1L;
+        ExtensionResourceMap resourceMap = mock(ExtensionResourceMap.class);
+        when(resourceMap.getId()).thenReturn(2L);
+        when(resourceMap.getExtensionId()).thenReturn(3L);
+        when(hostDetailsDao.findDetails(hostId)).thenReturn(null);
+        when(extensionResourceMapDetailsDao.listDetailsKeyPairs(2L, true)).thenReturn(Collections.emptyMap());
+        when(extensionDetailsDao.listDetailsKeyPairs(3L, true)).thenReturn(map);
+        Map<String, Map<String, String>> result = extensionsManager.getExternalAccessDetails(map, hostId, resourceMap);
+        assertTrue(result.containsKey(ApiConstants.ACTION));
+        assertFalse(result.containsKey(ApiConstants.HOST));
+        assertFalse(result.containsKey(ApiConstants.RESOURCE_MAP));
+        assertTrue(result.containsKey(ApiConstants.EXTENSION));
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void checkOrchestratorTemplatesThrowsIfTemplatesExist() {
+        when(templateDao.listIdsByExtensionId(1L)).thenReturn(Arrays.asList(1L, 2L));
+        extensionsManager.checkOrchestratorTemplates(1L);
+    }
+
+    @Test
+    public void getExtensionsPathReturnsProvisionerPath() {
+        when(externalProvisioner.getExtensionsPath()).thenReturn("/tmp/extensions");
+        assertEquals("/tmp/extensions", extensionsManager.getExtensionsPath());
+    }
+
+    @Test
+    public void getExtensionIdForClusterReturnsNullIfNoMap() {
+        when(extensionResourceMapDao.findByResourceIdAndType(anyLong(), any())).thenReturn(null);
+        assertNull(extensionsManager.getExtensionIdForCluster(1L));
+    }
+
+    @Test
+    public void getExtensionIdForClusterReturnsIdIfMapExists() {
+        ExtensionResourceMapVO map = mock(ExtensionResourceMapVO.class);
+        when(map.getExtensionId()).thenReturn(5L);
+        when(extensionResourceMapDao.findByResourceIdAndType(anyLong(), any())).thenReturn(map);
+        assertEquals(Long.valueOf(5L), extensionsManager.getExtensionIdForCluster(1L));
+    }
+
+    @Test
+    public void getExtensionReturnsExtension() {
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionDao.findById(1L)).thenReturn(ext);
+        assertEquals(ext, extensionsManager.getExtension(1L));
+    }
+
+    @Test
+    public void getExtensionForClusterReturnsNullIfNoId() {
+        when(extensionResourceMapDao.findByResourceIdAndType(anyLong(), any())).thenReturn(null);
+        assertNull(extensionsManager.getExtensionForCluster(1L));
+    }
+
+    @Test
+    public void getExtensionForClusterReturnsExtensionIfIdExists() {
+        ExtensionResourceMapVO map = mock(ExtensionResourceMapVO.class);
+        when(map.getExtensionId()).thenReturn(5L);
+        when(extensionResourceMapDao.findByResourceIdAndType(anyLong(), any())).thenReturn(map);
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionDao.findById(5L)).thenReturn(ext);
+        assertEquals(ext, extensionsManager.getExtensionForCluster(1L));
+    }
+
+    @Test
+    public void checkExtensionPathSyncUpdatesReadyWhenChecksumIsBlank() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(externalProvisioner.getChecksumForExtensionPath("ext", "entry.sh")).thenReturn("");
+
+        extensionsManager.checkExtensionPathState(ext, Collections.emptyList());
+
+        verify(extensionsManager).updateExtensionPathReady(ext, false);
+    }
+
+    @Test
+    public void checkExtensionPathSyncUpdatesReadyWhenNoHostsProvided() {
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(externalProvisioner.getChecksumForExtensionPath("ext", "entry.sh")).thenReturn("checksum123");
+        when(extensionDao.createForUpdate(anyLong())).thenReturn(ext);
+        extensionsManager.checkExtensionPathState(ext, Collections.emptyList());
+        verify(extensionsManager).updateExtensionPathReady(ext, true);
+    }
+
+    @Test
+    public void checkExtensionPathSyncUpdatesReadyWhenChecksumsMatchAcrossHosts() {
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(externalProvisioner.getChecksumForExtensionPath("ext", "entry.sh")).thenReturn("checksum123");
+        when(extensionDao.createForUpdate(anyLong())).thenReturn(ext);
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        doReturn(new Pair<>(true, "checksum123")).when(extensionsManager).getChecksumForExtensionPathOnMSPeer(ext, msHost);
+        extensionsManager.checkExtensionPathState(ext, Collections.singletonList(msHost));
+        verify(extensionsManager).updateExtensionPathReady(ext, true);
+    }
+
+    @Test
+    public void checkExtensionPathStateUpdatesNotReadyWhenChecksumsDifferAcrossHosts() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(externalProvisioner.getChecksumForExtensionPath("ext", "entry.sh")).thenReturn("checksum123");
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        when(msHost.getMsid()).thenReturn(1L);
+        doReturn(new Pair<>(true, "checksum456")).when(extensionsManager).getChecksumForExtensionPathOnMSPeer(ext, msHost);
+        extensionsManager.checkExtensionPathState(ext, Collections.singletonList(msHost));
+        verify(extensionsManager).updateExtensionPathReady(ext, false);
+    }
+
+    @Test
+    public void checkExtensionPathStateUpdatesNotReadyWhenPeerChecksumFails() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(externalProvisioner.getChecksumForExtensionPath("ext", "entry.sh")).thenReturn("checksum123");
+
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        when(msHost.getMsid()).thenReturn(1L);
+        doReturn(new Pair<>(false, null)).when(extensionsManager).getChecksumForExtensionPathOnMSPeer(ext, msHost);
+
+        extensionsManager.checkExtensionPathState(ext, Collections.singletonList(msHost));
+
+        verify(extensionsManager).updateExtensionPathReady(ext, false);
+    }
+
+    @Test
+    public void testCreateExtension_Success() {
+        CreateExtensionCmd cmd = mock(CreateExtensionCmd.class);
+        when(cmd.getName()).thenReturn("ext1");
+        when(cmd.getDescription()).thenReturn("desc");
+        when(cmd.getType()).thenReturn("Orchestrator");
+        when(cmd.getPath()).thenReturn(null);
+        when(cmd.isOrchestratorRequiresPrepareVm()).thenReturn(null);
+        when(cmd.getState()).thenReturn(null);
+        when(extensionDao.findByName("ext1")).thenReturn(null);
+        when(extensionDao.persist(any())).thenAnswer(inv -> {
+            ExtensionVO extensionVO = inv.getArgument(0);
+            ReflectionTestUtils.setField(extensionVO, "id", 1L);
+            return extensionVO;
+        });
+        when(managementServerHostDao.listBy(any())).thenReturn(Collections.emptyList());
+
+        Extension ext = extensionsManager.createExtension(cmd);
+
+        assertEquals("ext1", ext.getName());
+        verify(extensionDao).persist(any());
+    }
+
+    @Test
+    public void testCreateExtension_DuplicateName() {
+        CreateExtensionCmd cmd = mock(CreateExtensionCmd.class);
+        when(cmd.getName()).thenReturn("ext1");
+        when(extensionDao.findByName("ext1")).thenReturn(mock(ExtensionVO.class));
+
+        assertThrows(CloudRuntimeException.class, () -> extensionsManager.createExtension(cmd));
+    }
+
+    @Test
+    public void prepareExtensionPathAcrossServersReturnsTrueWhenAllServersSucceed() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.isUserDefined()).thenReturn(true);
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(ext.getId()).thenReturn(1L);
+        when(ext.isPathReady()).thenReturn(false);
+
+        ManagementServerHostVO msHost1 = mock(ManagementServerHostVO.class);
+        ManagementServerHostVO msHost2 = mock(ManagementServerHostVO.class);
+        when(msHost1.getMsid()).thenReturn(100L);
+        when(msHost2.getMsid()).thenReturn(200L);
+
+        when(managementServerHostDao.listBy(any())).thenReturn(Arrays.asList(msHost1, msHost2));
+
+        try (MockedStatic<ManagementServerNode> managementServerNodeMockedStatic = mockStatic(ManagementServerNode.class)) {
+            managementServerNodeMockedStatic.when(ManagementServerNode::getManagementServerId).thenReturn(101L);
+            doReturn(new Pair<>(true, "ok")).when(extensionsManager).prepareExtensionPathOnCurrentServer(anyString(), anyBoolean(), anyString());
+            doReturn(true).when(extensionsManager).prepareExtensionPathOnMSPeer(eq(ext), eq(msHost2));
+
+            // Simulate current server is msHost1
+            when(msHost1.getMsid()).thenReturn(101L);
+
+            // Extension entry point ready state should be updated
+            ExtensionVO updateExt = mock(ExtensionVO.class);
+            when(extensionDao.createForUpdate(1L)).thenReturn(updateExt);
+            when(extensionDao.update(1L, updateExt)).thenReturn(true);
+
+            boolean result = extensionsManager.prepareExtensionPathAcrossServers(ext);
+            assertTrue(result);
+            verify(extensionDao).update(1L, updateExt);
+        }
+    }
+
+    @Test
+    public void prepareExtensionPathAcrossServersReturnsFalseWhenAnyServerFails() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.isUserDefined()).thenReturn(true);
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(ext.getId()).thenReturn(1L);
+        when(ext.isPathReady()).thenReturn(true);
+
+        ManagementServerHostVO msHost1 = mock(ManagementServerHostVO.class);
+        ManagementServerHostVO msHost2 = mock(ManagementServerHostVO.class);
+        when(msHost1.getMsid()).thenReturn(101L);
+        when(msHost2.getMsid()).thenReturn(200L);
+
+        when(managementServerHostDao.listBy(any())).thenReturn(Arrays.asList(msHost1, msHost2));
+
+        try (MockedStatic<ManagementServerNode> managementServerNodeMockedStatic = mockStatic(ManagementServerNode.class)) {
+            managementServerNodeMockedStatic.when(ManagementServerNode::getManagementServerId).thenReturn(101L);
+            doReturn(new Pair<>(true, "ok")).when(extensionsManager).prepareExtensionPathOnCurrentServer(anyString(), anyBoolean(), anyString());
+            doReturn(false).when(extensionsManager).prepareExtensionPathOnMSPeer(eq(ext), eq(msHost2));
+
+            ExtensionVO updateExt = mock(ExtensionVO.class);
+            when(extensionDao.createForUpdate(1L)).thenReturn(updateExt);
+            when(extensionDao.update(1L, updateExt)).thenReturn(true);
+
+            boolean result = extensionsManager.prepareExtensionPathAcrossServers(ext);
+            assertFalse(result);
+            verify(extensionDao).update(1L, updateExt);
+        }
+    }
+
+    @Test
+    public void prepareExtensionPathAcrossServersDoesNotUpdateIfStateUnchanged() {
+        Extension ext = mock(Extension.class);
+        when(ext.getName()).thenReturn("ext");
+        when(ext.isUserDefined()).thenReturn(true);
+        when(ext.getRelativePath()).thenReturn("entry.sh");
+        when(ext.isPathReady()).thenReturn(true);
+
+        ManagementServerHostVO msHost = mock(ManagementServerHostVO.class);
+        when(msHost.getMsid()).thenReturn(101L);
+
+        when(managementServerHostDao.listBy(any())).thenReturn(Collections.singletonList(msHost));
+
+        try (MockedStatic<ManagementServerNode> managementServerNodeMockedStatic = mockStatic(ManagementServerNode.class)) {
+            managementServerNodeMockedStatic.when(ManagementServerNode::getManagementServerId).thenReturn(101L);
+            doReturn(new Pair<>(true, "ok")).when(extensionsManager).prepareExtensionPathOnCurrentServer(anyString(), anyBoolean(), anyString());
+
+            boolean result = extensionsManager.prepareExtensionPathAcrossServers(ext);
+            assertTrue(result);
+            verify(extensionDao, never()).update(anyLong(), any());
+        }
+    }
+
+    @Test
+    public void testListExtensionsReturnsResponses() {
+        ListExtensionsCmd cmd = mock(ListExtensionsCmd.class);
+        when(cmd.getExtensionId()).thenReturn(null);
+        when(cmd.getName()).thenReturn(null);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(0L);
+        when(cmd.getPageSizeVal()).thenReturn(10L);
+        when(cmd.getDetails()).thenReturn(null);
+
+        ExtensionVO ext1 = mock(ExtensionVO.class);
+        ExtensionVO ext2 = mock(ExtensionVO.class);
+        List<ExtensionVO> extList = Arrays.asList(ext1, ext2);
+        SearchBuilder<ExtensionVO> sb = mock(SearchBuilder.class);
+        when(sb.create()).thenReturn(mock(SearchCriteria.class));
+        when(sb.entity()).thenReturn(mock(ExtensionVO.class));
+        when(extensionDao.createSearchBuilder()).thenReturn(sb);
+        when(extensionDao.searchAndCount(any(), any())).thenReturn(new Pair<>(extList, 2));
+
+        // Spy createExtensionResponse to return a dummy response
+        ExtensionResponse resp1 = mock(ExtensionResponse.class);
+        ExtensionResponse resp2 = mock(ExtensionResponse.class);
+        doReturn(resp1).when(extensionsManager).createExtensionResponse(eq(ext1), any());
+        doReturn(resp2).when(extensionsManager).createExtensionResponse(eq(ext2), any());
+
+        List<ExtensionResponse> result = extensionsManager.listExtensions(cmd);
+
+        assertEquals(2, result.size());
+        assertTrue(result.contains(resp1));
+        assertTrue(result.contains(resp2));
+    }
+
+    @Test
+    public void testListExtensionsWithId() {
+        ListExtensionsCmd cmd = mock(ListExtensionsCmd.class);
+        when(cmd.getExtensionId()).thenReturn(42L);
+        when(cmd.getName()).thenReturn(null);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(0L);
+        when(cmd.getPageSizeVal()).thenReturn(10L);
+        when(cmd.getDetails()).thenReturn(null);
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        SearchBuilder<ExtensionVO> sb = mock(SearchBuilder.class);
+        when(sb.create()).thenReturn(mock(SearchCriteria.class));
+        when(sb.entity()).thenReturn(mock(ExtensionVO.class));
+        when(extensionDao.createSearchBuilder()).thenReturn(sb);
+        when(extensionDao.searchAndCount(any(), any())).thenReturn(new Pair<>(Collections.singletonList(ext), 1));
+        ExtensionResponse resp = mock(ExtensionResponse.class);
+        doReturn(resp).when(extensionsManager).createExtensionResponse(eq(ext), any());
+
+        List<ExtensionResponse> result = extensionsManager.listExtensions(cmd);
+
+        assertEquals(1, result.size());
+        assertEquals(resp, result.get(0));
+    }
+
+    @Test
+    public void testListExtensionsWithNameAndKeyword() {
+        ListExtensionsCmd cmd = mock(ListExtensionsCmd.class);
+        when(cmd.getExtensionId()).thenReturn(null);
+        when(cmd.getName()).thenReturn("testName");
+        when(cmd.getKeyword()).thenReturn("key");
+        when(cmd.getStartIndex()).thenReturn(0L);
+        when(cmd.getPageSizeVal()).thenReturn(10L);
+        when(cmd.getDetails()).thenReturn(null);
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        SearchBuilder<ExtensionVO> sb = mock(SearchBuilder.class);
+        when(sb.create()).thenReturn(mock(SearchCriteria.class));
+        when(sb.entity()).thenReturn(mock(ExtensionVO.class));
+        when(extensionDao.createSearchBuilder()).thenReturn(sb);
+        when(extensionDao.searchAndCount(any(), any())).thenReturn(new Pair<>(Collections.singletonList(ext), 1));
+        ExtensionResponse resp = mock(ExtensionResponse.class);
+        doReturn(resp).when(extensionsManager).createExtensionResponse(eq(ext), any());
+
+        List<ExtensionResponse> result = extensionsManager.listExtensions(cmd);
+
+        assertEquals(1, result.size());
+        assertEquals(resp, result.get(0));
+    }
+
+    @Test
+    public void testUpdateExtension_SuccessfulDescriptionUpdate() {
+        UpdateExtensionCmd cmd = mock(UpdateExtensionCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        when(cmd.getDescription()).thenReturn("new desc");
+        when(cmd.isOrchestratorRequiresPrepareVm()).thenReturn(null);
+        when(cmd.getState()).thenReturn(null);
+        when(cmd.getDetails()).thenReturn(null);
+        when(cmd.isCleanupDetails()).thenReturn(false);
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getDescription()).thenReturn("old desc");
+        when(extensionDao.findById(1L)).thenReturn(ext);
+        when(extensionDao.update(1L, ext)).thenReturn(true);
+
+        Extension result = extensionsManager.updateExtension(cmd);
+
+        assertEquals(ext, result);
+        verify(ext).setDescription("new desc");
+        verify(extensionDao, atLeastOnce()).update(1L, ext);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateExtension_NotFound() {
+        UpdateExtensionCmd cmd = mock(UpdateExtensionCmd.class);
+        when(cmd.getId()).thenReturn(2L);
+        when(extensionDao.findById(2L)).thenReturn(null);
+
+        extensionsManager.updateExtension(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateExtension_InvalidOrchestratorFlag() {
+        UpdateExtensionCmd cmd = mock(UpdateExtensionCmd.class);
+        when(cmd.getId()).thenReturn(3L);
+        when(cmd.isOrchestratorRequiresPrepareVm()).thenReturn(true);
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getType()).thenReturn(null);
+        when(extensionDao.findById(3L)).thenReturn(ext);
+
+        extensionsManager.updateExtension(cmd);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testUpdateExtension_UpdateFails() {
+        UpdateExtensionCmd cmd = mock(UpdateExtensionCmd.class);
+        when(cmd.getId()).thenReturn(4L);
+        when(cmd.getDescription()).thenReturn("desc");
+        when(cmd.isOrchestratorRequiresPrepareVm()).thenReturn(null);
+        when(cmd.getState()).thenReturn(null);
+        when(cmd.getDetails()).thenReturn(null);
+        when(cmd.isCleanupDetails()).thenReturn(false);
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getDescription()).thenReturn("old");
+        when(extensionDao.findById(4L)).thenReturn(ext);
+        when(extensionDao.update(4L, ext)).thenReturn(false);
+
+        extensionsManager.updateExtension(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateExtension_InvalidState() {
+        UpdateExtensionCmd cmd = mock(UpdateExtensionCmd.class);
+        when(cmd.getId()).thenReturn(5L);
+        when(cmd.getState()).thenReturn("NonExistentState");
+
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.getType()).thenReturn(Extension.Type.Orchestrator);
+        when(ext.getState()).thenReturn(Extension.State.Enabled);
+        when(extensionDao.findById(5L)).thenReturn(ext);
+
+        extensionsManager.updateExtension(cmd);
+    }
+
+    @Test
+    public void updateExtensionsDetails_SavesDetails_WhenDetailsProvided() {
+        long extensionId = 10L;
+        Map<String, String> details = Map.of("foo", "bar", "baz", "qux");
+        extensionsManager.updateExtensionsDetails(false, details, null, extensionId);
+        verify(extensionDetailsDao).saveDetails(any());
+    }
+
+    @Test
+    public void updateExtensionsDetails_DoesNothing_WhenDetailsAndCleanupAreNull() {
+        long extensionId = 11L;
+        extensionsManager.updateExtensionsDetails(null, null, null, extensionId);
+        verify(extensionDetailsDao, never()).removeDetails(anyLong());
+        verify(extensionDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updateExtensionsDetails_RemovesDetailsOnly_WhenCleanupIsTrue() {
+        long extensionId = 12L;
+        extensionsManager.updateExtensionsDetails(true, null, null, extensionId);
+        verify(extensionDetailsDao).removeDetails(extensionId);
+        verify(extensionDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updateExtensionsDetails_PersistsOrchestratorFlag_WhenFlagIsNotNull() {
+        long extensionId = 13L;
+        extensionsManager.updateExtensionsDetails(false, null, true, extensionId);
+        verify(extensionDetailsDao).persist(any());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void updateExtensionsDetails_ThrowsException_WhenPersistFails() {
+        long extensionId = 14L;
+        Map<String, String> details = Map.of("foo", "bar");
+        doThrow(CloudRuntimeException.class).when(extensionDetailsDao).saveDetails(any());
+        extensionsManager.updateExtensionsDetails(false, details, null, extensionId);
+    }
+
+    @Test
+    public void testDeleteExtension_Success() {
+        DeleteExtensionCmd cmd = mock(DeleteExtensionCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        when(cmd.isCleanup()).thenReturn(false);
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(ext.isUserDefined()).thenReturn(true);
+        when(extensionDao.findById(1L)).thenReturn(ext);
+        when(extensionResourceMapDao.listByExtensionId(1L)).thenReturn(Collections.emptyList());
+        when(extensionCustomActionDao.listIdsByExtensionId(1L)).thenReturn(Collections.emptyList());
+        doNothing().when(extensionDetailsDao).removeDetails(1L);
+        when(extensionDao.remove(1L)).thenReturn(true);
+
+        assertTrue(extensionsManager.deleteExtension(cmd));
+        verify(extensionDao).remove(1L);
+    }
+
+    @Test
+    public void testRegisterExtensionWithResource_InvalidResourceType() {
+        RegisterExtensionCmd cmd = mock(RegisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn("InvalidType");
+
+        assertThrows(InvalidParameterValueException.class, () -> extensionsManager.registerExtensionWithResource(cmd));
+    }
+
+    @Test
+    public void registerExtensionWithResourceRegistersSuccessfullyForValidResourceType() {
+        RegisterExtensionCmd cmd = mock(RegisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn(ExtensionResourceMap.ResourceType.Cluster.name());
+        when(cmd.getResourceId()).thenReturn(UUID.randomUUID().toString());
+        when(cmd.getExtensionId()).thenReturn(1L);
+        ExtensionVO extension = mock(ExtensionVO.class);
+        ClusterVO clusterVO = mock(ClusterVO.class);
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(clusterDao.findByUuid(anyString())).thenReturn(clusterVO);
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.persist(any())).thenReturn(resourceMap);
+        when(extensionDao.findById(anyLong())).thenReturn(extension);
+        Extension result = extensionsManager.registerExtensionWithResource(cmd);
+        assertEquals(extension, result);
+        verify(extensionResourceMapDao).persist(any());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void registerExtensionWithResourceThrowsForInvalidResourceType() {
+        RegisterExtensionCmd cmd = mock(RegisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn("InvalidType");
+
+        extensionsManager.registerExtensionWithResource(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void registerExtensionWithResourceThrowsForMissingExtension() {
+        RegisterExtensionCmd cmd = mock(RegisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn(ExtensionResourceMap.ResourceType.Cluster.name());
+        when(cmd.getResourceId()).thenReturn(UUID.randomUUID().toString());
+        ClusterVO clusterVO = mock(ClusterVO.class);
+        when(clusterDao.findByUuid(anyString())).thenReturn(clusterVO);
+        extensionsManager.registerExtensionWithResource(cmd);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void registerExtensionWithResourceThrowsForPersistFailure() {
+        RegisterExtensionCmd cmd = mock(RegisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn(ExtensionResourceMap.ResourceType.Cluster.name());
+        when(cmd.getResourceId()).thenReturn(UUID.randomUUID().toString());
+        when(cmd.getExtensionId()).thenReturn(1L);
+        ClusterVO clusterVO = mock(ClusterVO.class);
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(clusterDao.findByUuid(anyString())).thenReturn(clusterVO);
+        ExtensionVO extension = mock(ExtensionVO.class);
+        when(extensionDao.findById(1L)).thenReturn(extension);
+        when(extensionResourceMapDao.persist(any())).thenThrow(CloudRuntimeException.class);
+        extensionsManager.registerExtensionWithResource(cmd);
+    }
+
+    @Test
+    public void registerExtensionWithClusterRegistersSuccessfullyForValidCluster() {
+        Cluster cluster = mock(Cluster.class);
+        when(cluster.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        Extension extension = mock(Extension.class);
+        Map<String, String> details = Map.of("key1", "value1");
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.persist(any())).thenReturn(resourceMap);
+        ExtensionResourceMap result = extensionsManager.registerExtensionWithCluster(cluster, extension, details);
+        assertNotNull(result);
+        verify(extensionResourceMapDao).persist(any());
+    }
+
+    @Test
+    public void registerExtensionWithClusterHandlesNullDetails() {
+        Cluster cluster = mock(Cluster.class);
+        when(cluster.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        Extension extension = mock(Extension.class);
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.persist(any())).thenReturn(resourceMap);
+        ExtensionResourceMap result = extensionsManager.registerExtensionWithCluster(cluster, extension, null);
+        assertNotNull(result);
+        verify(extensionResourceMapDao).persist(any());
+    }
+
+    @Test
+    public void testUnregisterExtensionWithResource_InvalidResourceType() {
+        UnregisterExtensionCmd cmd = mock(UnregisterExtensionCmd.class);
+        when(cmd.getResourceType()).thenReturn("InvalidType");
+
+        assertThrows(InvalidParameterValueException.class, () -> extensionsManager.unregisterExtensionWithResource(cmd));
+    }
+
+    @Test
+    public void unregisterExtensionWithClusterRemovesMappingSuccessfully() {
+        Cluster cluster = mock(Cluster.class);
+        when(cluster.getId()).thenReturn(100L);
+        Long extensionId = 1L;
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.findByResourceIdAndType(eq(100L), eq(ExtensionResourceMap.ResourceType.Cluster)))
+            .thenReturn(resourceMap);
+        extensionsManager.unregisterExtensionWithCluster(cluster, extensionId);
+        verify(extensionResourceMapDao).remove(resourceMap.getId());
+    }
+
+    @Test
+    public void unregisterExtensionWithClusterHandlesMissingMappingGracefully() {
+        Cluster cluster = mock(Cluster.class);
+        when(cluster.getId()).thenReturn(100L);
+        Long extensionId = 1L;
+        when(extensionResourceMapDao.findByResourceIdAndType(eq(100L), eq(ExtensionResourceMap.ResourceType.Cluster)))
+            .thenReturn(null);
+        extensionsManager.unregisterExtensionWithCluster(cluster, extensionId);
+        verify(extensionResourceMapDao, never()).remove(anyLong());
+    }
+
+    @Test
+    public void testCreateExtensionResponse_BasicFields() {
+        Extension extension = mock(Extension.class);
+        when(extension.getUuid()).thenReturn("uuid-1");
+        when(extension.getName()).thenReturn("ext1");
+        when(extension.getDescription()).thenReturn("desc");
+        when(extension.getType()).thenReturn(Extension.Type.Orchestrator);
+        when(extension.getCreated()).thenReturn(new Date());
+        when(extension.getRelativePath()).thenReturn("entry.sh");
+        when(extension.isPathReady()).thenReturn(true);
+        when(extension.isUserDefined()).thenReturn(true);
+        when(extension.getState()).thenReturn(Extension.State.Enabled);
+        when(extension.getId()).thenReturn(1L);
+
+        // Mock externalProvisioner
+        when(externalProvisioner.getExtensionPath("entry.sh")).thenReturn("/some/path/entry.sh");
+
+        // Mock detailsDao
+        Pair<Map<String, String>, Map<String, String>> detailsPair = new Pair<>(Map.of("foo", "bar"),
+                Map.of(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM, "true"));
+        when(extensionDetailsDao.listDetailsKeyPairsWithVisibility(1L)).thenReturn(detailsPair);
+
+        EnumSet<ApiConstants.ExtensionDetails> viewDetails = EnumSet.of(ApiConstants.ExtensionDetails.all);
+
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension, viewDetails);
+
+        assertEquals("uuid-1", response.getId());
+        assertEquals("ext1", response.getName());
+        assertEquals("desc", response.getDescription());
+        assertEquals("Orchestrator", response.getType());
+        assertEquals("/some/path/entry.sh", response.getPath());
+        assertTrue(response.isPathReady());
+        assertTrue(response.isUserDefined());
+        assertEquals("Enabled", response.getState());
+        assertEquals("bar", response.getDetails().get("foo"));
+        assertTrue(response.isOrchestratorRequiresPrepareVm());
+        assertEquals("extension", response.getObjectName());
+    }
+
+    @Test
+    public void testCreateExtensionResponse_HiddenDetailsOnly() {
+        Extension extension = mock(Extension.class);
+        when(extension.getUuid()).thenReturn("uuid-2");
+        when(extension.getName()).thenReturn("ext2");
+        when(extension.getDescription()).thenReturn("desc2");
+        when(extension.getType()).thenReturn(Extension.Type.Orchestrator);
+        when(extension.getCreated()).thenReturn(new Date());
+        when(extension.getRelativePath()).thenReturn("entry2.sh");
+        when(extension.isPathReady()).thenReturn(false);
+        when(extension.isUserDefined()).thenReturn(false);
+        when(extension.getState()).thenReturn(Extension.State.Disabled);
+        when(extension.getId()).thenReturn(2L);
+
+        when(externalProvisioner.getExtensionPath("entry2.sh")).thenReturn("/some/path/entry2.sh");
+
+        Map<String, String> hiddenDetails = Map.of(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM, "false");
+        when(extensionDetailsDao.listDetailsKeyPairs(2L, List.of(ApiConstants.ORCHESTRATOR_REQUIRES_PREPARE_VM)))
+                .thenReturn(hiddenDetails);
+
+        EnumSet<ApiConstants.ExtensionDetails> viewDetails = EnumSet.noneOf(ApiConstants.ExtensionDetails.class);
+
+        ExtensionResponse response = extensionsManager.createExtensionResponse(extension, viewDetails);
+
+        assertEquals("uuid-2", response.getId());
+        assertEquals("ext2", response.getName());
+        assertEquals("desc2", response.getDescription());
+        assertEquals("Orchestrator", response.getType());
+        assertEquals("/some/path/entry2.sh", response.getPath());
+        assertFalse(response.isPathReady());
+        assertFalse(response.isUserDefined());
+        assertEquals("Disabled", response.getState());
+        assertFalse(response.isOrchestratorRequiresPrepareVm());
+        assertEquals("extension", response.getObjectName());
+    }
+
+    @Test
+    public void testAddCustomAction_Success() {
+        AddCustomActionCmd cmd = mock(AddCustomActionCmd.class);
+        when(cmd.getName()).thenReturn("action1");
+        when(cmd.getDescription()).thenReturn("desc");
+        when(cmd.getExtensionId()).thenReturn(1L);
+        when(cmd.getResourceType()).thenReturn("VirtualMachine");
+        when(cmd.getAllowedRoleTypes()).thenReturn(List.of("Admin"));
+        when(cmd.getTimeout()).thenReturn(5);
+        when(cmd.isEnabled()).thenReturn(true);
+        when(cmd.getParametersMap()).thenReturn(null);
+        when(cmd.getSuccessMessage()).thenReturn("ok");
+        when(cmd.getErrorMessage()).thenReturn("fail");
+        when(cmd.getDetails()).thenReturn(null);
+
+        when(extensionCustomActionDao.findByNameAndExtensionId(1L, "action1")).thenReturn(null);
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionDao.findById(1L)).thenReturn(ext);
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.persist(any())).thenReturn(actionVO);
+
+        ExtensionCustomAction result = extensionsManager.addCustomAction(cmd);
+
+        assertEquals(actionVO, result);
+        verify(extensionCustomActionDao).persist(any());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAddCustomAction_DuplicateName() {
+        AddCustomActionCmd cmd = mock(AddCustomActionCmd.class);
+        when(cmd.getName()).thenReturn("action1");
+        when(cmd.getExtensionId()).thenReturn(1L);
+        when(extensionCustomActionDao.findByNameAndExtensionId(1L, "action1")).thenReturn(mock(ExtensionCustomActionVO.class));
+
+        extensionsManager.addCustomAction(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testAddCustomAction_ExtensionNotFound() {
+        AddCustomActionCmd cmd = mock(AddCustomActionCmd.class);
+        when(cmd.getName()).thenReturn("action1");
+        when(cmd.getExtensionId()).thenReturn(2L);
+        when(extensionCustomActionDao.findByNameAndExtensionId(2L, "action1")).thenReturn(null);
+        when(extensionDao.findById(2L)).thenReturn(null);
+
+        extensionsManager.addCustomAction(cmd);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAddCustomAction_InvalidResourceType() {
+        AddCustomActionCmd cmd = mock(AddCustomActionCmd.class);
+        when(cmd.getName()).thenReturn("action1");
+        when(cmd.getExtensionId()).thenReturn(1L);
+        when(cmd.getResourceType()).thenReturn("InvalidType");
+        when(extensionCustomActionDao.findByNameAndExtensionId(1L, "action1")).thenReturn(null);
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionDao.findById(1L)).thenReturn(ext);
+
+        extensionsManager.addCustomAction(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testAddCustomAction_InvalidName() {
+        AddCustomActionCmd cmd = mock(AddCustomActionCmd.class);
+        when(cmd.getName()).thenReturn("action;1");
+        extensionsManager.addCustomAction(cmd);
+    }
+
+    @Test
+    public void deleteCustomAction_RemovesActionAndDetails_ReturnsTrue() {
+        long actionId = 10L;
+        DeleteCustomActionCmd cmd = mock(DeleteCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(actionId);
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(actionId)).thenReturn(actionVO);
+        when(extensionCustomActionDao.remove(actionId)).thenReturn(true);
+
+        boolean result = extensionsManager.deleteCustomAction(cmd);
+
+        assertTrue(result);
+        verify(extensionCustomActionDetailsDao).removeDetails(actionId);
+        verify(extensionCustomActionDao).remove(actionId);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void deleteCustomAction_ActionNotFound() {
+        long actionId = 20L;
+        DeleteCustomActionCmd cmd = mock(DeleteCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(actionId);
+        when(extensionCustomActionDao.findById(actionId)).thenReturn(null);
+        extensionsManager.deleteCustomAction(cmd);
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(anyLong());
+        verify(extensionCustomActionDao, never()).remove(anyLong());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void deleteCustomAction_RemoveFails() {
+        long actionId = 30L;
+        DeleteCustomActionCmd cmd = mock(DeleteCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(actionId);
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(actionId)).thenReturn(actionVO);
+        when(extensionCustomActionDao.remove(actionId)).thenReturn(false);
+        extensionsManager.deleteCustomAction(cmd);
+        verify(extensionCustomActionDetailsDao).removeDetails(actionId);
+        verify(extensionCustomActionDao).remove(actionId);
+    }
+
+    private void mockCallerRole(RoleType roleType) {
+        CallContext callContextMock = Mockito.mock(CallContext.class);
+        when(CallContext.current()).thenReturn(callContextMock);
+        Account accountMock = mock(Account.class);
+        when(accountMock.getRoleId()).thenReturn(1L);
+        Role role = mock(Role.class);
+        when(role.getRoleType()).thenReturn(roleType);
+        when(roleService.findRole(1L)).thenReturn(role);
+        when(callContextMock.getCallingAccount()).thenReturn(accountMock);
+    }
+
+    @Test
+    public void testListCustomActions_ReturnsResponses() {
+        ListCustomActionCmd cmd = mock(ListCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(null);
+        when(cmd.getName()).thenReturn(null);
+        when(cmd.getExtensionId()).thenReturn(1L);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getResourceType()).thenReturn(null);
+        when(cmd.getResourceId()).thenReturn(null);
+        when(cmd.isEnabled()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(0L);
+        when(cmd.getPageSizeVal()).thenReturn(10L);
+
+        ExtensionCustomActionVO action1 = mock(ExtensionCustomActionVO.class);
+        ExtensionCustomActionVO action2 = mock(ExtensionCustomActionVO.class);
+        List<ExtensionCustomActionVO> actions = Arrays.asList(action1, action2);
+        SearchBuilder<ExtensionCustomActionVO> sb = mock(SearchBuilder.class);
+        when(sb.create()).thenReturn(mock(SearchCriteria.class));
+        when(sb.entity()).thenReturn(mock(ExtensionCustomActionVO.class));
+        when(extensionCustomActionDao.createSearchBuilder()).thenReturn(sb);
+        when(extensionCustomActionDao.searchAndCount(any(), any())).thenReturn(new Pair<>(actions, 2));
+
+        ExtensionCustomActionResponse resp1 = mock(ExtensionCustomActionResponse.class);
+        ExtensionCustomActionResponse resp2 = mock(ExtensionCustomActionResponse.class);
+        doReturn(resp1).when(extensionsManager).createCustomActionResponse(eq(action1));
+        doReturn(resp2).when(extensionsManager).createCustomActionResponse(eq(action2));
+
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.Admin);
+            List<ExtensionCustomActionResponse> result = extensionsManager.listCustomActions(cmd);
+
+            assertEquals(2, result.size());
+            assertTrue(result.contains(resp1));
+            assertTrue(result.contains(resp2));
+        }
+    }
+
+    @Test
+    public void testUpdateCustomAction_UpdatesFields() {
+        long actionId = 1L;
+        String newDescription = "Updated description";
+        String newResourceType = "VirtualMachine";
+        List<String> newRoles = List.of("Admin", "User");
+        Boolean enabled = true;
+        int timeout = 10;
+        String successMsg = "Success!";
+        String errorMsg = "Error!";
+        Map<String, String> details = Map.of("key", "value");
+
+        UpdateCustomActionCmd cmd = mock(UpdateCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(actionId);
+        when(cmd.getDescription()).thenReturn(newDescription);
+        when(cmd.getResourceType()).thenReturn(newResourceType);
+        when(cmd.getAllowedRoleTypes()).thenReturn(newRoles);
+        when(cmd.isEnabled()).thenReturn(enabled);
+        when(cmd.getTimeout()).thenReturn(timeout);
+        when(cmd.getSuccessMessage()).thenReturn(successMsg);
+        when(cmd.getErrorMessage()).thenReturn(errorMsg);
+        when(cmd.getParametersMap()).thenReturn(null);
+        when(cmd.isCleanupParameters()).thenReturn(false);
+        when(cmd.getDetails()).thenReturn(details);
+        when(cmd.isCleanupDetails()).thenReturn(false);
+
+        ExtensionCustomActionVO actionVO = new ExtensionCustomActionVO();
+        ReflectionTestUtils.setField(actionVO, "id", 1L);
+        when(extensionCustomActionDao.findById(actionId)).thenReturn(actionVO);
+        when(extensionCustomActionDao.update(eq(actionId), any())).thenReturn(true);
+
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairs(eq(actionId), eq(false)))
+                .thenReturn(new HashMap<>());
+
+        ExtensionCustomAction result = extensionsManager.updateCustomAction(cmd);
+
+        assertEquals(newDescription, result.getDescription());
+        assertEquals(successMsg, result.getSuccessMessage());
+        assertEquals(errorMsg, result.getErrorMessage());
+        assertEquals(timeout, result.getTimeout());
+        assertTrue(result.isEnabled());
+        assertEquals(ExtensionCustomAction.ResourceType.VirtualMachine, result.getResourceType());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testUpdateCustomAction_ActionNotFound_ThrowsException() {
+        UpdateCustomActionCmd cmd = mock(UpdateCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(99L);
+        when(extensionCustomActionDao.findById(99L)).thenReturn(null);
+
+        extensionsManager.updateCustomAction(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateCustomAction_InvalidResourceType_ThrowsException() {
+        UpdateCustomActionCmd cmd = mock(UpdateCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        ExtensionCustomActionVO action = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(1L)).thenReturn(action);
+        when(cmd.getResourceType()).thenReturn("InvalidType");
+
+        extensionsManager.updateCustomAction(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateCustomAction_InvalidRoleType_ThrowsException() {
+        UpdateCustomActionCmd cmd = mock(UpdateCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        ExtensionCustomActionVO action = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(1L)).thenReturn(action);
+        when(cmd.getAllowedRoleTypes()).thenReturn(List.of("NotARole"));
+
+        extensionsManager.updateCustomAction(cmd);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testUpdateCustomAction_DaoUpdateFails_ThrowsException() {
+        UpdateCustomActionCmd cmd = mock(UpdateCustomActionCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        when(cmd.getDescription()).thenReturn("desc");
+        ExtensionCustomActionVO action = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(1L)).thenReturn(action);
+        when(extensionCustomActionDao.update(eq(1L), any())).thenReturn(false);
+
+        extensionsManager.updateCustomAction(cmd);
+    }
+
+    @Test
+    public void updatedCustomActionDetails_RemovesDetails_WhenCleanupDetailsIsTrue() {
+        long actionId = 1L;
+        Boolean cleanupDetails = true;
+        extensionsManager.updatedCustomActionDetails(actionId, cleanupDetails, null, false, null);
+        verify(extensionCustomActionDetailsDao).removeDetails(actionId);
+        verify(extensionCustomActionDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updatedCustomActionDetails_SavesDetails_WhenDetailsProvided() {
+        long actionId = 2L;
+        Map<String, String> details = Map.of("key1", "value1", "key2", "value2");
+        extensionsManager.updatedCustomActionDetails(actionId, false, details, false, null);
+        verify(extensionCustomActionDetailsDao).saveDetails(any());
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(anyLong());
+    }
+
+    @Test
+    public void updatedCustomActionDetails_DoesNothing_WhenDetailsAndCleanupDetailsAreNull() {
+        long actionId = 3L;
+        extensionsManager.updatedCustomActionDetails(actionId, null, null, false, null);
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(anyLong());
+        verify(extensionCustomActionDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updatedCustomActionDetails_HandlesEmptyDetailsGracefully() {
+        long actionId = 4L;
+        Map<String, String> details = Collections.emptyMap();
+        extensionsManager.updatedCustomActionDetails(actionId, false, details, false, null);
+        verify(extensionCustomActionDetailsDao, never()).saveDetails(any());
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(anyLong());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void updatedCustomActionDetails_ThrowsException_WhenSaveDetailsFails() {
+        long actionId = 5L;
+        Map<String, String> details = Map.of("key1", "value1");
+        doThrow(CloudRuntimeException.class).when(extensionCustomActionDetailsDao).saveDetails(any());
+        extensionsManager.updatedCustomActionDetails(actionId, false, details, false, null);
+    }
+
+    @Test
+    public void updatedCustomActionDetails_RemovesDetails_WhenCleanupDetailsParametersAreTrue() {
+        long actionId = 1L;
+        Map<String, String> hiddenDetails = new HashMap<>();
+        hiddenDetails.put(ApiConstants.PARAMETERS, "Test");
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairs(actionId, false)).thenReturn(hiddenDetails);
+        extensionsManager.updatedCustomActionDetails(actionId, true, null, true, null);
+        verify(extensionCustomActionDetailsDao).removeDetails(actionId);
+        verify(extensionCustomActionDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updatedCustomActionDetails_RemovesDetails_WhenCleanupDetailsTrueCleanupParametersFalse() {
+        long actionId = 1L;
+        Map<String, String> hiddenDetails = new HashMap<>();
+        hiddenDetails.put(ApiConstants.PARAMETERS, "Test");
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairs(actionId, false)).thenReturn(hiddenDetails);
+        extensionsManager.updatedCustomActionDetails(actionId, true, null, false, null);
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(actionId);
+        verify(extensionCustomActionDetailsDao).saveDetails(any());
+    }
+
+    @Test
+    public void updatedCustomActionDetails_RemovesDetails_WhenParameterGiven() {
+        long actionId = 1L;
+        extensionsManager.updatedCustomActionDetails(actionId, false, null, false,
+                List.of(mock(ExtensionCustomAction.Parameter.class)));
+        verify(extensionCustomActionDetailsDao, never()).removeDetails(actionId);
+        verify(extensionCustomActionDetailsDao, never()).saveDetails(any());
+        verify(extensionCustomActionDetailsDao).persist(any(ExtensionCustomActionDetailsVO.class));
+    }
+
+    @Test
+    public void runCustomAction_SuccessfulExecution_ReturnsExpectedResult() throws Exception {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(1L);
+        when(cmd.getResourceId()).thenReturn("vm-123");
+        when(cmd.getParameters()).thenReturn(Map.of("param1", "value1"));
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(1L)).thenReturn(actionVO);
+        when(actionVO.isEnabled()).thenReturn(true);
+        when(actionVO.getResourceType()).thenReturn(ExtensionCustomAction.ResourceType.VirtualMachine);
+        when(actionVO.getAllowedRoleTypes()).thenReturn(
+                RoleType.toCombinedMask(List.of(RoleType.Admin, RoleType.DomainAdmin, RoleType.User)));
+
+        ExtensionVO extensionVO = mock(ExtensionVO.class);
+        when(extensionDao.findById(anyLong())).thenReturn(extensionVO);
+        when(extensionVO.getState()).thenReturn(Extension.State.Enabled);
+
+        RunCustomActionAnswer answer = mock(RunCustomActionAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(vm.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(entityManager.findByUuid(eq(VirtualMachine.class), anyString())).thenReturn(vm);
+        when(virtualMachineManager.findClusterAndHostIdForVm(vm, false)).thenReturn(new Pair<>(1L, 1L));
+
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(mock(ExtensionResourceMapVO.class));
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(anyLong())).thenReturn(new Pair<>(new HashMap<>(), new HashMap<>()));
+
+        when(agentMgr.send(anyLong(), any(Command.class))).thenReturn(answer);
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.User);
+            CustomActionResultResponse result = extensionsManager.runCustomAction(cmd);
+
+            assertTrue(result.getSuccess());
+        }
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void runCustomAction_ActionNotFound_ThrowsException() {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(99L);
+        when(extensionCustomActionDao.findById(99L)).thenReturn(null);
+
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.Admin);
+            extensionsManager.runCustomAction(cmd);
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void runCustomAction_ActionNotAllowedForRole_ThrowsException() {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(2L);
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(2L)).thenReturn(actionVO);
+        when(actionVO.getAllowedRoleTypes()).thenReturn(
+                RoleType.toCombinedMask(List.of(RoleType.Admin, RoleType.DomainAdmin)));
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.User);
+            extensionsManager.runCustomAction(cmd);
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void runCustomAction_ActionDisabled_ThrowsException() {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(2L);
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(2L)).thenReturn(actionVO);
+        when(actionVO.isEnabled()).thenReturn(false);
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.Admin);
+            extensionsManager.runCustomAction(cmd);
+        }
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void runCustomAction_InvalidResourceType_ThrowsException() {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(3L);
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(3L)).thenReturn(actionVO);
+        when(actionVO.isEnabled()).thenReturn(true);
+        when(actionVO.getResourceType()).thenReturn(null);
+        when(actionVO.getExtensionId()).thenReturn(1L);
+        ExtensionVO extensionVO = mock(ExtensionVO.class);
+        when(extensionVO.getState()).thenReturn(Extension.State.Enabled);
+        when(extensionDao.findById(1L)).thenReturn(extensionVO);
+
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.Admin);
+            extensionsManager.runCustomAction(cmd);
+        }
+    }
+
+    @Test
+    public void runCustomAction_ExecutionThrowsException() throws Exception {
+        RunCustomActionCmd cmd = mock(RunCustomActionCmd.class);
+        when(cmd.getCustomActionId()).thenReturn(1L);
+        when(cmd.getResourceId()).thenReturn("vm-123");
+        when(cmd.getParameters()).thenReturn(Map.of("param1", "value1"));
+
+        ExtensionCustomActionVO actionVO = mock(ExtensionCustomActionVO.class);
+        when(extensionCustomActionDao.findById(1L)).thenReturn(actionVO);
+        when(actionVO.isEnabled()).thenReturn(true);
+        when(actionVO.getResourceType()).thenReturn(ExtensionCustomAction.ResourceType.VirtualMachine);
+
+        ExtensionVO extensionVO = mock(ExtensionVO.class);
+        when(extensionDao.findById(anyLong())).thenReturn(extensionVO);
+        when(extensionVO.getState()).thenReturn(Extension.State.Enabled);
+
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(vm.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(entityManager.findByUuid(eq(VirtualMachine.class), anyString())).thenReturn(vm);
+        when(virtualMachineManager.findClusterAndHostIdForVm(vm, false)).thenReturn(new Pair<>(1L, 1L));
+
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(mock(ExtensionResourceMapVO.class));
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(anyLong())).thenReturn(new Pair<>(new HashMap<>(), new HashMap<>()));
+
+        when(agentMgr.send(anyLong(), any(Command.class))).thenThrow(OperationTimedoutException.class);
+
+        try (MockedStatic<CallContext> ignored = mockStatic(CallContext.class)) {
+            mockCallerRole(RoleType.Admin);
+            CustomActionResultResponse result = extensionsManager.runCustomAction(cmd);
+
+            assertFalse(result.getSuccess());
+        }
+    }
+
+    @Test
+    public void createCustomActionResponse_SetsBasicFields() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getUuid()).thenReturn("uuid-1");
+        when(action.getName()).thenReturn("action1");
+        when(action.getDescription()).thenReturn("desc");
+        when(action.getResourceType()).thenReturn(ExtensionCustomAction.ResourceType.VirtualMachine);
+
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(anyLong()))
+                .thenReturn(new Pair<>(Map.of("foo", "bar"), Map.of()));
+
+        ExtensionCustomActionResponse response = extensionsManager.createCustomActionResponse(action);
+
+        assertEquals("uuid-1", response.getId());
+        assertEquals("action1", response.getName());
+        assertEquals("desc", response.getDescription());
+        assertEquals("VirtualMachine", response.getResourceType());
+        assertEquals("bar", response.getDetails().get("foo"));
+    }
+
+    @Test
+    public void createCustomActionResponse_HandlesNullResourceType() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getUuid()).thenReturn("uuid-2");
+        when(action.getName()).thenReturn("action2");
+        when(action.getDescription()).thenReturn("desc2");
+        when(action.getResourceType()).thenReturn(null);
+
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(anyLong()))
+                .thenReturn(new Pair<>(Collections.emptyMap(), Collections.emptyMap()));
+
+        ExtensionCustomActionResponse response = extensionsManager.createCustomActionResponse(action);
+
+        assertEquals("uuid-2", response.getId());
+        assertNull(response.getResourceType());
+        assertTrue(response.getDetails().isEmpty());
+    }
+
+    @Test
+    public void createCustomActionResponse_ParametersAreSetIfPresent() {
+        ExtensionCustomAction action = mock(ExtensionCustomAction.class);
+        when(action.getUuid()).thenReturn("uuid-3");
+        when(action.getName()).thenReturn("action3");
+        when(action.getDescription()).thenReturn("desc3");
+        when(action.getResourceType()).thenReturn(ExtensionCustomAction.ResourceType.VirtualMachine);
+
+        Map<String, String> details = Map.of("foo", "bar");
+        ExtensionCustomAction.Parameter param = new ExtensionCustomAction.Parameter("param1",
+                ExtensionCustomAction.Parameter.Type.STRING, ExtensionCustomAction.Parameter.ValidationFormat.NONE,
+                null, false);
+        Map<String, String> hidden = Map.of(ApiConstants.PARAMETERS,
+                ExtensionCustomAction.Parameter.toJsonFromList(List.of(param)));
+        when(extensionCustomActionDetailsDao.listDetailsKeyPairsWithVisibility(anyLong()))
+                .thenReturn(new Pair<>(details, hidden));
+
+        ExtensionCustomActionResponse response = extensionsManager.createCustomActionResponse(action);
+
+        assertEquals(ExtensionCustomAction.ResourceType.VirtualMachine.name(), response.getResourceType());
+        assertEquals("bar", response.getDetails().get("foo"));
+        assertNotNull(response.getParameters());
+        assertFalse(response.getParameters().isEmpty());
+    }
+
+    @Test
+    public void handleExtensionServerCommands_GetChecksumCommand_ReturnsChecksumAnswer() {
+        GetExtensionPathChecksumCommand cmd = mock(GetExtensionPathChecksumCommand.class);
+        when(cmd.getExtensionName()).thenReturn("ext");
+        when(cmd.getExtensionRelativePath()).thenReturn("ext/entry.sh");
+        when(extensionsManager.externalProvisioner.getChecksumForExtensionPath(anyString(), anyString()))
+                .thenReturn("checksum123");
+        String json = extensionsManager.handleExtensionServerCommands(cmd);
+        assertTrue(json.contains("checksum123"));
+        assertTrue(json.contains("\"result\":true"));
+    }
+
+    @Test
+    public void handleExtensionServerCommands_PreparePathCommand_ReturnsSuccessAnswer() {
+        PrepareExtensionPathCommand cmd = mock(PrepareExtensionPathCommand.class);
+        when(cmd.getExtensionName()).thenReturn("ext");
+        when(cmd.getExtensionRelativePath()).thenReturn("ext/entry.sh");
+        when(cmd.isExtensionUserDefined()).thenReturn(true);
+        doReturn(new Pair<>(true, "ok")).when(extensionsManager)
+                .prepareExtensionPathOnCurrentServer(anyString(), anyBoolean(), anyString());
+
+        String json = extensionsManager.handleExtensionServerCommands(cmd);
+        assertTrue(json.contains("\"result\":true"));
+        assertTrue(json.contains("ok"));
+    }
+
+    @Test
+    public void handleExtensionServerCommands_CleanupFilesCommand_ReturnsSuccessAnswer() {
+        CleanupExtensionFilesCommand cmd = mock(CleanupExtensionFilesCommand.class);
+        when(cmd.getExtensionName()).thenReturn("ext");
+        when(cmd.getExtensionRelativePath()).thenReturn("ext/entry.sh");
+        doReturn(new Pair<>(true, "cleaned")).when(extensionsManager)
+                .cleanupExtensionFilesOnCurrentServer(anyString(), anyString());
+
+        String json = extensionsManager.handleExtensionServerCommands(cmd);
+        assertTrue(json.contains("\"result\":true"));
+        assertTrue(json.contains("cleaned"));
+    }
+
+    @Test
+    public void handleExtensionServerCommands_UnsupportedCommand_ReturnsUnsupportedAnswer() {
+        ExtensionServerActionBaseCommand cmd = mock(ExtensionServerActionBaseCommand.class);
+        when(cmd.getExtensionName()).thenReturn("ext");
+        when(cmd.getExtensionRelativePath()).thenReturn("ext/entry.sh");
+
+        String json = extensionsManager.handleExtensionServerCommands(cmd);
+        assertTrue(json.contains("Unsupported command"));
+        assertTrue(json.contains("\"result\":false"));
+    }
+
+    @Test
+    public void getExtensionIdForCluster_WhenMappingExists_ReturnsExtensionId() {
+        long clusterId = 1L;
+        long extensionId = 100L;
+        ExtensionResourceMapVO mapVO = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.findByResourceIdAndType(eq(clusterId), any()))
+                .thenReturn(mapVO);
+        when(mapVO.getExtensionId()).thenReturn(extensionId);
+
+        Long result = extensionsManager.getExtensionIdForCluster(clusterId);
+
+        assertEquals(Long.valueOf(extensionId), result);
+    }
+
+    @Test
+    public void getExtensionIdForCluster_WhenNoMappingExists_ReturnsNull() {
+        long clusterId = 42L;
+        when(extensionResourceMapDao.findByResourceIdAndType(eq(clusterId), any()))
+                .thenReturn(null);
+
+        Long result = extensionsManager.getExtensionIdForCluster(clusterId);
+
+        assertNull(result);
+    }
+
+    @Test
+    public void getExtension_WhenExtensionExists_ReturnsExtension() {
+        long id = 1L;
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionDao.findById(id)).thenReturn(ext);
+
+        Extension result = extensionsManager.getExtension(id);
+
+        assertEquals(ext, result);
+    }
+
+    @Test
+    public void getExtension_WhenExtensionDoesNotExist_ReturnsNull() {
+        long id = 2L;
+        when(extensionDao.findById(id)).thenReturn(null);
+
+        Extension result = extensionsManager.getExtension(id);
+
+        assertNull(result);
+    }
+
+    @Test
+    public void getExtensionForCluster_WhenMappingExists_ReturnsExtension() {
+        long clusterId = 10L;
+        long extensionId = 20L;
+        ExtensionVO ext = mock(ExtensionVO.class);
+        when(extensionsManager.getExtensionIdForCluster(clusterId)).thenReturn(extensionId);
+        when(extensionDao.findById(extensionId)).thenReturn(ext);
+        Extension result = extensionsManager.getExtensionForCluster(clusterId);
+        assertEquals(ext, result);
+    }
+
+    @Test
+    public void getExtensionForCluster_WhenNoMappingExists_ReturnsNull() {
+        long clusterId = 10L;
+        when(extensionsManager.getExtensionIdForCluster(clusterId)).thenReturn(null);
+        Extension result = extensionsManager.getExtensionForCluster(clusterId);
+        assertNull(result);
+    }
+}
diff --git a/framework/pom.xml b/framework/pom.xml
index 77a2710c335..3b534a4bb5a 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -51,6 +51,7 @@
         <module>db</module>
         <module>direct-download</module>
         <module>events</module>
+        <module>extensions</module>
         <module>ipc</module>
         <module>jobs</module>
         <module>managed-context</module>
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index db88310d81c..5ea4a03b275 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -58,3 +58,4 @@ USAGECLASSPATH=
 USAGELOG=/var/log/cloudstack/usage/usage.log
 USAGESYSCONFDIR=/etc/cloudstack/usage
 PACKAGE=cloudstack
+EXTENSIONSDEPLOYMENTMODE=production
diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 2c6898cac7c..995f758033a 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/el8/cloud.spec
@@ -319,6 +319,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
 cp -r engine/schema/dist/systemvm-templates/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/md5sum.txt
 
+# Sample Extensions
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/extensions
+cp -r extensions/* ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/extensions
+ln -sf %{_sysconfdir}/%{name}/extensions ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/extensions
+
 # UI
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/ui
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ui/
@@ -607,6 +612,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %{_datadir}/%{name}-management/lib/*.jar
 %{_datadir}/%{name}-management/logs
 %{_datadir}/%{name}-management/templates
+%{_datadir}/%{name}-management/extensions
 %attr(0755,root,root) %{_bindir}/%{name}-setup-databases
 %attr(0755,root,root) %{_bindir}/%{name}-migrate-databases
 %attr(0755,root,root) %{_bindir}/%{name}-set-guest-password
@@ -628,6 +634,8 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %{_defaultdocdir}/%{name}-management-%{version}/LICENSE
 %{_defaultdocdir}/%{name}-management-%{version}/NOTICE
 %{_datadir}/%{name}-management/setup/wheel/*.whl
+%dir %attr(0755,cloud,cloud) %{_sysconfdir}/%{name}/extensions
+%attr(0755,cloud,cloud) %{_sysconfdir}/%{name}/extensions/*
 
 %files agent
 %attr(0755,root,root) %{_bindir}/%{name}-setup-agent
diff --git a/packaging/el8/replace.properties b/packaging/el8/replace.properties
index efeab01166e..a6094b59c73 100644
--- a/packaging/el8/replace.properties
+++ b/packaging/el8/replace.properties
@@ -57,3 +57,4 @@ SYSTEMJARS=
 USAGECLASSPATH=
 USAGELOG=/var/log/cloudstack/usage/usage.log
 USAGESYSCONFDIR=/etc/sysconfig
+EXTENSIONSDEPLOYMENTMODE=production
diff --git a/plugins/hypervisors/external/pom.xml b/plugins/hypervisors/external/pom.xml
new file mode 100644
index 00000000000..05a22cd2f9d
--- /dev/null
+++ b/plugins/hypervisors/external/pom.xml
@@ -0,0 +1,44 @@
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.cloudstack</groupId>
+        <artifactId>cloudstack-plugins</artifactId>
+        <version>4.21.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>cloud-plugin-hypervisor-external</artifactId>
+    <name>Apache CloudStack Plugin - Hypervisor External</name>
+    <description>External Hypervisor for Cloudstack</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-agent</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${cs.jackson.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManager.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManager.java
new file mode 100644
index 00000000000..24f0816868c
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManager.java
@@ -0,0 +1,24 @@
+// 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.
+
+package org.apache.cloudstack.agent.manager;
+
+import com.cloud.utils.component.Manager;
+
+public interface ExternalAgentManager extends Manager {
+
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManagerImpl.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManagerImpl.java
new file mode 100644
index 00000000000..c33ce479885
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManagerImpl.java
@@ -0,0 +1,55 @@
+//
+// 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.
+//
+
+package org.apache.cloudstack.agent.manager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.component.PluggableService;
+
+public class ExternalAgentManagerImpl extends ManagerBase implements ExternalAgentManager, Configurable, PluggableService {
+
+    public static final ConfigKey<Boolean> expectMacAddressFromExternalProvisioner = new ConfigKey<>(Boolean.class, "expect.macaddress.from.external.provisioner", "Advanced", "false",
+            "Sample external provisioning config, any value that has to be sent", true, ConfigKey.Scope.Cluster, null);
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return ExternalAgentManagerImpl.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[] {expectMacAddressFromExternalProvisioner};
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java
new file mode 100644
index 00000000000..33da0373b6a
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java
@@ -0,0 +1,183 @@
+// 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.
+package org.apache.cloudstack.agent.manager;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.apache.commons.collections.CollectionUtils;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.Pod;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.org.Cluster;
+import com.cloud.resource.ResourceManager;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+
+public class ExternalServerPlanner extends AdapterBase implements DeploymentPlanner {
+
+    @Inject
+    protected DataCenterDao dcDao;
+    @Inject
+    protected HostPodDao podDao;
+    @Inject
+    protected ClusterDao clusterDao;
+    @Inject
+    protected HostDao hostDao;
+    @Inject
+    protected ResourceManager resourceMgr;
+    @Inject
+    ExtensionDao extensionDao;
+    @Inject
+    ExtensionResourceMapDao extensionResourceMapDao;
+
+    @Override
+    public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid) throws InsufficientServerCapacityException {
+        VirtualMachine vm = vmProfile.getVirtualMachine();
+        ServiceOffering offering = vmProfile.getServiceOffering();
+        VirtualMachineTemplate template = vmProfile.getTemplate();
+        Long extensionId = template.getExtensionId();
+        final ExtensionVO extensionVO = extensionDao.findById(extensionId);
+        if (extensionVO == null) {
+            logger.error("Extension associated with {} cannot be found during deployment of external instance {}",
+                    template, vmProfile.getInstanceName());
+            return null;
+        }
+        if (!Extension.State.Enabled.equals(extensionVO.getState())) {
+            logger.error("{} is not in enabled state therefore planning can not be done for deployment of external instance {}",
+                    extensionVO, vmProfile.getInstanceName());
+            return null;
+        }
+        if (!extensionVO.isPathReady()) {
+            logger.error("{} path is not in ready state therefore planning can not be done for deployment of external instance {}",
+                    extensionVO, vmProfile.getInstanceName());
+            return null;
+        }
+
+        String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
+
+        if (vm.getLastHostId() != null) {
+            HostVO h = hostDao.findById(vm.getLastHostId());
+            DataCenter dc = dcDao.findById(h.getDataCenterId());
+            Pod pod = podDao.findById(h.getPodId());
+            Cluster c = clusterDao.findById(h.getClusterId());
+            logger.debug("Start external {} on last used {}", vm, h);
+            return new DeployDestination(dc, pod, c, h);
+        }
+
+        String hostTag = null;
+        if (haVmTag != null) {
+            hostTag = haVmTag;
+        } else if (offering.getHostTag() != null) {
+            String[] tags = offering.getHostTag().split(",");
+            if (tags.length > 0) {
+                hostTag = tags[0];
+            }
+        }
+
+        List<Long> clusterIds = clusterDao.listEnabledClusterIdsByZoneHypervisorArch(vm.getDataCenterId(),
+                HypervisorType.External, vmProfile.getTemplate().getArch());
+        List<Long> extensionClusterIds = extensionResourceMapDao.listResourceIdsByExtensionIdAndType(extensionId,
+                ExtensionResourceMap.ResourceType.Cluster);
+        if (CollectionUtils.isEmpty(extensionClusterIds)) {
+            logger.error("No clusters associated with {} to plan deployment of external instance {}",
+                    vmProfile.getInstanceName());
+            return null;
+        }
+        clusterIds = clusterIds.stream()
+                .filter(extensionClusterIds::contains)
+                .collect(Collectors.toList());
+        logger.debug("Found {} clusters associated with {}", clusterIds.size(), extensionVO);
+        HostVO target = null;
+        List<HostVO> hosts;
+        for (Long clusterId : clusterIds) {
+            hosts = resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, clusterId, null,
+                    vm.getDataCenterId());
+            if (hostTag != null) {
+                for (HostVO host : hosts) {
+                    hostDao.loadHostTags(host);
+                    List<String> hostTags = host.getHostTags();
+                    if (hostTags.contains(hostTag)) {
+                        target = host;
+                        break;
+                    }
+                }
+            } else {
+                if (CollectionUtils.isNotEmpty(hosts)) {
+                    Collections.shuffle(hosts);
+                    target = hosts.get(0);
+                    break;
+                }
+            }
+        }
+
+        if (target != null) {
+            DataCenter dc = dcDao.findById(target.getDataCenterId());
+            Pod pod = podDao.findById(target.getPodId());
+            Cluster cluster = clusterDao.findById(target.getClusterId());
+            return new DeployDestination(dc, pod, cluster, target);
+        }
+
+        logger.warn("Cannot find suitable host for deploying external instance {}", vmProfile.getInstanceName());
+        return null;
+    }
+
+    @Override
+    public boolean canHandle(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid) {
+        return vm.getHypervisorType() == HypervisorType.External;
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        return true;
+    }
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        return true;
+    }
+
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapter.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapter.java
new file mode 100644
index 00000000000..aefe9d0d180
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapter.java
@@ -0,0 +1,279 @@
+// 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.
+
+package org.apache.cloudstack.agent.manager;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.configuration.Resource;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventVO;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.Storage;
+import com.cloud.storage.TemplateProfile;
+import com.cloud.storage.VMTemplateStorageResourceAssoc;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.VMTemplateZoneVO;
+import com.cloud.template.TemplateAdapter;
+import com.cloud.template.TemplateAdapterBase;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class ExternalTemplateAdapter extends TemplateAdapterBase implements TemplateAdapter {
+
+    @Override
+    public String getName() {
+        return TemplateAdapterType.External.getName();
+    }
+
+    @Override
+    public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException {
+        Account caller = CallContext.current().getCallingAccount();
+        Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
+        _accountMgr.checkAccess(caller, null, true, owner);
+        Storage.TemplateType templateType = templateMgr.validateTemplateType(cmd, _accountMgr.isAdmin(caller.getAccountId()),
+                CollectionUtils.isEmpty(cmd.getZoneIds()), Hypervisor.HypervisorType.External);
+
+        List<Long> zoneId = cmd.getZoneIds();
+        // ignore passed zoneId if we are using region wide image store
+        List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
+        if (stores != null && stores.size() > 0) {
+            zoneId = null;
+        }
+
+        Hypervisor.HypervisorType hypervisorType = Hypervisor.HypervisorType.getType(cmd.getHypervisor());
+        if(hypervisorType == Hypervisor.HypervisorType.None) {
+            throw new InvalidParameterValueException(String.format(
+                    "Hypervisor Type: %s is invalid. Supported Hypervisor types are: %s",
+                    cmd.getHypervisor(),
+                    StringUtils.join(Arrays.stream(Hypervisor.HypervisorType.values()).filter(h -> h != Hypervisor.HypervisorType.None).map(Hypervisor.HypervisorType::name).toArray(), ", ")));
+        }
+
+        Map details = cmd.getDetails();
+        Map externalDetails = cmd.getExternalDetails();
+        if (details != null) {
+            details.putAll(externalDetails);
+        } else {
+            details = externalDetails;
+        }
+
+        return prepare(false, CallContext.current().getCallingUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getArch(), cmd.getBits(), cmd.isPasswordEnabled(), cmd.getRequiresHvm(),
+                cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneId, hypervisorType, cmd.getChecksum(), true,
+                cmd.getTemplateTag(), owner, details, cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), templateType,
+                cmd.isDirectDownload(), cmd.isDeployAsIs(), cmd.isForCks(), cmd.getExtensionId());
+    }
+
+    @Override
+    public TemplateProfile prepare(RegisterIsoCmd cmd) throws ResourceAllocationException {
+        throw new CloudRuntimeException("External hypervisor doesn't support ISO template");
+    }
+
+    @Override
+    public TemplateProfile prepare(GetUploadParamsForIsoCmd cmd) throws ResourceAllocationException {
+        throw new CloudRuntimeException("External hypervisor doesn't support ISO template");
+    }
+
+    private void templateCreateUsage(VMTemplateVO template, long dcId) {
+        if (template.getAccountId() != Account.ACCOUNT_ID_SYSTEM) {
+            UsageEventVO usageEvent =
+                    new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, template.getAccountId(), dcId, template.getId(), template.getName(), null,
+                            template.getSourceTemplateId(), 0L);
+            _usageEventDao.persist(usageEvent);
+        }
+    }
+
+    @Override
+    public VMTemplateVO create(TemplateProfile profile) {
+        VMTemplateVO template = persistTemplate(profile, VirtualMachineTemplate.State.Active);
+        List<Long> zones = profile.getZoneIdList();
+
+        // create an entry at template_store_ref with store_id = null to represent that this template is ready for use.
+        TemplateDataStoreVO vmTemplateHost =
+                new TemplateDataStoreVO(null, template.getId(), new Date(), 100, VMTemplateStorageResourceAssoc.Status.DOWNLOADED, null, null, null, null, template.getUrl());
+        this._tmpltStoreDao.persist(vmTemplateHost);
+
+        if (zones == null) {
+            List<DataCenterVO> dcs = _dcDao.listAllIncludingRemoved();
+            if (dcs != null && dcs.size() > 0) {
+                templateCreateUsage(template, dcs.get(0).getId());
+            }
+        } else {
+            for (Long zoneId: zones) {
+                templateCreateUsage(template, zoneId);
+            }
+        }
+
+        _resourceLimitMgr.incrementResourceCount(profile.getAccountId(), Resource.ResourceType.template);
+        return template;
+    }
+
+    @Override
+    public List<TemplateOrVolumePostUploadCommand> createTemplateForPostUpload(TemplateProfile profile) {
+        return Transaction.execute((TransactionCallback<List<TemplateOrVolumePostUploadCommand>>) status -> {
+            if (Storage.ImageFormat.ISO.equals(profile.getFormat())) {
+                throw new CloudRuntimeException("ISO upload is not supported for External hypervisor");
+            }
+            List<Long> zoneIdList = profile.getZoneIdList();
+            if (zoneIdList == null) {
+                throw new CloudRuntimeException("Zone ID is null, cannot upload template.");
+            }
+            if (zoneIdList.size() > 1) {
+                throw new CloudRuntimeException("Operation is not supported for more than one zone id at a time.");
+            }
+            VMTemplateVO template = persistTemplate(profile, VirtualMachineTemplate.State.NotUploaded);
+            if (template == null) {
+                throw new CloudRuntimeException("Unable to persist the template " + profile.getTemplate());
+            }
+            // Set Event Details for Template/ISO Upload
+            String eventResourceId = template.getUuid();
+            CallContext.current().setEventDetails(String.format("Template Id: %s", eventResourceId));
+            CallContext.current().putContextParameter(VirtualMachineTemplate.class, eventResourceId);
+            Long zoneId = zoneIdList.get(0);
+            DataStore imageStore = verifyHeuristicRulesForZone(template, zoneId);
+            List<TemplateOrVolumePostUploadCommand> payloads = new LinkedList<>();
+            if (imageStore == null) {
+                List<DataStore> imageStores = getImageStoresThrowsExceptionIfNotFound(zoneId, profile);
+                postUploadAllocation(imageStores, template, payloads);
+            } else {
+                postUploadAllocation(List.of(imageStore), template, payloads);
+            }
+            if (payloads.isEmpty()) {
+                throw new CloudRuntimeException("Unable to find zone or an image store with enough capacity");
+            }
+            _resourceLimitMgr.incrementResourceCount(profile.getAccountId(), Resource.ResourceType.template);
+            return payloads;
+        });
+    }
+
+    @Override
+    public TemplateProfile prepareDelete(DeleteIsoCmd cmd) {
+        throw new CloudRuntimeException("External hypervisor doesn't support ISO, how the delete get here???");
+    }
+
+    @Override
+    @DB
+    public boolean delete(TemplateProfile profile) {
+        VMTemplateVO template = profile.getTemplate();
+        Long templateId = template.getId();
+        boolean success = true;
+        String zoneName;
+
+        if (profile.getZoneIdList() != null && profile.getZoneIdList().size() > 1)
+            throw new CloudRuntimeException("Operation is not supported for more than one zone id at a time");
+
+        if (!template.isCrossZones() && profile.getZoneIdList() != null) {
+            //get the first element in the list
+            zoneName = profile.getZoneIdList().get(0).toString();
+        } else {
+            zoneName = "all zones";
+        }
+
+        logger.debug("Attempting to mark template host refs for {} as destroyed in zone: {}", template, zoneName);
+        Account account = _accountDao.findByIdIncludingRemoved(template.getAccountId());
+        String eventType = EventTypes.EVENT_TEMPLATE_DELETE;
+        List<TemplateDataStoreVO> templateHostVOs = this._tmpltStoreDao.listByTemplate(templateId);
+
+        for (TemplateDataStoreVO vo : templateHostVOs) {
+            TemplateDataStoreVO lock = null;
+            try {
+                lock = _tmpltStoreDao.acquireInLockTable(vo.getId());
+                if (lock == null) {
+                    logger.debug("Failed to acquire lock when deleting templateDataStoreVO with ID: {}", vo.getId());
+                    success = false;
+                    break;
+                }
+
+                vo.setDestroyed(true);
+                _tmpltStoreDao.update(vo.getId(), vo);
+
+            } finally {
+                if (lock != null) {
+                    _tmpltStoreDao.releaseFromLockTable(lock.getId());
+                }
+            }
+        }
+
+        if (profile.getZoneIdList() != null) {
+            UsageEventVO usageEvent = new UsageEventVO(eventType, account.getId(), profile.getZoneIdList().get(0),
+                    templateId, null);
+            _usageEventDao.persist(usageEvent);
+
+            VMTemplateZoneVO templateZone = _tmpltZoneDao.findByZoneTemplate(profile.getZoneIdList().get(0), templateId);
+
+            if (templateZone != null) {
+                _tmpltZoneDao.remove(templateZone.getId());
+            }
+        } else {
+            List<DataCenterVO> dcs = _dcDao.listAllIncludingRemoved();
+            for (DataCenterVO dc : dcs) {
+                UsageEventVO usageEvent = new UsageEventVO(eventType, account.getId(), dc.getId(), templateId, null);
+                _usageEventDao.persist(usageEvent);
+            }
+        }
+
+        logger.debug("Successfully marked template host refs for {}} as destroyed in zone: {}", template, zoneName);
+
+        // If there are no more non-destroyed template host entries for this template, delete it
+        if (success && _tmpltStoreDao.listByTemplate(templateId).isEmpty()) {
+            long accountId = template.getAccountId();
+
+            VMTemplateVO lock = _tmpltDao.acquireInLockTable(templateId);
+
+            try {
+                if (lock == null) {
+                    logger.debug("Failed to acquire lock when deleting template with ID: {}", templateId);
+                    success = false;
+                } else if (_tmpltDao.remove(templateId)) {
+                    // Decrement the number of templates and total secondary storage space used by the account.
+                    _resourceLimitMgr.decrementResourceCount(accountId, Resource.ResourceType.template);
+                    _resourceLimitMgr.recalculateResourceCount(accountId, _accountMgr.getAccount(accountId).getDomainId(), Resource.ResourceType.secondary_storage.getOrdinal());
+                }
+
+            } finally {
+                if (lock != null) {
+                    _tmpltDao.releaseFromLockTable(lock.getId());
+                }
+            }
+            logger.debug("Removed template: {} because all of its template host refs were marked as destroyed.", template.getName());
+        }
+
+        return success;
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/guru/ExternalHypervisorGuru.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/guru/ExternalHypervisorGuru.java
new file mode 100644
index 00000000000..cd6a2cf996a
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/guru/ExternalHypervisorGuru.java
@@ -0,0 +1,114 @@
+// 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.
+package org.apache.cloudstack.guru;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.commons.collections.MapUtils;
+
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.host.Host;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.hypervisor.HypervisorGuruBase;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfileImpl;
+import com.cloud.vm.dao.UserVmDao;
+
+public class ExternalHypervisorGuru extends HypervisorGuruBase implements HypervisorGuru {
+
+    @Inject
+    private VirtualMachineManager virtualMachineManager;
+    @Inject
+    private UserVmDao userVmDao;
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    protected ExternalHypervisorGuru() {
+        super();
+    }
+
+    @Override
+    public Hypervisor.HypervisorType getHypervisorType() {
+        return Hypervisor.HypervisorType.External;
+    }
+
+    @Override
+    public VirtualMachineTO implement(VirtualMachineProfile vm) {
+        VirtualMachineTO to = toVirtualMachineTO(vm);
+        return to;
+    }
+
+    @Override
+    public boolean trackVmHostChange() {
+        return false;
+    }
+
+    @Override
+    protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) {
+        VirtualMachineTO to = super.toVirtualMachineTO(vmProfile);
+
+        Map<String, String> newDetails = new HashMap<>();
+        Map<String, String> toDetails = to.getDetails();
+        Map<String, String> serviceOfferingDetails = _serviceOfferingDetailsDao.listDetailsKeyPairs(vmProfile.getServiceOfferingId());
+        if (MapUtils.isNotEmpty(serviceOfferingDetails)) {
+            newDetails.putAll(serviceOfferingDetails);
+        }
+        newDetails.putAll(toDetails);
+        if (MapUtils.isNotEmpty(newDetails)) {
+            to.setDetails(newDetails);
+        }
+
+        return to;
+    }
+
+    protected void updateStopCommandForExternalHypervisorType(final Hypervisor.HypervisorType hypervisorType,
+                  final Long hostId, final Map<String, String> vmExternalDetails, final StopCommand stopCommand) {
+        if (!Hypervisor.HypervisorType.External.equals(hypervisorType) || hostId == null) {
+            return;
+        }
+        Host host = hostDao.findById(hostId);
+        if (host == null) {
+            return;
+        }
+        stopCommand.setExternalDetails(extensionsManager.getExternalAccessDetails(host, vmExternalDetails));
+        stopCommand.setExpungeVM(true);
+    }
+
+    public List<Command> finalizeExpunge(VirtualMachine vm) {
+        List<Command> commands = new ArrayList<>();
+        final StopCommand stop = new StopCommand(vm, virtualMachineManager.getExecuteInSequence(vm.getHypervisorType()), false, false);
+        VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        VirtualMachineTO virtualMachineTO = toVirtualMachineTO(profile);
+        stop.setVirtualMachine(virtualMachineTO);
+        final Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
+        updateStopCommandForExternalHypervisorType(vm.getHypervisorType(), hostId,
+                virtualMachineTO.getExternalDetails(), stop);
+        commands.add(stop);
+        return commands;
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java
new file mode 100644
index 00000000000..643a29fe3ee
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java
@@ -0,0 +1,294 @@
+// 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.
+
+package org.apache.cloudstack.hypervisor.external.discoverer;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.apache.cloudstack.hypervisor.external.resource.ExternalResource;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.Listener;
+import com.cloud.agent.api.AgentControlAnswer;
+import com.cloud.agent.api.AgentControlCommand;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.dc.ClusterVO;
+import com.cloud.exception.ConnectionException;
+import com.cloud.exception.DiscoveryException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.Discoverer;
+import com.cloud.resource.DiscovererBase;
+import com.cloud.resource.ResourceStateAdapter;
+import com.cloud.resource.ServerResource;
+import com.cloud.resource.UnableDeleteHostException;
+
+public class ExternalServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
+
+    @Inject
+    AgentManager agentManager;
+
+    @Inject
+    ExtensionDao extensionDao;
+
+    @Inject
+    ExtensionResourceMapDao extensionResourceMapDao;
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    @Override
+    public boolean processAnswers(long agentId, long seq, Answer[] answers) {
+        return false;
+    }
+
+    @Override
+    public boolean processCommands(long agentId, long seq, Command[] commands) {
+        return false;
+    }
+
+    @Override
+    public AgentControlAnswer processControlCommand(long agentId, AgentControlCommand cmd) {
+        return null;
+    }
+
+    @Override
+    public void processHostAdded(long hostId) {
+
+    }
+
+    @Override
+    public void processConnect(Host host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
+
+    }
+
+    @Override
+    public boolean processDisconnect(long agentId, Status state) {
+        return false;
+    }
+
+    @Override
+    public void processHostAboutToBeRemoved(long hostId) {
+
+    }
+
+    @Override
+    public void processHostRemoved(long hostId, long clusterId) {
+
+    }
+
+    @Override
+    public boolean isRecurring() {
+        return false;
+    }
+
+    @Override
+    public int getTimeout() {
+        return 0;
+    }
+
+    @Override
+    public boolean processTimeout(long agentId, long seq) {
+        return false;
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        super.configure(name, params);
+        agentManager.registerForHostEvents(this, true, false, true);
+        _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
+        return true;
+    }
+
+    protected String getResourceGuidFromName(String name) {
+        return "External:" + UUID.nameUUIDFromBytes(name.getBytes());
+    }
+
+    protected void addExtensionDataToResourceParams(ExtensionVO extension, Map<String, Object> params) {
+        params.put("extensionName", extension.getName());
+        params.put("extensionRelativePath", extension.getRelativePath());
+        params.put("extensionState", extension.getState());
+        params.put("extensionPathReady", extension.isPathReady());
+    }
+
+    @Override
+    public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List<String> hostTags) throws DiscoveryException {
+        Map<ExternalResource, Map<String, String>> resources;
+        String errorMessage;
+        if (clusterId == null) {
+            errorMessage = "Must specify cluster Id when adding host";
+            logger.error(errorMessage);
+            throw new DiscoveryException(errorMessage);
+        }
+        ClusterVO cluster = _clusterDao.findById(clusterId);
+        if (cluster == null || (cluster.getHypervisorType() != Hypervisor.HypervisorType.External)) {
+            errorMessage = "Invalid cluster id or cluster is not for External hypervisors";
+            logger.error(errorMessage);
+            throw new DiscoveryException(errorMessage);
+        }
+        if (podId == null) {
+            errorMessage = "Must specify pod when adding host";
+            logger.error(errorMessage);
+            throw new DiscoveryException(errorMessage);
+        }
+        ExtensionResourceMapVO extensionResourceMapVO = extensionResourceMapDao.findByResourceIdAndType(clusterId,
+                ExtensionResourceMap.ResourceType.Cluster);
+        if (extensionResourceMapVO == null) {
+            logger.error("External hypervisor {} must be registered with an extension when adding host",
+                    cluster);
+            throw new DiscoveryException(String.format("Cluster: %s is not registered with an extension",
+                    cluster.getName()));
+        }
+        ExtensionVO extensionVO = extensionDao.findById(extensionResourceMapVO.getExtensionId());
+        if (extensionVO == null) {
+            logger.error("Extension ID: {} to which {} cluster is registered is not found",
+                    extensionResourceMapVO.getExtensionId(), cluster);
+            throw new DiscoveryException(String.format("Cluster: %s is registered with an inexistent extension",
+                    cluster.getName()));
+        }
+        if (cluster.getGuid() == null) {
+            cluster.setGuid(UUID.randomUUID().toString());
+            _clusterDao.update(clusterId, cluster);
+        }
+        Map<String, Object> params = new HashMap<>();
+        params.put("username", username);
+        params.put("password", password);
+        params.put("zone", Long.toString(dcId));
+        params.put("pod", Long.toString(podId));
+        params.put("cluster", Long.toString(clusterId));
+        String name = uri.toString();
+        params.put("guid", getResourceGuidFromName(name));
+        addExtensionDataToResourceParams(extensionVO, params);
+        resources = createAgentResource(name, params);
+        if (resources == null) {
+            throw new DiscoveryException("Failed to create external agent");
+        }
+        return resources;
+    }
+
+    @Override
+    protected HashMap<String, Object> buildConfigParams(HostVO host) {
+        HashMap<String, Object> params = super.buildConfigParams(host);
+        long clusterId = Long.parseLong((String) params.get("cluster"));
+        ExtensionResourceMapVO extensionResourceMapVO =
+                extensionResourceMapDao.findByResourceIdAndType(clusterId,
+                        ExtensionResourceMap.ResourceType.Cluster);
+        if (extensionResourceMapVO == null) {
+            logger.debug("Cluster ID: {} not registered with any extension", clusterId);
+            return params;
+        }
+        ExtensionVO extensionVO = extensionDao.findById(extensionResourceMapVO.getExtensionId());
+        if (extensionVO == null) {
+            logger.error("Extension with ID: {} not found", extensionResourceMapVO.getExtensionId());
+            return params;
+        }
+        addExtensionDataToResourceParams(extensionVO, params);
+        return params;
+    }
+
+    private Map<ExternalResource, Map<String, String>> createAgentResource(String name, Map<String, Object> params) {
+        try {
+            logger.info("Creating external server resource: {}", name);
+            Map<String, String> args = new HashMap<>();
+            Map<ExternalResource, Map<String, String>> newResources = new HashMap<>();
+            ExternalResource agentResource;
+            synchronized (this) {
+                agentResource = new ExternalResource();
+                try {
+                    agentResource.start();
+                    agentResource.configure(name, params);
+                    args.put("guid", (String)params.get("guid"));
+                    newResources.put(agentResource, args);
+                } catch (ConfigurationException e) {
+                    logger.error("Error while configuring server resource {}", e.getMessage());
+                }
+            }
+            return newResources;
+        } catch (Exception ex) {
+            logger.warn("Caught creating external server resources {}", name, ex);
+        }
+        return null;
+    }
+
+    @Override
+    public void postDiscovery(List<HostVO> hosts, long msId) {
+    }
+
+    @Override
+    public boolean matchHypervisor(String hypervisor) {
+        if (hypervisor == null)
+            return true;
+
+        return getHypervisorType().toString().equalsIgnoreCase(hypervisor);
+    }
+
+    @Override
+    public Hypervisor.HypervisorType getHypervisorType() {
+        return Hypervisor.HypervisorType.External;
+    }
+
+    @Override
+    public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd) {
+        return null;
+    }
+
+    @Override
+    public HostVO createHostVOForDirectConnectAgent(HostVO host, StartupCommand[] startup, ServerResource resource,
+                    Map<String, String> details, List<String> hostTags) {
+        StartupCommand firstCmd = startup[0];
+        if (!(firstCmd instanceof StartupRoutingCommand)) {
+            return null;
+        }
+        StartupRoutingCommand ssCmd = (StartupRoutingCommand)firstCmd;
+        if (ssCmd.getHypervisorType() != Hypervisor.HypervisorType.External) {
+            return null;
+        }
+        ExtensionResourceMapVO extensionResourceMapVO = extensionResourceMapDao.findByResourceIdAndType(
+                host.getClusterId(), ExtensionResourceMap.ResourceType.Cluster);
+        if (extensionResourceMapVO != null) {
+            ExtensionVO extension = extensionDao.findById(extensionResourceMapVO.getExtensionId());
+            logger.debug("Creating {} for {}", host, extension);
+            extensionsManager.prepareExtensionPathAcrossServers(extension);
+        } else {
+            logger.debug("Creating {}. No extension registered for cluster ID: {}", host, host.getClusterId());
+        }
+        return _resourceMgr.fillRoutingHostVO(host, ssCmd, Hypervisor.HypervisorType.External, details, hostTags);
+    }
+
+    @Override
+    public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) throws UnableDeleteHostException {
+        return new DeleteHostAnswer(true);
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java
new file mode 100644
index 00000000000..5a1632ce977
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java
@@ -0,0 +1,832 @@
+//
+// 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.
+//
+package org.apache.cloudstack.hypervisor.external.provisioner;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.utils.security.DigestHelper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.PrepareExternalProvisioningCommand;
+import com.cloud.agent.api.RebootAnswer;
+import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.agent.api.RunCustomActionCommand;
+import com.cloud.agent.api.StartAnswer;
+import com.cloud.agent.api.StartCommand;
+import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.ExternalProvisioner;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.hypervisor.HypervisorGuruManager;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.utils.FileUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.PropertiesUtil;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.json.JsonMergeUtil;
+import com.cloud.utils.script.Script;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfileImpl;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public class ExternalPathPayloadProvisioner extends ManagerBase implements ExternalProvisioner, PluggableService {
+
+    public static final String BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR = "scripts/vm/hypervisor/external/provisioner";
+    public static final String BASE_EXTERNAL_PROVISIONER_SHELL_SCRIPT =
+            BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR + "/provisioner.sh";
+
+    private static final String PROPERTIES_FILE = "server.properties";
+    private static final String EXTENSIONS_DEPLOYMENT_MODE_NAME = "extensions.deployment.mode";
+    private static final String EXTENSIONS_DIRECTORY_PROD = "/usr/share/cloudstack-management/extensions";
+    private static final String EXTENSIONS_DATA_DIRECTORY_PROD = "/var/lib/cloudstack/management/extensions";
+    private static final String EXTENSIONS_DIRECTORY_DEV = "extensions";
+    private static final String EXTENSIONS_DATA_DIRECTORY_DEV = "client/target/extensions-data";
+
+    @Inject
+    UserVmDao _uservmDao;
+
+    @Inject
+    HostDao hostDao;
+
+    @Inject
+    VMInstanceDao vmInstanceDao;
+
+    @Inject
+    HypervisorGuruManager hypervisorGuruManager;
+
+    @Inject
+    ExtensionsManager extensionsManager;
+
+    private static final AtomicReference<Properties> propertiesRef = new AtomicReference<>();
+    private String extensionsDirectory;
+    private String extensionsDataDirectory;
+    private ExecutorService payloadCleanupExecutor;
+    private ScheduledExecutorService payloadCleanupScheduler;
+    private static final List<String> TRIVIAL_ACTIONS = Arrays.asList(
+            "status"
+    );
+
+    @Override
+    public String getName() {
+        return getClass().getSimpleName();
+    }
+
+    protected Map<String, Object> loadAccessDetails(Map<String, Map<String, String>> externalDetails,
+                            VirtualMachineTO virtualMachineTO) {
+        Map<String, Object> modifiedDetails = new HashMap<>();
+        if (MapUtils.isNotEmpty(externalDetails)) {
+            modifiedDetails.put(ApiConstants.EXTERNAL_DETAILS, externalDetails);
+        }
+        if (virtualMachineTO != null) {
+            modifiedDetails.put(ApiConstants.VIRTUAL_MACHINE_ID, virtualMachineTO.getUuid());
+            modifiedDetails.put(ApiConstants.VIRTUAL_MACHINE_NAME, virtualMachineTO.getName());
+            modifiedDetails.put(VmDetailConstants.CLOUDSTACK_VM_DETAILS, virtualMachineTO);
+        }
+        return modifiedDetails;
+    }
+
+    protected String getExtensionCheckedPath(String extensionName, String extensionRelativePath) {
+        String path = getExtensionPath(extensionRelativePath);
+        File file = new File(path);
+        String errorSuffix = String.format("Entry point [%s] for extension: %s", path, extensionName);
+        if (!file.exists()) {
+            logger.error("{} does not exist", errorSuffix);
+            return null;
+        }
+        if (!file.isFile()) {
+            logger.error("{} is not a file", errorSuffix);
+            return null;
+        }
+        if (!file.canRead()) {
+            logger.error("{} is not readable", errorSuffix);
+            return null;
+        }
+        if (!file.canExecute()) {
+            logger.error("{} is not executable", errorSuffix);
+            return null;
+        }
+        return path;
+
+    }
+
+    protected boolean checkExtensionsDirectory() {
+        File dir = new File(extensionsDirectory);
+        if (!dir.exists() || !dir.isDirectory() || !dir.canWrite()) {
+            logger.error("Extension directory [{}] is not properly set up. It must exist, be a directory, and be writeable",
+                    dir.getAbsolutePath());
+            return false;
+        }
+        if (!extensionsDirectory.equals(dir.getAbsolutePath())) {
+            extensionsDirectory = dir.getAbsolutePath();
+        }
+        logger.info("Extensions directory path: {}", extensionsDirectory);
+        return true;
+    }
+
+    protected void createOrCheckExtensionsDataDirectory() throws ConfigurationException {
+        File dir = new File(extensionsDataDirectory);
+        if (!dir.exists()) {
+            try {
+                Files.createDirectories(dir.toPath());
+            } catch (IOException e) {
+                logger.error("Unable to create extensions data directory [{}]", dir.getAbsolutePath(), e);
+                throw new ConfigurationException("Unable to create extensions data directory path");
+            }
+        }
+        if (!dir.isDirectory() || !dir.canWrite()) {
+            logger.error("Extensions data directory [{}] is not properly set up. It must exist, be a directory, and be writeable",
+                    dir.getAbsolutePath());
+            throw new ConfigurationException("Extensions data directory path is not accessible");
+        }
+        extensionsDataDirectory = dir.getAbsolutePath();
+        logger.info("Extensions data directory path: {}", extensionsDataDirectory);
+    }
+
+    private String getServerProperty(String name) {
+        Properties props = propertiesRef.get();
+        if (props == null) {
+            File propsFile = PropertiesUtil.findConfigFile(PROPERTIES_FILE);
+            if (propsFile == null) {
+                logger.error("{} file not found", PROPERTIES_FILE);
+                return null;
+            }
+            Properties tempProps = new Properties();
+            try (FileInputStream is = new FileInputStream(propsFile)) {
+                tempProps.load(is);
+            } catch (IOException e) {
+                logger.error("Error loading {}: {}", PROPERTIES_FILE, e.getMessage(), e);
+                return null;
+            }
+            if (!propertiesRef.compareAndSet(null, tempProps)) {
+                tempProps = propertiesRef.get();
+            }
+            props = tempProps;
+        }
+        return props.getProperty(name);
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        super.configure(name, params);
+
+        initializeExtensionDirectories();
+        checkExtensionsDirectory();
+        createOrCheckExtensionsDataDirectory();
+        return true;
+    }
+
+    private void initializeExtensionDirectories() {
+        String deploymentMode = getServerProperty(EXTENSIONS_DEPLOYMENT_MODE_NAME);
+        if ("developer".equals(deploymentMode)) {
+            extensionsDirectory = EXTENSIONS_DIRECTORY_DEV;
+            extensionsDataDirectory = EXTENSIONS_DATA_DIRECTORY_DEV;
+        } else {
+            extensionsDirectory = EXTENSIONS_DIRECTORY_PROD;
+            extensionsDataDirectory = EXTENSIONS_DATA_DIRECTORY_PROD;
+        }
+    }
+
+    @Override
+    public boolean start() {
+        payloadCleanupExecutor = Executors.newSingleThreadExecutor();
+        payloadCleanupScheduler = Executors.newSingleThreadScheduledExecutor();
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        payloadCleanupExecutor.shutdown();
+        payloadCleanupScheduler.shutdown();
+        return true;
+    }
+
+    @Override
+    public String getExtensionsPath() {
+        return extensionsDirectory;
+    }
+
+    @Override
+    public String getExtensionPath(String relativePath) {
+        return String.format("%s%s%s", extensionsDirectory, File.separator, relativePath);
+    }
+
+    @Override
+    public String getChecksumForExtensionPath(String extensionName, String relativePath) {
+        String path = getExtensionCheckedPath(extensionName, relativePath);
+        if (StringUtils.isBlank(path)) {
+            return null;
+        }
+        try {
+            return DigestHelper.calculateChecksum(new File(path));
+        } catch (CloudRuntimeException ignored) {
+            return null;
+        }
+    }
+
+    @Override
+    public PrepareExternalProvisioningAnswer prepareExternalProvisioning(String hostGuid,
+                 String extensionName, String extensionRelativePath, PrepareExternalProvisioningCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new PrepareExternalProvisioningAnswer(cmd, false, "Extension not configured");
+        }
+        VirtualMachineTO vmTO = cmd.getVirtualMachineTO();
+        String vmUUID = vmTO.getUuid();
+        logger.debug("Executing PrepareExternalProvisioningCommand in the external provisioner " +
+                "for the VM {} as part of VM deployment", vmUUID);
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), vmTO);
+        Pair<Boolean, String> result = prepareExternalProvisioningInternal(extensionName, extensionPath,
+                vmUUID, accessDetails, cmd.getWait());
+        String output = result.second();
+        if (!result.first()) {
+            return new PrepareExternalProvisioningAnswer(cmd, false, output);
+        }
+        if (StringUtils.isEmpty(output)) {
+            return new PrepareExternalProvisioningAnswer(cmd, result.first(), "");
+        }
+        try {
+            String merged = JsonMergeUtil.mergeJsonPatch(GsonHelper.getGson().toJson(vmTO), result.second());
+            VirtualMachineTO virtualMachineTO  = GsonHelper.getGson().fromJson(merged, VirtualMachineTO.class);
+            return new PrepareExternalProvisioningAnswer(cmd, null, virtualMachineTO, null);
+        } catch (Exception e) {
+            logger.warn("Failed to parse the output from preparing external provisioning operation as " +
+                    "part of VM deployment: {}", e.getMessage(), e);
+            return new PrepareExternalProvisioningAnswer(cmd, false, "Failed to parse VM");
+        }
+    }
+
+    @Override
+    public StartAnswer startInstance(String hostGuid, String extensionName, String extensionRelativePath,
+                             StartCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new StartAnswer(cmd, "Extension not configured");
+        }
+        VirtualMachineTO virtualMachineTO = cmd.getVirtualMachine();
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), virtualMachineTO);
+        String vmUUID = virtualMachineTO.getUuid();
+
+        logger.debug(String.format("Executing StartCommand in the external provisioner for VM %s", vmUUID));
+
+        Object deployvm = virtualMachineTO.getDetails().get("deployvm");
+        boolean isDeploy = (deployvm != null && Boolean.parseBoolean((String)deployvm));
+        String operation = isDeploy ? "Deploying" : "Starting";
+        try {
+            Pair<Boolean, String> result = executeStartCommandOnExternalSystem(extensionName, isDeploy,
+                    extensionPath, vmUUID, accessDetails, cmd.getWait());
+
+            if (!result.first()) {
+                String errMsg = String.format("%s VM %s on the external system failed: %s", operation, vmUUID, result.second());
+                logger.debug(errMsg);
+                return new StartAnswer(cmd, result.second());
+            }
+            logger.debug(String.format("%s VM %s on the external system", operation, vmUUID));
+            return new StartAnswer(cmd);
+
+        } catch (CloudRuntimeException e) {
+            String errMsg = String.format("%s VM %s on the external system failed: %s", operation, vmUUID, e.getMessage());
+            logger.debug(errMsg);
+            return new StartAnswer(cmd, errMsg);
+        }
+    }
+
+    private Pair<Boolean, String> executeStartCommandOnExternalSystem(String extensionName, boolean isDeploy,
+                          String filename, String vmUUID, Map<String, Object> accessDetails, int wait) {
+        if (isDeploy) {
+            return deployInstanceOnExternalSystem(extensionName, filename, vmUUID, accessDetails, wait);
+        } else {
+            return startInstanceOnExternalSystem(extensionName, filename, vmUUID, accessDetails, wait);
+        }
+    }
+
+    @Override
+    public StopAnswer stopInstance(String hostGuid, String extensionName, String extensionRelativePath,
+                           StopCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new StopAnswer(cmd, "Extension not configured", false);
+        }
+        logger.debug("Executing stop command on the external provisioner");
+        VirtualMachineTO virtualMachineTO = cmd.getVirtualMachine();
+        String vmUUID = cmd.getVirtualMachine().getUuid();
+        logger.debug("Executing stop command in the external system for the VM {}", vmUUID);
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), virtualMachineTO);
+        Pair<Boolean, String> result = stopInstanceOnExternalSystem(extensionName, extensionPath, vmUUID,
+                accessDetails, cmd.getWait());
+        if (result.first()) {
+            return new StopAnswer(cmd, null, true);
+        } else {
+            return new StopAnswer(cmd, result.second(), false);
+        }
+    }
+
+    @Override
+    public RebootAnswer rebootInstance(String hostGuid, String extensionName, String extensionRelativePath,
+                           RebootCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new RebootAnswer(cmd, "Extension not configured", false);
+        }
+        logger.debug("Executing reboot command using IPMI in the external provisioner");
+        VirtualMachineTO virtualMachineTO = cmd.getVirtualMachine();
+        String vmUUID = virtualMachineTO.getUuid();
+        logger.debug("Executing reboot command in the external system for the VM {}", vmUUID);
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), virtualMachineTO);
+        Pair<Boolean, String> result = rebootInstanceOnExternalSystem(extensionName, extensionPath, vmUUID,
+                accessDetails, cmd.getWait());
+        if (result.first()) {
+            return new RebootAnswer(cmd, null, true);
+        } else {
+            return new RebootAnswer(cmd, result.second(), false);
+        }
+    }
+
+    @Override
+    public StopAnswer expungeInstance(String hostGuid, String extensionName, String extensionRelativePath,
+                          StopCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new StopAnswer(cmd, "Extension not configured", false);
+        }
+        VirtualMachineTO virtualMachineTO = cmd.getVirtualMachine();
+        String vmUUID = virtualMachineTO.getUuid();
+        logger.debug("Executing stop command as part of expunge in the external system for the VM {}", vmUUID);
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), virtualMachineTO);
+        Pair<Boolean, String> result = deleteInstanceOnExternalSystem(extensionName, extensionPath, vmUUID,
+                accessDetails, cmd.getWait());
+        if (result.first()) {
+            return new StopAnswer(cmd, null, true);
+        } else {
+            return new StopAnswer(cmd, result.second(), false);
+        }
+    }
+
+    @Override
+    public Map<String, HostVmStateReportEntry> getHostVmStateReport(long hostId, String extensionName,
+                            String extensionRelativePath) {
+        final Map<String, HostVmStateReportEntry> vmStates = new HashMap<>();
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return vmStates;
+        }
+        HostVO host = hostDao.findById(hostId);
+        if (host == null) {
+            logger.error("Host with ID: {} not found", hostId);
+            return vmStates;
+        }
+        List<UserVmVO> allVms = _uservmDao.listByHostId(hostId);
+        allVms.addAll(_uservmDao.listByLastHostId(hostId));
+        if (CollectionUtils.isEmpty(allVms)) {
+            logger.debug("No VMs found for the {}", host);
+            return vmStates;
+        }
+        Map<String, Map<String, String>> accessDetails =
+                extensionsManager.getExternalAccessDetails(host, null);
+        for (UserVmVO vm: allVms) {
+            VirtualMachine.PowerState powerState = getVmPowerState(vm, accessDetails, extensionName, extensionPath);
+            vmStates.put(vm.getInstanceName(), new HostVmStateReportEntry(powerState, "host-" + hostId));
+        }
+        return vmStates;
+    }
+
+    @Override
+    public RunCustomActionAnswer runCustomAction(String hostGuid, String extensionName,
+                         String extensionRelativePath, RunCustomActionCommand cmd) {
+        String extensionPath = getExtensionCheckedPath(extensionName, extensionRelativePath);
+        if (StringUtils.isEmpty(extensionPath)) {
+            return new RunCustomActionAnswer(cmd, false, "Extension not configured");
+        }
+        final String actionName = cmd.getActionName();
+        final Map<String, Object> parameters = cmd.getParameters();
+        logger.debug("Executing custom action '{}' in the external provisioner", actionName);
+        VirtualMachineTO virtualMachineTO = null;
+        if (cmd.getVmId() != null) {
+            VMInstanceVO vm = vmInstanceDao.findById(cmd.getVmId());
+            final HypervisorGuru hvGuru = hypervisorGuruManager.getGuru(Hypervisor.HypervisorType.External);
+            VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+            virtualMachineTO = hvGuru.implement(profile);
+        }
+        logger.debug("Executing custom action '{}' in the external system", actionName);
+        Map<String, Object> accessDetails = loadAccessDetails(cmd.getExternalDetails(), virtualMachineTO);
+        accessDetails.put(ApiConstants.ACTION, actionName);
+        if (MapUtils.isNotEmpty(parameters)) {
+            accessDetails.put(ApiConstants.PARAMETERS, parameters);
+        }
+        Pair<Boolean, String> result = runCustomActionOnExternalSystem(extensionName, extensionPath,
+                actionName, accessDetails, cmd.getWait());
+        return new RunCustomActionAnswer(cmd, result.first(), result.second());
+    }
+
+    protected boolean createExtensionPath(String extensionName, Path destinationPathObj) throws IOException {
+        String sourceScriptPath = Script.findScript("", BASE_EXTERNAL_PROVISIONER_SHELL_SCRIPT);
+        if(sourceScriptPath == null) {
+            logger.error("Failed to find base script for preparing extension: {}",
+                    extensionName);
+            return false;
+        }
+        Path sourcePath = Paths.get(sourceScriptPath);
+        Files.copy(sourcePath, destinationPathObj, StandardCopyOption.REPLACE_EXISTING);
+        return true;
+    }
+
+    @Override
+    public void prepareExtensionPath(String extensionName, boolean userDefined,
+                           String extensionRelativePath) {
+        logger.debug("Preparing entry point for Extension [name: {}, user-defined: {}]", extensionName, userDefined);
+        if (!userDefined) {
+            logger.debug("Skipping preparing entry point for inbuilt extension: {}", extensionName);
+            return;
+        }
+        String destinationPath = getExtensionPath(extensionRelativePath);
+        if (!destinationPath.endsWith(".sh")) {
+            logger.info("File {} for extension: {} is not a bash script, skipping copy.", destinationPath,
+                    extensionName);
+            return;
+        }
+        File destinationFile = new File(destinationPath);
+        if (destinationFile.exists()) {
+            logger.info("File already exists at {} for extension: {}, skipping copy.", destinationPath,
+                    extensionName);
+            return;
+        }
+        CloudRuntimeException exception =
+                new CloudRuntimeException(String.format("Failed to prepare scripts for extension: %s", extensionName));
+        if (!checkExtensionsDirectory()) {
+            throw exception;
+        }
+        Path destinationPathObj = Paths.get(destinationPath);
+        Path destinationDirPath = destinationPathObj.getParent();
+        if (destinationDirPath == null) {
+            logger.error("Failed to find parent directory for extension: {} script path {}",
+                    extensionName, destinationPath);
+            throw exception;
+        }
+        try {
+            Files.createDirectories(destinationDirPath);
+        } catch (IOException e) {
+            logger.error("Failed to create directory: {} for extension: {}", destinationDirPath,
+                    extensionName, e);
+            throw exception;
+        }
+        try {
+            if (!createExtensionPath(extensionName, destinationPathObj)) {
+                throw exception;
+            }
+        } catch (IOException e) {
+            logger.error("Failed to copy entry point file to [{}] for extension: {}",
+                    destinationPath, extensionName, e);
+            throw exception;
+        }
+        logger.debug("Successfully prepared entry point [{}] for extension: {}", destinationPath,
+                extensionName);
+    }
+
+    @Override
+    public void cleanupExtensionPath(String extensionName, String extensionRelativePath) {
+        String normalizedPath = extensionRelativePath;
+        if (normalizedPath.startsWith("/")) {
+            normalizedPath = normalizedPath.substring(1);
+        }
+        try {
+            Path rootPath = Paths.get(extensionsDirectory).toAbsolutePath().normalize();
+            String extensionDirName = Extension.getDirectoryName(extensionName);
+            Path filePath = rootPath
+                    .resolve(normalizedPath.startsWith(extensionDirName) ? extensionDirName : normalizedPath)
+                    .normalize();
+            if (!Files.exists(filePath)) {
+                return;
+            }
+            if (!Files.isDirectory(filePath) && !Files.isRegularFile(filePath)) {
+                throw new CloudRuntimeException(
+                        String.format("Failed to cleanup extension entry-point: %s for extension: %s as it either " +
+                                        "does not exist or is not a regular file/directory",
+                                extensionName, extensionRelativePath));
+            }
+            if (!FileUtil.deleteRecursively(filePath)) {
+                throw new CloudRuntimeException(
+                        String.format("Failed to delete extension entry-point: %s for extension: %s",
+                                extensionName, filePath));
+            }
+        } catch (IOException e) {
+            throw new CloudRuntimeException(
+                    String.format("Failed to cleanup extension entry-point: %s for extension: %s due to: %s",
+                            extensionName, normalizedPath, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public void cleanupExtensionData(String extensionName, int olderThanDays, boolean cleanupDirectory) {
+        String extensionPayloadDirPath = extensionsDataDirectory + File.separator + extensionName;
+        Path dirPath = Paths.get(extensionPayloadDirPath);
+        if (!Files.exists(dirPath)) {
+            return;
+        }
+        try {
+            if (cleanupDirectory) {
+                try (Stream<Path> paths = Files.walk(dirPath)) {
+                    paths.sorted(Comparator.reverseOrder())
+                            .map(Path::toFile)
+                            .forEach(File::delete);
+                }
+                return;
+            }
+            long cutoffMillis = System.currentTimeMillis() - (olderThanDays * 24L * 60 * 60 * 1000);
+            long lastModified = Files.getLastModifiedTime(dirPath).toMillis();
+            if (lastModified < cutoffMillis) {
+                return;
+            }
+            try (Stream<Path> paths = Files.walk(dirPath)) {
+                paths.filter(path -> !path.equals(dirPath))
+                        .filter(path -> {
+                            try {
+                                return Files.getLastModifiedTime(path).toMillis() < cutoffMillis;
+                            } catch (IOException e) {
+                                return false;
+                            }
+                        })
+                        .sorted(Comparator.reverseOrder())
+                        .map(Path::toFile)
+                        .forEach(File::delete);
+            }
+        } catch (IOException e) {
+            logger.warn("Failed to clean up extension payloads for {}: {}", extensionName, e.getMessage());
+        }
+    }
+
+    public Pair<Boolean, String> runCustomActionOnExternalSystem(String extensionName, String filename,
+                 String actionName, Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, actionName, accessDetails, wait,
+                String.format("Failed to execute custom action '%s' on external system", actionName), filename);
+    }
+
+    protected VirtualMachine.PowerState getPowerStateFromString(String powerStateStr) {
+        if (StringUtils.isBlank(powerStateStr)) {
+            return VirtualMachine.PowerState.PowerUnknown;
+        }
+        if (powerStateStr.equalsIgnoreCase(VirtualMachine.PowerState.PowerOn.toString())) {
+            return VirtualMachine.PowerState.PowerOn;
+        } else if (powerStateStr.equalsIgnoreCase(VirtualMachine.PowerState.PowerOff.toString())) {
+            return VirtualMachine.PowerState.PowerOff;
+        }
+        return VirtualMachine.PowerState.PowerUnknown;
+    }
+
+    protected VirtualMachine.PowerState parsePowerStateFromResponse(UserVmVO userVmVO, String response) {
+        logger.debug("Power status response from the external system for {} : {}", userVmVO, response);
+        if (StringUtils.isBlank(response)) {
+            logger.warn("Empty response while trying to fetch the power status of the {}", userVmVO);
+            return VirtualMachine.PowerState.PowerUnknown;
+        }
+        if (!response.trim().startsWith("{")) {
+            return getPowerStateFromString(response);
+        }
+        try {
+            JsonObject jsonObj = new JsonParser().parse(response).getAsJsonObject();
+            String powerState = jsonObj.has("power_state") ? jsonObj.get("power_state").getAsString() : null;
+            return getPowerStateFromString(powerState);
+        } catch (Exception e) {
+            logger.warn("Failed to parse power status response: {} for {} as JSON: {}",
+                    response, userVmVO, e.getMessage());
+            return VirtualMachine.PowerState.PowerUnknown;
+        }
+    }
+
+    private VirtualMachine.PowerState getVmPowerState(UserVmVO userVmVO, Map<String, Map<String, String>> accessDetails,
+                  String extensionName, String extensionPath) {
+        final HypervisorGuru hvGuru = hypervisorGuruManager.getGuru(Hypervisor.HypervisorType.External);
+        VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVmVO);
+        VirtualMachineTO virtualMachineTO = hvGuru.implement(profile);
+        accessDetails.put(ApiConstants.VIRTUAL_MACHINE, virtualMachineTO.getExternalDetails());
+        Map<String, Object> modifiedDetails = loadAccessDetails(accessDetails, virtualMachineTO);
+        String vmUUID = userVmVO.getUuid();
+        logger.debug("Trying to get VM power status from the external system for {}", userVmVO);
+        Pair<Boolean, String> result = getInstanceStatusOnExternalSystem(extensionName, extensionPath, vmUUID,
+                modifiedDetails, AgentManager.Wait.value());
+        if (!result.first()) {
+            logger.warn("Failure response received while trying to fetch the power status of the {} : {}",
+                    userVmVO, result.second());
+            return VirtualMachine.PowerState.PowerUnknown;
+        }
+        return parsePowerStateFromResponse(userVmVO, result.second());
+    }
+    public Pair<Boolean, String> prepareExternalProvisioningInternal(String extensionName, String filename,
+                             String vmUUID, Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "prepare", accessDetails, wait,
+                String.format("Failed to prepare external provisioner for deploying VM %s on external system", vmUUID),
+                filename);
+    }
+
+    public Pair<Boolean, String> deployInstanceOnExternalSystem(String extensionName, String filename, String vmUUID,
+                            Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "create", accessDetails, wait,
+                String.format("Failed to create the instance %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> startInstanceOnExternalSystem(String extensionName, String filename, String vmUUID,
+                               Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "start", accessDetails, wait,
+                String.format("Failed to start the instance %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> stopInstanceOnExternalSystem(String extensionName, String filename, String vmUUID,
+                              Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "stop", accessDetails, wait,
+                String.format("Failed to stop the instance %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> rebootInstanceOnExternalSystem(String extensionName, String filename, String vmUUID,
+                                Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "reboot", accessDetails, wait,
+                String.format("Failed to reboot the instance %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> deleteInstanceOnExternalSystem(String extensionName, String filename, String vmUUID,
+                                Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "delete", accessDetails, wait,
+                String.format("Failed to delete the instance %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> getInstanceStatusOnExternalSystem(String extensionName, String filename, String vmUUID,
+                               Map<String, Object> accessDetails, int wait) {
+        return executeExternalCommand(extensionName, "status", accessDetails, wait,
+                String.format("Failed to get the instance power status %s on external system", vmUUID), filename);
+    }
+
+    public Pair<Boolean, String> executeExternalCommand(String extensionName, String action,
+                        Map<String, Object> accessDetails, int wait, String errorLogPrefix, String file) {
+        try {
+            Path executablePath = Paths.get(file).toAbsolutePath().normalize();
+            if (!Files.isExecutable(executablePath)) {
+                logger.error("{}: File is not executable: {}", errorLogPrefix, executablePath);
+                return new Pair<>(false, "File is not executable");
+            }
+            if (wait == 0) {
+                wait = AgentManager.Wait.value();
+            }
+            List<String> command = new ArrayList<>();
+            command.add(executablePath.toString());
+            command.add(action);
+            String dataFile = prepareExternalPayload(extensionName, accessDetails);
+            command.add(dataFile);
+            command.add(Integer.toString(wait));
+            ProcessBuilder builder = new ProcessBuilder(command);
+            builder.redirectErrorStream(true);
+
+            logger.debug("Executing {} for command: {} with wait: {} and data file: {}", executablePath,
+                    action, wait, dataFile);
+
+            Process process = builder.start();
+            boolean finished = process.waitFor(wait, TimeUnit.SECONDS);
+            if (!finished) {
+                process.destroyForcibly();
+                logger.error("{}: External API execution timed out after {} seconds", errorLogPrefix, wait);
+                return new Pair<>(false, "Timeout");
+            }
+            StringBuilder output = new StringBuilder();
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    output.append(line).append(System.lineSeparator());
+                }
+            }
+            int exitCode = process.exitValue();
+            if (exitCode != 0) {
+                logger.warn("{}: External API execution failed with exit code {}", errorLogPrefix, exitCode);
+                return new Pair<>(false, "Exit code: " + exitCode + ", Output: " + output.toString().trim());
+            }
+            deleteExtensionPayloadFile(extensionName, action, dataFile);
+            return new Pair<>(true, output.toString().trim());
+
+        } catch (IOException | InterruptedException e) {
+            logger.error("{}: External operation failed", errorLogPrefix, e);
+            throw new CloudRuntimeException(String.format("%s: External operation failed", errorLogPrefix), e);
+        }
+    }
+
+    protected void deleteExtensionPayloadFile(String extensionName, String action, String payloadFileName) {
+        if (!TRIVIAL_ACTIONS.contains(action)) {
+            return;
+        }
+        logger.trace("Deleting payload file: {} for extension: {}, action: {}, file: {}",
+                payloadFileName, extensionName, action);
+        FileUtil.deletePath(payloadFileName);
+    }
+
+    protected void scheduleExtensionPayloadDirectoryCleanup(String extensionName) {
+        try {
+            Future<?> future = payloadCleanupExecutor.submit(() -> {
+                try {
+                    cleanupExtensionData(extensionName, 1, false);
+                    logger.trace("Cleaned up payload directory for extension: {}", extensionName);
+                } catch (Exception e) {
+                    logger.warn("Exception during payload cleanup for extension: {} due to {}", extensionName,
+                            e.getMessage());
+                    logger.trace(e);
+                }
+            });
+            payloadCleanupScheduler.schedule(() -> {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                        logger.trace("Cancelled cleaning up payload directory for extension: {} as it " +
+                                "running for more than 3 seconds", extensionName);
+                    }
+                } catch (Exception e) {
+                    logger.warn("Failed to cancel payload cleanup task for extension: {} due to {}",
+                            extensionName, e.getMessage());
+                    logger.trace(e);
+                }
+            }, 3, TimeUnit.SECONDS);
+        } catch (RejectedExecutionException e) {
+            logger.warn("Payload cleanup task for extension: {} was rejected due to: {}", extensionName,
+                    e.getMessage());
+            logger.trace(e);
+        }
+    }
+
+    protected String prepareExternalPayload(String extensionName, Map<String, Object> details) throws IOException {
+        String json = GsonHelper.getGson().toJson(details);
+        String fileName = UUID.randomUUID() + ".json";
+        String extensionPayloadDir = extensionsDataDirectory + File.separator + extensionName;
+        Path payloadDirPath = Paths.get(extensionPayloadDir);
+        if (!Files.exists(payloadDirPath)) {
+            Files.createDirectories(payloadDirPath);
+        } else {
+            scheduleExtensionPayloadDirectoryCleanup(extensionName);
+        }
+        Path payloadFile = payloadDirPath.resolve(fileName);
+        Files.writeString(payloadFile, json, StandardOpenOption.CREATE_NEW);
+        return payloadFile.toAbsolutePath().toString();
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        return new ArrayList<>();
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java
new file mode 100644
index 00000000000..ab70c880a81
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java
@@ -0,0 +1,376 @@
+// 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.
+package org.apache.cloudstack.hypervisor.external.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.command.ExtensionRoutingUpdateCommand;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+
+import com.cloud.agent.IAgentControl;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.CheckHealthAnswer;
+import com.cloud.agent.api.CheckHealthCommand;
+import com.cloud.agent.api.CheckNetworkAnswer;
+import com.cloud.agent.api.CheckNetworkCommand;
+import com.cloud.agent.api.CleanupNetworkRulesCmd;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.GetHostStatsAnswer;
+import com.cloud.agent.api.GetHostStatsCommand;
+import com.cloud.agent.api.GetVmStatsCommand;
+import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.agent.api.MaintainAnswer;
+import com.cloud.agent.api.MaintainCommand;
+import com.cloud.agent.api.PingCommand;
+import com.cloud.agent.api.PingRoutingCommand;
+import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.PrepareExternalProvisioningCommand;
+import com.cloud.agent.api.ReadyAnswer;
+import com.cloud.agent.api.ReadyCommand;
+import com.cloud.agent.api.RebootAnswer;
+import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.agent.api.RunCustomActionCommand;
+import com.cloud.agent.api.StartAnswer;
+import com.cloud.agent.api.StartCommand;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.StopCommand;
+import com.cloud.host.Host;
+import com.cloud.hypervisor.ExternalProvisioner;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.Networks;
+import com.cloud.resource.ServerResource;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ComponentContext;
+
+public class ExternalResource implements ServerResource {
+    protected Logger logger = LogManager.getLogger(getClass());
+    protected static final int CPU = 0;
+    protected static final long CPU_SPEED = 0;
+    protected static final long RAM = 0;
+    protected static final long DOM0_RAM = 0;
+    protected static final String CAPABILITIES = "hvm";
+
+    protected ExternalProvisioner externalProvisioner;
+
+    protected String url;
+    protected String dcId;
+    protected String pod;
+    protected String cluster;
+    protected String name;
+    protected String guid;
+    private final Host.Type type;
+
+    private String extensionName;
+    private String extensionRelativePath;
+    private Extension.State extensionState;
+    private boolean extensionPathReady;
+
+    protected boolean isExtensionDisconnected() {
+        return StringUtils.isAnyBlank(extensionName, extensionRelativePath);
+    }
+
+    protected boolean isExtensionNotEnabled() {
+        return !Extension.State.Enabled.equals(extensionState);
+    }
+
+    protected boolean isExtensionPathNotReady() {
+        return !extensionPathReady;
+    }
+
+    public ExternalResource() {
+        type = Host.Type.Routing;
+    }
+
+    @Override
+    public Host.Type getType() {
+        return type;
+    }
+
+    @Override
+    public StartupCommand[] initialize() {
+        final StartupRoutingCommand cmd =
+                new StartupRoutingCommand(CPU, CPU_SPEED, RAM, DOM0_RAM, CAPABILITIES,
+                        Hypervisor.HypervisorType.External,Networks.RouterPrivateIpStrategy.HostLocal);
+        cmd.setDataCenter(dcId);
+        cmd.setPod(pod);
+        cmd.setCluster(cluster);
+        cmd.setHostType(type);
+        cmd.setName(name);
+        cmd.setPrivateIpAddress(Hypervisor.HypervisorType.External.toString());
+        cmd.setGuid(guid);
+        cmd.setIqn(guid);
+        cmd.setVersion(ExternalResource.class.getPackage().getImplementationVersion());
+        return new StartupCommand[] {cmd};
+    }
+
+    @Override
+    public PingCommand getCurrentStatus(long id) {
+        if (isExtensionDisconnected()) {
+            return new PingRoutingCommand(Host.Type.Routing, id, new HashMap<>());
+        }
+        final Map<String, HostVmStateReportEntry> vmStates = externalProvisioner.getHostVmStateReport(id, extensionName,
+                extensionRelativePath);
+        return new PingRoutingCommand(Host.Type.Routing, id, vmStates);
+    }
+
+    @Override
+    public Answer executeRequest(Command cmd) {
+        try {
+            if (cmd instanceof ExtensionRoutingUpdateCommand) {
+                return execute((ExtensionRoutingUpdateCommand)cmd);
+            } else if (cmd instanceof PingTestCommand) {
+                return execute((PingTestCommand) cmd);
+            } else if (cmd instanceof ReadyCommand) {
+                return execute((ReadyCommand)cmd);
+            } else if (cmd instanceof CheckHealthCommand) {
+                return execute((CheckHealthCommand) cmd);
+            } else if (cmd instanceof CheckNetworkCommand) {
+                return execute((CheckNetworkCommand)cmd);
+            }else if (cmd instanceof CleanupNetworkRulesCmd) {
+                return execute((CleanupNetworkRulesCmd) cmd);
+            } else if (cmd instanceof GetVmStatsCommand) {
+                return execute((GetVmStatsCommand) cmd);
+            } else if (cmd instanceof MaintainCommand) {
+                return execute((MaintainCommand) cmd);
+            } else if (cmd instanceof StartCommand) {
+                return execute((StartCommand) cmd);
+            } else if (cmd instanceof StopCommand) {
+                return execute((StopCommand) cmd);
+            } else if (cmd instanceof RebootCommand) {
+                return execute((RebootCommand) cmd);
+            } else if (cmd instanceof PrepareExternalProvisioningCommand) {
+                return execute((PrepareExternalProvisioningCommand) cmd);
+            } else if (cmd instanceof GetHostStatsCommand) {
+                return execute((GetHostStatsCommand) cmd);
+            } else if (cmd instanceof RunCustomActionCommand) {
+                return execute((RunCustomActionCommand) cmd);
+            } else {
+                return execute(cmd);
+            }
+        } catch (IllegalArgumentException e) {
+            return new Answer(cmd, false, e.getMessage());
+        }
+    }
+
+    protected String logAndGetExtensionNotConnectedOrDisabledError() {
+        if (isExtensionDisconnected()) {
+            logger.error("Extension not connected to host: {}", name);
+            return "Extension not connected";
+        }
+        if (isExtensionNotEnabled()) {
+            logger.error("Extension: {} connected to host: {} is not in Enabled state", extensionName, name);
+            return "Extension is disabled";
+        }
+        logger.error("Extension: {} connected to host: {} is not having path in Ready state", extensionName, name);
+        return "Extension is not ready";
+    }
+
+    private Answer execute(ExtensionRoutingUpdateCommand cmd) {
+        if (StringUtils.isNotBlank(extensionName) && !extensionName.equals(cmd.getExtensionName())) {
+            return new Answer(cmd, false, "Not same extension");
+        }
+        if (cmd.isRemoved()) {
+            extensionName = null;
+            extensionRelativePath = null;
+            extensionState = Extension.State.Disabled;
+            return new Answer(cmd);
+        }
+        extensionName = cmd.getExtensionName();
+        extensionRelativePath = cmd.getExtensionRelativePath();
+        extensionState = cmd.getExtensionState();
+        return new Answer(cmd);
+    }
+
+    private Answer execute(PingTestCommand cmd) {
+        return new Answer(cmd);
+    }
+
+    private Answer execute(ReadyCommand cmd) {
+        return new ReadyAnswer(cmd);
+    }
+
+    private Answer execute(CheckHealthCommand cmd) {
+        if (isExtensionDisconnected()) {
+            logAndGetExtensionNotConnectedOrDisabledError();
+        }
+        return new CheckHealthAnswer(cmd, !isExtensionDisconnected());
+    }
+
+    private Answer execute(CheckNetworkCommand cmd) {
+        return new CheckNetworkAnswer(cmd, true, "Network Setup check by names is done");
+    }
+
+    private Answer execute(CleanupNetworkRulesCmd cmd) {
+        if (isExtensionDisconnected()) {
+            return new Answer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        return new Answer(cmd, false, "Not supported");
+    }
+
+    private Answer execute(GetVmStatsCommand cmd) {
+        if (isExtensionDisconnected()) {
+            return new Answer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        return new Answer(cmd, false, "Not supported");
+    }
+
+    private MaintainAnswer execute(MaintainCommand cmd) {
+        return new MaintainAnswer(cmd, false);
+    }
+
+    public GetHostStatsAnswer execute(GetHostStatsCommand cmd) {
+        if (isExtensionDisconnected()) {
+            logAndGetExtensionNotConnectedOrDisabledError();
+        }
+        return new GetHostStatsAnswer(cmd, null);
+    }
+
+    public StartAnswer execute(StartCommand cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new StartAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        return externalProvisioner.startInstance(guid, extensionName, extensionRelativePath, cmd);
+    }
+
+    public StopAnswer execute(StopCommand cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new StopAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError(), false);
+        }
+        if (cmd.isExpungeVM()) {
+            return externalProvisioner.expungeInstance(guid, extensionName, extensionRelativePath, cmd);
+        }
+        return externalProvisioner.stopInstance(guid, extensionName, extensionRelativePath, cmd);
+    }
+
+    public RebootAnswer execute(RebootCommand cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new RebootAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError(), false);
+        }
+        return externalProvisioner.rebootInstance(guid, extensionName, extensionRelativePath, cmd);
+    }
+
+    public PrepareExternalProvisioningAnswer execute(PrepareExternalProvisioningCommand cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new PrepareExternalProvisioningAnswer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        return externalProvisioner.prepareExternalProvisioning(guid, extensionName, extensionRelativePath, cmd);
+    }
+
+    public RunCustomActionAnswer execute(RunCustomActionCommand cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new RunCustomActionAnswer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        return externalProvisioner.runCustomAction(guid, extensionName, extensionRelativePath, cmd);
+    }
+
+    public Answer execute(Command cmd) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
+            return new Answer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
+        }
+        RunCustomActionCommand runCustomActionCommand = new RunCustomActionCommand(cmd.toString());
+        RunCustomActionAnswer customActionAnswer = externalProvisioner.runCustomAction(guid, extensionName,
+                extensionRelativePath, runCustomActionCommand);
+        return new Answer(cmd, customActionAnswer.getResult(), customActionAnswer.getDetails());
+    }
+
+    @Override
+    public void disconnected() {
+
+    }
+
+    @Override
+    public IAgentControl getAgentControl() {
+        return null;
+    }
+
+    @Override
+    public void setAgentControl(IAgentControl agentControl) {
+
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public void setName(String name) {
+
+    }
+
+    @Override
+    public void setConfigParams(Map<String, Object> params) {
+
+    }
+
+    @Override
+    public Map<String, Object> getConfigParams() {
+        return null;
+    }
+
+    @Override
+    public int getRunLevel() {
+        return 0;
+    }
+
+    @Override
+    public void setRunLevel(int level) {
+
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        try {
+            externalProvisioner = ComponentContext.getDelegateComponentOfType(ExternalProvisioner.class);
+        } catch (NoSuchBeanDefinitionException e) {
+            throw new ConfigurationException(
+                    String.format("Unable to find an ExternalProvisioner for the external resource: %s", name)
+            );
+        }
+        externalProvisioner.configure(name, params);
+        dcId = (String)params.get("zone");
+        pod = (String)params.get("pod");
+        cluster = (String)params.get("cluster");
+        this.name = name;
+        guid = (String)params.get("guid");
+        extensionName = (String)params.get("extensionName");
+        extensionRelativePath = (String)params.get("extensionRelativePath");
+        extensionState = (Extension.State)params.get("extensionState");
+        extensionPathReady = (boolean)params.get("extensionPathReady");
+        return true;
+    }
+
+    @Override
+    public boolean start() {
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        return true;
+    }
+}
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml
new file mode 100644
index 00000000000..abc704c9947
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml
@@ -0,0 +1,31 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+                      >
+    <bean id="ExternalProvisioner" class="org.apache.cloudstack.hypervisor.external.provisioner.ExternalPathPayloadProvisioner"/>
+    <bean id="ExternalAgentManager" class="org.apache.cloudstack.agent.manager.ExternalAgentManagerImpl" />
+</beans>
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/module.properties b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/module.properties
new file mode 100644
index 00000000000..726cb6d197d
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/module.properties
@@ -0,0 +1,18 @@
+# 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.
+name=external-compute
+parent=compute
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/spring-external-compute-context.xml b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/spring-external-compute-context.xml
new file mode 100644
index 00000000000..7dd21d6f7a9
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/spring-external-compute-context.xml
@@ -0,0 +1,31 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <bean id="ExternalHypervisorGuru" class="org.apache.cloudstack.guru.ExternalHypervisorGuru">
+        <property name="name" value="ExternalHypervisorGuru" />
+    </bean>
+</beans>
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/module.properties b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/module.properties
new file mode 100644
index 00000000000..2220b459b44
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/module.properties
@@ -0,0 +1,18 @@
+# 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.
+name=external-discoverer
+parent=discoverer
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/spring-external-discoverer-context.xml b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/spring-external-discoverer-context.xml
new file mode 100644
index 00000000000..6a7181bdcd2
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/spring-external-discoverer-context.xml
@@ -0,0 +1,34 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+>
+
+    <bean id="ExternalServerDiscoverer" class="org.apache.cloudstack.hypervisor.external.discoverer.ExternalServerDiscoverer">
+        <property name="name" value="External Discover" />
+    </bean>
+
+</beans>
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/module.properties b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/module.properties
new file mode 100644
index 00000000000..3d9d10b8537
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/module.properties
@@ -0,0 +1,18 @@
+# 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.
+name=external-planner
+parent=planner
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/spring-external-planner-context.xml b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/spring-external-planner-context.xml
new file mode 100644
index 00000000000..da915b1557d
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/spring-external-planner-context.xml
@@ -0,0 +1,34 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+                      >
+
+    <bean id="ExternalServerPlanner" class="org.apache.cloudstack.agent.manager.ExternalServerPlanner">
+        <property name="name" value="ExternalServerPlanner" />
+    </bean>
+
+</beans>
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/module.properties b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/module.properties
new file mode 100644
index 00000000000..c040872c19c
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/module.properties
@@ -0,0 +1,18 @@
+# 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.
+name=external-storage
+parent=storage
diff --git a/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/spring-external-storage-context.xml b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/spring-external-storage-context.xml
new file mode 100644
index 00000000000..b3f5b6c306b
--- /dev/null
+++ b/plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/spring-external-storage-context.xml
@@ -0,0 +1,32 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd
+                      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+                      http://www.springframework.org/schema/context
+                      http://www.springframework.org/schema/context/spring-context.xsd"
+>
+
+    <bean id="ExternalTemplateAdapter" class="org.apache.cloudstack.agent.manager.ExternalTemplateAdapter" />
+
+</beans>
diff --git a/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapterTest.java b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapterTest.java
new file mode 100644
index 00000000000..3349b61c1d9
--- /dev/null
+++ b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapterTest.java
@@ -0,0 +1,173 @@
+// 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.
+
+package org.apache.cloudstack.agent.manager;
+
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.cpu.CPU;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.TemplateProfile;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.template.TemplateManager;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ExternalTemplateAdapterTest {
+    @Mock
+    ImageStoreDao _imgStoreDao;
+    @Mock
+    AccountManager _accountMgr;
+    @Mock
+    TemplateManager templateMgr;
+    @Mock
+    ResourceLimitService _resourceLimitMgr;
+    @Mock
+    UserDao _userDao;
+    @Mock
+    VMTemplateDao _tmpltDao;
+
+    @Spy
+    @InjectMocks
+    ExternalTemplateAdapter adapter;
+
+    private RegisterTemplateCmd cmd;
+    private TemplateProfile profile;
+    private DataStore dataStore;
+
+    @Before
+    public void setUp() {
+        cmd = mock(RegisterTemplateCmd.class);
+        profile = mock(TemplateProfile.class);
+        dataStore = mock(DataStore.class);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void prepare_WhenHypervisorTypeIsNone_ThrowsInvalidParameterValueException() throws ResourceAllocationException {
+        Account adminAccount =  new AccountVO("system", 1L, "", Account.Type.ADMIN, "uuid");
+        ReflectionTestUtils.setField(adminAccount, "id", 1L);
+        CallContext callContext = Mockito.mock(CallContext.class);
+        when(callContext.getCallingAccount()).thenReturn(adminAccount);
+        try (MockedStatic<CallContext> mockedCallContext = Mockito.mockStatic(CallContext.class)) {
+            mockedCallContext.when(CallContext::current).thenReturn(callContext);
+            when(cmd.getHypervisor()).thenReturn("None");
+            when(cmd.getZoneIds()).thenReturn(List.of(1L));
+            when(_imgStoreDao.findRegionImageStores()).thenReturn(Collections.emptyList());
+
+            adapter.prepare(cmd);
+        }
+    }
+
+    @Test
+    public void prepare_WhenRegionImageStoresExist_ZoneIdsAreIgnored() throws ResourceAllocationException {
+        Account adminAccount =  new AccountVO("system", 1L, "", Account.Type.ADMIN, "uuid");
+        ReflectionTestUtils.setField(adminAccount, "id", 1L);
+        CallContext callContext = Mockito.mock(CallContext.class);
+        when(callContext.getCallingAccount()).thenReturn(adminAccount);
+        try (MockedStatic<CallContext> mockedCallContext = Mockito.mockStatic(CallContext.class)) {
+            mockedCallContext.when(CallContext::current).thenReturn(callContext);
+            when(cmd.getZoneIds()).thenReturn(List.of(1L, 2L));
+            when(_imgStoreDao.findRegionImageStores()).thenReturn(List.of(mock(ImageStoreVO.class)));
+            when(cmd.getHypervisor()).thenReturn("KVM");
+            when(cmd.getDetails()).thenReturn(null);
+            when(cmd.getExternalDetails()).thenReturn(Collections.emptyMap());
+            when(_accountMgr.getAccount(anyLong())).thenReturn(mock(com.cloud.user.Account.class));
+            when(_accountMgr.isAdmin(anyLong())).thenReturn(true);
+            when(templateMgr.validateTemplateType(any(), anyBoolean(), anyBoolean(), eq(Hypervisor.HypervisorType.External))).thenReturn(com.cloud.storage.Storage.TemplateType.USER);
+            when(_userDao.findById(any())).thenReturn(mock(UserVO.class));
+            when(cmd.getEntityOwnerId()).thenReturn(1L);
+            when(cmd.getTemplateName()).thenReturn("t");
+            when(cmd.getDisplayText()).thenReturn("d");
+            when(cmd.getArch()).thenReturn(CPU.CPUArch.amd64);
+            when(cmd.getBits()).thenReturn(64);
+            when(cmd.isPasswordEnabled()).thenReturn(false);
+            when(cmd.getRequiresHvm()).thenReturn(false);
+            when(cmd.getUrl()).thenReturn("http://example.com");
+            when(cmd.isPublic()).thenReturn(false);
+            when(cmd.isFeatured()).thenReturn(false);
+            when(cmd.isExtractable()).thenReturn(false);
+            when(cmd.getFormat()).thenReturn("QCOW2");
+            when(cmd.getOsTypeId()).thenReturn(1L);
+            when(cmd.getChecksum()).thenReturn("abc");
+            when(cmd.getTemplateTag()).thenReturn(null);
+            when(cmd.isSshKeyEnabled()).thenReturn(false);
+            when(cmd.isDynamicallyScalable()).thenReturn(false);
+            when(cmd.isDirectDownload()).thenReturn(false);
+            when(cmd.isDeployAsIs()).thenReturn(false);
+            when(cmd.isForCks()).thenReturn(false);
+            when(cmd.getExtensionId()).thenReturn(null);
+
+            TemplateProfile result = adapter.prepare(cmd);
+
+            assertNull(result.getZoneIdList());
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void createTemplateForPostUpload_WhenZoneIdListIsNull_ThrowsCloudRuntimeException() {
+        when(profile.getFormat()).thenReturn(com.cloud.storage.Storage.ImageFormat.QCOW2);
+        when(profile.getZoneIdList()).thenReturn(null);
+
+        adapter.createTemplateForPostUpload(profile);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void createTemplateForPostUpload_WhenMultipleZoneIds_ThrowsCloudRuntimeException() {
+        when(profile.getFormat()).thenReturn(com.cloud.storage.Storage.ImageFormat.QCOW2);
+        when(profile.getZoneIdList()).thenReturn(List.of(1L, 2L));
+
+        adapter.createTemplateForPostUpload(profile);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void prepareDelete_AlwaysThrowsCloudRuntimeException() {
+        adapter.prepareDelete(mock(org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd.class));
+    }
+}
diff --git a/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscovererTest.java b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscovererTest.java
new file mode 100644
index 00000000000..367ec58fcec
--- /dev/null
+++ b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscovererTest.java
@@ -0,0 +1,182 @@
+// 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.
+
+package org.apache.cloudstack.hypervisor.external.discoverer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.when;
+
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.cloudstack.extension.ExtensionResourceMap;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.exception.DiscoveryException;
+import com.cloud.host.HostVO;
+import com.cloud.hypervisor.Hypervisor;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ExternalServerDiscovererTest {
+
+    @Mock
+    private AgentManager agentManager;
+    @Mock
+    private ExtensionDao extensionDao;
+    @Mock
+    private ExtensionResourceMapDao extensionResourceMapDao;
+    @Mock
+    private ExtensionsManager extensionsManager;
+    @Mock
+    ClusterDao _clusterDao;
+    @Mock
+    ConfigurationDao _configDao;
+    @Mock
+    private ClusterVO clusterVO;
+    @Mock
+    private ExtensionResourceMapVO extensionResourceMapVO;
+    @Mock
+    private ExtensionVO extensionVO;
+    @Mock
+    private HostVO hostVO;
+
+    @InjectMocks
+    private ExternalServerDiscoverer discoverer;
+
+    @Before
+    public void setUp() {
+    }
+
+    @Test
+    public void testGetResourceGuidFromName() {
+        String name = "test-resource";
+        String guid = discoverer.getResourceGuidFromName(name);
+        assertTrue(guid.startsWith("External:"));
+        assertTrue(guid.length() > "External:".length());
+    }
+
+    @Test
+    public void testAddExtensionDataToResourceParams() {
+        Map<String, Object> params = new HashMap<>();
+        when(extensionVO.getName()).thenReturn("ext");
+        when(extensionVO.getRelativePath()).thenReturn("entry.sh");
+        when(extensionVO.getState()).thenReturn(ExtensionVO.State.Enabled);
+
+        discoverer.addExtensionDataToResourceParams(extensionVO, params);
+
+        assertEquals("ext", params.get("extensionName"));
+        assertEquals("entry.sh", params.get("extensionRelativePath"));
+        assertEquals(ExtensionVO.State.Enabled, params.get("extensionState"));
+    }
+
+    @Test(expected = DiscoveryException.class)
+    public void testFindThrowsWhenClusterIdNull() throws Exception {
+        discoverer.find(1L, 2L, null, new URI("http://host"), "user", "pass", Collections.emptyList());
+    }
+
+    @Test(expected = DiscoveryException.class)
+    public void testFindThrowsWhenClusterNotExternal() throws Exception {
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        when(_clusterDao.findById(1L)).thenReturn(clusterVO);
+        discoverer.find(1L, 2L, 1L, new URI("http://host"), "user", "pass", Collections.emptyList());
+    }
+
+    @Test(expected = DiscoveryException.class)
+    public void testFindThrowsWhenPodIdNull() throws Exception {
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(_clusterDao.findById(1L)).thenReturn(clusterVO);
+        discoverer.find(1L, null, 1L, new URI("http://host"), "user", "pass", Collections.emptyList());
+    }
+
+    @Test(expected = DiscoveryException.class)
+    public void testFindThrowsWhenNoExtensionResourceMap() throws Exception {
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(_clusterDao.findById(1L)).thenReturn(clusterVO);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(null);
+        discoverer.find(1L, 2L, 1L, new URI("http://host"), "user", "pass", Collections.emptyList());
+    }
+
+    @Test(expected = DiscoveryException.class)
+    public void testFindThrowsWhenNoExtensionVO() throws Exception {
+        when(clusterVO.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
+        when(_clusterDao.findById(1L)).thenReturn(clusterVO);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(extensionResourceMapVO);
+        when(extensionResourceMapVO.getExtensionId()).thenReturn(10L);
+        when(extensionDao.findById(10L)).thenReturn(null);
+        discoverer.find(1L, 2L, 1L, new URI("http://host"), "user", "pass", Collections.emptyList());
+    }
+
+    @Test
+    public void testBuildConfigParamsAddsExtensionData() {
+        when(hostVO.getClusterId()).thenReturn(1L);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("cluster", "1");
+        discoverer.extensionResourceMapDao = extensionResourceMapDao;
+        discoverer.extensionDao = extensionDao;
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(extensionResourceMapVO);
+        when(extensionResourceMapVO.getExtensionId()).thenReturn(10L);
+        when(extensionDao.findById(10L)).thenReturn(extensionVO);
+        when(extensionVO.getName()).thenReturn("ext");
+        when(extensionVO.getRelativePath()).thenReturn("entry.sh");
+        when(extensionVO.getState()).thenReturn(ExtensionVO.State.Enabled);
+        when(_clusterDao.findById(anyLong())).thenReturn(clusterVO);
+        when(clusterVO.getGuid()).thenReturn(UUID.randomUUID().toString());
+
+        HashMap<String, Object> result = discoverer.buildConfigParams(hostVO);
+        assertEquals("ext", result.get("extensionName"));
+        assertEquals("entry.sh", result.get("extensionRelativePath"));
+        assertEquals(ExtensionVO.State.Enabled, result.get("extensionState"));
+    }
+
+    @Test
+    public void testMatchHypervisor() {
+        assertTrue(discoverer.matchHypervisor(null));
+        assertTrue(discoverer.matchHypervisor("External"));
+        assertFalse(discoverer.matchHypervisor("KVM"));
+    }
+
+    @Test
+    public void testGetHypervisorType() {
+        assertEquals(Hypervisor.HypervisorType.External, discoverer.getHypervisorType());
+    }
+
+    @Test
+    public void testIsRecurringAndTimeout() {
+        assertFalse(discoverer.isRecurring());
+        assertEquals(0, discoverer.getTimeout());
+    }
+}
diff --git a/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java
new file mode 100644
index 00000000000..8c63a20fa31
--- /dev/null
+++ b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java
@@ -0,0 +1,750 @@
+//
+// 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.
+//
+package org.apache.cloudstack.hypervisor.external.provisioner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
+import com.cloud.agent.api.PrepareExternalProvisioningCommand;
+import com.cloud.agent.api.RebootAnswer;
+import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.RunCustomActionAnswer;
+import com.cloud.agent.api.RunCustomActionCommand;
+import com.cloud.agent.api.StartAnswer;
+import com.cloud.agent.api.StartCommand;
+import com.cloud.agent.api.StopAnswer;
+import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.hypervisor.HypervisorGuruManager;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.utils.FileUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.PropertiesUtil;
+import com.cloud.utils.script.Script;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ExternalPathPayloadProvisionerTest {
+
+    @Spy
+    @InjectMocks
+    private ExternalPathPayloadProvisioner provisioner;
+
+    @Mock
+    private UserVmDao userVmDao;
+
+    @Mock
+    private HostDao hostDao;
+
+    @Mock
+    private VMInstanceDao vmInstanceDao;
+
+    @Mock
+    private HypervisorGuruManager hypervisorGuruManager;
+
+    @Mock
+    private HypervisorGuru hypervisorGuru;
+
+    @Mock
+    private Logger logger;
+
+    @Mock
+    private ExtensionsManager extensionsManager;
+
+    private File tempDir;
+    private File tempDataDir;
+    private Properties testProperties;
+    private File testScript;
+
+    @Before
+    public void setUp() throws IOException {
+        tempDir = Files.createTempDirectory("extensions-test").toFile();
+        tempDataDir = Files.createTempDirectory("extensions-data-test").toFile();
+
+        testScript = new File(tempDir, "test-extension.sh");
+        testScript.createNewFile();
+        resetTestScript();
+
+        testProperties = new Properties();
+        testProperties.setProperty("extensions.deployment.mode", "developer");
+
+        ReflectionTestUtils.setField(provisioner, "extensionsDirectory", tempDir.getAbsolutePath());
+        ReflectionTestUtils.setField(provisioner, "extensionsDataDirectory", tempDataDir.getAbsolutePath());
+
+        try (MockedStatic<PropertiesUtil> propertiesUtilMock = Mockito.mockStatic(PropertiesUtil.class)) {
+            File mockPropsFile = mock(File.class);
+            propertiesUtilMock.when(() -> PropertiesUtil.findConfigFile(anyString())).thenReturn(mockPropsFile);
+        }
+    }
+
+    @After
+    public void tearDown() {
+        if (tempDir != null && tempDir.exists()) {
+            deleteDirectory(tempDir);
+        }
+        if (tempDataDir != null && tempDataDir.exists()) {
+            deleteDirectory(tempDataDir);
+        }
+    }
+
+    private void deleteDirectory(File dir) {
+        if (dir.isDirectory()) {
+            File[] files = dir.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    deleteDirectory(file);
+                }
+            }
+        }
+        dir.delete();
+    }
+
+    private void resetTestScript() {
+        testScript.setExecutable(true);
+        testScript.setReadable(true);
+        testScript.setWritable(true);
+    }
+
+    @Test
+    public void testLoadAccessDetails() {
+        Map<String, Map<String, String>> externalDetails = new HashMap<>();
+        externalDetails.put(ApiConstants.EXTENSION, Map.of("key1", "value1"));
+
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(vmTO.getName()).thenReturn("test-vm");
+
+        Map<String, Object> result = provisioner.loadAccessDetails(externalDetails, vmTO);
+
+        assertNotNull(result);
+        assertEquals(externalDetails, result.get(ApiConstants.EXTERNAL_DETAILS));
+        assertEquals("test-uuid", result.get(ApiConstants.VIRTUAL_MACHINE_ID));
+        assertEquals("test-vm", result.get(ApiConstants.VIRTUAL_MACHINE_NAME));
+        assertEquals(vmTO, result.get("cloudstack.vm.details"));
+    }
+
+    @Test
+    public void testLoadAccessDetailsWithNullExternalDetails() {
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(vmTO.getName()).thenReturn("test-vm");
+
+        Map<String, Object> result = provisioner.loadAccessDetails(null, vmTO);
+
+        assertNotNull(result);
+        assertNull(result.get(ApiConstants.EXTERNAL_DETAILS));
+        assertEquals("test-uuid", result.get(ApiConstants.VIRTUAL_MACHINE_ID));
+        assertEquals("test-vm", result.get(ApiConstants.VIRTUAL_MACHINE_NAME));
+    }
+
+    @Test
+    public void testGetExtensionCheckedPathValidFile() {
+        String result = provisioner.getExtensionCheckedPath("test-extension", "test-extension.sh");
+
+        assertEquals(testScript.getAbsolutePath(), result);
+    }
+
+    @Test
+    public void testGetExtensionCheckedPathFileNotExists() {
+        String result = provisioner.getExtensionCheckedPath("test-extension", "nonexistent.sh");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetExtensionCheckedPathNoExecutePermissions() {
+        testScript.setExecutable(false);
+        String result = provisioner.getExtensionCheckedPath("test-extension", "test-extension.sh");
+        assertNull(result);
+        Mockito.verify(logger).error("{} is not executable", "Entry point [" + testScript.getAbsolutePath() + "] for extension: test-extension");
+    }
+
+    @Test
+    public void testGetExtensionCheckedPathNoReadPermissions() {
+        testScript.setWritable(false);
+        testScript.setReadable(false);
+        Assume.assumeFalse("Skipping test as file can not be marked unreadable", testScript.canRead());
+        String result = provisioner.getExtensionCheckedPath("test-extension", "test-extension.sh");
+        assertNull(result);
+        Mockito.verify(logger).error("{} is not readable", "Entry point [" + testScript.getAbsolutePath() + "] for extension: test-extension");
+    }
+
+    @Test
+    public void testCheckExtensionsDirectoryValid() {
+        boolean result = provisioner.checkExtensionsDirectory();
+        assertTrue(result);
+    }
+
+    @Test
+    public void testCheckExtensionsDirectoryInvalid() {
+        ReflectionTestUtils.setField(provisioner, "extensionsDirectory", "/nonexistent/path");
+
+        boolean result = provisioner.checkExtensionsDirectory();
+        assertFalse(result);
+    }
+
+    @Test
+    public void testCreateOrCheckExtensionsDataDirectory() throws ConfigurationException {
+        provisioner.createOrCheckExtensionsDataDirectory();
+        Mockito.verify(logger).info("Extensions data directory path: {}", tempDataDir.getAbsolutePath());
+    }
+
+    @Test(expected = ConfigurationException.class)
+    public void testCreateOrCheckExtensionsDataDirectoryCreateThrowsExceptionFail() throws ConfigurationException {
+        ReflectionTestUtils.setField(provisioner, "extensionsDataDirectory", "/nonexistent/path");
+        try(MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class)) {
+            filesMock.when(() -> Files.createDirectories(any())).thenThrow(new IOException("fail"));
+            provisioner.createOrCheckExtensionsDataDirectory();
+        }
+    }
+
+    @Test(expected = ConfigurationException.class)
+    public void testCreateOrCheckExtensionsDataDirectoryNoCreateFail() throws ConfigurationException {
+        ReflectionTestUtils.setField(provisioner, "extensionsDataDirectory", "/nonexistent/path");
+        try(MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class)) {
+            filesMock.when(() -> Files.createDirectories(any())).thenReturn(mock(Path.class));
+            provisioner.createOrCheckExtensionsDataDirectory();
+        }
+    }
+
+    @Test
+    public void testGetExtensionPath() {
+        String result = provisioner.getExtensionPath("test-extension.sh");
+        String expected = tempDir.getAbsolutePath() + File.separator + "test-extension.sh";
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testGetChecksumForExtensionPath() {
+        String result = provisioner.getChecksumForExtensionPath("test-extension", "test-extension.sh");
+
+        assertNotNull(result);
+    }
+
+    @Test
+    public void testGetChecksumForExtensionPath_InvalidFile() {
+        String result = provisioner.getChecksumForExtensionPath("test-extension", "nonexistent.sh");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testPrepareExternalProvisioning() {
+        try (MockedStatic<Script> scriptMock = Mockito.mockStatic(Script.class)) {
+            scriptMock.when(() -> Script.findScript(anyString(), anyString())).thenReturn(testScript.getAbsolutePath());
+
+            PrepareExternalProvisioningCommand cmd = mock(PrepareExternalProvisioningCommand.class);
+            VirtualMachineTO vmTO = new VirtualMachineTO(1, "test-vm", VirtualMachine.Type.User, 1, 1000, 256,
+                    512, VirtualMachineTemplate.BootloaderType.HVM, "OS", false, false, "Pass");
+            vmTO.setUuid("test-uuid");
+
+            when(cmd.getVirtualMachineTO()).thenReturn(vmTO);
+            when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+            when(cmd.getWait()).thenReturn(30);
+
+            doReturn(new Pair<>(true, "{\"nics\":[{\"uuid\":\"test-net-uuid\",\"mac\":\"00:00:00:01:02:03\"}]}")).when(provisioner)
+                .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+            PrepareExternalProvisioningAnswer answer = provisioner.prepareExternalProvisioning(
+                "host-guid", "test-extension", "test-extension.sh", cmd);
+
+            assertTrue(answer.getResult());
+            assertEquals("test-net-uuid", answer.getVirtualMachineTO().getNics()[0].getNetworkUuid());
+            assertEquals("00:00:00:01:02:03", answer.getVirtualMachineTO().getNics()[0].getMac());
+        }
+    }
+
+    @Test
+    public void testPrepareExternalProvisioning_ExtensionNotConfigured() {
+        PrepareExternalProvisioningCommand cmd = mock(PrepareExternalProvisioningCommand.class);
+
+        PrepareExternalProvisioningAnswer answer = provisioner.prepareExternalProvisioning(
+            "host-guid", "test-extension", "nonexistent.sh", cmd);
+
+        assertFalse(answer.getResult());
+        assertEquals("Extension not configured", answer.getDetails());
+    }
+
+    @Test
+    public void testStartInstance() {
+        StartCommand cmd = mock(StartCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(true, "{\"status\": \"success\", \"message\": \"Instance started\"}")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        StartAnswer answer = provisioner.startInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+        Mockito.verify(logger).debug("Starting VM test-uuid on the external system");
+    }
+
+    @Test
+    public void testStartInstanceDeploy() {
+        StartCommand cmd = mock(StartCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        Map<String, String> details = new HashMap<>();
+        details.put("deployvm", "true");
+        when(vmTO.getDetails()).thenReturn(details);
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(true, "{\"status\": \"success\", \"message\": \"Instance started\"}")).when(provisioner)
+                .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        StartAnswer answer = provisioner.startInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+        Mockito.verify(logger).debug("Deploying VM test-uuid on the external system");
+    }
+
+    @Test
+    public void testStartInstanceError() {
+        StartCommand cmd = mock(StartCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(false, "{\"error\": \"Instance failed to start\"}")).when(provisioner)
+                .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        StartAnswer answer = provisioner.startInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertFalse(answer.getResult());
+        assertEquals("{\"error\": \"Instance failed to start\"}", answer.getDetails());
+        Mockito.verify(logger).debug("Starting VM test-uuid on the external system failed: {\"error\": \"Instance failed to start\"}");
+    }
+
+    @Test
+    public void testStopInstance() {
+        StopCommand cmd = mock(StopCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(true, "success")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        StopAnswer answer = provisioner.stopInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testRebootInstance() {
+        RebootCommand cmd = mock(RebootCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(true, "success")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        RebootAnswer answer = provisioner.rebootInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testExpungeInstance() {
+        StopCommand cmd = mock(StopCommand.class);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(vmTO.getUuid()).thenReturn("test-uuid");
+        when(cmd.getVirtualMachine()).thenReturn(vmTO);
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+
+        doReturn(new Pair<>(true, "success")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        StopAnswer answer = provisioner.expungeInstance("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testGetHostVmStateReport() {
+        HostVO host = mock(HostVO.class);
+        when(hostDao.findById(anyLong())).thenReturn(host);
+
+        UserVmVO vm = mock(UserVmVO.class);
+        when(vm.getUuid()).thenReturn("test-uuid");
+        when(vm.getInstanceName()).thenReturn("test-instance");
+
+        List<UserVmVO> vms = new ArrayList<>();
+        vms.add(vm);
+        when(userVmDao.listByHostId(anyLong())).thenReturn(vms);
+        when(userVmDao.listByLastHostId(anyLong())).thenReturn(new ArrayList<>());
+
+        when(hypervisorGuruManager.getGuru(Hypervisor.HypervisorType.External)).thenReturn(hypervisorGuru);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(hypervisorGuru.implement(any(VirtualMachineProfile.class))).thenReturn(vmTO);
+
+        doReturn(new Pair<>(true, "PowerOn")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        Map<String, HostVmStateReportEntry> result = provisioner.getHostVmStateReport(1L, "test-extension", "test-extension.sh");
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertTrue(result.containsKey("test-instance"));
+    }
+
+    @Test
+    public void testGetHostVmStateReportHostNotFound() {
+        Map<String, HostVmStateReportEntry> result = provisioner.getHostVmStateReport(1L, "test-extension", "test-extension.sh");
+
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+        Mockito.verify(logger).error("Host with ID: {} not found", 1L);
+    }
+
+    @Test
+    public void testRunCustomAction() {
+        RunCustomActionCommand cmd = mock(RunCustomActionCommand.class);
+        when(cmd.getActionName()).thenReturn("test-action");
+        when(cmd.getParameters()).thenReturn(new HashMap<>());
+        when(cmd.getExternalDetails()).thenReturn(new HashMap<>());
+        when(cmd.getWait()).thenReturn(30);
+        when(cmd.getVmId()).thenReturn(1L);
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        when(vmInstanceDao.findById(anyLong())).thenReturn(vm);
+
+        when(hypervisorGuruManager.getGuru(Hypervisor.HypervisorType.External)).thenReturn(hypervisorGuru);
+        VirtualMachineTO vmTO = mock(VirtualMachineTO.class);
+        when(hypervisorGuru.implement(any(VirtualMachineProfile.class))).thenReturn(vmTO);
+
+        doReturn(new Pair<>(true, "success")).when(provisioner)
+            .executeExternalCommand(anyString(), anyString(), anyMap(), anyInt(), anyString(), anyString());
+
+        RunCustomActionAnswer answer = provisioner.runCustomAction("host-guid", "test-extension", "test-extension.sh", cmd);
+
+        assertTrue(answer.getResult());
+        Mockito.verify(logger).debug("Executing custom action '{}' in the external system", "test-action");
+    }
+
+    @Test
+    public void testPrepareExtensionPath() throws IOException {
+        try (MockedStatic<Script> scriptMock = Mockito.mockStatic(Script.class)) {
+            File mockScript = new File(tempDir, "provisioner.sh");
+            mockScript.createNewFile();
+            scriptMock.when(() -> Script.findScript(anyString(), anyString())).thenReturn(mockScript.getAbsolutePath());
+
+            provisioner.prepareExtensionPath("test-extension", true, "test-extension-new.sh");
+
+            File createdFile = new File(tempDir, "test-extension-new.sh");
+            assertTrue(createdFile.exists());
+        }
+    }
+
+    @Test
+    public void testPrepareExtensionPathNotUserDefined() {
+        provisioner.prepareExtensionPath("test-extension", false, "test-extension-builtin.sh");
+        File createdFile = new File(tempDir, "test-extension-builtin.sh");
+        assertFalse(createdFile.exists());
+    }
+
+    @Test
+    public void testPrepareExtensionPathNotBashScript() {
+        provisioner.prepareExtensionPath("test-extension", true, "test-extension.txt");
+
+        File createdFile = new File(tempDir, "test-extension.txt");
+        assertFalse(createdFile.exists());
+    }
+
+    @Test
+    public void testPrepareExtensionPathFileAlreadyExists() {
+        File existingFile = new File(tempDir, "test-extension.sh");
+
+        provisioner.prepareExtensionPath("test-extension", true, "test-extension.sh");
+
+        assertTrue(existingFile.exists());
+    }
+
+    @Test
+    public void testCleanupExtensionPath() throws IOException {
+        String extensionDirName = Extension.getDirectoryName("test-extension");
+        File extensionDir = new File(tempDir, extensionDirName);
+        extensionDir.mkdirs();
+        File testFile = new File(extensionDir, "test-file.txt");
+        testFile.createNewFile();
+
+        provisioner.cleanupExtensionPath("test-extension", extensionDirName + "/test-file.txt");
+
+        assertFalse(testFile.exists());
+    }
+
+    @Test
+    public void testCleanupExtensionData() throws IOException {
+        File extensionDataDir = new File(tempDataDir, "test-extension");
+        extensionDataDir.mkdirs();
+        File testFile = new File(extensionDataDir, "test-file.txt");
+        testFile.createNewFile();
+
+        provisioner.cleanupExtensionData("test-extension", 1, true);
+
+        assertFalse(extensionDataDir.exists());
+    }
+
+    @Test
+    public void testExecuteExternalCommand() throws IOException {
+        String scriptContent = "#!/bin/bash\nif grep -q '{\"test\":\"value\"}' \"$2\"; then\necho 'success'\nexit 0\nelse\necho 'fail'\nexit 1\nfi";
+        Files.write(testScript.toPath(), scriptContent.getBytes());
+
+        Map<String, Object> accessDetails = new HashMap<>();
+        accessDetails.put("test", "value");
+
+        Pair<Boolean, String> result = provisioner.executeExternalCommand(
+            "test-extension", "test-action", accessDetails, 30, "Test error", testScript.getAbsolutePath());
+
+        assertTrue(result.first());
+        assertTrue(result.second().contains("success"));
+    }
+
+    @Test
+    public void testExecuteExternalCommandFileNotExecutable() {
+        Map<String, Object> accessDetails = new HashMap<>();
+
+        Pair<Boolean, String> result = provisioner.executeExternalCommand(
+            "test-extension", "test-action", accessDetails, 30, "Test error", "/nonexistent/path");
+
+        assertFalse(result.first());
+        assertEquals("File is not executable", result.second());
+    }
+
+    @Test
+    public void deleteExtensionPayloadFile_DeletesFile_WhenActionIsTrivial() {
+        String extensionName = "test-extension";
+        String action = "status"; // in TRIVIAL_ACTIONS
+        String payloadFileName = "/tmp/test-payload.json";
+
+        try (MockedStatic<FileUtil> fileUtilMock = Mockito.mockStatic(FileUtil.class)) {
+            provisioner.deleteExtensionPayloadFile(extensionName, action, payloadFileName);
+
+            fileUtilMock.verify(() -> FileUtil.deletePath(payloadFileName));
+            Mockito.verify(logger).trace(
+                    "Deleting payload file: {} for extension: {}, action: {}, file: {}",
+                    payloadFileName, extensionName, action
+            );
+        }
+    }
+
+    @Test
+    public void deleteExtensionPayloadFile_DoesNothing_WhenActionIsNotTrivial() {
+        String extensionName = "test-extension";
+        String action = "start";
+        String payloadFileName = "/tmp/test-payload.json";
+
+        try (MockedStatic<FileUtil> fileUtilMock = Mockito.mockStatic(FileUtil.class)) {
+            provisioner.deleteExtensionPayloadFile(extensionName, action, payloadFileName);
+
+            fileUtilMock.verifyNoInteractions();
+            Mockito.verify(logger, Mockito.never()).trace(anyString(), any(), any(), any(), any());
+        }
+    }
+
+    @Test
+    public void prepareExternalPayloadCreatesFileInNewDirectory() throws IOException {
+        String extensionName = "test-extension";
+        Map<String, Object> details = Map.of("key", "value");
+        String result = provisioner.prepareExternalPayload(extensionName, details);
+        assertNotNull(result);
+        Path payloadFile = Paths.get(result);
+        assertTrue(Files.exists(payloadFile));
+        assertTrue(Files.isRegularFile(payloadFile));
+        assertEquals("{\"key\":\"value\"}", Files.readString(payloadFile));
+    }
+
+    @Test
+    public void prepareExternalPayloadCreatesFileInExistingDirectory() throws IOException {
+        String extensionName = "test-extension";
+        Map<String, Object> details = Map.of("key", "value");
+        Path existingDir = Paths.get(tempDataDir.getAbsolutePath(), extensionName);
+        Files.createDirectories(existingDir);
+        doNothing().when(provisioner).scheduleExtensionPayloadDirectoryCleanup(extensionName);
+        String result = provisioner.prepareExternalPayload(extensionName, details);
+        assertNotNull(result);
+        Path payloadFile = Paths.get(result);
+        assertTrue(Files.exists(payloadFile));
+        assertTrue(Files.isRegularFile(payloadFile));
+        assertEquals("{\"key\":\"value\"}", Files.readString(payloadFile));
+    }
+
+    @Test
+    public void prepareExternalPayloadSchedulesCleanupForExistingDirectory() throws IOException {
+        String extensionName = "test-extension";
+        Map<String, Object> details = Map.of("key", "value");
+        Path existingDir = Paths.get(tempDataDir.getAbsolutePath(), extensionName);
+        Files.createDirectories(existingDir);
+        doNothing().when(provisioner).scheduleExtensionPayloadDirectoryCleanup(extensionName);
+        provisioner.prepareExternalPayload(extensionName, details);
+    }
+
+    @Test(expected = IOException.class)
+    public void prepareExternalPayloadThrowsExceptionWhenFileCannotBeWritten() throws IOException {
+        String extensionName = "test-extension";
+        Map<String, Object> details = Map.of("key", "value");
+        Path existingDir = Paths.get(tempDataDir.getAbsolutePath(), extensionName);
+        Files.createDirectories(existingDir);
+        try (MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class)) {
+            filesMock.when(() -> Files.writeString(any(Path.class), anyString(), eq(StandardOpenOption.CREATE_NEW))).thenThrow(IOException.class);
+            provisioner.prepareExternalPayload(extensionName, details);
+        }
+    }
+
+    @Test
+    public void getPowerStateFromStringReturnsPowerOnForValidInput() {
+        VirtualMachine.PowerState result = provisioner.getPowerStateFromString("PowerOn");
+        assertEquals(VirtualMachine.PowerState.PowerOn, result);
+    }
+
+    @Test
+    public void getPowerStateFromStringReturnsPowerOffForValidInput() {
+        VirtualMachine.PowerState result = provisioner.getPowerStateFromString("PowerOff");
+        assertEquals(VirtualMachine.PowerState.PowerOff, result);
+    }
+
+    @Test
+    public void getPowerStateFromStringReturnsPowerUnknownForInvalidInput() {
+        VirtualMachine.PowerState result = provisioner.getPowerStateFromString("InvalidState");
+        assertEquals(VirtualMachine.PowerState.PowerUnknown, result);
+    }
+
+    @Test
+    public void getPowerStateFromStringReturnsPowerUnknownForBlankInput() {
+        VirtualMachine.PowerState result = provisioner.getPowerStateFromString("");
+        assertEquals(VirtualMachine.PowerState.PowerUnknown, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerOnForValidJson() {
+        String response = "{\"power_state\":\"PowerOn\"}";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerOn, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerOffForValidJson() {
+        String response = "{\"power_state\":\"PowerOff\"}";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerOff, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerUnknownForInvalidJson() {
+        String response = "{\"invalid_key\":\"value\"}";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerUnknown, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerUnknownForMalformedJson() {
+        String response = "{power_state:PowerOn";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerUnknown, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerUnknownForBlankResponse() {
+        String response = "";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerUnknown, result);
+    }
+
+    @Test
+    public void parsePowerStateFromResponseReturnsPowerStateForPlainTextResponse() {
+        String response = "PowerOn";
+        UserVmVO vm = mock(UserVmVO.class);
+        VirtualMachine.PowerState result = provisioner.parsePowerStateFromResponse(vm, response);
+        assertEquals(VirtualMachine.PowerState.PowerOn, result);
+    }
+}
diff --git a/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceTest.java b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceTest.java
new file mode 100644
index 00000000000..60b80ec3c53
--- /dev/null
+++ b/plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceTest.java
@@ -0,0 +1,93 @@
+// 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.
+
+package org.apache.cloudstack.hypervisor.external.resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import org.apache.cloudstack.extension.Extension;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class ExternalResourceTest {
+    private ExternalResource externalResource;
+    private Logger logger;
+
+    @Before
+    public void setUp() {
+        externalResource = spy(new ExternalResource());
+        logger = mock(Logger.class);
+        ReflectionTestUtils.setField(externalResource, "logger", logger);
+    }
+
+    @Test
+    public void isExtensionDisconnected_WhenExtensionNameAndPathAreBlank_ReturnsTrue() {
+        ReflectionTestUtils.setField(externalResource, "extensionName", "");
+        ReflectionTestUtils.setField(externalResource, "extensionRelativePath", "");
+        boolean result = externalResource.isExtensionDisconnected();
+        assertTrue(result);
+    }
+
+    @Test
+    public void isExtensionDisconnected_WhenExtensionNameAndPathAreNotBlank_ReturnsFalse() {
+        ReflectionTestUtils.setField(externalResource, "extensionName", "testExtension");
+        ReflectionTestUtils.setField(externalResource, "extensionRelativePath", "path");
+        boolean result = externalResource.isExtensionDisconnected();
+        assertFalse(result);
+    }
+
+    @Test
+    public void isExtensionNotEnabled_WhenExtensionStateIsEnabled_ReturnsFalse() {
+        ReflectionTestUtils.setField(externalResource, "extensionState", Extension.State.Enabled);
+        boolean result = externalResource.isExtensionNotEnabled();
+        assertFalse(result);
+    }
+
+    @Test
+    public void isExtensionNotEnabled_WhenExtensionStateIsNotEnabled_ReturnsTrue() {
+        ReflectionTestUtils.setField(externalResource, "extensionState", Extension.State.Disabled);
+        boolean result = externalResource.isExtensionNotEnabled();
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void logAndGetExtensionNotConnectedOrDisabledError_WhenExtensionDisconnected_LogsErrorAndReturnsMessage() {
+        ReflectionTestUtils.setField(externalResource, "extensionName", null);
+        ReflectionTestUtils.setField(externalResource, "extensionRelativePath", null);
+        String result = externalResource.logAndGetExtensionNotConnectedOrDisabledError();
+        verify(logger).error("Extension not connected to host: {}", externalResource.getName());
+        assertEquals("Extension not connected", result);
+    }
+
+    @Test
+    public void logAndGetExtensionNotConnectedOrDisabledError_WhenExtensionDisabled_LogsErrorAndReturnsMessage() {
+        ReflectionTestUtils.setField(externalResource, "extensionName", "testExtension");
+        ReflectionTestUtils.setField(externalResource, "extensionRelativePath", "path");
+        ReflectionTestUtils.setField(externalResource, "extensionState", Extension.State.Disabled);
+        String result = externalResource.logAndGetExtensionNotConnectedOrDisabledError();
+        verify(logger).error("Extension: {} connected to host: {} is not in Enabled state", "testExtension", externalResource.getName());
+        assertEquals("Extension is disabled", result);
+    }
+}
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
index c02513f4889..8f4d7e4da92 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -651,7 +651,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Co
     private VMTemplateVO createVMTemplateRecord(String vmInternalName, long guestOsId, long accountId) {
         Long nextTemplateId = vmTemplateDao.getNextInSequence(Long.class, "id");
         VMTemplateVO templateVO = new VMTemplateVO(nextTemplateId, "Imported-from-" + vmInternalName, Storage.ImageFormat.OVA, false, false, false, Storage.TemplateType.USER, null,
-                false, 64, accountId, null, "Template imported from VM " + vmInternalName, false, guestOsId, false, HypervisorType.VMware, null, null, false, false, false, false, CPU.CPUArch.amd64);
+                false, 64, accountId, null, "Template imported from VM " + vmInternalName, false, guestOsId, false, HypervisorType.VMware, null, null, false, false, false, false, CPU.CPUArch.amd64, null);
         return vmTemplateDao.persist(templateVO);
     }
 
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
index 427ad4cbfed..d48def5c9bd 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
@@ -16,15 +16,11 @@
 // under the License.
 package org.apache.cloudstack.service;
 
-import com.cloud.network.IpAddress;
-import com.cloud.network.Network;
-import com.cloud.network.SDNProviderNetworkRule;
-import com.cloud.network.nsx.NsxService;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.vpc.Vpc;
-import com.cloud.network.vpc.VpcVO;
-import com.cloud.network.vpc.dao.VpcDao;
-import com.cloud.utils.exception.CloudRuntimeException;
+import java.util.List;
+import java.util.Objects;
+
+import javax.inject.Inject;
+
 import org.apache.cloudstack.NsxAnswer;
 import org.apache.cloudstack.agent.api.CreateNsxDistributedFirewallRulesCommand;
 import org.apache.cloudstack.agent.api.CreateNsxLoadBalancerRuleCommand;
@@ -34,8 +30,8 @@ import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
 import org.apache.cloudstack.agent.api.CreateOrUpdateNsxTier1NatRuleCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxDistributedFirewallRulesCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxLoadBalancerRuleCommand;
-import org.apache.cloudstack.agent.api.DeleteNsxSegmentCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxNatRuleCommand;
+import org.apache.cloudstack.agent.api.DeleteNsxSegmentCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxTier1GatewayCommand;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -45,9 +41,15 @@ import org.apache.cloudstack.utils.NsxHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.inject.Inject;
-import java.util.List;
-import java.util.Objects;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.SDNProviderNetworkRule;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.nsx.NsxService;
+import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 public class NsxServiceImpl implements NsxService, Configurable {
     @Inject
@@ -205,4 +207,9 @@ public class NsxServiceImpl implements NsxService, Configurable {
             NSX_API_FAILURE_RETRIES, NSX_API_FAILURE_INTERVAL
         };
     }
+
+    @Override
+    public String getSegmentId(long domainId, long accountId, long zoneId, Long vpcId, long networkId) {
+        return NsxControllerUtils.getNsxSegmentId(domainId, accountId, zoneId, vpcId, networkId);
+    }
 }
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0471e5a3228..6a1a13fb5b1 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -87,6 +87,7 @@
         <module>host-allocators/random</module>
 
         <module>hypervisors/baremetal</module>
+        <module>hypervisors/external</module>
         <module>hypervisors/hyperv</module>
         <module>hypervisors/kvm</module>
         <module>hypervisors/ucs</module>
diff --git a/scripts/vm/hypervisor/external/provisioner/provisioner.sh b/scripts/vm/hypervisor/external/provisioner/provisioner.sh
new file mode 100755
index 00000000000..6aa96610ef4
--- /dev/null
+++ b/scripts/vm/hypervisor/external/provisioner/provisioner.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+# 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.
+
+parse_json() {
+    local json_string=$1
+    echo "$json_string" | jq '.' > /dev/null || { echo '{"error":"Invalid JSON input"}'; exit 1; }
+}
+
+generate_random_mac() {
+    hexchars="0123456789ABCDEF"
+    echo "52:54:00:$(for i in {1..3}; do echo -n ${hexchars:$(( RANDOM % 16 )):1}${hexchars:$(( RANDOM % 16 )):1}; [[ $i -lt 3 ]] && echo -n ':'; done)"
+}
+
+prepare() {
+    parse_json "$1" || exit 1
+
+    local input_json="$1"
+    local nics_json
+    nics_json=$(echo "$input_json" | jq '.["cloudstack.vm.details"].nics')
+
+    # If NICs array is empty, return empty string
+    if [ "$(echo "$nics_json" | jq 'length // 0')" -eq 0 ]; then
+        echo ""
+        return
+    fi
+
+    local result='{"nics":['
+    local first=1
+
+    while IFS= read -r uuid; do
+        local mac
+        mac=$(generate_random_mac)
+
+        if [ $first -eq 1 ]; then
+            first=0
+        else
+            result+=','
+        fi
+
+        result+='{"uuid":"'"$uuid"'","mac":"'"$mac"'"}'
+    done < <(echo "$nics_json" | jq -r '.[].uuid')
+
+    result+=']}'
+    echo "$result"
+}
+
+create() {
+    parse_json "$1" || exit 1
+
+    local response
+    response=$(jq -n \
+        '{status: "success", message: "Instance created"}')
+
+    echo "$response"
+}
+
+delete() {
+    parse_json "$1" || exit 1
+
+    local response
+    response=$(jq -n \
+        '{status: "success", message: "Instance deleted"}')
+
+    echo "$response"
+}
+
+start() {
+    parse_json "$1" || exit 1
+    echo '{"status": "success", "message": "Instance started"}'
+}
+
+stop() {
+    parse_json "$1" || exit 1
+    echo '{"status": "success", "message": "Instance stopped"}'
+}
+
+reboot() {
+    parse_json "$1" || exit 1
+    echo '{"status": "success", "message": "Instance rebooted"}'
+}
+
+status() {
+    parse_json "$1" || exit 1
+    echo '{"status": "success", "power_state": "running"}'
+}
+
+action=$1
+parameters_file="$2"
+wait_time="$3"
+
+if [[ -z "$action" || -z "$parameters_file" ]]; then
+    echo '{"error":"Missing required arguments"}'
+    exit 1
+fi
+
+if [[ ! -r "$parameters_file" ]]; then
+    echo '{"error":"File not found or unreadable"}'
+    exit 1
+fi
+
+# Read file content as parameters (assumes space-separated arguments)
+parameters=$(<"$parameters_file")
+
+case $action in
+    prepare)
+        prepare "$parameters"
+        ;;
+    create)
+        create "$parameters"
+        ;;
+    delete)
+        delete "$parameters"
+        ;;
+    start)
+        start "$parameters"
+        ;;
+    stop)
+        stop "$parameters"
+        ;;
+    reboot)
+        reboot "$parameters"
+        ;;
+    status)
+        status "$parameters"
+        ;;
+    *)
+        echo '{"error":"Invalid action"}'
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/server/pom.xml b/server/pom.xml
index 171752587c4..437d7006c33 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>metrics-jvm</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-framework-extensions</artifactId>
+            <version>4.21.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
index 377b2134d78..3240bfcc8ab 100644
--- a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
@@ -37,9 +37,6 @@ import javax.inject.Inject;
 import javax.mail.MessagingException;
 import javax.naming.ConfigurationException;
 
-import com.cloud.dc.DataCenter;
-import com.cloud.dc.Pod;
-import com.cloud.org.Cluster;
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -52,8 +49,9 @@ import org.apache.cloudstack.utils.mailing.SMTPMailProperties;
 import org.apache.cloudstack.utils.mailing.SMTPMailSender;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
 import com.cloud.alert.dao.AlertDao;
 import com.cloud.api.ApiDBUtils;
@@ -66,9 +64,11 @@ import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenter.NetworkType;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
+import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan.VlanType;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
@@ -82,6 +82,7 @@ import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.network.Ipv6Service;
 import com.cloud.network.dao.IPAddressDao;
+import com.cloud.org.Cluster;
 import com.cloud.org.Grouping.AllocationState;
 import com.cloud.resource.ResourceManager;
 import com.cloud.storage.StorageManager;
@@ -93,8 +94,6 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallbackNoReturn;
 import com.cloud.utils.db.TransactionStatus;
 
-import org.jetbrains.annotations.Nullable;
-
 public class AlertManagerImpl extends ManagerBase implements AlertManager, Configurable {
     protected Logger logger = LogManager.getLogger(AlertManagerImpl.class.getName());
 
@@ -109,7 +108,8 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi
             , AlertType.ALERT_TYPE_UPLOAD_FAILED
             , AlertType.ALERT_TYPE_OOBM_AUTH_ERROR
             , AlertType.ALERT_TYPE_HA_ACTION
-            , AlertType.ALERT_TYPE_CA_CERT);
+            , AlertType.ALERT_TYPE_CA_CERT
+            , AlertType.ALERT_TYPE_EXTENSION_PATH_NOT_READY);
 
     private static final long INITIAL_CAPACITY_CHECK_DELAY = 30L * 1000L; // Thirty seconds expressed in milliseconds.
 
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index a8c0991b7dc..5bce31b9fc6 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1572,6 +1572,7 @@ public class ApiResponseHelper implements ResponseGenerator {
     @Override
     public ClusterResponse createClusterResponse(Cluster cluster, Boolean showCapacities) {
         ClusterResponse clusterResponse = new ClusterResponse();
+        clusterResponse.setInternalId(cluster.getId());
         clusterResponse.setId(cluster.getUuid());
         clusterResponse.setName(cluster.getName());
         HostPodVO pod = ApiDBUtils.findPodById(cluster.getPodId());
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index cdedd830c0a..e91c76adc79 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -147,6 +147,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionHelper;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
@@ -320,6 +322,7 @@ import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.dao.StoragePoolTagsDao;
 import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplateDetailsDao;
 import com.cloud.storage.dao.VMTemplatePoolDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.tags.ResourceTagVO;
@@ -631,6 +634,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
     @Inject
     private AsyncJobManager jobManager;
+    @Inject
+    private VMTemplateDetailsDao templateDetailsDao;
 
     @Inject
     private StoragePoolAndAccessGroupMapDao storagePoolAndAccessGroupMapDao;
@@ -647,6 +652,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     @Inject
     GuestOSDao guestOSDao;
 
+    @Inject
+    ExtensionHelper extensionHelper;
+
     private SearchCriteria<ServiceOfferingJoinVO> getMinimumCpuServiceOfferingJoinSearchCriteria(int cpu) {
         SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
         SearchCriteria<ServiceOfferingJoinVO> sc1 = _srvOfferingJoinDao.createSearchCriteria();
@@ -1338,6 +1346,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         Long userdataId = cmd.getUserdataId();
         Map<String, String> tags = cmd.getTags();
         final CPU.CPUArch arch = cmd.getArch();
+        final Long extensionId = cmd.getExtensionId();
 
         boolean isAdmin = false;
         boolean isRootAdmin = false;
@@ -1578,12 +1587,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         }
 
         Boolean isVnf = cmd.getVnf();
-        boolean templateJoinNeeded = isVnf != null || arch != null;
+        boolean templateJoinNeeded = ObjectUtils.anyNotNull(isVnf, arch, extensionId);
         if (templateJoinNeeded) {
             SearchBuilder<VMTemplateVO> templateSearch = _templateDao.createSearchBuilder();
             templateSearch.and("templateArch", templateSearch.entity().getArch(), Op.EQ);
             templateSearch.and("templateTypeEQ", templateSearch.entity().getTemplateType(), Op.EQ);
             templateSearch.and("templateTypeNEQ", templateSearch.entity().getTemplateType(), Op.NEQ);
+            templateSearch.and("templateExtensionId", templateSearch.entity().getExtensionId(), Op.EQ);
 
             userVmSearchBuilder.join("vmTemplate", templateSearch, templateSearch.entity().getId(), userVmSearchBuilder.entity().getTemplateId(), JoinBuilder.JoinType.INNER);
         }
@@ -1713,6 +1723,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         if (arch != null) {
             userVmSearchCriteria.setJoinParameters("vmTemplate", "templateArch", arch);
         }
+        if (extensionId != null) {
+            userVmSearchCriteria.setJoinParameters("vmTemplate", "templateExtensionId", extensionId);
+        }
 
         if (isRootAdmin) {
             if (podId != null) {
@@ -2370,6 +2383,25 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         return _projectAccountJoinDao.searchAndCount(sc, searchFilter);
     }
 
+    protected void updateHostsExtensions(final List<HostResponse> hostResponses) {
+        if (CollectionUtils.isEmpty(hostResponses)) {
+            return;
+        }
+        Map<Long, Extension> clusterIdExtensionMap = new HashMap<>();
+        for  (HostResponse response : hostResponses) {
+            if (!Hypervisor.HypervisorType.External.getHypervisorDisplayName().equals(response.getHypervisor())) {
+                continue;
+            }
+            Extension extension = clusterIdExtensionMap.computeIfAbsent(response.getClusterInternalId(),
+                    id -> extensionHelper.getExtensionForCluster(id));
+            if (extension == null) {
+                continue;
+            }
+            response.setExtensionId(extension.getUuid());
+            response.setExtensionName(extension.getName());
+        }
+    }
+
     @Override
     public ListResponse<HostResponse> searchForServers(ListHostsCmd cmd) {
         // FIXME: do we need to support list hosts with VmId, maybe we should
@@ -2380,6 +2412,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         ListResponse<HostResponse> response = new ListResponse<>();
         logger.debug(">>>Generating Response>>>");
         List<HostResponse> hostResponses = ViewResponseHelper.createHostResponse(cmd.getDetails(), hosts.first().toArray(new HostJoinVO[hosts.first().size()]));
+        updateHostsExtensions(hostResponses);
         response.setResponses(hostResponses, hosts.second());
         return response;
     }
@@ -4796,7 +4829,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 null, cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(),
                 cmd.getImageStoreId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller,
                 listProjectResourcesCriteria, tags, showRemovedTmpl, cmd.getIds(), parentTemplateId, cmd.getShowUnique(),
-                templateType, isVnf, cmd.getArch(), cmd.getOsCategoryId(), forCks);
+                templateType, isVnf, cmd.getArch(), cmd.getOsCategoryId(), forCks, cmd.getExtensionId());
     }
 
     private Pair<List<TemplateJoinVO>, Integer> searchForTemplatesInternal(Long templateId, String name, String keyword,
@@ -4805,15 +4838,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             boolean showDomr, boolean onlyReady, List<Account> permittedAccounts, Account caller,
             ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags,
             boolean showRemovedTmpl, List<Long> ids, Long parentTemplateId, Boolean showUnique, String templateType,
-            Boolean isVnf, CPU.CPUArch arch, Long osCategoryId, Boolean forCks) {
+            Boolean isVnf, CPU.CPUArch arch, Long osCategoryId, Boolean forCks, Long extensionId) {
 
         // check if zone is configured, if not, just return empty list
         List<HypervisorType> hypers = null;
         if (!isIso) {
             hypers = _resourceMgr.listAvailHypervisorInZone(null);
-            if (hypers == null || hypers.isEmpty()) {
-                return new Pair<>(new ArrayList<>(), 0);
-            }
+            hypers.add(HypervisorType.External);
         }
 
         VMTemplateVO template;
@@ -4840,6 +4871,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             sb.and("guestOsIdIN", sb.entity().getGuestOSId(), Op.IN);
         }
 
+        if (extensionId != null) {
+            sb.and("extensionId", sb.entity().getExtensionId(), Op.IN);
+        }
+
         SearchCriteria<TemplateJoinVO> sc = sb.create();
 
         if (imageStoreId != null) {
@@ -4863,6 +4898,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             }
         }
 
+        if (extensionId != null) {
+            sc.setParameters("extensionId", extensionId);
+        }
+
         // verify templateId parameter and specially handle it
         if (templateId != null) {
             template = _templateDao.findByIdIncludingRemoved(templateId); // Done for backward compatibility - Bug-5221
@@ -5113,7 +5152,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         if (onlyReady) {
             SearchCriteria<TemplateJoinVO> readySc = _templateJoinDao.createSearchCriteria();
             readySc.addOr("state", SearchCriteria.Op.EQ, TemplateState.Ready);
-            readySc.addOr("format", SearchCriteria.Op.EQ, ImageFormat.BAREMETAL);
+            readySc.addOr("format", SearchCriteria.Op.IN, ImageFormat.BAREMETAL, ImageFormat.EXTERNAL);
             SearchCriteria<TemplateJoinVO> isoPerhostSc = _templateJoinDao.createSearchCriteria();
             isoPerhostSc.addAnd("format", SearchCriteria.Op.EQ, ImageFormat.ISO);
             isoPerhostSc.addAnd("templateType", SearchCriteria.Op.EQ, TemplateType.PERHOST);
@@ -5253,7 +5292,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                 cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(), cmd.getImageStoreId(),
                 hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria,
                 tags, showRemovedISO, null, null, cmd.getShowUnique(), null, null,
-                cmd.getArch(), cmd.getOsCategoryId(), null);
+                cmd.getArch(), cmd.getOsCategoryId(), null, null);
     }
 
     @Override
diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
index 0b7ecf49509..fd963179aa2 100644
--- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -28,7 +28,6 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
-import com.cloud.user.AccountManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@ -55,6 +54,7 @@ import com.cloud.host.HostStats;
 import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.StorageStats;
+import com.cloud.user.AccountManager;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -120,6 +120,7 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
     private void setNewHostResponseBase(HostJoinVO host, EnumSet<HostDetails> details, HostResponse hostResponse) {
         hostResponse.setId(host.getUuid());
         hostResponse.setCapabilities(host.getCapabilities());
+        hostResponse.setClusterInternalId(host.getClusterId());
         hostResponse.setClusterId(host.getClusterUuid());
         hostResponse.setCpuSockets(host.getCpuSockets());
         hostResponse.setCpuNumber(host.getCpus());
@@ -259,8 +260,10 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                     hostResponse.setUefiCapability(new Boolean(false));
                 }
             }
-            if (details.contains(HostDetails.all) && (host.getHypervisorType() == Hypervisor.HypervisorType.KVM ||
-                    host.getHypervisorType() == Hypervisor.HypervisorType.Custom)) {
+            if (details.contains(HostDetails.all) &&
+                    Arrays.asList(Hypervisor.HypervisorType.KVM,
+                            Hypervisor.HypervisorType.Custom,
+                            Hypervisor.HypervisorType.External).contains(host.getHypervisorType())) {
                 //only kvm has the requirement to return host details
                 try {
                     hostResponse.setDetails(hostDetails, host.getHypervisorType());
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 3f983dd0cd6..e2a3201e954 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
@@ -240,7 +240,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         templateResponse.setDisplayText(template.getDisplayText());
         templateResponse.setPublic(template.isPublicTemplate());
         templateResponse.setCreated(template.getCreatedOnStore());
-        if (template.getFormat() == Storage.ImageFormat.BAREMETAL) {
+        if (template.getFormat() == Storage.ImageFormat.BAREMETAL || template.getFormat() == Storage.ImageFormat.EXTERNAL) {
             // for baremetal template, we didn't download, but is ready to use.
             templateResponse.setReady(true);
         } else {
@@ -252,12 +252,12 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         templateResponse.setDynamicallyScalable(template.isDynamicallyScalable());
         templateResponse.setSshKeyEnabled(template.isEnableSshKey());
         templateResponse.setCrossZones(template.isCrossZones());
-        templateResponse.setFormat(template.getFormat());
         if (template.getTemplateType() != null) {
             templateResponse.setTemplateType(template.getTemplateType().toString());
         }
 
         templateResponse.setHypervisor(template.getHypervisorType().getHypervisorDisplayName());
+        templateResponse.setFormat(template.getFormat());
 
         templateResponse.setOsTypeId(template.getGuestOSUuid());
         templateResponse.setOsTypeName(template.getGuestOSName());
@@ -331,6 +331,10 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         if (template.getArch() != null) {
             templateResponse.setArch(template.getArch().getType());
         }
+        if (template.getExtensionId() != null) {
+            templateResponse.setExtensionId(template.getExtensionUuid());
+            templateResponse.setExtensionName(template.getExtensionName());
+        }
 
         //set template children disks
         Set<ChildTemplateResponse> childTemplatesSet = new HashSet<ChildTemplateResponse>();
diff --git a/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java
index d3c68b13f93..201b081b962 100644
--- a/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java
@@ -265,6 +265,15 @@ public class TemplateJoinVO extends BaseViewWithTagInformationVO implements Cont
     @Column(name = "user_data_params")
     private String userDataParams;
 
+    @Column(name = "extension_id")
+    private Long extensionId;
+
+    @Column(name = "extension_uuid")
+    private String extensionUuid;
+
+    @Column(name = "extension_name")
+    private String extensionName;
+
     public TemplateJoinVO() {
     }
 
@@ -567,4 +576,16 @@ public class TemplateJoinVO extends BaseViewWithTagInformationVO implements Cont
     public CPU.CPUArch getArch() {
         return arch;
     }
+
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public String getExtensionUuid() {
+        return extensionUuid;
+    }
+
+    public String getExtensionName() {
+        return extensionName;
+    }
 }
diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
index 51efb6a668d..2de9abc827e 100644
--- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
@@ -179,6 +179,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
             return true;
         }
         HostVO host = _hostDao.findById(hostId);
+        if (HypervisorType.External.equals(host.getHypervisorType())) {
+            return true;
+        }
         return releaseVmCapacity(vm, moveFromReserved, moveToReservered, host);
     }
 
@@ -187,6 +190,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
         if (host == null) {
             return true;
         }
+        if (HypervisorType.External.equals(host.getHypervisorType())) {
+            return true;
+        }
 
         final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId());
         CapacityVO capacityCpu = _capacityDao.findByHostIdType(host.getId(), Capacity.CAPACITY_TYPE_CPU);
@@ -290,6 +296,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
 
         final long hostId = vm.getHostId();
         final HostVO host = _hostDao.findById(hostId);
+        if (HypervisorType.External.equals(host.getHypervisorType())) {
+            return;
+        }
         final long clusterId = host.getClusterId();
         final float cpuOvercommitRatio = Float.parseFloat(_clusterDetailsDao.findDetail(clusterId, VmDetailConstants.CPU_OVER_COMMIT_RATIO).getValue());
         final float memoryOvercommitRatio = Float.parseFloat(_clusterDetailsDao.findDetail(clusterId, VmDetailConstants.MEMORY_OVER_COMMIT_RATIO).getValue());
@@ -671,6 +680,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
     @DB
     @Override
     public void updateCapacityForHost(final Host host) {
+        if (HypervisorType.External.equals(host.getHypervisorType())) {
+            return;
+        }
         long usedCpuCore = 0;
         long reservedCpuCore = 0;
         long usedCpu = 0;
@@ -1128,6 +1140,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
 
     @Override
     public Pair<Boolean, Boolean> checkIfHostHasCpuCapabilityAndCapacity(Host host, ServiceOffering offering, boolean considerReservedCapacity) {
+        if (HypervisorType.External.equals(host.getHypervisorType())) {
+            logger.debug("Skipping capability and capacity check for the External {}", host);
+            return new Pair<>(true, true);
+        }
+
         int cpu_requested = offering.getCpu() * offering.getSpeed();
         long ram_requested = offering.getRamSize() * 1024L * 1024L;
         Pair<String, String> clusterDetails = getClusterValues(host.getClusterId());
diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java
index 01cf6df882d..443909ce319 100644
--- a/server/src/main/java/com/cloud/configuration/Config.java
+++ b/server/src/main/java/com/cloud/configuration/Config.java
@@ -664,7 +664,7 @@ public enum Config {
             String.class,
             "hypervisor.list",
             HypervisorType.KVM + "," + HypervisorType.VMware + "," + HypervisorType.XenServer + "," + HypervisorType.Hyperv + "," +
-                    HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC + "," + HypervisorType.Ovm3,
+                    HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC + "," + HypervisorType.Ovm3 + "," + HypervisorType.External,
                     "The list of hypervisors that this deployment will use.",
             "hypervisorList",
             ConfigKey.Kind.CSV,
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 72c9c1c0845..dd204d41141 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -209,6 +209,7 @@ import com.cloud.host.HostTagVO;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.host.dao.HostTagsDao;
+import com.cloud.hypervisor.ExternalProvisioner;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorGuru;
 import com.cloud.hypervisor.kvm.dpdk.DpdkHelper;
@@ -306,6 +307,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.NicIpAlias;
 import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.NicIpAliasVO;
 import com.cloud.vm.dao.VMInstanceDao;
@@ -388,6 +390,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Inject
     AlertManager _alertMgr;
     List<SecurityChecker> _secChecker;
+    List<ExternalProvisioner> externalProvisioners;
 
     @Inject
     CapacityDao _capacityDao;
@@ -540,6 +543,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     private static final List<String> SUPPORTED_ROUTING_MODE_STRS = Arrays.asList(Static.toString().toLowerCase(), Dynamic.toString().toLowerCase());
     private static final long GiB_TO_BYTES = 1024 * 1024 * 1024;
 
+    public List<ExternalProvisioner> getExternalProvisioners() {
+        return externalProvisioners;
+    }
+
+    public void setExternalProvisioners(final List<ExternalProvisioner> externalProvisioners) {
+        this.externalProvisioners = externalProvisioners;
+    }
+
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
         final String defaultPageSizeString = _configDao.getValue(Config.DefaultPageSize.key());
@@ -3757,6 +3768,30 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
     }
 
+    protected boolean serviceOfferingExternalDetailsNeedUpdate(final Map<String, String> offeringDetails,
+               final Map<String, String> externalDetails) {
+        if (MapUtils.isEmpty(externalDetails)) {
+            return false;
+        }
+
+        Map<String, String> existingExternalDetails = offeringDetails.entrySet().stream()
+                .filter(detail -> detail.getKey().startsWith(VmDetailConstants.EXTERNAL_DETAIL_PREFIX))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        if (MapUtils.isEmpty(existingExternalDetails) || existingExternalDetails.size() != externalDetails.size()) {
+            return true;
+        }
+
+        for (Map.Entry<String, String> entry : externalDetails.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            if (!value.equals(existingExternalDetails.get(key))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_SERVICE_OFFERING_EDIT, eventDescription = "updating service offering")
     public ServiceOffering updateServiceOffering(final UpdateServiceOfferingCmd cmd) {
@@ -3771,6 +3806,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         String hostTags = cmd.getHostTags();
         ServiceOffering.State state = cmd.getState();
         boolean purgeResources = cmd.isPurgeResources();
+        final Map<String, String> externalDetails = cmd.getExternalDetails();
 
         if (userId == null) {
             userId = Long.valueOf(User.UID_SYSTEM);
@@ -3788,7 +3824,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         List<Long> existingZoneIds = _serviceOfferingDetailsDao.findZoneIds(id);
         Collections.sort(existingZoneIds);
 
-        String purgeResourceStr = _serviceOfferingDetailsDao.getDetail(id, ServiceOffering.PURGE_DB_ENTITIES_KEY);
+        Map<String, String> offeringDetails = _serviceOfferingDetailsDao.listDetailsKeyPairs(id);
+        String purgeResourceStr = offeringDetails.get(ServiceOffering.PURGE_DB_ENTITIES_KEY);
         boolean existingPurgeResources = false;
         if (StringUtils.isNotBlank(purgeResourceStr)) {
             existingPurgeResources = Boolean.parseBoolean(purgeResourceStr);
@@ -3862,8 +3899,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
 
         final boolean updateNeeded = name != null || displayText != null || sortKey != null || storageTags != null || hostTags != null || state != null;
+        final boolean serviceOfferingExternalDetailsNeedUpdate =
+                serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
         final boolean detailsUpdateNeeded = !filteredDomainIds.equals(existingDomainIds) ||
-                !filteredZoneIds.equals(existingZoneIds) || purgeResources != existingPurgeResources;
+                !filteredZoneIds.equals(existingZoneIds) || purgeResources != existingPurgeResources ||
+                serviceOfferingExternalDetailsNeedUpdate;
         if (!updateNeeded && !detailsUpdateNeeded) {
             return _serviceOfferingDao.findById(id);
         }
@@ -3905,6 +3945,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
             SearchBuilder<ServiceOfferingDetailsVO> sb = _serviceOfferingDetailsDao.createSearchBuilder();
             sb.and("offeringId", sb.entity().getResourceId(), SearchCriteria.Op.EQ);
             sb.and("detailName", sb.entity().getName(), SearchCriteria.Op.EQ);
+            sb.and("detailNameLike", sb.entity().getName(), SearchCriteria.Op.LIKE);
             sb.done();
             SearchCriteria<ServiceOfferingDetailsVO> sc = sb.create();
             sc.setParameters("offeringId", String.valueOf(id));
@@ -3930,6 +3971,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                             "true", false));
                 }
             }
+            if (serviceOfferingExternalDetailsNeedUpdate) {
+                SearchCriteria<ServiceOfferingDetailsVO> externalDetailsRemoveSC = sb.create();
+                externalDetailsRemoveSC.setParameters("detailNameLike", VmDetailConstants.EXTERNAL_DETAIL_PREFIX + "%");
+                _serviceOfferingDetailsDao.remove(externalDetailsRemoveSC);
+                for (Map.Entry<String, String> entry : externalDetails.entrySet()) {
+                    detailsVO.add(new ServiceOfferingDetailsVO(id, entry.getKey(), entry.getValue(), true));
+                }
+            }
         }
         if (!detailsVO.isEmpty()) {
             for (ServiceOfferingDetailsVO detailVO : detailsVO) {
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 68b057fef13..9d68c3395d4 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -190,6 +190,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
     private static final long ADMIN_ACCOUNT_ROLE_ID = 1l;
     private static final long INITIAL_RESERVATION_RELEASE_CHECKER_DELAY = 30L * 1000L; // thirty seconds expressed in milliseconds
     protected long _nodeId = -1;
+    protected static final List<HypervisorType> DEPLOYMENT_PLANNING_SKIP_HYPERVISORS = Arrays.asList(
+            HypervisorType.BareMetal, HypervisorType.External);
 
     protected List<StoragePoolAllocator> _storagePoolAllocators;
 
@@ -371,6 +373,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
             if (plannerName == null) {
                 if (vm.getHypervisorType() == HypervisorType.BareMetal) {
                     plannerName = "BareMetalPlanner";
+                } else if (vm.getHypervisorType() == HypervisorType.External) {
+                    plannerName = "ExternalServerPlanner";
                 } else {
                     plannerName = _configDao.getValue(Config.VmDeploymentPlanner.key());
                 }
@@ -514,7 +518,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
                 logger.debug("Last host [{}] of VM [{}] is UP and has enough capacity. Checking for suitable pools for this host under zone [{}], pod [{}] and cluster [{}].",
                         host, vm, dc, pod, cluster);
 
-                if (vm.getHypervisorType() == HypervisorType.BareMetal) {
+                if (DEPLOYMENT_PLANNING_SKIP_HYPERVISORS.contains(vm.getHypervisorType())) {
                     DeployDestination dest = new DeployDestination(dc, pod, cluster, host, new HashMap<>(), displayStorage);
                     logger.debug("Returning Deployment Destination: {}.", dest);
                     return dest;
@@ -627,7 +631,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
                 host, dc, pod, cluster, vm);
 
         boolean displayStorage = getDisplayStorageFromVmProfile(vmProfile);
-        if (vm.getHypervisorType() == HypervisorType.BareMetal) {
+        if (DEPLOYMENT_PLANNING_SKIP_HYPERVISORS.contains(vm.getHypervisorType())) {
             DeployDestination dest = new DeployDestination(dc, pod, cluster, host, new HashMap<>(),
                     displayStorage);
             logger.debug("Returning Deployment Destination: {}.", dest);
@@ -1324,7 +1328,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
                 // if found suitable hosts in this cluster, find suitable storage
                 // pools for each volume of the VM
                 if (CollectionUtils.isNotEmpty(suitableHosts)) {
-                    if (vmProfile.getHypervisorType() == HypervisorType.BareMetal) {
+                    if (DEPLOYMENT_PLANNING_SKIP_HYPERVISORS.contains(vmProfile.getHypervisorType())) {
                         DeployDestination dest = new DeployDestination(dc, pod, clusterVO, suitableHosts.get(0));
                         return dest;
                     }
@@ -2007,7 +2011,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
                     }
                     Map<Long, Long> volumeReservationMap = new HashMap<>();
 
-                    if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+                    if (!DEPLOYMENT_PLANNING_SKIP_HYPERVISORS.contains(vm.getHypervisorType())) {
                         for (Volume vo : plannedDestination.getStorageForDisks().keySet()) {
                             volumeReservationMap.put(vo.getId(), plannedDestination.getStorageForDisks().get(vo).getId());
                         }
diff --git a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
index 9370204fb6e..63377a66b6c 100644
--- a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
@@ -645,7 +645,7 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
     public boolean canHandle(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid) {
         // check what the ServiceOffering says. If null, check the global config
         ServiceOffering offering = vm.getServiceOffering();
-        if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+        if (vm.getHypervisorType() != HypervisorType.BareMetal && vm.getHypervisorType() != HypervisorType.External) {
             if (offering != null && offering.getDeploymentPlanner() != null) {
                 if (offering.getDeploymentPlanner().equals(getName())) {
                     return true;
diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
index 5a7df7df32d..2ee835d844e 100644
--- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
@@ -17,6 +17,8 @@
 
 package com.cloud.network;
 
+import static com.cloud.network.Network.Service.SecurityGroup;
+
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -145,8 +147,6 @@ import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.NicSecondaryIpDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
-import static com.cloud.network.Network.Service.SecurityGroup;
-
 public class NetworkModelImpl extends ManagerBase implements NetworkModel, Configurable {
     public static final String UNABLE_TO_USE_NETWORK = "Unable to use network with id= %s, permission denied";
     @Inject
@@ -2197,29 +2197,29 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel, Confi
         if (nic == null) {
             return null;
         }
-        NetworkVO network = _networksDao.findById(networkId);
-        Integer networkRate = getNetworkRate(network.getId(), vm.getId());
+        DataCenter dc = _dcDao.findById(vm.getDataCenterId());
+        return getNicProfile(vm, nic, dc);
+    }
 
+    @Override
+    public NicProfile getNicProfile(VirtualMachine vm, Nic nic, DataCenter dataCenter) {
+        NetworkVO network = _networksDao.findById(nic.getNetworkId());
+        Integer networkRate = getNetworkRate(network.getId(), vm.getId());
         NicProfile profile =
-            new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate, isSecurityGroupSupportedInNetwork(network), getNetworkTag(
-                vm.getHypervisorType(), network));
+                new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), networkRate,
+                        isSecurityGroupSupportedInNetwork(network), getNetworkTag(vm.getHypervisorType(), network));
         if (network.getTrafficType() == TrafficType.Public && network.getPublicMtu() != null) {
             profile.setMtu(network.getPublicMtu());
         }
         if (network.getTrafficType() == TrafficType.Guest && network.getPrivateMtu() != null) {
             profile.setMtu(network.getPrivateMtu());
         }
-
-        DataCenter dc = _dcDao.findById(network.getDataCenterId());
-
-        Pair<String, String> ip4Dns = getNetworkIp4Dns(network, dc);
+        Pair<String, String> ip4Dns = getNetworkIp4Dns(network, dataCenter);
         profile.setIPv4Dns1(ip4Dns.first());
         profile.setIPv4Dns2(ip4Dns.second());
-
-        Pair<String, String> ip6Dns = getNetworkIp6Dns(network, dc);
+        Pair<String, String> ip6Dns = getNetworkIp6Dns(network, dataCenter);
         profile.setIPv6Dns1(ip6Dns.first());
         profile.setIPv6Dns2(ip6Dns.second());
-
         return profile;
     }
 
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index f593212a13a..d0f0e893a10 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -41,8 +41,6 @@ import java.util.UUID;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.utils.component.AdapterBase;
-import com.cloud.dc.dao.ASNumberDao;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.alert.AlertService;
@@ -86,12 +84,14 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.to.IpAddressTO;
+import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.manager.Commands;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.ApiDBUtils;
@@ -110,6 +110,7 @@ import com.cloud.dc.DomainVlanMapVO;
 import com.cloud.dc.Vlan.VlanType;
 import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
+import com.cloud.dc.dao.ASNumberDao;
 import com.cloud.dc.dao.AccountVlanMapDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.DataCenterVnetDao;
@@ -179,6 +180,7 @@ import com.cloud.network.element.VirtualRouterProviderVO;
 import com.cloud.network.element.VpcVirtualRouterElement;
 import com.cloud.network.guru.GuestNetworkGuru;
 import com.cloud.network.guru.NetworkGuru;
+import com.cloud.network.nsx.NsxService;
 import com.cloud.network.router.CommandSetupHelper;
 import com.cloud.network.router.NetworkHelper;
 import com.cloud.network.router.VirtualRouter;
@@ -225,6 +227,8 @@ import com.cloud.user.dao.UserDao;
 import com.cloud.utils.Journal;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.EntityManager;
@@ -6379,4 +6383,22 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
 
         _accountMgr.checkAccess(callingAccount, domainOfThePreviousOwner);
     }
+
+    @Override
+    public String getNicVlanValueForExternalVm(NicTO nic) {
+        Networks.BroadcastDomainType broadcastDomainType = Networks.BroadcastDomainType.getSchemeValue(nic.getBroadcastUri());
+        if (Networks.BroadcastDomainType.NSX.equals(broadcastDomainType)) {
+            NetworkVO networkVO = _networksDao.findById(nic.getNetworkId());
+            try {
+                NsxService nsxService = ComponentContext.getDelegateComponentOfType(NsxService.class);
+                return nsxService.getSegmentId(networkVO.getDomainId(), networkVO.getDataCenterId(),
+                        networkVO.getAccountId(), networkVO.getVpcId(), networkVO.getId());
+            } catch (NoSuchBeanDefinitionException e) {
+                logger.error("NSX service is not available, unable to retrieve segment ID for NIC: {}", nic, e);
+                throw new CloudRuntimeException(
+                        String.format("Unable to retrieve segment ID for NIC with NSX broadcast domain: %s", nic));
+            }
+        }
+        return Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
+    }
 }
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index 8884a5edb1f..463014c0b84 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -553,6 +553,10 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         if (template == null) {
             throw new InvalidParameterValueException("Unable to find template by id " + cmd.getTemplateId());
         }
+        if (HypervisorType.External.equals(template.getHypervisorType())) {
+            logger.error("Cannot create AutoScale Vm Profile with {} as it is an {} hypervisor template", template, HypervisorType.External);
+            throw new InvalidParameterValueException(String.format("Unable to create AutoScale Vm Profile with template: %s", template.getName()));
+        }
 
         // validations
         HashMap<String, String> deployParams = cmd.getDeployParamMap();
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
index b844d2b8958..f87e14c3561 100644
--- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -180,6 +180,9 @@ public class NetworkHelperImpl implements NetworkHelper {
     @Inject
     VpcManager vpcManager;
 
+    protected static final List<HypervisorType> HYPERVISOR_TYPES_NOT_SUPPORTING_DOMAIN_ROUTER = Arrays.asList(
+            HypervisorType.Ovm, HypervisorType.BareMetal, HypervisorType.External);
+
     protected final Map<HypervisorType, ConfigKey<String>> hypervisorsMap = new HashMap<>();
 
     @PostConstruct
@@ -666,8 +669,9 @@ public class NetworkHelperImpl implements NetworkHelper {
             hypervisors.add(defaults);
         }
         if (dest.getCluster() != null) {
-            if (dest.getCluster().getHypervisorType() == HypervisorType.Ovm) {
-                hypervisors.add(getClusterToStartDomainRouterForOvm(dest.getCluster().getPodId()));
+            HypervisorType destClusterHypType = dest.getCluster().getHypervisorType();
+            if (HYPERVISOR_TYPES_NOT_SUPPORTING_DOMAIN_ROUTER.contains(destClusterHypType)) {
+                hypervisors.add(getClusterToStartDomainRouterOtherThanProvidedType(dest.getCluster().getPodId()));
             } else {
                 hypervisors.add(dest.getCluster().getHypervisorType());
             }
@@ -692,10 +696,10 @@ public class NetworkHelperImpl implements NetworkHelper {
      * Ovm won't support any system. So we have to choose a partner cluster in
      * the same pod to start domain router for us
      */
-    protected HypervisorType getClusterToStartDomainRouterForOvm(final long podId) {
+    protected HypervisorType getClusterToStartDomainRouterOtherThanProvidedType(final long podId) {
         final List<ClusterVO> clusters = _clusterDao.listByPodId(podId);
         for (final ClusterVO cv : clusters) {
-            if (cv.getHypervisorType() == HypervisorType.Ovm || cv.getHypervisorType() == HypervisorType.BareMetal) {
+            if (HYPERVISOR_TYPES_NOT_SUPPORTING_DOMAIN_ROUTER.contains(cv.getHypervisorType())) {
                 continue;
             }
 
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index e63394ee445..a96097c84f1 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -345,6 +345,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
         hTypes.add(HypervisorType.LXC);
         hTypes.add(HypervisorType.Hyperv);
         hTypes.add(HypervisorType.Ovm3);
+        hTypes.add(HypervisorType.External);
     }
 
     private void checkVpcDns(VpcOffering vpcOffering, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2) {
diff --git a/server/src/main/java/com/cloud/resource/DiscovererBase.java b/server/src/main/java/com/cloud/resource/DiscovererBase.java
index e594a0a0aeb..43f31c8745d 100644
--- a/server/src/main/java/com/cloud/resource/DiscovererBase.java
+++ b/server/src/main/java/com/cloud/resource/DiscovererBase.java
@@ -16,6 +16,17 @@
 // under the License.
 package com.cloud.resource;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+
 import com.cloud.configuration.Config;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
@@ -25,15 +36,6 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.network.NetworkModel;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.net.UrlUtil;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 
 public abstract class DiscovererBase extends AdapterBase implements Discoverer {
     protected Map<String, String> _params;
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 7e140ecac1b..999b46e9f9f 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -38,11 +38,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.storage.ScopeType;
-import com.cloud.storage.StoragePoolAndAccessGroupMapVO;
-import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
-import com.cloud.storage.dao.StoragePoolTagsDao;
-import com.cloud.utils.StringUtils;
 import org.apache.cloudstack.alert.AlertService;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -62,15 +57,23 @@ import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
+import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
+import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.ArrayUtils;
-
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 import com.cloud.agent.AgentManager;
@@ -168,8 +171,10 @@ import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.GuestOSCategoryVO;
+import com.cloud.storage.ScopeType;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
+import com.cloud.storage.StoragePoolAndAccessGroupMapVO;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.StorageService;
@@ -177,11 +182,14 @@ import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.GuestOSCategoryDao;
+import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.StoragePoolTagsDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
+import com.cloud.utils.StringUtils;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.UriUtils;
 import com.cloud.utils.component.Manager;
@@ -314,6 +322,12 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     private AnnotationService annotationService;
     @Inject
     private VolumeDao volumeDao;
+    @Inject
+    ExtensionResourceMapDao extensionResourceMapDao;
+    @Inject
+    ExtensionsManager extensionsManager;
+    @Inject
+    ExtensionDao extensionDao;
 
     private final long _nodeId = ManagementServerNode.getManagementServerId();
 
@@ -429,6 +443,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         final String username = cmd.getUsername();
         final String password = cmd.getPassword();
         CPU.CPUArch arch = cmd.getArch();
+        final Long extensionId = cmd.getExtensionId();
+        final Map<String, String> externalDetails = cmd.getExternalDetails();
 
         if (url != null) {
             url = URLDecoder.decode(url, com.cloud.utils.StringUtils.getPreferredCharset());
@@ -487,6 +503,22 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             }
         }
 
+        if (!HypervisorType.External.equals(hypervisorType) && extensionId != null) {
+            throw new InvalidParameterValueException("Extension can be specified only for External hypervisor type");
+        }
+
+        ExtensionVO extension = null;
+        if (extensionId != null) {
+            extension = extensionDao.findById(extensionId);
+            if (extension == null || !Extension.Type.Orchestrator.equals(extension.getType())) {
+                throw new InvalidParameterValueException("Invalid extension specified");
+            }
+        }
+
+        if (MapUtils.isNotEmpty(externalDetails) && extension == null) {
+            throw new InvalidParameterValueException("External details can be specified only with extension");
+        }
+
         Cluster.ClusterType clusterType = null;
         if (cmd.getClusterType() != null && !cmd.getClusterType().isEmpty()) {
             clusterType = Cluster.ClusterType.valueOf(cmd.getClusterType());
@@ -552,9 +584,13 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
                 details.put("ovm3pool", allParams.get("ovm3pool"));
                 details.put("ovm3cluster", allParams.get("ovm3cluster"));
             }
+
             details.put(VmDetailConstants.CPU_OVER_COMMIT_RATIO, CapacityManager.CpuOverprovisioningFactor.value().toString());
             details.put(VmDetailConstants.MEMORY_OVER_COMMIT_RATIO, CapacityManager.MemOverprovisioningFactor.value().toString());
             _clusterDetailsDao.persist(cluster.getId(), details);
+            if (HypervisorType.External.equals(cluster.getHypervisorType()) && extension != null) {
+                extensionsManager.registerExtensionWithCluster(cluster, extension, externalDetails);
+            }
             return result;
         }
 
@@ -660,21 +696,27 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             }
         }
 
-        String hypervisorType = cmd.getHypervisor().equalsIgnoreCase(HypervisorGuru.HypervisorCustomDisplayName.value()) ?
+        String hypervisorType =
+                cmd.getHypervisor().equalsIgnoreCase(HypervisorGuru.HypervisorCustomDisplayName.value()) ?
                 "Custom" : cmd.getHypervisor();
-        return discoverHostsFull(dcId, podId, clusterId, clusterName, url, username, password, hypervisorType, hostTags, storageAccessGroups, cmd.getFullUrlParams(), false);
+        return discoverHostsFull(dcId, podId, clusterId, clusterName, url, username, password, hypervisorType,
+                hostTags, storageAccessGroups, cmd.getFullUrlParams(), false, cmd.getExternalDetails());
     }
 
     @Override
-    public List<? extends Host> discoverHosts(final AddSecondaryStorageCmd cmd) throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException {
+    public List<? extends Host> discoverHosts(final AddSecondaryStorageCmd cmd)
+            throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException {
         final Long dcId = cmd.getZoneId();
         final String url = cmd.getUrl();
-        return discoverHostsFull(dcId, null, null, null, url, null, null, "SecondaryStorage", null, null, null, false);
+        return discoverHostsFull(dcId, null, null, null, url, null, null, "SecondaryStorage",
+                null, null, null, false, null);
     }
 
-    private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long clusterId, final String clusterName, String url, String username, String password,
-                                           final String hypervisorType, final List<String> hostTags, List<String> storageAccessGroups, final Map<String, String> params, final boolean deferAgentCreation) throws IllegalArgumentException, DiscoveryException,
-            InvalidParameterValueException {
+    private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long clusterId, final String clusterName,
+               String url, String username, String password, final String hypervisorType, final List<String> hostTags,
+               List<String> storageAccessGroups, final Map<String, String> params, final boolean deferAgentCreation,
+               Map<String, String> cmdDetails)
+            throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException {
         URI uri;
 
         // Check if the zone exists in the system
@@ -795,25 +837,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
         }
 
-        try {
-            uri = new URI(UriUtils.encodeURIComponent(url));
-            if (uri.getScheme() == null) {
-                throw new InvalidParameterValueException("uri.scheme is null " + url + ", add nfs:// (or cifs://) as a prefix");
-            } else if (uri.getScheme().equalsIgnoreCase("nfs")) {
-                if (uri.getHost() == null || uri.getHost().equalsIgnoreCase("") || uri.getPath() == null || uri.getPath().equalsIgnoreCase("")) {
-                    throw new InvalidParameterValueException("Your host and/or path is wrong.  Make sure it's of the format nfs://hostname/path");
-                }
-            } else if (uri.getScheme().equalsIgnoreCase("cifs")) {
-                // Don't validate against a URI encoded URI.
-                final URI cifsUri = new URI(url);
-                final String warnMsg = UriUtils.getCifsUriParametersProblems(cifsUri);
-                if (warnMsg != null) {
-                    throw new InvalidParameterValueException(warnMsg);
-                }
-            }
-        } catch (final URISyntaxException e) {
-            throw new InvalidParameterValueException(url + " is not a valid uri");
-        }
+        uri = validatedHostUrl(url, hypervisorType);
 
         final List<HostVO> hosts = new ArrayList<>();
         logger.info("Trying to add a new host at {} in data center {}", url, zone);
@@ -878,10 +902,27 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
                     }
 
                     HostVO host;
+                    Map<String, String> details = entry.getValue();
+                    if (details == null) {
+                        details = new HashMap<>();
+                    }
+
+                    if (cmdDetails != null) {
+                        if (HypervisorType.External.toString().equalsIgnoreCase(hypervisorType)) {
+                            List<ClusterDetailsVO> clusterDetails = _clusterDetailsDao.listDetails(clusterId);
+                            if (clusterDetails != null) {
+                                for (ClusterDetailsVO detail : clusterDetails) {
+                                    details.put(detail.getName(), detail.getValue());
+                                }
+                            }
+                        }
+                        details.putAll(cmdDetails);
+                    }
+
                     if (deferAgentCreation) {
-                        host = (HostVO)createHostAndAgentDeferred(resource, entry.getValue(), true, hostTags, storageAccessGroups, false);
+                        host = (HostVO)createHostAndAgentDeferred(resource, details, true, hostTags, storageAccessGroups, false);
                     } else {
-                        host = (HostVO)createHostAndAgent(resource, entry.getValue(), true, hostTags, storageAccessGroups, false);
+                        host = (HostVO)createHostAndAgent(resource, details, true, hostTags, storageAccessGroups, false);
                     }
                     if (host != null) {
                         hosts.add(host);
@@ -903,6 +944,33 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         throw new DiscoveryException("Unable to add the host: " + errorMsg);
     }
 
+    @NotNull
+    private static URI validatedHostUrl(String url, String hostHypervisorType) {
+        URI uri;
+        try {
+            uri = new URI(UriUtils.encodeURIComponent(url));
+            if (uri.getScheme() == null) {
+                if (!HypervisorType.External.name().equalsIgnoreCase(hostHypervisorType)) {
+                    throw new InvalidParameterValueException("uri.scheme is null " + url + ", add nfs:// (or cifs://) as a prefix");
+                }
+            } else if (uri.getScheme().equalsIgnoreCase("nfs")) {
+                if (uri.getHost() == null || uri.getHost().equalsIgnoreCase("") || uri.getPath() == null || uri.getPath().equalsIgnoreCase("")) {
+                    throw new InvalidParameterValueException("Your host and/or path is wrong.  Make sure it's of the format nfs://hostname/path");
+                }
+            } else if (uri.getScheme().equalsIgnoreCase("cifs")) {
+                // Don't validate against a URI encoded URI.
+                final URI cifsUri = new URI(url);
+                final String warnMsg = UriUtils.getCifsUriParametersProblems(cifsUri);
+                if (warnMsg != null) {
+                    throw new InvalidParameterValueException(warnMsg);
+                }
+            }
+        } catch (final URISyntaxException e) {
+            throw new InvalidParameterValueException(url + " is not a valid uri");
+        }
+        return uri;
+    }
+
     @Override
     public Host getHost(final long hostId) {
         return _hostDao.findById(hostId);
@@ -1109,6 +1177,15 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
                         throw new CloudRuntimeException(String.format("Cluster: %s cannot be removed. Cluster still has storage pools", cluster));
                     }
 
+                    if (HypervisorType.External.toString().equalsIgnoreCase(cluster.getHypervisorType().toString())) {
+                        ExtensionResourceMapVO registeredExtension =
+                                extensionResourceMapDao.findByResourceIdAndType(cluster.getId(),
+                                        ExtensionResourceMap.ResourceType.Cluster);
+                        if (registeredExtension != null) {
+                            extensionsManager.unregisterExtensionWithCluster(cluster, registeredExtension.getExtensionId());
+                        }
+                    }
+
                     if (_clusterDao.remove(cmd.getId())) {
                         _capacityDao.removeBy(null, null, null, cluster.getId(), null);
                         // If this cluster is of type vmware, and if the nexus vswitch
@@ -2685,11 +2762,11 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     @Override
     public Host updateHost(final UpdateHostCmd cmd) throws NoTransitionException {
         return updateHost(cmd.getId(), cmd.getName(), cmd.getOsCategoryId(),
-                cmd.getAllocationState(), cmd.getUrl(), cmd.getHostTags(), cmd.getIsTagARule(), cmd.getAnnotation(), false);
+                cmd.getAllocationState(), cmd.getUrl(), cmd.getHostTags(), cmd.getIsTagARule(), cmd.getAnnotation(), false, cmd.getExternalDetails());
     }
 
     private Host updateHost(Long hostId, String name, Long guestOSCategoryId, String allocationState,
-                            String url, List<String> hostTags, Boolean isTagARule, String annotation, boolean isUpdateFromHostHealthCheck) throws NoTransitionException {
+                            String url, List<String> hostTags, Boolean isTagARule, String annotation, boolean isUpdateFromHostHealthCheck, Map<String, String> externalDetails) throws NoTransitionException {
         // Verify that the host exists
         final HostVO host = _hostDao.findById(hostId);
         if (host == null) {
@@ -2713,6 +2790,10 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             updateHostTags(host, hostId, hostTags, isTagARule);
         }
 
+        if (MapUtils.isNotEmpty(externalDetails)) {
+            _hostDetailsDao.replaceExternalDetails(hostId, externalDetails);
+        }
+
         if (url != null) {
             _storageMgr.updateSecondaryStorage(hostId, url);
         }
@@ -2769,7 +2850,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
     @Override
     public Host autoUpdateHostAllocationState(Long hostId, ResourceState.Event resourceEvent) throws NoTransitionException {
-        return updateHost(hostId, null, null, resourceEvent.toString(), null, null, null, null, true);
+        return updateHost(hostId, null, null, resourceEvent.toString(), null, null, null, null, true, null);
     }
 
     @Override
@@ -2820,7 +2901,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
         for (final ClusterVO cluster : clustersForZone) {
             final HypervisorType hType = cluster.getHypervisorType();
-            if (!forVirtualRouter || (hType != HypervisorType.BareMetal && hType != HypervisorType.Ovm)) {
+            if (!forVirtualRouter || (hType != HypervisorType.BareMetal && hType != HypervisorType.External && hType != HypervisorType.Ovm)) {
                 hypervisorTypes.add(hType);
             }
         }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 650028e1247..352783cdcc7 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -44,15 +44,6 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.cpu.CPU;
-import com.cloud.dc.VlanDetailsVO;
-import com.cloud.dc.dao.VlanDetailsDao;
-import com.cloud.network.dao.NetrisProviderDao;
-import com.cloud.network.dao.NsxProviderDao;
-
-import com.cloud.utils.security.CertificateHelper;
-import com.cloud.api.query.dao.ManagementServerJoinDao;
-import com.cloud.api.query.vo.ManagementServerJoinVO;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@@ -646,6 +637,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDao;
 import org.apache.cloudstack.framework.config.impl.ConfigurationGroupVO;
 import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO;
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.management.ManagementServerHost;
@@ -689,7 +681,9 @@ import com.cloud.alert.AlertManager;
 import com.cloud.alert.AlertVO;
 import com.cloud.alert.dao.AlertDao;
 import com.cloud.api.ApiDBUtils;
+import com.cloud.api.query.dao.ManagementServerJoinDao;
 import com.cloud.api.query.dao.StoragePoolJoinDao;
+import com.cloud.api.query.vo.ManagementServerJoinVO;
 import com.cloud.api.query.vo.StoragePoolJoinVO;
 import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityVO;
@@ -700,6 +694,7 @@ import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManagerImpl;
 import com.cloud.consoleproxy.ConsoleProxyManagementState;
 import com.cloud.consoleproxy.ConsoleProxyManager;
+import com.cloud.cpu.CPU;
 import com.cloud.dc.AccountVlanMapVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
@@ -709,6 +704,7 @@ import com.cloud.dc.Pod;
 import com.cloud.dc.PodVlanMapVO;
 import com.cloud.dc.Vlan;
 import com.cloud.dc.Vlan.VlanType;
+import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
 import com.cloud.dc.dao.AccountVlanMapDao;
 import com.cloud.dc.dao.ClusterDao;
@@ -717,6 +713,7 @@ import com.cloud.dc.dao.DomainVlanMapDao;
 import com.cloud.dc.dao.HostPodDao;
 import com.cloud.dc.dao.PodVlanMapDao;
 import com.cloud.dc.dao.VlanDao;
+import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
@@ -764,12 +761,14 @@ import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.LoadBalancerVO;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkAccountDao;
 import com.cloud.network.dao.NetworkAccountVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
 import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PublicIpQuarantineDao;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.org.Cluster;
@@ -846,6 +845,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.MacAddress;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.utils.security.CertificateHelper;
 import com.cloud.utils.ssh.SSHKeysHelper;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.DiskProfile;
@@ -853,9 +853,9 @@ import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.InstanceGroupVO;
 import com.cloud.vm.NicVO;
 import com.cloud.vm.SecondaryStorageVmVO;
-import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
@@ -868,8 +868,8 @@ import com.cloud.vm.dao.InstanceGroupDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 public class ManagementServerImpl extends ManagerBase implements ManagementServer, Configurable {
     protected StateMachine2<State, VirtualMachine.Event, VirtualMachine> _stateMachine;
@@ -1059,6 +1059,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     NsxProviderDao nsxProviderDao;
     @Inject
     NetrisProviderDao netrisProviderDao;
+    @Inject
+    ExtensionsManager extensionsManager;
 
     private LockControllerListener _lockControllerListener;
     private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker"));
@@ -4655,6 +4657,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         final Map<String, Object> capabilities = new HashMap<>();
 
         final Account caller = getCaller();
+        final boolean isCallerAdmin = _accountService.isAdmin(caller.getId());
         boolean securityGroupsEnabled = false;
         boolean elasticLoadBalancerEnabled = false;
         boolean KVMSnapshotEnabled = false;
@@ -4683,10 +4686,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         final Integer apiLimitInterval = Integer.valueOf(_configDao.getValue(Config.ApiLimitInterval.key()));
         final Integer apiLimitMax = Integer.valueOf(_configDao.getValue(Config.ApiLimitMax.key()));
 
-        final boolean allowUserViewDestroyedVM = (QueryService.AllowUserViewDestroyedVM.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
-        final boolean allowUserExpungeRecoverVM = (UserVmManager.AllowUserExpungeRecoverVm.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
-        final boolean allowUserExpungeRecoverVolume = (VolumeApiServiceImpl.AllowUserExpungeRecoverVolume.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
-        final boolean allowUserForceStopVM = (UserVmManager.AllowUserForceStopVm.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
+        final boolean allowUserViewDestroyedVM = (QueryService.AllowUserViewDestroyedVM.valueIn(caller.getId()) | isCallerAdmin);
+        final boolean allowUserExpungeRecoverVM = (UserVmManager.AllowUserExpungeRecoverVm.valueIn(caller.getId()) | isCallerAdmin);
+        final boolean allowUserExpungeRecoverVolume = (VolumeApiServiceImpl.AllowUserExpungeRecoverVolume.valueIn(caller.getId()) | isCallerAdmin);
+        final boolean allowUserForceStopVM = (UserVmManager.AllowUserForceStopVm.valueIn(caller.getId()) | isCallerAdmin);
 
         final boolean allowUserViewAllDomainAccounts = (QueryService.AllowUserViewAllDomainAccounts.valueIn(caller.getDomainId()));
 
@@ -4735,6 +4738,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         }
         capabilities.put(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT, fsVmMinCpu);
         capabilities.put(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE, fsVmMinRam);
+        if (isCallerAdmin) {
+            capabilities.put(ApiConstants.EXTENSIONS_PATH, extensionsManager.getExtensionsPath());
+        }
 
         return capabilities;
     }
diff --git a/server/src/main/java/com/cloud/storage/TemplateProfile.java b/server/src/main/java/com/cloud/storage/TemplateProfile.java
index c2a3c506221..ef4cf30ac73 100644
--- a/server/src/main/java/com/cloud/storage/TemplateProfile.java
+++ b/server/src/main/java/com/cloud/storage/TemplateProfile.java
@@ -57,6 +57,7 @@ public class TemplateProfile {
     Boolean deployAsIs;
     Boolean forCks;
     Long size;
+    Long extensionId;
 
     public TemplateProfile(Long templateId, Long userId, String name, String displayText, CPU.CPUArch arch, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url,
                            Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, List<Long> zoneIdList, HypervisorType hypervisorType,
@@ -100,7 +101,7 @@ public class TemplateProfile {
                            Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, List<Long> zoneId,
 
                            HypervisorType hypervisorType, String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, String templateTag, Map details,
-                           Boolean sshKeyEnabled, Long imageStoreId, Boolean isDynamicallyScalable, TemplateType templateType, Boolean directDownload, Boolean deployAsIs) {
+                           Boolean sshKeyEnabled, Long imageStoreId, Boolean isDynamicallyScalable, TemplateType templateType, Boolean directDownload, Boolean deployAsIs, Long extensionId) {
         this(templateId,
             userId,
             name,
@@ -129,6 +130,7 @@ public class TemplateProfile {
         this.templateType = templateType;
         this.directDownload = directDownload;
         this.deployAsIs = deployAsIs;
+        this.extensionId = extensionId;
     }
 
     public Long getTemplateId() {
@@ -354,4 +356,11 @@ public class TemplateProfile {
     public CPU.CPUArch getArch() {
         return arch;
     }
+    public Long getExtensionId() {
+        return extensionId;
+    }
+
+    public void setExtensionId(Long extensionId) {
+        this.extensionId = extensionId;
+    }
 }
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index baf75925a02..a79ba15f740 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -2633,6 +2633,13 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
         checkDeviceId(deviceId, volumeToAttach, vm);
 
+        HypervisorType rootDiskHyperType = vm.getHypervisorType();
+        HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
+
+        if (HypervisorType.External.equals(rootDiskHyperType)) {
+            throw new InvalidParameterValueException("Volume operations are not allowed for External hypervisor type");
+        }
+
         checkNumberOfAttachedVolumes(deviceId, vm);
 
         excludeLocalStorageIfNeeded(volumeToAttach);
@@ -2641,9 +2648,6 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
         checkRightsToAttach(caller, volumeToAttach, vm);
 
-        HypervisorType rootDiskHyperType = vm.getHypervisorType();
-        HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
-
         StoragePoolVO volumeToAttachStoragePool = _storagePoolDao.findById(volumeToAttach.getPoolId());
         if (logger.isTraceEnabled() && volumeToAttachStoragePool != null) {
             logger.trace("volume to attach {} has a primary storage assigned to begin with {}",
@@ -3342,6 +3346,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             throw new InvalidParameterValueException("Volume " + vol + " is already on the destination storage pool");
         }
 
+        HypervisorType hypervisorType = _volsDao.getHypervisorType(volumeId);
+        if (HypervisorType.External.equals(hypervisorType)) {
+            throw new InvalidParameterValueException("Volume migration operation is not allowed for hypervisor type External");
+        }
+
         boolean liveMigrateVolume = false;
         boolean srcAndDestOnStorPool = false;
         Long instanceId = vol.getInstanceId();
@@ -3456,7 +3465,6 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             throw new CloudRuntimeException("Storage pool " + destPool.getName() + " is not suitable to migrate volume " + vol.getName());
         }
 
-        HypervisorType hypervisorType = _volsDao.getHypervisorType(volumeId);
         DiskProfile diskProfile = new DiskProfile(vol, diskOffering, hypervisorType);
         Pair<Volume, DiskProfile> volumeDiskProfilePair = new Pair<>(vol, diskProfile);
         if (!storageMgr.storagePoolHasEnoughSpace(Collections.singletonList(volumeDiskProfilePair), destPool)) {
@@ -3818,6 +3826,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         if (volume == null) {
             throw new InvalidParameterValueException("Creating snapshot failed due to volume:" + volumeId + " doesn't exist");
         }
+        if (HypervisorType.External.equals(volume.getHypervisorType())) {
+            throw new InvalidParameterValueException("Snapshot operations are not allowed for External hypervisor type");
+        }
         if (policyId != null && policyId > 0) {
             if (CollectionUtils.isNotEmpty(zoneIds)) {
                 throw new InvalidParameterValueException(String.format("%s can not be specified for snapshots linked with snapshot policy", ApiConstants.ZONE_ID_LIST));
@@ -4600,7 +4611,12 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         String errorMsg = "Failed to attach volume " + volumeToAttach.getName() + " to VM " + vm.getHostName();
         boolean sendCommand = vm.getState() == State.Running;
         AttachAnswer answer = null;
+        HypervisorType rootDiskHyperType = vm.getHypervisorType();
         StoragePoolVO volumeToAttachStoragePool = _storagePoolDao.findById(volumeToAttach.getPoolId());
+        if (HypervisorType.External.equals(rootDiskHyperType)) {
+            throw new InvalidParameterValueException("Volume operations are not allowed for External hypervisor type");
+        }
+
         if (logger.isTraceEnabled() && volumeToAttachStoragePool != null) {
             logger.trace("storage is gotten from volume to attach: {}", volumeToAttachStoragePool);
         }
diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
index d50d9e71df3..2d5920eb919 100644
--- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
@@ -28,9 +28,6 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import com.cloud.domain.Domain;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.agent.directdownload.CheckUrlAnswer;
 import org.apache.cloudstack.agent.directdownload.CheckUrlCommand;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -44,13 +41,8 @@ import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplat
 import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.direct.download.DirectDownloadManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
-import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult;
@@ -61,11 +53,9 @@ import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.framework.async.AsyncRpcContext;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.PublishScope;
-import org.apache.cloudstack.secstorage.heuristics.HeuristicType;
 import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-import org.apache.cloudstack.storage.heuristics.HeuristicRuleHelper;
 import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
 import org.apache.cloudstack.utils.security.DigestHelper;
 import org.apache.commons.collections.CollectionUtils;
@@ -73,7 +63,6 @@ import org.apache.commons.collections.CollectionUtils;
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.alert.AlertManager;
-import com.cloud.configuration.Config;
 import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
@@ -84,9 +73,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor;
-import com.cloud.org.Grouping;
 import com.cloud.resource.ResourceManager;
-import com.cloud.server.StatsCollector;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Storage.TemplateType;
@@ -109,6 +96,8 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
 import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
 
 public class HypervisorTemplateAdapter extends TemplateAdapterBase {
     @Inject
@@ -116,24 +105,16 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
     @Inject
     AgentManager _agentMgr;
     @Inject
-    StatsCollector _statsCollector;
-    @Inject
     TemplateDataStoreDao templateDataStoreDao;
     @Inject
-    DataStoreManager storeMgr;
-    @Inject
     TemplateService imageService;
     @Inject
-    TemplateDataFactory imageFactory;
-    @Inject
     TemplateManager templateMgr;
     @Inject
     AlertManager alertMgr;
     @Inject
     VMTemplateZoneDao templateZoneDao;
     @Inject
-    EndPointSelector _epSelector;
-    @Inject
     DataCenterDao _dcDao;
     @Inject
     MessageBus _messageBus;
@@ -148,8 +129,6 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
     @Inject
     private AnnotationDao annotationDao;
     @Inject
-    private HeuristicRuleHelper heuristicRuleHelper;
-    @Inject
     VMInstanceDao _vmInstanceDao;
 
     @Override
@@ -320,24 +299,6 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
         }
     }
 
-    protected List<DataStore> getImageStoresThrowsExceptionIfNotFound(long zoneId, TemplateProfile profile) {
-        List<DataStore> imageStores = storeMgr.getImageStoresByZoneIds(zoneId);
-        if (imageStores == null || imageStores.size() == 0) {
-            throw new CloudRuntimeException(String.format("Unable to find image store to download the template [%s].", profile.getTemplate()));
-        }
-        return imageStores;
-    }
-
-    protected DataStore verifyHeuristicRulesForZone(VMTemplateVO template, Long zoneId) {
-        HeuristicType heuristicType;
-        if (ImageFormat.ISO.equals(template.getFormat())) {
-            heuristicType = HeuristicType.ISO;
-        } else {
-            heuristicType = HeuristicType.TEMPLATE;
-        }
-        return heuristicRuleHelper.getImageStoreIfThereIsHeuristicRule(zoneId, heuristicType, template);
-    }
-
     protected void standardImageStoreAllocation(List<DataStore> imageStores, VMTemplateVO template) {
         Set<Long> zoneSet = new HashSet<Long>();
         Collections.shuffle(imageStores);
@@ -361,44 +322,6 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
         }
     }
 
-    protected boolean isZoneAndImageStoreAvailable(DataStore imageStore, Long zoneId, Set<Long> zoneSet, boolean isTemplatePrivate) {
-        if (zoneId == null) {
-            logger.warn(String.format("Zone ID is null, cannot allocate ISO/template in image store [%s].", imageStore));
-            return false;
-        }
-
-        DataCenterVO zone = _dcDao.findById(zoneId);
-        if (zone == null) {
-            logger.warn("Unable to find zone by id [{}], so skip downloading template to its image store [{}].", zoneId, imageStore);
-            return false;
-        }
-
-        if (Grouping.AllocationState.Disabled == zone.getAllocationState()) {
-            logger.info("Zone [{}] is disabled. Skip downloading template to its image store [{}].", zone, imageStore);
-            return false;
-        }
-
-        if (!_statsCollector.imageStoreHasEnoughCapacity(imageStore)) {
-            logger.info("Image store doesn't have enough capacity. Skip downloading template to this image store [{}].", imageStore);
-            return false;
-        }
-
-        if (zoneSet == null) {
-            logger.info(String.format("Zone set is null; therefore, the ISO/template should be allocated in every secondary storage of zone [%s].", zone));
-            return true;
-        }
-
-        if (isTemplatePrivate && zoneSet.contains(zoneId)) {
-            logger.info(String.format("The template is private and it is already allocated in a secondary storage in zone [%s]; therefore, image store [%s] will be skipped.",
-                    zone, imageStore));
-            return false;
-        }
-
-        logger.info(String.format("Private template will be allocated in image store [%s] in zone [%s].", imageStore, zone));
-        zoneSet.add(zoneId);
-        return true;
-    }
-
     @Override
     public List<TemplateOrVolumePostUploadCommand> createTemplateForPostUpload(final TemplateProfile profile) {
         // persist entry in vm_template, vm_template_details and template_zone_ref tables, not that entry at template_store_ref is not created here, and created in createTemplateAsync.
@@ -452,61 +375,6 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
         });
     }
 
-    /**
-     * If the template/ISO is marked as private, then it is allocated to a random secondary storage; otherwise, allocates to every storage pool in every zone given by the
-     * {@link TemplateProfile#getZoneIdList()}.
-     */
-    private void postUploadAllocation(List<DataStore> imageStores, VMTemplateVO template, List<TemplateOrVolumePostUploadCommand> payloads) {
-        Set<Long> zoneSet = new HashSet<>();
-        Collections.shuffle(imageStores);
-        for (DataStore imageStore : imageStores) {
-            Long zoneId_is = imageStore.getScope().getScopeId();
-
-            if (!isZoneAndImageStoreAvailable(imageStore, zoneId_is, zoneSet, isPrivateTemplate(template))) {
-                continue;
-            }
-
-            TemplateInfo tmpl = imageFactory.getTemplate(template.getId(), imageStore);
-
-            // persist template_store_ref entry
-            DataObject templateOnStore = imageStore.create(tmpl);
-
-            // update template_store_ref and template state
-            EndPoint ep = _epSelector.select(templateOnStore);
-            if (ep == null) {
-                String errMsg = String.format("There is no secondary storage VM for downloading template to image store %s", imageStore);
-                logger.warn(errMsg);
-                throw new CloudRuntimeException(errMsg);
-            }
-
-            TemplateOrVolumePostUploadCommand payload = new TemplateOrVolumePostUploadCommand(template.getId(), template.getUuid(), tmpl.getInstallPath(), tmpl
-                    .getChecksum(), tmpl.getType().toString(), template.getUniqueName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(),
-                    templateOnStore.getDataStore().getRole().toString());
-            //using the existing max template size configuration
-            payload.setMaxUploadSize(_configDao.getValue(Config.MaxTemplateAndIsoSize.key()));
-
-            Long accountId = template.getAccountId();
-            Account account = _accountDao.findById(accountId);
-            Domain domain = _domainDao.findById(account.getDomainId());
-
-            payload.setDefaultMaxSecondaryStorageInGB(_resourceLimitMgr.findCorrectResourceLimitForAccountAndDomain(account, domain, ResourceType.secondary_storage, null));
-            payload.setAccountId(accountId);
-            payload.setRemoteEndPoint(ep.getPublicAddr());
-            payload.setRequiresHvm(template.requiresHvm());
-            payload.setDescription(template.getDisplayText());
-            payloads.add(payload);
-        }
-    }
-
-    private boolean isPrivateTemplate(VMTemplateVO template){
-
-        // if public OR featured OR system template
-        if(template.isPublicTemplate() || template.isFeatured() || template.getTemplateType() == TemplateType.SYSTEM)
-            return false;
-        else
-            return true;
-    }
-
     private class CreateTemplateContext<T> extends AsyncRpcContext<T> {
         final TemplateInfo template;
 
diff --git a/server/src/main/java/com/cloud/template/TemplateAdapter.java b/server/src/main/java/com/cloud/template/TemplateAdapter.java
index 32a8db515aa..bdd386553f9 100644
--- a/server/src/main/java/com/cloud/template/TemplateAdapter.java
+++ b/server/src/main/java/com/cloud/template/TemplateAdapter.java
@@ -43,6 +43,7 @@ public interface TemplateAdapter extends Adapter {
 
         public static final TemplateAdapterType Hypervisor = new TemplateAdapterType("HypervisorAdapter");
         public static final TemplateAdapterType BareMetal = new TemplateAdapterType("BareMetalAdapter");
+        public static final TemplateAdapterType External = new TemplateAdapterType("ExternalAdapter");
 
         public TemplateAdapterType(String name) {
             _name = name;
@@ -75,10 +76,10 @@ public interface TemplateAdapter extends Adapter {
 
     TemplateProfile prepare(boolean isIso, Long userId, String name, String displayText, CPU.CPUArch arch, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, Boolean isPublic,
                             Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneId, HypervisorType hypervisorType, String accountName, Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload,
-                            boolean deployAsIs) throws ResourceAllocationException;
+                            boolean deployAsIs, Long extensionId) throws ResourceAllocationException;
 
     TemplateProfile prepare(boolean isIso, long userId, String name, String displayText, CPU.CPUArch arch, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url, Boolean isPublic,
                             Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneId, HypervisorType hypervisorType, String chksum, Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshKeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable,
-                            TemplateType templateType, boolean directDownload, boolean deployAsIs, boolean forCks) throws ResourceAllocationException;
+                            TemplateType templateType, boolean directDownload, boolean deployAsIs, boolean forCks, Long extensionId) throws ResourceAllocationException;
 
 }
diff --git a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
index 1b2031dcfad..75c63aebe0d 100644
--- a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
@@ -18,42 +18,52 @@ package com.cloud.template;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import javax.inject.Inject;
 
-import com.cloud.cpu.CPU;
-import com.cloud.deployasis.DeployAsIsConstants;
-import com.cloud.storage.upload.params.IsoUploadParams;
-import com.cloud.storage.upload.params.TemplateUploadParams;
-import com.cloud.storage.upload.params.UploadParams;
-import com.cloud.vm.VmDetailConstants;
-import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd;
-import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.BooleanUtils;
-
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd;
 import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
 import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
 import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
 import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.secstorage.heuristics.HeuristicType;
+import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
 import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
+import org.apache.cloudstack.storage.heuristics.HeuristicRuleHelper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.Resource.ResourceType;
+import com.cloud.cpu.CPU;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deployasis.DeployAsIsConstants;
+import com.cloud.domain.Domain;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.event.dao.UsageEventDao;
 import com.cloud.exception.InvalidParameterValueException;
@@ -65,6 +75,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.org.Grouping;
 import com.cloud.projects.ProjectManager;
 import com.cloud.server.ConfigurationServer;
+import com.cloud.server.StatsCollector;
 import com.cloud.storage.GuestOS;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Storage.TemplateType;
@@ -73,6 +84,9 @@ import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.dao.GuestOSHypervisorDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
+import com.cloud.storage.upload.params.IsoUploadParams;
+import com.cloud.storage.upload.params.TemplateUploadParams;
+import com.cloud.storage.upload.params.UploadParams;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.ResourceLimitService;
@@ -83,8 +97,8 @@ import com.cloud.utils.EnumUtils;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.UserVmDao;
-import org.apache.commons.lang3.StringUtils;
 
 public abstract class TemplateAdapterBase extends AdapterBase implements TemplateAdapter {
     protected @Inject
@@ -118,13 +132,134 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
     protected @Inject
     ImageStoreDao _imgStoreDao;
     @Inject
-    TemplateManager templateMgr;
+    protected TemplateManager templateMgr;
     @Inject
     ConfigurationServer _configServer;
     @Inject
     ProjectManager _projectMgr;
     @Inject
     private TemplateDataStoreDao templateDataStoreDao;
+    @Inject
+    DataStoreManager storeMgr;
+    @Inject
+    HeuristicRuleHelper heuristicRuleHelper;
+    @Inject
+    TemplateDataFactory imageFactory;
+    @Inject
+    EndPointSelector _epSelector;
+    @Inject
+    StatsCollector _statsCollector;
+
+    protected List<DataStore> getImageStoresThrowsExceptionIfNotFound(long zoneId, TemplateProfile profile) {
+        List<DataStore> imageStores = storeMgr.getImageStoresByZoneIds(zoneId);
+        if (CollectionUtils.isEmpty(imageStores)) {
+            throw new CloudRuntimeException(String.format("Unable to find image store to download the template [%s].", profile.getTemplate()));
+        }
+        return imageStores;
+    }
+
+    protected DataStore verifyHeuristicRulesForZone(VMTemplateVO template, Long zoneId) {
+        HeuristicType heuristicType;
+        if (ImageFormat.ISO.equals(template.getFormat())) {
+            heuristicType = HeuristicType.ISO;
+        } else {
+            heuristicType = HeuristicType.TEMPLATE;
+        }
+        return heuristicRuleHelper.getImageStoreIfThereIsHeuristicRule(zoneId, heuristicType, template);
+    }
+
+    protected boolean isZoneAndImageStoreAvailable(DataStore imageStore, Long zoneId, Set<Long> zoneSet, boolean isTemplatePrivate) {
+        if (zoneId == null) {
+            logger.warn(String.format("Zone ID is null, cannot allocate ISO/template in image store [%s].", imageStore));
+            return false;
+        }
+
+        DataCenterVO zone = _dcDao.findById(zoneId);
+        if (zone == null) {
+            logger.warn("Unable to find zone by id [{}], so skip downloading template to its image store [{}].", zoneId, imageStore);
+            return false;
+        }
+
+        if (Grouping.AllocationState.Disabled == zone.getAllocationState()) {
+            logger.info("Zone [{}] is disabled. Skip downloading template to its image store [{}].", zone, imageStore);
+            return false;
+        }
+
+        if (!_statsCollector.imageStoreHasEnoughCapacity(imageStore)) {
+            logger.info("Image store doesn't have enough capacity. Skip downloading template to this image store [{}].", imageStore);
+            return false;
+        }
+
+        if (zoneSet == null) {
+            logger.info(String.format("Zone set is null; therefore, the ISO/template should be allocated in every secondary storage of zone [%s].", zone));
+            return true;
+        }
+
+        if (isTemplatePrivate && zoneSet.contains(zoneId)) {
+            logger.info(String.format("The template is private and it is already allocated in a secondary storage in zone [%s]; therefore, image store [%s] will be skipped.",
+                    zone, imageStore));
+            return false;
+        }
+
+        logger.info(String.format("Private template will be allocated in image store [%s] in zone [%s].", imageStore, zone));
+        zoneSet.add(zoneId);
+        return true;
+    }
+
+    /**
+     * If the template/ISO is marked as private, then it is allocated to a random secondary storage; otherwise, allocates to every storage pool in every zone given by the
+     * {@link TemplateProfile#getZoneIdList()}.
+     */
+    protected void postUploadAllocation(List<DataStore> imageStores, VMTemplateVO template, List<TemplateOrVolumePostUploadCommand> payloads) {
+        Set<Long> zoneSet = new HashSet<>();
+        Collections.shuffle(imageStores);
+        for (DataStore imageStore : imageStores) {
+            Long zoneId_is = imageStore.getScope().getScopeId();
+
+            if (!isZoneAndImageStoreAvailable(imageStore, zoneId_is, zoneSet, isPrivateTemplate(template))) {
+                continue;
+            }
+
+            TemplateInfo tmpl = imageFactory.getTemplate(template.getId(), imageStore);
+
+            // persist template_store_ref entry
+            DataObject templateOnStore = imageStore.create(tmpl);
+
+            // update template_store_ref and template state
+            EndPoint ep = _epSelector.select(templateOnStore);
+            if (ep == null) {
+                String errMsg = String.format("There is no secondary storage VM for downloading template to image store %s", imageStore);
+                logger.warn(errMsg);
+                throw new CloudRuntimeException(errMsg);
+            }
+
+            TemplateOrVolumePostUploadCommand payload = new TemplateOrVolumePostUploadCommand(template.getId(), template.getUuid(), tmpl.getInstallPath(), tmpl
+                    .getChecksum(), tmpl.getType().toString(), template.getUniqueName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(),
+                    templateOnStore.getDataStore().getRole().toString());
+            //using the existing max template size configuration
+            payload.setMaxUploadSize(_configDao.getValue(Config.MaxTemplateAndIsoSize.key()));
+
+            Long accountId = template.getAccountId();
+            Account account = _accountDao.findById(accountId);
+            Domain domain = _domainDao.findById(account.getDomainId());
+
+            payload.setDefaultMaxSecondaryStorageInGB(_resourceLimitMgr.findCorrectResourceLimitForAccountAndDomain(account, domain, ResourceType.secondary_storage, null));
+            payload.setAccountId(accountId);
+            payload.setRemoteEndPoint(ep.getPublicAddr());
+            payload.setRequiresHvm(template.requiresHvm());
+            payload.setDescription(template.getDisplayText());
+            payloads.add(payload);
+        }
+    }
+
+    protected boolean isPrivateTemplate(VMTemplateVO template){
+        // if public OR featured OR system template
+        if (template.isPublicTemplate() || template.isFeatured() || template.getTemplateType() == TemplateType.SYSTEM) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 
     @Override
     public boolean stop() {
@@ -134,16 +269,16 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
     @Override
     public TemplateProfile prepare(boolean isIso, Long userId, String name, String displayText, CPU.CPUArch arch, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url,
                                    Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneId, HypervisorType hypervisorType, String accountName,
-                                   Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload, boolean deployAsIs) throws ResourceAllocationException {
+                                   Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload, boolean deployAsIs, Long extensionId) throws ResourceAllocationException {
         return prepare(isIso, userId, name, displayText, arch, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, format, guestOSId, zoneId,
-            hypervisorType, chksum, bootable, null, null, details, false, null, false, TemplateType.USER, directDownload, deployAsIs, false);
+            hypervisorType, chksum, bootable, null, null, details, false, null, false, TemplateType.USER, directDownload, deployAsIs, false, extensionId);
     }
 
     @Override
     public TemplateProfile prepare(boolean isIso, long userId, String name, String displayText, CPU.CPUArch arch, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url,
                                    Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneIdList, HypervisorType hypervisorType, String chksum,
                                    Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshkeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable,
-                                   TemplateType templateType, boolean directDownload, boolean deployAsIs, boolean forCks) throws ResourceAllocationException {
+                                   TemplateType templateType, boolean directDownload, boolean deployAsIs, boolean forCks, Long extensionId) throws ResourceAllocationException {
         //Long accountId = null;
         // parameters verification
 
@@ -271,7 +406,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
         CallContext.current().setEventDetails("Id: " + id + " name: " + name);
         TemplateProfile profile = new TemplateProfile(id, userId, name, displayText, arch, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, imgfmt, guestOSId, zoneIdList,
             hypervisorType, templateOwner.getAccountName(), templateOwner.getDomainId(), templateOwner.getAccountId(), chksum, bootable, templateTag, details,
-            sshkeyEnabled, null, isDynamicallyScalable, templateType, directDownload, deployAsIs);
+            sshkeyEnabled, null, isDynamicallyScalable, templateType, directDownload, deployAsIs, extensionId);
         profile.setForCks(forCks);
         return profile;
 
@@ -284,16 +419,6 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
         Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
         _accountMgr.checkAccess(caller, null, true, owner);
 
-        TemplateType templateType = templateMgr.validateTemplateType(cmd, _accountMgr.isAdmin(caller.getAccountId()),
-                CollectionUtils.isEmpty(cmd.getZoneIds()));
-
-        List<Long> zoneId = cmd.getZoneIds();
-        // ignore passed zoneId if we are using region wide image store
-        List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
-        if (stores != null && stores.size() > 0) {
-            zoneId = null;
-        }
-
         HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
         if(hypervisorType == HypervisorType.None) {
             throw new InvalidParameterValueException(String.format(
@@ -302,6 +427,16 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
                     StringUtils.join(Arrays.stream(HypervisorType.values()).filter(h -> h != HypervisorType.None).map(HypervisorType::name).toArray(), ", ")));
         }
 
+        TemplateType templateType = templateMgr.validateTemplateType(cmd, _accountMgr.isAdmin(caller.getAccountId()),
+                CollectionUtils.isEmpty(cmd.getZoneIds()), hypervisorType);
+
+        List<Long> zoneId = cmd.getZoneIds();
+        // ignore passed zoneId if we are using region wide image store
+        List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
+        if (stores != null && stores.size() > 0) {
+            zoneId = null;
+        }
+
         Map details = cmd.getDetails();
         if (cmd.isDeployAsIs()) {
             if (MapUtils.isNotEmpty(details)) {
@@ -315,10 +450,19 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
                 }
             }
         }
+
+        if (HypervisorType.External.equals(hypervisorType) && MapUtils.isNotEmpty(cmd.getExternalDetails())) {
+            if (details != null) {
+                details.putAll(cmd.getExternalDetails());
+            } else {
+                details = cmd.getExternalDetails();
+            }
+        }
+
         return prepare(false, CallContext.current().getCallingUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getArch(), cmd.getBits(), cmd.isPasswordEnabled(), cmd.getRequiresHvm(),
                 cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneId, hypervisorType, cmd.getChecksum(), true,
                 cmd.getTemplateTag(), owner, details, cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), templateType,
-                cmd.isDirectDownload(), cmd.isDeployAsIs(), cmd.isForCks());
+                cmd.isDirectDownload(), cmd.isDeployAsIs(), cmd.isForCks(), cmd.getExtensionId());
 
     }
 
@@ -351,7 +495,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
                 params.isExtractable(), params.getFormat(), params.getGuestOSId(), zoneList,
                 params.getHypervisorType(), params.getChecksum(), params.isBootable(), params.getTemplateTag(), owner,
                 params.getDetails(), params.isSshKeyEnabled(), params.getImageStoreUuid(),
-                params.isDynamicallyScalable(), params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER, params.isDirectDownload(), params.isDeployAsIs(), false);
+                params.isDynamicallyScalable(), params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER, params.isDirectDownload(), params.isDeployAsIs(), false, null);
     }
 
     private Long getDefaultDeployAsIsGuestOsId() {
@@ -403,7 +547,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
 
         return prepare(true, CallContext.current().getCallingUserId(), cmd.getIsoName(), cmd.getDisplayText(), cmd.getArch(), 64, cmd.isPasswordEnabled(), true, cmd.getUrl(), cmd.isPublic(),
             cmd.isFeatured(), cmd.isExtractable(), ImageFormat.ISO.toString(), cmd.getOsTypeId(), zoneList, HypervisorType.None, cmd.getChecksum(), cmd.isBootable(), null,
-            owner, null, false, cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER, cmd.isDirectDownload(), false, false);
+            owner, null, false, cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER, cmd.isDirectDownload(), false, false, null);
     }
 
     protected VMTemplateVO persistTemplate(TemplateProfile profile, VirtualMachineTemplate.State initialState) {
@@ -412,7 +556,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
             new VMTemplateVO(profile.getTemplateId(), profile.getName(), profile.getFormat(), profile.isPublic(), profile.isFeatured(), profile.isExtractable(),
                 profile.getTemplateType(), profile.getUrl(), profile.isRequiresHVM(), profile.getBits(), profile.getAccountId(), profile.getCheckSum(),
                 profile.getDisplayText(), profile.isPasswordEnabled(), profile.getGuestOsId(), profile.isBootable(), profile.getHypervisorType(),
-                profile.getTemplateTag(), profile.getDetails(), profile.isSshKeyEnabled(), profile.IsDynamicallyScalable(), profile.isDirectDownload(), profile.isDeployAsIs(), profile.getArch());
+                profile.getTemplateTag(), profile.getDetails(), profile.isSshKeyEnabled(), profile.IsDynamicallyScalable(), profile.isDirectDownload(), profile.isDeployAsIs(), profile.getArch(), profile.getExtensionId());
         template.setState(initialState);
         template.setForCks(profile.isForCks());
 
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index d8e90cd3d05..d041ac19430 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -34,9 +34,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.cpu.CPU;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.storage.snapshot.SnapshotManager;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
@@ -129,6 +126,7 @@ import com.cloud.api.query.dao.UserVmJoinDao;
 import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.Resource.ResourceType;
+import com.cloud.cpu.CPU;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
@@ -184,6 +182,7 @@ import com.cloud.storage.dao.VMTemplateDetailsDao;
 import com.cloud.storage.dao.VMTemplatePoolDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.template.TemplateAdapter.TemplateAdapterType;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
 import com.cloud.user.Account;
@@ -213,6 +212,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
@@ -326,6 +326,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         TemplateAdapter adapter = null;
         if (type == HypervisorType.BareMetal) {
             adapter = AdapterBase.getAdapterByName(_adapters, TemplateAdapterType.BareMetal.getName());
+        } else if (type == HypervisorType.External) {
+            adapter = AdapterBase.getAdapterByName(_adapters, TemplateAdapterType.External.getName());
         } else {
             // Get template adapter according to hypervisor
             adapter = AdapterBase.getAdapterByName(_adapters, type.name());
@@ -938,7 +940,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         List<String> failedZones = new ArrayList<>();
 
         boolean success = false;
-        if (template.getHypervisorType() == HypervisorType.BareMetal) {
+        if (template.getHypervisorType() == HypervisorType.BareMetal || template.getHypervisorType() == HypervisorType.External) {
             if (template.isCrossZones()) {
                 logger.debug("Template {} is cross-zone, don't need to copy", template);
                 return template;
@@ -1207,6 +1209,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
 
+        if (HypervisorType.External.equals(vm.getHypervisorType())) {
+            throw new InvalidParameterValueException("Attach ISO operation is not allowed for External hypervisor type");
+        }
+
         VMTemplateVO iso = _tmpltDao.findById(isoId);
         if (iso == null || iso.getRemoved() != null) {
             throw new InvalidParameterValueException("Unable to find an ISO with id " + isoId);
@@ -1961,7 +1967,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         }
         privateTemplate = new VMTemplateVO(nextTemplateId, name, ImageFormat.RAW, isPublic, featured, isExtractable,
                 TemplateType.USER, null, requiresHvmValue, bitsValue, templateOwner.getId(), null, description,
-                passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails(), sshKeyEnabledValue, isDynamicScalingEnabled, false, false, arch);
+                passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails(), sshKeyEnabledValue, isDynamicScalingEnabled, false, false, arch, null);
 
         if (sourceTemplateId != null) {
             if (logger.isDebugEnabled()) {
@@ -2167,7 +2173,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         String templateTag = null;
         if (cmd instanceof UpdateTemplateCmd) {
             boolean isAdmin = _accountMgr.isAdmin(account.getId());
-            templateType = validateTemplateType(cmd, isAdmin, template.isCrossZones());
+            templateType = validateTemplateType(cmd, isAdmin, template.isCrossZones(), template.getHypervisorType());
             if (cmd instanceof UpdateVnfTemplateCmd) {
                 VnfTemplateUtils.validateApiCommandParams(cmd, template);
                 vnfTemplateManager.updateVnfTemplate(template.getId(), (UpdateVnfTemplateCmd) cmd);
@@ -2311,7 +2317,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
     }
 
     @Override
-    public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones) {
+    public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, HypervisorType hypervisorType) {
         if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd)) {
             return null;
         }
@@ -2345,6 +2351,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
             boolean isRouting = Boolean.TRUE.equals(isRoutingType);
             templateType = (cmd instanceof RegisterVnfTemplateCmd) ? TemplateType.VNF : (isRouting ? TemplateType.ROUTING : TemplateType.USER);
         }
+        validateExternalHypervisorTemplateType(hypervisorType, templateType);
         if (templateType != null && !isAdmin && !Arrays.asList(TemplateType.USER, TemplateType.VNF).contains(templateType)) {
             if (cmd instanceof RegisterTemplateCmd) {
                 throw new InvalidParameterValueException(String.format("Users can not register template with template type %s.", templateType));
@@ -2355,10 +2362,20 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         return templateType;
     }
 
+    protected void validateExternalHypervisorTemplateType(HypervisorType hypervisorType, TemplateType templateType) {
+        if (!HypervisorType.External.equals(hypervisorType) ||
+                templateType == null || templateType == TemplateType.USER) {
+            return;
+        }
+        throw new InvalidParameterValueException(String.format("Only %s templates supported for %s hypervisor type",
+                TemplateType.USER, HypervisorType.External));
+    }
+
     void validateDetails(VMTemplateVO template, Map<String, String> details) {
         if (MapUtils.isEmpty(details)) {
             return;
         }
+
         String bootMode = details.get(ApiConstants.BootType.UEFI.toString());
         if (bootMode == null) {
             return;
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 14757bfb30f..771d3c0c5a7 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -251,6 +251,7 @@ import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
 import com.cloud.hypervisor.kvm.dpdk.DpdkHelper;
@@ -966,6 +967,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
+        if (Hypervisor.HypervisorType.External.equals(userVm.getHypervisorType())) {
+            logger.error("Reset VM userdata not supported for {} as it is {} hypervisor instance",
+                    userVm, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    userVm.getName()));
+        }
         _accountMgr.checkAccess(caller, null, true, userVm);
 
         VMTemplateVO template = _templateDao.findByIdIncludingRemoved(userVm.getTemplateId());
@@ -1013,6 +1020,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
+        if (Hypervisor.HypervisorType.External.equals(userVm.getHypervisorType())) {
+            logger.error("Reset VM SSH key not supported for {} as it is {} hypervisor instance",
+                    userVm, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    userVm.getName()));
+        }
 
         VMTemplateVO template = _templateDao.findByIdIncludingRemoved(userVm.getTemplateId());
 
@@ -1944,6 +1957,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (vm == null) {
             throw new InvalidParameterValueException("Unable to find VM's UUID");
         }
+        if (Hypervisor.HypervisorType.External.equals(vm.getHypervisorType())) {
+            logger.error("Scale VM not supported for {} as it is {} hypervisor instance",
+                    vm, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    vm.getName()));
+        }
         CallContext.current().setEventDetails("Vm Id: " + vm.getUuid());
 
         Map<String, String> cmdDetails = cmd.getDetails();
@@ -4306,7 +4325,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 }
             }
 
-            if (hypervisorType != HypervisorType.BareMetal) {
+            if (hypervisorType != HypervisorType.BareMetal && hypervisorType != HypervisorType.External) {
                 // check if we have available pools for vm deployment
                 long availablePools = _storagePoolDao.countPoolsByStatus(StoragePoolStatus.Up);
                 if (availablePools < 1) {
@@ -8525,6 +8544,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
+        if (Hypervisor.HypervisorType.External.equals(vm.getHypervisorType())) {
+            logger.error("Restore VM not supported for {} as it is {} hypervisor instance",
+                    vm, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    vm.getName()));
+        }
         _accountMgr.checkAccess(caller, null, true, vm);
 
         VMTemplateVO template;
@@ -8552,6 +8577,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             }
         }
 
+        if (HypervisorType.External.equals(vm.getHypervisorType())) {
+            throw new InvalidParameterValueException("Restore VM instance operation is not allowed for External hypervisor type");
+        }
+
         //check if there are any active snapshots on volumes associated with the VM
         logger.debug("Checking if there are any ongoing snapshots on the ROOT volumes associated with VM {}", vm);
         if (checkStatusOfVolumeSnapshots(vm, Volume.Type.ROOT)) {
diff --git a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 3ce57ae068c..1fe06d8a3ee 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -30,8 +30,6 @@ import javax.naming.ConfigurationException;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.stereotype.Component;
 import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory;
@@ -55,6 +53,8 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.collections.MapUtils;
+import org.springframework.stereotype.Component;
 
 import com.cloud.agent.api.RestoreVMSnapshotCommand;
 import com.cloud.agent.api.VMSnapshotTO;
@@ -69,6 +69,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
 import com.cloud.gpu.GPU;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
 import com.cloud.projects.Project.ListProjectResourcesCriteria;
@@ -326,6 +327,10 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
             throw new InvalidParameterValueException("Creating VM snapshot failed due to VM:" + vmId + " is a system VM or does not exist");
         }
 
+        if (HypervisorType.External.equals(userVmVo.getHypervisorType())) {
+            throw new InvalidParameterValueException("VM snapshot operation is not allowed for hypervisor type External");
+        }
+
         // VM snapshot with memory is not supported for VGPU Vms
         if (snapshotMemory && _serviceOfferingDetailsDao.findDetail(userVmVo.getServiceOfferingId(), GPU.Keys.vgpuType.toString()) != null) {
             throw new InvalidParameterValueException("VM snapshot with MEMORY is not supported for vGPU enabled VMs.");
@@ -509,6 +514,12 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
         if (UserVmManager.SHAREDFSVM.equals(userVm.getUserVmType())) {
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
+        if (Hypervisor.HypervisorType.External.equals(userVm.getHypervisorType())) {
+            logger.error("Create VM snapshot not supported for {} as it is {} hypervisor instance",
+                    userVm, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    userVm.getName()));
+        }
         VMSnapshotVO vmSnapshot = _vmSnapshotDao.findById(vmSnapshotId);
         if (vmSnapshot == null) {
             throw new CloudRuntimeException("VM snapshot id: " + vmSnapshotId + " can not be found");
diff --git a/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
index d098ef25652..650d52f9dc5 100644
--- a/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
@@ -43,6 +43,7 @@ import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.DomainManager;
@@ -434,6 +435,12 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro
         if (UserVmManager.SHAREDFSVM.equals(vmInstance.getUserVmType())) {
             throw new InvalidParameterValueException("Operation not supported on Shared FileSystem Instance");
         }
+        if (Hypervisor.HypervisorType.External.equals(vmInstance.getHypervisorType())) {
+            logger.error("Update VM Affinity Group not supported for {} as it is {} hypervisor instance",
+                    vmInstance, Hypervisor.HypervisorType.External.name());
+            throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
+                    vmInstance.getName()));
+        }
 
         // Check that the VM is stopped
         if (!vmInstance.getState().equals(State.Stopped)) {
diff --git a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
index b497871238b..38ab45f20b4 100644
--- a/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
@@ -208,6 +208,12 @@ public class ConsoleAccessManagerImpl extends ManagerBase implements ConsoleAcce
                 return new ConsoleEndpoint(false, null, "Cannot find VM with ID " + vmId);
             }
 
+            if (Hypervisor.HypervisorType.External.equals(vm.getHypervisorType())) {
+                logger.error("Console access for {} cannot be provided it is {} hypervisor instance", vm,
+                        Hypervisor.HypervisorType.External);
+                return new ConsoleEndpoint(false, null, "Console access to this instance cannot be provided");
+            }
+
             if (!checkSessionPermission(vm, account)) {
                 return new ConsoleEndpoint(false, null, "Permission denied");
             }
diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index d82e20dc344..9e570e635fa 100644
--- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -391,4 +391,9 @@
     </bean>
 
     <bean id="guiThemeServiceImpl" class="org.apache.cloudstack.gui.theme.GuiThemeServiceImpl" />
+
+    <bean id="ExternalOrchestratorDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExternalOrchestratorDaoImpl" />
+    <bean id="ExternalOrchestratorDetailDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExternalOrchestratorDetailDaoImpl" />
+    <bean id="ExtensionResourceMapDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExtensionResourceMapDaoImpl" />
+    <bean id="ExtensionResourceMapDetailsDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExtensionResourceMapDetailsDaoImpl" />
 </beans>
diff --git a/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java b/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
index fdc277404f6..892cd1e7def 100644
--- a/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
+++ b/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
@@ -17,6 +17,59 @@
 
 package com.cloud.api.query;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.command.admin.storage.ListObjectStoragePoolsCmd;
+import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
+import org.apache.cloudstack.api.command.admin.vm.ListAffectedVmsForStorageScopeChangeCmd;
+import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
+import org.apache.cloudstack.api.command.user.bucket.ListBucketsCmd;
+import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
+import org.apache.cloudstack.api.command.user.resource.ListDetailOptionsCmd;
+import org.apache.cloudstack.api.response.DetailOptionsResponse;
+import org.apache.cloudstack.api.response.EventResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ObjectStoreResponse;
+import org.apache.cloudstack.api.response.UserResponse;
+import org.apache.cloudstack.api.response.VirtualMachineResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.extension.Extension;
+import org.apache.cloudstack.extension.ExtensionHelper;
+import org.apache.cloudstack.storage.datastore.db.ObjectStoreDao;
+import org.apache.cloudstack.storage.datastore.db.ObjectStoreVO;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.dao.TemplateJoinDao;
 import com.cloud.api.query.dao.UserAccountJoinDao;
@@ -36,13 +89,14 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.network.Network;
 import com.cloud.network.VNF;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.server.ResourceTag;
 import com.cloud.storage.BucketVO;
-import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.ScopeType;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.dao.BucketDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.Account;
@@ -60,53 +114,6 @@ import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
 
-import org.apache.cloudstack.acl.SecurityChecker;
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.ResponseObject;
-import org.apache.cloudstack.api.command.admin.storage.ListObjectStoragePoolsCmd;
-import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
-import org.apache.cloudstack.api.command.admin.vm.ListAffectedVmsForStorageScopeChangeCmd;
-import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
-import org.apache.cloudstack.api.command.user.bucket.ListBucketsCmd;
-import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
-import org.apache.cloudstack.api.command.user.resource.ListDetailOptionsCmd;
-import org.apache.cloudstack.api.response.DetailOptionsResponse;
-import org.apache.cloudstack.api.response.EventResponse;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.ObjectStoreResponse;
-import org.apache.cloudstack.api.response.UserResponse;
-import org.apache.cloudstack.api.response.VirtualMachineResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.storage.datastore.db.ObjectStoreDao;
-import org.apache.cloudstack.storage.datastore.db.ObjectStoreVO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
 @RunWith(MockitoJUnitRunner.class)
 public class QueryManagerImplTest {
     public static final long USER_ID = 1;
@@ -169,6 +176,9 @@ public class QueryManagerImplTest {
     @Mock
     AccountDao accountDao;
 
+    @Mock
+    ExtensionHelper extensionHelper;
+
     private AccountVO account;
     private UserVO user;
 
@@ -187,16 +197,16 @@ public class QueryManagerImplTest {
                 UUID.randomUUID().toString(), User.Source.UNKNOWN);
         CallContext.register(user, account);
         Mockito.when(accountManager.isRootAdmin(account.getId())).thenReturn(false);
-        final SearchBuilder<EventVO> eventSearchBuilder = Mockito.mock(SearchBuilder.class);
-        final SearchCriteria<EventVO> eventSearchCriteria = Mockito.mock(SearchCriteria.class);
-        final EventVO eventVO = Mockito.mock(EventVO.class);
+        final SearchBuilder<EventVO> eventSearchBuilder = mock(SearchBuilder.class);
+        final SearchCriteria<EventVO> eventSearchCriteria = mock(SearchCriteria.class);
+        final EventVO eventVO = mock(EventVO.class);
         when(eventSearchBuilder.entity()).thenReturn(eventVO);
         when(eventSearchBuilder.create()).thenReturn(eventSearchCriteria);
         Mockito.when(eventDao.createSearchBuilder()).thenReturn(eventSearchBuilder);
     }
 
     private ListEventsCmd setupMockListEventsCmd() {
-        ListEventsCmd cmd = Mockito.mock(ListEventsCmd.class);
+        ListEventsCmd cmd = mock(ListEventsCmd.class);
         Mockito.when(cmd.getEntryTime()).thenReturn(null);
         Mockito.when(cmd.listAll()).thenReturn(true);
         return cmd;
@@ -209,17 +219,17 @@ public class QueryManagerImplTest {
         Mockito.when(cmd.getResourceId()).thenReturn(uuid);
         Mockito.when(cmd.getResourceType()).thenReturn(ApiCommandResourceType.Network.toString());
         List<EventVO> events = new ArrayList<>();
-        events.add(Mockito.mock(EventVO.class));
-        events.add(Mockito.mock(EventVO.class));
-        events.add(Mockito.mock(EventVO.class));
+        events.add(mock(EventVO.class));
+        events.add(mock(EventVO.class));
+        events.add(mock(EventVO.class));
         Pair<List<EventVO>, Integer> pair = new Pair<>(events, events.size());
 
         List<EventJoinVO> eventJoins = new ArrayList<>();
-        eventJoins.add(Mockito.mock(EventJoinVO.class));
-        eventJoins.add(Mockito.mock(EventJoinVO.class));
-        eventJoins.add(Mockito.mock(EventJoinVO.class));
+        eventJoins.add(mock(EventJoinVO.class));
+        eventJoins.add(mock(EventJoinVO.class));
+        eventJoins.add(mock(EventJoinVO.class));
 
-        NetworkVO network = Mockito.mock(NetworkVO.class);
+        NetworkVO network = mock(NetworkVO.class);
         Mockito.when(network.getId()).thenReturn(1L);
         Mockito.when(network.getAccountId()).thenReturn(account.getId());
         Mockito.when(entityManager.findByUuidIncludingRemoved(Network.class, uuid)).thenReturn(network);
@@ -277,7 +287,7 @@ public class QueryManagerImplTest {
         String uuid = UUID.randomUUID().toString();
         Mockito.when(cmd.getResourceId()).thenReturn(uuid);
         Mockito.when(cmd.getResourceType()).thenReturn(ApiCommandResourceType.Network.toString());
-        NetworkVO network = Mockito.mock(NetworkVO.class);
+        NetworkVO network = mock(NetworkVO.class);
         Mockito.when(network.getId()).thenReturn(1L);
         Mockito.when(network.getAccountId()).thenReturn(2L);
         Mockito.when(entityManager.findByUuidIncludingRemoved(Network.class, uuid)).thenReturn(network);
@@ -287,7 +297,7 @@ public class QueryManagerImplTest {
 
     @Test
     public void listVnfDetailOptionsCmd() {
-        ListDetailOptionsCmd cmd = Mockito.mock(ListDetailOptionsCmd.class);
+        ListDetailOptionsCmd cmd = mock(ListDetailOptionsCmd.class);
         when(cmd.getResourceType()).thenReturn(ResourceTag.ResourceObjectType.VnfTemplate);
 
         DetailOptionsResponse response = queryManager.listDetailOptions(cmd);
@@ -313,7 +323,7 @@ public class QueryManagerImplTest {
 
         queryManagerImplSpy.applyPublicTemplateSharingRestrictions(searchCriteriaMock, accountMock);
 
-        Mockito.verify(searchCriteriaMock, Mockito.never()).addAnd(Mockito.anyString(), Mockito.any(), Mockito.any());
+        verify(searchCriteriaMock, Mockito.never()).addAnd(Mockito.anyString(), Mockito.any(), Mockito.any());
     }
 
     @Test
@@ -325,15 +335,15 @@ public class QueryManagerImplTest {
         Mockito.when(accountMock.getType()).thenReturn(Account.Type.NORMAL);
 
         Mockito.when(accountMock.getDomainId()).thenReturn(callerDomainId);
-        TemplateJoinVO templateMock1 = Mockito.mock(TemplateJoinVO.class);
+        TemplateJoinVO templateMock1 = mock(TemplateJoinVO.class);
         Mockito.when(templateMock1.getDomainId()).thenReturn(callerDomainId);
         Mockito.lenient().doReturn(false).when(queryManagerImplSpy).checkIfDomainSharesTemplates(callerDomainId);
 
-        TemplateJoinVO templateMock2 = Mockito.mock(TemplateJoinVO.class);
+        TemplateJoinVO templateMock2 = mock(TemplateJoinVO.class);
         Mockito.when(templateMock2.getDomainId()).thenReturn(sharableDomainId);
         Mockito.doReturn(true).when(queryManagerImplSpy).checkIfDomainSharesTemplates(sharableDomainId);
 
-        TemplateJoinVO templateMock3 = Mockito.mock(TemplateJoinVO.class);
+        TemplateJoinVO templateMock3 = mock(TemplateJoinVO.class);
         Mockito.when(templateMock3.getDomainId()).thenReturn(unsharableDomainId);
         Mockito.doReturn(false).when(queryManagerImplSpy).checkIfDomainSharesTemplates(unsharableDomainId);
 
@@ -342,7 +352,7 @@ public class QueryManagerImplTest {
 
         queryManagerImplSpy.applyPublicTemplateSharingRestrictions(searchCriteriaMock, accountMock);
 
-        Mockito.verify(searchCriteriaMock).addAnd("domainId", SearchCriteria.Op.NOTIN, unsharableDomainId);
+        verify(searchCriteriaMock).addAnd("domainId", SearchCriteria.Op.NOTIN, unsharableDomainId);
     }
 
     @Test
@@ -380,8 +390,8 @@ public class QueryManagerImplTest {
         os1.setName("Simulator");
         objectStores.add(os1);
         objectStores.add(os2);
-        SearchBuilder<ObjectStoreVO> sb = Mockito.mock(SearchBuilder.class);
-        ObjectStoreVO objectStoreVO = Mockito.mock(ObjectStoreVO.class);
+        SearchBuilder<ObjectStoreVO> sb = mock(SearchBuilder.class);
+        ObjectStoreVO objectStoreVO = mock(ObjectStoreVO.class);
         when(sb.entity()).thenReturn(objectStoreVO);
         when(objectStoreDao.createSearchBuilder()).thenReturn(sb);
         when(objectStoreDao.searchAndCount(any(), any())).thenReturn(new Pair<>(objectStores, 2));
@@ -399,8 +409,8 @@ public class QueryManagerImplTest {
         b2.setName("test-bucket-1");
         buckets.add(b1);
         buckets.add(b2);
-        SearchBuilder<BucketVO> sb = Mockito.mock(SearchBuilder.class);
-        BucketVO bucketVO = Mockito.mock(BucketVO.class);
+        SearchBuilder<BucketVO> sb = mock(SearchBuilder.class);
+        BucketVO bucketVO = mock(BucketVO.class);
         when(sb.entity()).thenReturn(bucketVO);
         when(bucketDao.createSearchBuilder()).thenReturn(sb);
         when(bucketDao.searchAndCount(any(), any())).thenReturn(new Pair<>(buckets, 2));
@@ -409,20 +419,20 @@ public class QueryManagerImplTest {
 
     @Test
     public void testGetHostTagsFromTemplateForServiceOfferingsListingNoTemplateId() {
-        Assert.assertTrue(CollectionUtils.isEmpty(queryManager.getHostTagsFromTemplateForServiceOfferingsListing(Mockito.mock(AccountVO.class), null)));
+        Assert.assertTrue(CollectionUtils.isEmpty(queryManager.getHostTagsFromTemplateForServiceOfferingsListing(mock(AccountVO.class), null)));
     }
 
     @Test(expected = InvalidParameterValueException.class)
     public void testGetHostTagsFromTemplateForServiceOfferingsListingException() {
-        queryManager.getHostTagsFromTemplateForServiceOfferingsListing(Mockito.mock(AccountVO.class), 1L);
+        queryManager.getHostTagsFromTemplateForServiceOfferingsListing(mock(AccountVO.class), 1L);
     }
 
     @Test(expected = PermissionDeniedException.class)
     public void testGetHostTagsForServiceOfferingsListingNoAccess() {
         long templateId = 1L;
-        Account account = Mockito.mock(Account.class);
+        Account account = mock(Account.class);
         Mockito.when(account.getType()).thenReturn(Account.Type.NORMAL);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
         Mockito.when(templateDao.findByIdIncludingRemoved(templateId)).thenReturn(template);
         Mockito.lenient().doThrow(PermissionDeniedException.class).when(accountManager).checkAccess(account, null, false, template);
         queryManager.getHostTagsFromTemplateForServiceOfferingsListing(account, templateId);
@@ -431,9 +441,9 @@ public class QueryManagerImplTest {
     @Test
     public void testGetHostTagsFromTemplateForServiceOfferingsListingAdmin() {
         long templateId = 1L;
-        Account account = Mockito.mock(Account.class);
+        Account account = mock(Account.class);
         Mockito.when(account.getType()).thenReturn(Account.Type.ADMIN);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
         Mockito.when(template.getTemplateTag()).thenReturn("tag");
         Mockito.when(templateDao.findByIdIncludingRemoved(templateId)).thenReturn(template);
         Mockito.lenient().doThrow(PermissionDeniedException.class).when(accountManager).checkAccess(account, null, false, template);
@@ -444,9 +454,9 @@ public class QueryManagerImplTest {
     @Test
     public void testGetHostTagsForServiceOfferingsListingSuccess() {
         long templateId = 1L;
-        Account account = Mockito.mock(Account.class);
+        Account account = mock(Account.class);
         Mockito.when(account.getType()).thenReturn(Account.Type.NORMAL);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
         Mockito.when(templateDao.findByIdIncludingRemoved(templateId)).thenReturn(template);
         Mockito.lenient().doNothing().when(accountManager).checkAccess(account, null, false, template);
         List<String> result = queryManager.getHostTagsFromTemplateForServiceOfferingsListing(account, templateId);
@@ -467,18 +477,18 @@ public class QueryManagerImplTest {
         ReflectionTestUtils.setField(cmd, "clusterIdForScopeChange", clusterId);
         ReflectionTestUtils.setField(cmd, "storageId", poolId);
 
-        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO pool = mock(StoragePoolVO.class);
         Mockito.when(pool.getScope()).thenReturn(ScopeType.CLUSTER);
         Mockito.when(storagePoolDao.findById(poolId)).thenReturn(pool);
         ListResponse<VirtualMachineResponse> response = queryManager.listAffectedVmsForStorageScopeChange(cmd);
         Assert.assertEquals(response.getResponses().size(), 0);
 
-        VMInstanceVO instance = Mockito.mock(VMInstanceVO.class);
-        UserVmJoinVO userVM = Mockito.mock(UserVmJoinVO.class);
+        VMInstanceVO instance = mock(VMInstanceVO.class);
+        UserVmJoinVO userVM = mock(UserVmJoinVO.class);
         String instanceUuid = String.valueOf(UUID.randomUUID());
         Pair<List<VMInstanceVO>, Integer> vms = new Pair<>(List.of(instance), 1);
-        HostVO host = Mockito.mock(HostVO.class);
-        ClusterVO cluster = Mockito.mock(ClusterVO.class);
+        HostVO host = mock(HostVO.class);
+        ClusterVO cluster = mock(ClusterVO.class);
 
         Mockito.when(pool.getScope()).thenReturn(ScopeType.ZONE);
         Mockito.when(instance.getUuid()).thenReturn(instanceUuid);
@@ -499,7 +509,7 @@ public class QueryManagerImplTest {
 
     @Test
     public void testSearchForUsers() {
-        ListUsersCmd cmd = Mockito.mock(ListUsersCmd.class);
+        ListUsersCmd cmd = mock(ListUsersCmd.class);
         String username = "Admin";
         String accountName = "Admin";
         Account.Type accountType = Account.Type.ADMIN;
@@ -514,12 +524,12 @@ public class QueryManagerImplTest {
         Mockito.when(cmd.getUserSource()).thenReturn(userSource);
 
         UserAccountJoinVO user = new UserAccountJoinVO();
-        DomainVO domain = Mockito.mock(DomainVO.class);
-        SearchBuilder<UserAccountJoinVO> sb = Mockito.mock(SearchBuilder.class);
-        SearchCriteria<UserAccountJoinVO> sc = Mockito.mock(SearchCriteria.class);
+        DomainVO domain = mock(DomainVO.class);
+        SearchBuilder<UserAccountJoinVO> sb = mock(SearchBuilder.class);
+        SearchCriteria<UserAccountJoinVO> sc = mock(SearchCriteria.class);
         List<UserAccountJoinVO> users = new ArrayList<>();
         Pair<List<UserAccountJoinVO>, Integer> result = new Pair<>(users, 0);
-        UserResponse response = Mockito.mock(UserResponse.class);
+        UserResponse response = mock(UserResponse.class);
 
         Mockito.when(userAccountJoinDao.createSearchBuilder()).thenReturn(sb);
         Mockito.when(sb.entity()).thenReturn(user);
@@ -528,19 +538,19 @@ public class QueryManagerImplTest {
 
         queryManager.searchForUsers(ResponseObject.ResponseView.Restricted, cmd);
 
-        Mockito.verify(sc).setParameters("username", username);
-        Mockito.verify(sc).setParameters("accountName", accountName);
-        Mockito.verify(sc).setParameters("type", accountType);
-        Mockito.verify(sc).setParameters("domainId", domainId);
-        Mockito.verify(sc).setParameters("apiKeyAccess", false);
-        Mockito.verify(sc).setParameters("userSource", userSource.toString());
-        Mockito.verify(userAccountJoinDao, Mockito.times(1)).searchAndCount(
+        verify(sc).setParameters("username", username);
+        verify(sc).setParameters("accountName", accountName);
+        verify(sc).setParameters("type", accountType);
+        verify(sc).setParameters("domainId", domainId);
+        verify(sc).setParameters("apiKeyAccess", false);
+        verify(sc).setParameters("userSource", userSource.toString());
+        verify(userAccountJoinDao, Mockito.times(1)).searchAndCount(
                 any(SearchCriteria.class), any(Filter.class));
     }
 
     @Test
     public void testSearchForAccounts() {
-        ListAccountsCmd cmd = Mockito.mock(ListAccountsCmd.class);
+        ListAccountsCmd cmd = mock(ListAccountsCmd.class);
         Long domainId = 1L;
         String accountName = "Admin";
         Account.Type accountType = Account.Type.ADMIN;
@@ -551,9 +561,9 @@ public class QueryManagerImplTest {
         Mockito.when(cmd.getAccountType()).thenReturn(accountType);
         Mockito.when(cmd.getApiKeyAccess()).thenReturn(apiKeyAccess);
 
-        DomainVO domain = Mockito.mock(DomainVO.class);
-        SearchBuilder<AccountVO> sb = Mockito.mock(SearchBuilder.class);
-        SearchCriteria<AccountVO> sc = Mockito.mock(SearchCriteria.class);
+        DomainVO domain = mock(DomainVO.class);
+        SearchBuilder<AccountVO> sb = mock(SearchBuilder.class);
+        SearchCriteria<AccountVO> sc = mock(SearchCriteria.class);
         Pair<List<AccountVO>, Integer> uniqueAccountPair = new Pair<>(new ArrayList<>(), 0);
         Mockito.when(domainDao.findById(domainId)).thenReturn(domain);
         Mockito.doNothing().when(accountManager).checkAccess(account, domain);
@@ -567,11 +577,49 @@ public class QueryManagerImplTest {
             queryManager.searchForAccounts(cmd);
         }
 
-        Mockito.verify(sc).setParameters("domainId", domainId);
-        Mockito.verify(sc).setParameters("accountName", accountName);
-        Mockito.verify(sc).setParameters("type", accountType);
-        Mockito.verify(sc).setParameters("apiKeyAccess", true);
-        Mockito.verify(accountDao, Mockito.times(1)).searchAndCount(
+        verify(sc).setParameters("domainId", domainId);
+        verify(sc).setParameters("accountName", accountName);
+        verify(sc).setParameters("type", accountType);
+        verify(sc).setParameters("apiKeyAccess", true);
+        verify(accountDao, Mockito.times(1)).searchAndCount(
                 any(SearchCriteria.class), any(Filter.class));
     }
+
+    @Test
+    public void updateHostsExtensions_emptyList_noAction() {
+        queryManagerImplSpy.updateHostsExtensions(Collections.emptyList());
+        // No exception, nothing to verify
+    }
+
+    @Test
+    public void updateHostsExtensions_nullList_noAction() {
+        queryManagerImplSpy.updateHostsExtensions(null);
+        // No exception, nothing to verify
+    }
+
+    @Test
+    public void updateHostsExtensions_withHostResponses_setsExtension() {
+        HostResponse host1 = mock(HostResponse.class);
+        HostResponse host2 = mock(HostResponse.class);
+
+        when(host1.getClusterInternalId()).thenReturn(1L);
+        when(host1.getHypervisor()).thenReturn(Hypervisor.HypervisorType.External.name());
+        when(host2.getClusterInternalId()).thenReturn(2L);
+        when(host2.getHypervisor()).thenReturn(Hypervisor.HypervisorType.External.name());
+
+        Extension ext1 = mock(Extension.class);
+        when(ext1.getUuid()).thenReturn("a");
+        Extension ext2 = mock(Extension.class);
+        when(ext2.getUuid()).thenReturn("b");
+
+        when(extensionHelper.getExtensionForCluster(1L)).thenReturn(ext1);
+        when(extensionHelper.getExtensionForCluster(2L)).thenReturn(ext2);
+
+        List<HostResponse> hosts = Arrays.asList(host1, host2);
+
+        queryManagerImplSpy.updateHostsExtensions(hosts);
+
+        verify(host1).setExtensionId("a");
+        verify(host2).setExtensionId("b");
+    }
 }
diff --git a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
index 2bddabce719..9facfc04b41 100644
--- a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
+++ b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
@@ -89,6 +89,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -1045,4 +1046,54 @@ public class ConfigurationManagerImplTest {
         configurationManagerImplSpy.getConfigurationType(configuration.key());
         Mockito.verify(configurationManagerImplSpy).parseConfigurationTypeIntoString(configuration.type(), configurationVOMock);
     }
+
+    @Test
+    public void serviceOfferingExternalDetailsNeedUpdateReturnsFalseWhenExternalDetailsIsEmpty() {
+        Map<String, String> offeringDetails = Map.of("key1", "value1");
+        Map<String, String> externalDetails = Collections.emptyMap();
+
+        boolean result = configurationManagerImplSpy.serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void serviceOfferingExternalDetailsNeedUpdateReturnsTrueWhenExistingExternalDetailsIsEmpty() {
+        Map<String, String> offeringDetails = Map.of("key1", "value1");
+        Map<String, String> externalDetails = Map.of("External:key1", "value1");
+
+        boolean result = configurationManagerImplSpy.serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void serviceOfferingExternalDetailsNeedUpdateReturnsTrueWhenSizesDiffer() {
+        Map<String, String> offeringDetails = Map.of("External:key1", "value1");
+        Map<String, String> externalDetails = Map.of("External:key1", "value1", "External:key2", "value2");
+
+        boolean result = configurationManagerImplSpy.serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void serviceOfferingExternalDetailsNeedUpdateReturnsTrueWhenValuesDiffer() {
+        Map<String, String> offeringDetails = Map.of("External:key1", "value1");
+        Map<String, String> externalDetails = Map.of("External:key1", "differentValue");
+
+        boolean result = configurationManagerImplSpy.serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void serviceOfferingExternalDetailsNeedUpdateReturnsFalseWhenDetailsMatch() {
+        Map<String, String> offeringDetails = Map.of("External:key1", "value1", "External:key2", "value2");
+        Map<String, String> externalDetails = Map.of("External:key1", "value1", "External:key2", "value2");
+
+        boolean result = configurationManagerImplSpy.serviceOfferingExternalDetailsNeedUpdate(offeringDetails, externalDetails);
+
+        Assert.assertFalse(result);
+    }
 }
diff --git a/server/src/test/java/com/cloud/network/MockNetworkModelImpl.java b/server/src/test/java/com/cloud/network/MockNetworkModelImpl.java
index ea9a0340eaa..a959553ed78 100644
--- a/server/src/test/java/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/src/test/java/com/cloud/network/MockNetworkModelImpl.java
@@ -775,6 +775,11 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
         return null;
     }
 
+    @Override
+    public NicProfile getNicProfile(VirtualMachine vm, Nic nic, DataCenter dataCenter) {
+        return null;
+    }
+
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkModel#getAvailableIps(com.cloud.network.Network, java.lang.String)
      */
diff --git a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
index 70bbe2d1b80..b6f2ff65b9f 100644
--- a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
+++ b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
@@ -16,36 +16,13 @@
 // under the License.
 package com.cloud.network;
 
-import com.cloud.dc.DataCenter;
-import com.cloud.dc.VlanVO;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.network.addr.PublicIp;
-import com.cloud.network.dao.IPAddressVO;
-import com.cloud.network.dao.NetworkServiceMapDao;
-import com.cloud.network.dao.NetworkServiceMapVO;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.element.NetworkElement;
-import com.cloud.network.element.VpcVirtualRouterElement;
-import com.cloud.offerings.NetworkOfferingVO;
-import com.cloud.offerings.dao.NetworkOfferingDao;
-import com.cloud.network.vpc.VpcVO;
-import com.cloud.network.vpc.dao.VpcDao;
-import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
-import com.cloud.utils.Pair;
-import com.cloud.utils.net.Ip;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import org.mockito.ArgumentMatchers;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,6 +30,43 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.VlanVO;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.addr.PublicIp;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkServiceMapDao;
+import com.cloud.network.dao.NetworkServiceMapVO;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.element.NetworkElement;
+import com.cloud.network.element.VpcVirtualRouterElement;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.net.Ip;
+import com.cloud.vm.Nic;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.VirtualMachine;
+
 @RunWith(MockitoJUnitRunner.class)
 public class NetworkModelImplTest {
     final String[] ip4Dns1 = {"5.5.5.5", "6.6.6.6", "9.9.9.9"};
@@ -62,19 +76,23 @@ public class NetworkModelImplTest {
 
     @Mock
     private VpcDao vpcDao;
+    @Mock
+    private NetworkDao _networksDao;
     @Inject
     private NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
 
+    @Spy
     @InjectMocks
     private NetworkModelImpl networkModel = new NetworkModelImpl();
 
     private NetworkOfferingDao networkOfferingDao;
     private NetworkServiceMapDao networkServiceMapDao;
+
     @Before
     public void setUp() {
-        networkOfferingDao = Mockito.mock(NetworkOfferingDao.class);
-        networkServiceMapDao = Mockito.mock(NetworkServiceMapDao.class);
-        networkOfferingServiceMapDao = Mockito.mock(NetworkOfferingServiceMapDao.class);
+        networkOfferingDao = mock(NetworkOfferingDao.class);
+        networkServiceMapDao = mock(NetworkServiceMapDao.class);
+        networkOfferingServiceMapDao = mock(NetworkOfferingServiceMapDao.class);
         networkModel._networkOfferingDao = networkOfferingDao;
         networkModel._ntwkSrvcDao = networkServiceMapDao;
         networkModel._ntwkOfferingSrvcDao = networkOfferingServiceMapDao;
@@ -84,29 +102,29 @@ public class NetworkModelImplTest {
                               String networkDns1, String zoneDns1, String networkDns2, String zoneDns2,
                               String vpcDns1, String vpcDns2) {
         if (isIp6) {
-            Mockito.when(network.getIp6Dns1()).thenReturn(networkDns1);
-            Mockito.when(zone.getIp6Dns1()).thenReturn(zoneDns1);
-            Mockito.when(network.getIp6Dns2()).thenReturn(networkDns2);
-            Mockito.when(zone.getIp6Dns2()).thenReturn(zoneDns2);
-            Mockito.when(vpc.getIp6Dns1()).thenReturn(vpcDns1);
-            Mockito.when(vpc.getIp6Dns2()).thenReturn(vpcDns2);
+            when(network.getIp6Dns1()).thenReturn(networkDns1);
+            when(zone.getIp6Dns1()).thenReturn(zoneDns1);
+            when(network.getIp6Dns2()).thenReturn(networkDns2);
+            when(zone.getIp6Dns2()).thenReturn(zoneDns2);
+            when(vpc.getIp6Dns1()).thenReturn(vpcDns1);
+            when(vpc.getIp6Dns2()).thenReturn(vpcDns2);
         } else {
-            Mockito.when(network.getDns1()).thenReturn(networkDns1);
-            Mockito.when(zone.getDns1()).thenReturn(zoneDns1);
-            Mockito.when(network.getDns2()).thenReturn(networkDns2);
-            Mockito.when(zone.getDns2()).thenReturn(zoneDns2);
-            Mockito.when(vpc.getIp4Dns1()).thenReturn(vpcDns1);
-            Mockito.when(vpc.getIp4Dns2()).thenReturn(vpcDns2);
+            when(network.getDns1()).thenReturn(networkDns1);
+            when(zone.getDns1()).thenReturn(zoneDns1);
+            when(network.getDns2()).thenReturn(networkDns2);
+            when(zone.getDns2()).thenReturn(zoneDns2);
+            when(vpc.getIp4Dns1()).thenReturn(vpcDns1);
+            when(vpc.getIp4Dns2()).thenReturn(vpcDns2);
         }
     }
 
     private void testDnsCases(boolean isIp6) {
         String[] dns1 = isIp6 ? ip6Dns1 : ip4Dns1;
         String[] dns2 = isIp6 ? ip6Dns2 : ip4Dns2;
-        Network network = Mockito.mock(Network.class);
-        DataCenter zone = Mockito.mock(DataCenter.class);
-        VpcVO vpc = Mockito.mock(VpcVO.class);
-        Mockito.when(network.getVpcId()).thenReturn(1L);
+        Network network = mock(Network.class);
+        DataCenter zone = mock(DataCenter.class);
+        VpcVO vpc = mock(VpcVO.class);
+        when(network.getVpcId()).thenReturn(1L);
         Mockito.doReturn(vpc).when(vpcDao).findById(ArgumentMatchers.anyLong());
         // network, vpc and zone have valid dns
         prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1], dns2[0], dns2[1], dns1[2], dns2[2]);
@@ -127,35 +145,35 @@ public class NetworkModelImplTest {
         Assert.assertEquals(dns1[2], result.first());
         Assert.assertEquals(dns2[2], result.second());
         // Zone has a valid dns and network/vpc don't
-        prepareMocks(isIp6, network, zone, vpc, null, dns1[1],  null, dns2[1], null, null);
+        prepareMocks(isIp6, network, zone, vpc, null, dns1[1], null, dns2[1], null, null);
         result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
                 networkModel.getNetworkIp4Dns(network, zone);
         Assert.assertEquals(dns1[1], result.first());
         Assert.assertEquals(dns2[1], result.second());
         // Zone/vpc has a valid dns and network has only first dns
-        prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1],  null, dns2[1], dns1[2], dns2[2]);
+        prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1], null, dns2[1], dns1[2], dns2[2]);
         result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
                 networkModel.getNetworkIp4Dns(network, zone);
         Assert.assertEquals(dns1[0], result.first());
-        Assert.assertNull(result.second());
+        assertNull(result.second());
         // network don't have a valid dns, vpc has only first dns, Zone has a valid dns
         prepareMocks(isIp6, network, zone, vpc, null, dns1[1], null, dns2[1], dns1[2], null);
         result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
                 networkModel.getNetworkIp4Dns(network, zone);
         Assert.assertEquals(dns1[2], result.first());
-        Assert.assertNull(result.second());
+        assertNull(result.second());
         // network/vpc/zone only have the first dns
-        prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1],  null, null, dns1[2], null);
+        prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1], null, null, dns1[2], null);
         result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
                 networkModel.getNetworkIp4Dns(network, zone);
         Assert.assertEquals(dns1[0], result.first());
-        Assert.assertNull(result.second());
+        assertNull(result.second());
         // network/vpc and zone dns are null
-        prepareMocks(isIp6, network, zone, vpc, null, null,  null, null, null, null);
+        prepareMocks(isIp6, network, zone, vpc, null, null, null, null, null, null);
         result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
                 networkModel.getNetworkIp4Dns(network, zone);
-        Assert.assertNull(result.first());
-        Assert.assertNull(result.second());
+        assertNull(result.first());
+        assertNull(result.second());
     }
 
     @Test
@@ -229,13 +247,30 @@ public class NetworkModelImplTest {
         NetworkElement element = new VpcVirtualRouterElement();
 
         ReflectionTestUtils.setField(networkModel, "networkElements", List.of(element));
-        Mockito.when(networkOfferingDao.findById(ArgumentMatchers.anyLong())).thenReturn(networkOfferingVO);
-        Mockito.when(networkServiceMapDao.getServicesInNetwork(ArgumentMatchers.anyLong())).thenReturn(networkServiceMapVOs);
+        when(networkOfferingDao.findById(ArgumentMatchers.anyLong())).thenReturn(networkOfferingVO);
+        when(networkServiceMapDao.getServicesInNetwork(ArgumentMatchers.anyLong())).thenReturn(networkServiceMapVOs);
         Map<PublicIpAddress, Set<Network.Service>> ipToServices = new HashMap<>();
         ipToServices.put(publicIpAddress1, services1);
         ipToServices.put(publicIpAddress2, services2);
         Mockito.when(networkOfferingServiceMapDao.isProviderForNetworkOffering(networkOfferingVO.getId(), Network.Provider.Nsx)).thenReturn(false);
         Map<Network.Provider, ArrayList<PublicIpAddress>> result = networkModel.getProviderToIpList(network, ipToServices);
-        Assert.assertNotNull(result);
+        assertNotNull(result);
+    }
+
+    @Test
+    public void getNicProfile_validInputs_returnsNicProfile() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        Nic nic = mock(Nic.class);
+        NetworkVO network = mock(NetworkVO.class);
+        when(network.getId()).thenReturn(1L);
+        when(nic.getNetworkId()).thenReturn(1L);
+        when(vm.getId()).thenReturn(10L);
+        when(_networksDao.findById(1L)).thenReturn(network);
+        doReturn(100).when(networkModel).getNetworkRate(1L, 10L);
+        doReturn("cloud").when(networkModel).getNetworkTag(any(), any());
+        doReturn(false).when(networkModel).isSecurityGroupSupportedInNetwork(any());
+        NicProfile result = networkModel.getNicProfile(vm, nic, mock(DataCenterVO.class));
+
+        assertNotNull(result);
     }
 }
diff --git a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
index 2eba3186d0e..30350d71684 100644
--- a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
+++ b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.network;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -29,6 +30,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -60,9 +62,11 @@ import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.cloud.agent.api.to.IpAddressTO;
+import com.cloud.agent.api.to.NicTO;
 import com.cloud.alert.AlertManager;
 import com.cloud.bgp.BGPService;
 import com.cloud.configuration.ConfigurationManager;
@@ -84,6 +88,7 @@ import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.dao.PublicIpQuarantineDao;
+import com.cloud.network.nsx.NsxService;
 import com.cloud.network.router.CommandSetupHelper;
 import com.cloud.network.router.NetworkHelper;
 import com.cloud.network.vo.PublicIpQuarantineVO;
@@ -107,6 +112,7 @@ import com.cloud.user.UserVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.user.dao.UserDao;
 import com.cloud.utils.Pair;
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Ip;
@@ -1217,4 +1223,49 @@ public class NetworkServiceImplTest {
             Assert.fail(e.getMessage());
         }
     }
+
+    @Test
+    public void testGetNicVlanValueForExternalVm_NonNsx() {
+        NicTO nic = mock(NicTO.class);
+        String broadcastUri = "vlan://123";
+        when(nic.getBroadcastUri()).thenReturn(URI.create(broadcastUri));
+        String result = service.getNicVlanValueForExternalVm(nic);
+        assertEquals("123", result);
+    }
+
+    @Test
+    public void testGetNicVlanValueForExternalVm_Nsx() {
+        NicTO nic = mock(NicTO.class);
+        NetworkVO networkVO = mock(NetworkVO.class);
+        NsxService nsxService = mock(NsxService.class);
+        String broadcastUri = "nsx://segment";
+        when(nic.getBroadcastUri()).thenReturn(URI.create(broadcastUri));
+        when(nic.getNetworkId()).thenReturn(42L);
+        when(networkDao.findById(42L)).thenReturn(networkVO);
+        when(networkVO.getDomainId()).thenReturn(1L);
+        when(networkVO.getDataCenterId()).thenReturn(2L);
+        when(networkVO.getAccountId()).thenReturn(3L);
+        when(networkVO.getVpcId()).thenReturn(4L);
+        when(networkVO.getId()).thenReturn(5L);
+        when(nsxService.getSegmentId(1L, 2L, 3L, 4L, 5L)).thenReturn("segment-123");
+        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
+            when(ComponentContext.getDelegateComponentOfType(NsxService.class)).thenReturn(nsxService);
+            String result = service.getNicVlanValueForExternalVm(nic);
+            assertEquals("segment-123", result);
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetNicVlanValueForExternalVm_Nsx_NoBean() {
+        NicTO nic = mock(NicTO.class);
+        NetworkVO networkVO = mock(NetworkVO.class);
+        String broadcastUri = "nsx://segment";
+        when(nic.getBroadcastUri()).thenReturn(URI.create(broadcastUri));
+        when(nic.getNetworkId()).thenReturn(42L);
+        when(networkDao.findById(42L)).thenReturn(networkVO);
+        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
+            when(ComponentContext.getDelegateComponentOfType(NsxService.class)).thenThrow(NoSuchBeanDefinitionException.class);
+            service.getNicVlanValueForExternalVm(nic);
+        }
+    }
 }
diff --git a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
index 98b1c05dba8..bb510e2aaa1 100755
--- a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
+++ b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
@@ -651,14 +651,14 @@ public class TemplateManagerImplTest {
     public void testRegisterTemplateWithTemplateType() {
         RegisterTemplateCmd cmd = Mockito.mock(RegisterTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.KVM);
         Assert.assertEquals(Storage.TemplateType.SYSTEM, type);
     }
 
     @Test
     public void testRegisterTemplateWithoutTemplateType() {
         RegisterTemplateCmd cmd = Mockito.mock(RegisterTemplateCmd.class);
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.KVM);
         Assert.assertEquals(Storage.TemplateType.USER, type);
     }
 
@@ -666,21 +666,21 @@ public class TemplateManagerImplTest {
     public void testRegisterTemplateWithSystemTemplateTypeByUser() {
         RegisterVnfTemplateCmd cmd = Mockito.mock(RegisterVnfTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.KVM);
     }
 
     @Test(expected = InvalidParameterValueException.class)
     public void testRegisterVnfTemplateWithTemplateType() {
         RegisterVnfTemplateCmd cmd = Mockito.mock(RegisterVnfTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.KVM);
         Assert.assertEquals(Storage.TemplateType.VNF, type);
     }
 
     @Test
     public void testRegisterVnfTemplateWithoutTemplateType() {
         RegisterVnfTemplateCmd cmd = Mockito.mock(RegisterVnfTemplateCmd.class);
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.KVM);
         Assert.assertEquals(Storage.TemplateType.VNF, type);
     }
 
@@ -688,14 +688,14 @@ public class TemplateManagerImplTest {
     public void testUpdateTemplateWithTemplateType() {
         UpdateTemplateCmd cmd = Mockito.mock(UpdateTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.XenServer);
         Assert.assertEquals(Storage.TemplateType.SYSTEM, type);
     }
 
     @Test
     public void testUpdateTemplateWithoutTemplateType() {
         UpdateTemplateCmd cmd = Mockito.mock(UpdateTemplateCmd.class);
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.KVM);
         Assert.assertNull(type);
     }
 
@@ -703,7 +703,7 @@ public class TemplateManagerImplTest {
     public void testUpdateTemplateWithInvalidTemplateType() {
         UpdateTemplateCmd cmd = Mockito.mock(UpdateTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn("invalidtype");
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.VMware);
     }
 
     @Test(expected = InvalidParameterValueException.class)
@@ -711,42 +711,42 @@ public class TemplateManagerImplTest {
         UpdateTemplateCmd cmd = Mockito.mock(UpdateTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.USER.toString());
         when(cmd.isRoutingType()).thenReturn(true);
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.KVM);
     }
 
     @Test(expected = InvalidParameterValueException.class)
     public void testUpdateTemplateWithInvalidCrossZonesForSystem() {
         UpdateTemplateCmd cmd = Mockito.mock(UpdateTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, false);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, false, Hypervisor.HypervisorType.KVM);
     }
 
     @Test(expected = InvalidParameterValueException.class)
     public void testUpdateTemplateWithSystemTemplateTypeByUser() {
         UpdateVnfTemplateCmd cmd = Mockito.mock(UpdateVnfTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.XenServer);
     }
 
     @Test(expected = InvalidParameterValueException.class)
     public void testUpdateVnfTemplateWithTemplateType() {
         UpdateVnfTemplateCmd cmd = Mockito.mock(UpdateVnfTemplateCmd.class);
         when(cmd.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM.toString());
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.KVM);
         Assert.assertEquals(Storage.TemplateType.VNF, type);
     }
 
     @Test
     public void testUpdateVnfTemplateWithoutTemplateType() {
         UpdateVnfTemplateCmd cmd = Mockito.mock(UpdateVnfTemplateCmd.class);
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, false, true, Hypervisor.HypervisorType.KVM);
         Assert.assertNull(type);
     }
 
     @Test
     public void testDeleteTemplateWithTemplateType() {
         DeleteTemplateCmd cmd = new DeleteTemplateCmd();
-        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true);
+        Storage.TemplateType type = templateManager.validateTemplateType(cmd, true, true, Hypervisor.HypervisorType.VMware);
         Assert.assertNull(type);
     }
 
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
index 979a411d300..b25da259b6b 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
@@ -779,7 +779,7 @@ public class UserVmManagerImplTest {
     public void verifyIfHypervisorSupportRootdiskSizeOverrideTest() {
         Hypervisor.HypervisorType[] hypervisorTypeArray = Hypervisor.HypervisorType.values();
         int exceptionCounter = 0;
-        int expectedExceptionCounter = hypervisorTypeArray.length - 5;
+        int expectedExceptionCounter = hypervisorTypeArray.length - 6;
 
         for(int i = 0; i < hypervisorTypeArray.length; i++) {
             if (hypervisorTypeArray[i].isFunctionalitySupported(Hypervisor.HypervisorType.Functionality.RootDiskSizeOverride)) {
diff --git a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
index 7533767c00b..7a357690208 100644
--- a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -24,11 +24,6 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.dc.DataCenter;
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.network.PublicIpQuarantine;
-import com.cloud.network.VirtualRouterProvider;
-import com.cloud.utils.fsm.NoTransitionException;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
@@ -51,6 +46,8 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationSe
 import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 import org.springframework.stereotype.Component;
 
+import com.cloud.agent.api.to.NicTO;
+import com.cloud.dc.DataCenter;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
@@ -60,6 +57,7 @@ import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.network.GuestVlan;
 import com.cloud.network.GuestVlanRange;
 import com.cloud.network.IpAddress;
@@ -74,6 +72,8 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.PhysicalNetworkTrafficType;
+import com.cloud.network.PublicIpQuarantine;
+import com.cloud.network.VirtualRouterProvider;
 import com.cloud.network.dao.NetworkServiceMapDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.element.DhcpServiceProvider;
@@ -93,6 +93,7 @@ import com.cloud.user.User;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.NicSecondaryIp;
@@ -1130,4 +1131,9 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
     @Override
     public void expungeLbVmRefs(List<Long> vmIds, Long batchSize) {
     }
+
+    @Override
+    public String getNicVlanValueForExternalVm(NicTO nic) {
+        return null;
+    }
 }
diff --git a/server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java
index 3b41a56dc0f..df100535c5b 100644
--- a/server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java
@@ -791,6 +791,11 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
         return null;
     }
 
+    @Override
+    public NicProfile getNicProfile(VirtualMachine vm, Nic nic, DataCenter dataCenter) {
+        return null;
+    }
+
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkModel#getAvailableIps(com.cloud.network.Network, java.lang.String)
      */
diff --git a/test/integration/smoke/test_extension_custom.py b/test/integration/smoke/test_extension_custom.py
new file mode 100644
index 00000000000..1f52cb41f3e
--- /dev/null
+++ b/test/integration/smoke/test_extension_custom.py
@@ -0,0 +1,619 @@
+# 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.
+""" BVT tests for custom extension
+"""
+# Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import listManagementServers
+from marvin.lib.base import (Extension,
+                             Pod,
+                             Cluster,
+                             Host,
+                             Template,
+                             ServiceOffering,
+                             NetworkOffering,
+                             Network,
+                             VirtualMachine,
+                             ExtensionCustomAction)
+from marvin.lib.common import (get_zone)
+from marvin.lib.utils import (random_gen)
+from marvin.sshClient import SshClient
+from nose.plugins.attrib import attr
+# Import System modules
+import json
+import logging
+from pathlib import Path
+import random
+import string
+import time
+
+_multiprocess_shared_ = True
+
+CUSTOM_EXTENSION_CONTENT = """#!/bin/bash
+
+parse_json() {
+  local json_string=$1
+  echo "$json_string" | jq '.' > /dev/null || { echo '{"error":"Invalid JSON input"}'; exit 1; }
+}
+
+get_vm_name() {
+  local input_json=$1
+  local name
+  name=$(jq -r '.virtualmachinename' <<< "$input_json")
+  if [[ -z "$name" || "$name" == "null" ]]; then
+      echo '{"status":"error","message":"virtualmachinename missing in JSON"}'
+      exit 1
+  fi
+  echo "$name"
+}
+
+get_vm_file() {
+  local name=$1
+  local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  echo "$script_dir/$name"
+}
+
+validate_vm_file_exists() {
+  local file=$1
+  if [[ ! -f "$file" ]]; then
+      echo '{"status":"error","message":"Instance file not found"}'
+      exit 1
+  fi
+}
+
+update_vm_status() {
+  local file=$1
+  local status=$2
+  local updated_json
+  updated_json=$(jq --arg status "$status" '.status = $status' "$file")
+  echo "$updated_json" > "$file"
+}
+
+prepare() {
+  echo ""
+}
+
+create() {
+  parse_json "$1"
+  local vm_name updated_json file
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+
+  updated_json=$(jq '. + {status: "Running"}' <<< "$1")
+  echo "$updated_json" > "$file"
+
+  jq -n --arg file "$file" \
+      '{status: "success", message: "Instance created", file: $file}'
+}
+
+delete() {
+  parse_json "$1"
+  local vm_name file
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+
+  if [[ -f "$file" ]]; then
+      rm -f "$file"
+  fi
+  jq -n --arg file "$file" \
+      '{status: "success", message: "Instance deleted", file: $file}'
+}
+
+start() {
+  parse_json "$1"
+  local vm_name file
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+  validate_vm_file_exists "$file"
+
+  update_vm_status "$file" "Running"
+  echo '{"status": "success", "message": "Instance started"}'
+}
+
+stop() {
+  parse_json "$1"
+  local vm_name file
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+
+  if [[ -f "$file" ]]; then
+      update_vm_status "$file" "Stopped"
+  fi
+  echo '{"status": "success", "message": "Instance stopped"}'
+}
+
+reboot() {
+  parse_json "$1"
+  local vm_name file
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+  validate_vm_file_exists "$file"
+
+  update_vm_status "$file" "Running"
+  echo '{"status": "success", "message": "Instance rebooted"}'
+}
+
+status() {
+  parse_json "$1"
+  local vm_name file vm_status
+  vm_name=$(get_vm_name "$1")
+  file=$(get_vm_file "$vm_name")
+  validate_vm_file_exists "$file"
+
+  vm_status=$(jq -r '.status' "$file")
+  [[ -z "$vm_status" || "$vm_status" == "null" ]] && vm_status="unknown"
+
+  case "${vm_status,,}" in
+    "running"|"poweron")
+      power_state="PowerOn"
+      ;;
+    "stopped"|"shutdown"|"poweroff")
+      power_state="PowerOff"
+      ;;
+    *)
+      power_state="$vm_status"
+      ;;
+  esac
+
+  jq -n --arg ps "$power_state" '{status: "success", power_state: $ps}'
+}
+
+testaction() {
+  parse_json "$1"
+  local vm_name param_val
+  vm_name=$(get_vm_name "$1")
+  param_val=$(jq -r '.parameters.Name' <<< "$1")
+
+  echo "$param_val for $vm_name"
+}
+
+action=$1
+parameters_file="$2"
+wait_time="$3"
+
+if [[ -z "$action" || -z "$parameters_file" ]]; then
+  echo '{"error":"Missing required arguments"}'
+  exit 1
+fi
+
+if [[ ! -r "$parameters_file" ]]; then
+  echo '{"error":"File not found or unreadable"}'
+  exit 1
+fi
+
+parameters=$(<"$parameters_file")
+
+case $action in
+  prepare)     prepare "$parameters" ;;
+  create)      create "$parameters" ;;
+  delete)      delete "$parameters" ;;
+  start)       start "$parameters" ;;
+  stop)        stop "$parameters" ;;
+  reboot)      reboot "$parameters" ;;
+  status)      status "$parameters" ;;
+  testaction)  testaction "$parameters" ;;
+  *)           echo '{"error":"Invalid action"}'; exit 1 ;;
+esac
+
+exit 0
+
+"""
+
+class TestExtensions(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestExtensions, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+
+        cls.mgtSvrDetails = cls.config.__dict__["mgtSvr"][0].__dict__
+
+        cls._cleanup = []
+        cls.logger = logging.getLogger('TestExtensions')
+        cls.logger.setLevel(logging.DEBUG)
+
+        cls.compute_offering = ServiceOffering.create(
+            cls.apiclient,
+            cls.services["service_offerings"]["tiny"])
+        cls._cleanup.append(cls.compute_offering)
+        cls.network_offering = NetworkOffering.create(
+            cls.apiclient,
+            cls.services["l2-network_offering"],
+        )
+        cls._cleanup.append(cls.network_offering)
+        cls.network_offering.update(cls.apiclient, state='Enabled')
+        cls.services["network"]["networkoffering"] = cls.network_offering.id
+        cls.l2_network = Network.create(
+            cls.apiclient,
+            cls.services["l2-network"],
+            zoneid=cls.zone.id,
+            networkofferingid=cls.network_offering.id
+        )
+        cls._cleanup.append(cls.l2_network)
+
+        cls.resource_name_suffix = random_gen()
+        cls.create_cluster()
+        cls.extension = Extension.create(
+            cls.apiclient,
+            name=f"ext-{cls.resource_name_suffix}",
+            type='Orchestrator'
+        )
+        cls._cleanup.append(cls.extension)
+        cls.update_extension_path(cls.extension.path)
+        cls.extension.register(cls.apiclient, cls.cluster.id, 'Cluster')
+        details = {
+            'url': f"host-{cls.resource_name_suffix}",
+            'zoneid': cls.cluster.zoneid,
+            'podid': cls.cluster.podid,
+            'username': 'External',
+            'password': 'External'
+        }
+        cls.host = Host.create(
+            cls.apiclient,
+            cls.cluster,
+            details,
+            hypervisor=cls.cluster.hypervisortype
+        )
+        cls._cleanup.append(cls.host)
+        template_name = f"template-{cls.resource_name_suffix}"
+        template_data = {
+            "name": template_name,
+            "displaytext": template_name,
+            "format": cls.host.hypervisor,
+            "hypervisor": cls.host.hypervisor,
+            "ostype": "Other Linux (64-bit)",
+            "url": template_name,
+            "requireshvm": "True",
+            "ispublic": "True",
+            "isextractable": "True",
+            "extensionid": cls.extension.id
+        }
+        cls.template = Template.register(
+            cls.apiclient,
+            template_data,
+            zoneid=cls.zone.id,
+            hypervisor=cls.cluster.hypervisortype
+        )
+        cls._cleanup.append(cls.template)
+        logging.info("Waiting for 3 seconds for template to be ready")
+        time.sleep(3)
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+        cls.services["virtual_machine"]["template"] = cls.template.id
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestExtensions, cls).tearDownClass()
+
+    @classmethod
+    def create_cluster(cls):
+        pod_list = Pod.list(cls.apiclient)
+        if len(pod_list) <= 0:
+            cls.fail("No Pods found")
+        pod_id = pod_list[0].id
+        cluster_services = {
+            'clustername': 'cluster-' + cls.resource_name_suffix,
+            'clustertype': 'CloudManaged'
+        }
+        cls.cluster = Cluster.create(
+            cls.apiclient,
+            cluster_services,
+            cls.zone.id,
+            pod_id,
+            'External'
+        )
+        cls._cleanup.append(cls.cluster)
+
+    @classmethod
+    def getManagementServerIps(cls):
+        if cls.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+            return None
+        cmd = listManagementServers.listManagementServersCmd()
+        servers = cls.apiclient.listManagementServers(cmd)
+        active_server_ips = []
+        active_server_ips.append(cls.mgtSvrDetails["mgtSvrIp"])
+        for idx, server in enumerate(servers):
+            if server.state == 'Up' and server.ipaddress != cls.mgtSvrDetails["mgtSvrIp"]:
+                active_server_ips.append(server.ipaddress)
+        return active_server_ips
+
+    @classmethod
+    def update_path_locally(cls, path):
+        try:
+            file = Path(path)
+            file.write_text(CUSTOM_EXTENSION_CONTENT)
+            file.chmod(file.stat().st_mode | 0o111)  # Make executable
+        except Exception as e:
+            cls.fail(f"Failed to update path on localhost: {str(e)}")
+
+    @classmethod
+    def update_extension_path(cls, path):
+        logging.info(f"Updating extension path {path}")
+        server_ips = cls.getManagementServerIps()
+        if server_ips is None:
+            if cls.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+                cls.update_path_locally(path)
+                return
+            cls.fail(f"Extension path update cannot be done on {cls.mgtSvrDetails['mgtSvrIp']}")
+        logging.info("Updating extension path on all management server")
+        command = (
+            f"cat << 'EOF' > {path}\n{CUSTOM_EXTENSION_CONTENT}\nEOF\n"
+            f"chmod +x {path}"
+        )
+        for idx, server_ip in enumerate(server_ips):
+            logging.info(f"Updating extension path on management server #{idx} with IP {server_ip}")
+            sshClient = SshClient(
+                server_ip,
+                22,
+                cls.mgtSvrDetails["user"],
+                cls.mgtSvrDetails["passwd"]
+            )
+            sshClient.execute(command)
+
+    def setUp(self):
+        self.cleanup = []
+
+    def tearDown(self):
+        super(TestExtensions, self).tearDown()
+
+    def get_vm_content_path(self, extension_path, vm_name):
+        directory = extension_path.rsplit('/', 1)[0] if '/' in extension_path else '.'
+        path = f"{directory}/{vm_name}"
+        return path
+
+    def get_vm_content_locally(self, path):
+        try:
+            file = Path(path)
+            if not file.exists():
+                return None
+            return file.read_text().strip()
+        except Exception:
+            return None
+
+    def get_vm_content(self, extension_path, vm_name):
+        path = self.get_vm_content_path(extension_path, vm_name)
+        server_ips = self.getManagementServerIps()
+        if not server_ips:
+            if self.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+                return self.get_vm_content_locally(path)
+            return None
+        logging.info("Trying to get VM content from all management server")
+        command = f"cat {path}"
+        for idx, server_ip in enumerate(server_ips):
+            logging.info(f"Trying to get VM content from management server #{idx} with IP {server_ip}")
+            sshClient = SshClient(
+                server_ip,
+                22,
+                self.mgtSvrDetails["user"],
+                self.mgtSvrDetails["passwd"]
+            )
+            results = sshClient.execute(command)
+            if isinstance(results, list) and len(results) > 0:
+                return '\n'.join(line.strip() for line in results)
+        return None
+
+    def check_vm_content_values(self, content):
+        if content is None:
+            self.fail("VM content is empty")
+
+        try:
+            data = json.loads(content)
+        except json.JSONDecodeError as e:
+            self.fail(f"Invalid JSON for the VM: {e}")
+
+        if not data:
+            self.fail("Empty JSON for the VM")
+
+        required_keys = ['externaldetails', 'cloudstack.vm.details', 'virtualmachineid', 'virtualmachinename', 'status']
+        if not all(key in data for key in required_keys):
+            self.fail("Missing one or more required keys.")
+
+        memory = self.compute_offering.memory * 1024 * 1024
+        vm_details = data['cloudstack.vm.details']
+
+        self.assertEqual(
+            memory,
+            vm_details['minRam'],
+            "VM memory mismatch"
+        )
+        self.assertEqual(
+            self.compute_offering.cpunumber,
+            vm_details['cpus'],
+            "VM CPU count mismatch"
+        )
+        self.assertEqual(
+            'Running',
+            data['status'],
+            "VM status mismatch"
+        )
+
+    def check_vm_status_from_content(self, extension_path, vm_name, status):
+        content = self.get_vm_content(extension_path, vm_name)
+        if content is None:
+            self.fail("VM content is empty")
+
+        try:
+            data = json.loads(content)
+        except json.JSONDecodeError as e:
+            self.fail(f"Invalid JSON for the VM: {e}")
+
+        if not data:
+            self.fail("Empty JSON for the VM")
+
+        self.assertEqual(
+            status,
+            data['status'],
+            "VM status mismatch"
+        )
+
+    def check_vm_content_exist_locally(self, path):
+        try:
+            file = Path(path)
+            return file.exists()
+        except Exception:
+            return None
+
+    def check_vm_content_exist(self, extension_path, vm_name):
+        path = self.get_vm_content_path(extension_path, vm_name)
+        server_ips = self.getManagementServerIps()
+        if not server_ips:
+            if self.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+                return self.check_vm_content_exist_locally(path)
+            return None
+        logging.info("Trying to check VM content exists from all management server")
+        command = f"test -e '{path}' && echo EXISTS || echo MISSING"
+        for idx, server_ip in enumerate(server_ips):
+            logging.info(f"Trying to check VM content exists from management server #{idx} with IP {server_ip}")
+            sshClient = SshClient(
+                server_ip,
+                22,
+                self.mgtSvrDetails["user"],
+                self.mgtSvrDetails["passwd"]
+            )
+            results = sshClient.execute(command)
+            if results is not None and results[0].strip() == "EXISTS":
+                return True
+        return False
+
+    def popItemFromCleanup(self, item_id):
+        for idx, x in enumerate(self.cleanup):
+            if x.id == item_id:
+                self.cleanup.pop(idx)
+                break
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_01_extension_vm_lifecycle(self):
+        self.virtual_machine = VirtualMachine.create(
+            self.apiclient,
+            self.services["virtual_machine"],
+            templateid=self.template.id,
+            serviceofferingid=self.compute_offering.id,
+            networkids=[self.l2_network.id]
+        )
+        self.cleanup.append(self.virtual_machine)
+        self.assertEqual(
+            self.virtual_machine.state,
+            'Running',
+            "VM not in Running state"
+        )
+        content = self.get_vm_content(self.extension.path, self.virtual_machine.instancename)
+        self.check_vm_content_values(content)
+        self.virtual_machine.stop(self.apiclient)
+        self.check_vm_status_from_content(self.extension.path, self.virtual_machine.instancename, 'Stopped')
+        self.virtual_machine.start(self.apiclient)
+        self.check_vm_status_from_content(self.extension.path, self.virtual_machine.instancename, 'Running')
+        self.virtual_machine.reboot(self.apiclient)
+        self.check_vm_status_from_content(self.extension.path, self.virtual_machine.instancename, 'Running')
+        self.virtual_machine.delete(self.apiclient, expunge=True)
+        self.popItemFromCleanup(self.virtual_machine.id)
+        self.assertFalse(
+            self.check_vm_content_exist(self.extension.path, self.virtual_machine.instancename),
+            "VM content exist event after expunge"
+        )
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_02_run_custom_action(self):
+        name = 'testaction'
+        details = [{}]
+        details[0]['abc'] = 'xyz'
+        parameters = [{}]
+        parameter0 = {
+            'name': 'Name',
+            'type': 'STRING',
+            'validationformat': 'NONE',
+            'required': True
+        }
+        parameters[0] = parameter0
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name,
+            enabled=True,
+            details=details,
+            parameters=parameters,
+            successmessage='Successfully completed {{actionName}}'
+        )
+        self.cleanup.append(self.custom_action)
+        self.virtual_machine = VirtualMachine.create(
+            self.apiclient,
+            self.services["virtual_machine"],
+            templateid=self.template.id,
+            serviceofferingid=self.compute_offering.id,
+            networkids=[self.l2_network.id]
+        )
+        self.cleanup.append(self.virtual_machine)
+        param_val=random_gen()
+        run_parameters = [{}]
+        run_parameters[0] = {
+            'Name': param_val
+        }
+        run_response = self.custom_action.run(
+            self.apiclient,
+            resourceid=self.virtual_machine.id,
+            parameters=run_parameters
+        )
+        self.assertTrue(
+            run_response.success,
+            "Action run status not success"
+        )
+        self.assertEquals(
+            f"Successfully completed {name}",
+            run_response.result.message,
+            "Action run status not success"
+        )
+        data = run_response.result.details
+        self.assertEquals(
+            f"{param_val} for {self.virtual_machine.instancename}",
+            run_response.result.details,
+            "Action response details not match"
+        )
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_03_run_invalid_custom_action(self):
+        name = 'invalidaction'
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name,
+            enabled=True,
+            errormessage='Failed {{actionName}}'
+        )
+        self.cleanup.append(self.custom_action)
+        self.virtual_machine = VirtualMachine.create(
+            self.apiclient,
+            self.services["virtual_machine"],
+            templateid=self.template.id,
+            serviceofferingid=self.compute_offering.id,
+            networkids=[self.l2_network.id]
+        )
+        self.cleanup.append(self.virtual_machine)
+        run_response = self.custom_action.run(
+            self.apiclient,
+            resourceid=self.virtual_machine.id
+        )
+        self.assertFalse(
+            run_response.success,
+            "Action run status not failure"
+        )
+        self.assertEquals(
+            f"Failed {name}",
+            run_response.result.message,
+            "Action run status not success"
+        )
diff --git a/test/integration/smoke/test_extension_custom_action_lifecycle.py b/test/integration/smoke/test_extension_custom_action_lifecycle.py
new file mode 100644
index 00000000000..8e0396a0a3b
--- /dev/null
+++ b/test/integration/smoke/test_extension_custom_action_lifecycle.py
@@ -0,0 +1,281 @@
+# 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.
+""" BVT tests for extension custom actions lifecycle functionalities
+"""
+# Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import listManagementServers
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.lib.base import (Extension,
+                             ExtensionCustomAction)
+from marvin.lib.common import (get_zone)
+from marvin.lib.utils import (random_gen)
+from marvin.sshClient import SshClient
+from nose.plugins.attrib import attr
+# Import System modules
+import logging
+import random
+import string
+import time
+
+_multiprocess_shared_ = True
+
+class TestExtensions(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestExtensions, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+
+        cls.mgtSvrDetails = cls.config.__dict__["mgtSvr"][0].__dict__
+
+        cls._cleanup = []
+        cls.logger = logging.getLogger('TestExtensions')
+        cls.logger.setLevel(logging.DEBUG)
+
+        cls.resource_name_suffix = random_gen()
+        cls.extension = Extension.create(
+            cls.apiclient,
+            name=f"ext-{cls.resource_name_suffix}",
+            type='Orchestrator'
+        )
+        cls._cleanup.append(cls.extension)
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestExtensions, cls).tearDownClass()
+
+    def setUp(self):
+        self.cleanup = []
+
+    def tearDown(self):
+        super(TestExtensions, self).tearDown()
+
+    def popItemFromCleanup(self, item_id):
+        for idx, x in enumerate(self.cleanup):
+            if x.id == item_id:
+                self.cleanup.pop(idx)
+                break
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_01_extension_create_custom_action(self):
+        name = random_gen()
+        details = [{}]
+        details[0]['abc'] = 'xyz'
+        parameters = [{}]
+        parameter0 = {
+            'name': 'Name',
+            'type': 'STRING',
+            'validationformat': 'NONE',
+            'required': True
+        }
+        parameters[0] = parameter0
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name,
+            details=details,
+            parameters=parameters
+        )
+        self.cleanup.append(self.custom_action)
+        self.assertEqual(
+            name,
+            self.custom_action.name,
+            "Check custom action name failed"
+        )
+        self.assertEqual(
+            self.extension.id,
+            self.custom_action.extensionid,
+            "Check custom action extension ID failed"
+        )
+        self.assertEqual(
+            'VirtualMachine',
+            self.custom_action.resourcetype,
+            "Check custom action resorucetype failed"
+        )
+        self.assertFalse(
+            self.custom_action.enabled,
+            "Check custom action enabled failed"
+        )
+        self.assertTrue(
+            self.custom_action.allowedroletypes is not None and len(self.custom_action.allowedroletypes) == 1 and self.custom_action.allowedroletypes[0] == 'Admin',
+            "Check custom action allowedroletypes failed"
+        )
+        self.assertEqual(
+            3,
+            self.custom_action.timeout,
+            "Check custom action timeout failed"
+        )
+        action_details = self.custom_action.details.__dict__
+        for k, v in details[0].items():
+            self.assertIn(k, action_details, f"Key '{k}' should be present in details")
+            self.assertEqual(v, action_details[k], f"Value for key '{k}' should be '{v}'")
+        self.assertTrue(
+            self.custom_action.parameters is not None and len(self.custom_action.parameters) == 1,
+            "Check custom action parameters count failed"
+        )
+        parameter_result = self.custom_action.parameters[0].__dict__
+        for k, v in parameter0.items():
+            self.assertIn(k, parameter_result, f"Key '{k}' should be present in the parameter")
+            self.assertEqual(v, parameter_result[k], f"Parameter property for key '{k}' should be '{v}'")
+
+        actions = self.extension.list_custom_actions(self.apiclient)
+        self.assertTrue(
+            actions is not None and len(actions) == 1 and actions[0].id == self.custom_action.id,
+            "Check extension custom actions failed"
+        )
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_02_extension_create_custom_action_name_fail(self):
+        name = random_gen()
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name
+        )
+        try:
+            self.custom_action1 = ExtensionCustomAction.create(
+                self.apiclient,
+                extensionid=self.extension.id,
+                name=name
+            )
+            self.cleanup.append(self.custom_action1)
+            self.fail(f"Same name: {name} custom action created twice")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_03_extension_create_custom_action_resourcetype_fail(self):
+        try:
+            self.custom_action = ExtensionCustomAction.create(
+                self.apiclient,
+                extensionid=self.extension.id,
+                name=random_gen(),
+                resourcetype='Host'
+            )
+            self.cleanup.append(self.custom_action)
+            self.fail(f"Unknown resourcetype: {type} custom action created")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_04_extension_update_custom_action(self):
+        details = [{}]
+        details[0]['abc'] = 'xyz'
+        parameters = [{}]
+        parameter0 = {
+            'name': 'Name',
+            'type': 'STRING',
+            'validationformat': 'NONE',
+            'required': True
+        }
+        parameters[0] = parameter0
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=random_gen(),
+            details=details,
+            parameters=parameters
+        )
+        self.cleanup.append(self.custom_action)
+
+        details[0]['bca'] = 'yzx'
+        description = 'Updated test description'
+        parameter1 = {
+            'name': 'COUNT',
+            'type': 'NUMBER',
+            'validationformat': 'NONE',
+            'required': False,
+            'valueoptions': '10,100,1000'
+        }
+        parameters.append(parameter1)
+        updated_action = self.custom_action.update(
+            self.apiclient,
+            description=description,
+            enabled=True,
+            details=details,
+            parameters=parameters)['extensioncustomaction']
+        self.assertTrue(
+            updated_action.enabled,
+            "Check custom action enabled failed"
+        )
+        self.assertEqual(
+            description,
+            updated_action.description,
+            "Check custom action description failed"
+        )
+        action_details = updated_action.details.__dict__
+        for k, v in details[0].items():
+            self.assertIn(k, action_details, f"Key '{k}' should be present in details")
+            self.assertEqual(v, action_details[k], f"Value for key '{k}' should be '{v}'")
+        self.assertTrue(
+            updated_action.parameters is not None and len(updated_action.parameters) == 2,
+            "Check custom action parameters count failed"
+        )
+        for idx, param in enumerate(parameters):
+            parameter_result = updated_action.parameters[idx].__dict__
+            for k, v in param.items():
+                self.assertIn(k, parameter_result, f"Key '{k}' should be present in the parameter")
+                actual = ','.join(str(x) for x in parameter_result[k]) if k == 'valueoptions' else parameter_result[k]
+                self.assertEqual(v, actual, f"Parameter property for key '{k}' should be '{v}'")
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_05_extension_run_custom_action_invalid_resource_type_fail(self):
+        name = random_gen()
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name,
+            enabled=True
+        )
+        self.cleanup.append(self.custom_action)
+        try:
+            self.custom_action.run(
+                self.apiclient,
+                resourcetype='Host',
+                resourceid='abcd'
+            )
+            self.fail(f"Invalid resource custom action: {name} ran successfully")
+        except Exception as e:
+            msg = str(e)
+            if msg.startswith("Job failed") == False or "Internal error running action" not in msg == False:
+                self.fail(f"Unknown exception occurred: {e}")
+            pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_06_extension_run_custom_action_fail(self):
+        name = random_gen()
+        self.custom_action = ExtensionCustomAction.create(
+            self.apiclient,
+            extensionid=self.extension.id,
+            name=name,
+            enabled=True
+        )
+        self.cleanup.append(self.custom_action)
+        try:
+            self.custom_action.run(
+                self.apiclient,
+                resourceid='abcd'
+            )
+            self.fail(f"Invalid resource custom action: {name} ran successfully")
+        except Exception as e:
+            msg = str(e)
+            if msg.startswith("Job failed") == False or "Invalid action" not in msg == False:
+                self.fail(f"Unknown exception occurred: {e}")
+            pass
diff --git a/test/integration/smoke/test_extension_lifecycle.py b/test/integration/smoke/test_extension_lifecycle.py
new file mode 100644
index 00000000000..aac380be7df
--- /dev/null
+++ b/test/integration/smoke/test_extension_lifecycle.py
@@ -0,0 +1,480 @@
+# 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.
+""" BVT tests for extensions lifecycle functionalities
+"""
+# Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import (listInfrastructure,
+                                  listManagementServers)
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.lib.base import (Extension,
+                             Pod,
+                             Cluster,
+                             Host,
+                             Configurations,
+                             Template,
+                             ServiceOffering,
+                             NetworkOffering,
+                             Network,
+                             VirtualMachine)
+from marvin.lib.common import (get_zone)
+from marvin.lib.utils import (random_gen)
+from marvin.sshClient import SshClient
+from nose.plugins.attrib import attr
+# Import System modules
+import logging
+from pathlib import Path
+import random
+import string
+import time
+
+_multiprocess_shared_ = True
+
+CONFIG_EXTENSION_PATH_STATE_CHECK_NAME = "extension.path.state.check.interval"
+
+class TestExtensions(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestExtensions, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+
+        cls.mgtSvrDetails = cls.config.__dict__["mgtSvr"][0].__dict__
+
+        cls._cleanup = []
+        cls.logger = logging.getLogger('TestExtensions')
+        cls.logger.setLevel(logging.DEBUG)
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestExtensions, cls).tearDownClass()
+
+    def setUp(self):
+        self.changedConfigurations = {}
+        self.staticConfigurations = []
+        self.cleanup = []
+
+    def tearDown(self):
+        restartServer = False
+        for config in self.changedConfigurations:
+            value = self.changedConfigurations[config]
+            logging.info(f"Reverting value of config: {config} to {value}")
+            Configurations.update(self.apiclient,
+                config,
+                value=value)
+            if config in self.staticConfigurations:
+                restartServer = True
+        if restartServer:
+            self.restartAllManagementServers()
+        super(TestExtensions, self).tearDown()
+
+    def isManagementUp(self):
+        try:
+            self.apiclient.listInfrastructure(listInfrastructure.listInfrastructureCmd())
+            return True
+        except Exception:
+            return False
+
+    def getManagementServerIps(self):
+        if self.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+            return None
+        cmd = listManagementServers.listManagementServersCmd()
+        servers = self.apiclient.listManagementServers(cmd)
+        active_server_ips = []
+        active_server_ips.append(self.mgtSvrDetails["mgtSvrIp"])
+        for idx, server in enumerate(servers):
+            if server.state == 'Up' and server.ipaddress != self.mgtSvrDetails["mgtSvrIp"]:
+                active_server_ips.append(server.ipaddress)
+        return active_server_ips
+
+    def restartAllManagementServers(self):
+        """Restart all management servers
+         Assumes all servers have same username and password"""
+        server_ips = self.getManagementServerIps()
+        if server_ips is None:
+            self.staticConfigurations.clear()
+            self.fail(f"MS restarts cannot be done on {self.mgtSvrDetails['mgtSvrIp']}")
+            return False
+        logging.info("Restarting all management server")
+        for idx, server_ip in enumerate(server_ips):
+            logging.info(f"Restarting management server #{idx} with IP {server_ip}")
+            sshClient = SshClient(
+                server_ip,
+                22,
+                self.mgtSvrDetails["user"],
+                self.mgtSvrDetails["passwd"]
+            )
+            command = "service cloudstack-management stop"
+            sshClient.execute(command)
+            command = "service cloudstack-management start"
+            sshClient.execute(command)
+            if idx == 0:
+                # Wait before restarting other management servers to make the first as oldest running
+                time.sleep(10)
+
+        # Waits for management to come up in 10 mins, when it's up it will continue
+        timeout = time.time() + (10 * 60)
+        while time.time() < timeout:
+            if self.isManagementUp() is True: return True
+            time.sleep(5)
+        logging.info("Management server did not come up, failing")
+        return False
+
+    def changeConfiguration(self, name, value):
+        current_config = Configurations.list(self.apiclient, name=name)[0]
+        if current_config.value == str(value):
+            return
+        logging.info(f"Current value for config: {name} is {current_config.value}, changing it to {value}")
+        self.changedConfigurations[name] = current_config.value
+        if current_config.isdynamic == False:
+            self.staticConfigurations.append(name)
+        Configurations.update(self.apiclient,
+            name,
+            value=value)
+
+    def create_cluster(self):
+        pod_list = Pod.list(self.apiclient)
+        if len(pod_list) <= 0:
+            self.fail("No Pods found")
+        pod_id = pod_list[0].id
+        cluster_services = {
+            'clustername': 'C0-Test-' + random_gen(),
+            'clustertype': 'CloudManaged'
+        }
+        self.cluster = Cluster.create(
+            self.apiclient,
+            cluster_services,
+            self.zone.id,
+            pod_id,
+            'External'
+        )
+        self.cleanup.append(self.cluster)
+
+    def move_extension_path_locally(self, source, target):
+        try:
+            Path(source).rename(target)
+        except Exception as e:
+            self.fail(f"Failed to move extension path on localhost: {str(e)}")
+
+    def move_extension_path(self, path, restore=False):
+        logging.info(f"Moving path {path}")
+        source = path
+        target = f"{path}-backup"
+        if restore:
+            source = target
+            target = path
+        server_ips = self.getManagementServerIps()
+        if server_ips is None:
+            if self.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+                self.move_extension_path_locally(source, target)
+                return
+            self.fail(f"Extension path cannot be moved on {cls.mgtSvrDetails['mgtSvrIp']}")
+        logging.info(f"Moving {path} on all management servers")
+        command = f"mv {source} {target}"
+        for idx, server_ip in enumerate(server_ips):
+            logging.info(f"Moving {path} on management server #{idx} with IP {server_ip}")
+            sshClient = SshClient(
+                server_ip,
+                22,
+                self.mgtSvrDetails["user"],
+                self.mgtSvrDetails["passwd"]
+            )
+            sshClient.execute(command)
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_01_create_extension(self):
+        name = random_gen()
+        type = 'Orchestrator'
+        details = [{}]
+        details[0]['abc'] = 'xyz'
+        self.extension = Extension.create(
+            self.apiclient,
+            name=name,
+            type=type,
+            details=details
+        )
+        self.cleanup.append(self.extension)
+        self.assertEqual(
+            name,
+            self.extension.name,
+            "Check extension name failed"
+        )
+        self.assertEqual(
+            type,
+            self.extension.type,
+            "Check extension type failed"
+        )
+        self.assertEqual(
+            'Enabled',
+            self.extension.state,
+            "Check extension state failed"
+        )
+        self.assertTrue(
+            self.extension.pathready,
+            "Check extension path ready failed"
+        )
+        extension_details = self.extension.details.__dict__
+        for k, v in details[0].items():
+            self.assertIn(k, extension_details, f"Key '{k}' should be present in details")
+            self.assertEqual(v, extension_details[k], f"Value for key '{k}' should be '{v}'")
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_02_create_extension_type_fail(self):
+        type = 'Random'
+        try:
+            self.extension = Extension.create(
+                self.apiclient,
+                name=random_gen(),
+                type=type
+            )
+            self.cleanup.append(self.extension)
+            self.fail(f"Unknown type: {type} extension created")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_03_create_extension_name_fail(self):
+        name = random_gen()
+        self.extension = Extension.create(
+            self.apiclient,
+            name=name,
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension)
+        try:
+            self.extension1 = Extension.create(
+                self.apiclient,
+                name=name,
+                type='Orchestrator'
+            )
+            self.cleanup.append(self.extension1)
+            self.fail(f"Same name: {name} extension created twice")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_04_update_extension(self):
+        details = [{}]
+        details[0]['abc'] = 'xyz'
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator',
+            description='Test description',
+            state='Disabled',
+            details=details
+        )
+        self.cleanup.append(self.extension)
+
+        details[0]['bca'] = 'yzx'
+        description = 'Updated test description'
+        state = 'Enabled'
+        updated_extension = self.extension.update(
+            self.apiclient,
+            description=description,
+            state=state,
+            details=details)
+        self.assertEqual(
+            description,
+            updated_extension.description,
+            "Check extension description"
+        )
+        self.assertEqual(
+            state,
+            updated_extension.state,
+            "Check extension state"
+        )
+        self.assertTrue(
+            updated_extension.details is not None,
+            "Check extension details not None"
+        )
+        updated_details = updated_extension.details.__dict__
+        for k, v in details[0].items():
+            self.assertIn(k, updated_details, f"Key '{k}' should be present in updated details")
+            self.assertEqual(v, updated_details[k], f"Value for key '{k}' should be '{v}'")
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_05_register_unregister_extension(self):
+        self.create_cluster()
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension)
+        registered_extension = self.extension.register(self.apiclient, self.cluster.id, 'Cluster')
+        resource_found = False
+        if registered_extension is not None and registered_extension.resources is not None and len(registered_extension.resources) > 0:
+            for resource in registered_extension.resources:
+                if resource.id == self.cluster.id and resource.type == 'Cluster':
+                    resource_found = True
+                    break
+        self.assertTrue(resource_found, "Registered resource not found")
+        self.extension.unregister(self.apiclient, self.cluster.id, 'Cluster')
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_06_register_extension_already_fail(self):
+        self.create_cluster()
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension)
+        registered_extension = self.extension.register(self.apiclient,self.cluster.id, 'Cluster')['extension']
+        self.extension1 = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension1)
+        try:
+            self.extension1.register(self.apiclient, self.cluster.id, 'Cluster')
+            self.fail(f"Same cluster: {cluster.id} registered with two extensions")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_07_delete_extension_registered_resource_fail(self):
+        self.create_cluster()
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension)
+        self.extension.register(self.apiclient, self.cluster.id, 'Cluster')
+        try:
+            self.extension.delete(self.apiclient, False)
+            self.fail("Deleted extensions which is registered to a resource")
+        except CloudstackAPIException: pass
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_08_extension_sync(self):
+        sync_task_interval = 60
+        if self.mgtSvrDetails["mgtSvrIp"] in ('localhost', '127.0.0.1'):
+            sync_config = Configurations.list(self.apiclient, name=CONFIG_EXTENSION_PATH_STATE_CHECK_NAME)[0]
+            if sync_config.value != str(sync_task_interval):
+                self.skipTest("Test running on localhost, MS cannot be restarted to change config")
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.assertTrue(self.extension.pathready, "Path not ready")
+        self.changeConfiguration(CONFIG_EXTENSION_PATH_STATE_CHECK_NAME, sync_task_interval)
+        if len(self.staticConfigurations) > 0:
+            self.restartAllManagementServers()
+        self.move_extension_path(self.extension.path)
+        wait_multiple = 1.5
+        wait = wait_multiple * sync_task_interval
+        logging.info(f"Waiting for {wait_multiple}x{sync_task_interval} = {wait} seconds for background task to execute")
+        time.sleep(wait)
+        ext = Extension.list(
+            self.apiclient,
+            id=self.extension.id
+        )[0]
+        self.assertFalse(ext.pathready, "Path is still ready")
+        self.move_extension_path(self.extension.path, True)
+        logging.info(f"Waiting for {wait_multiple}x{sync_task_interval} = {wait} seconds for background task to execute")
+        time.sleep(wait)
+        ext = Extension.list(
+            self.apiclient,
+            id=self.extension.id
+        )[0]
+        self.assertTrue(ext.pathready, "Path not ready")
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_09_extension_deploy_vm(self):
+        self.create_cluster()
+        self.extension = Extension.create(
+            self.apiclient,
+            name=random_gen(),
+            type='Orchestrator'
+        )
+        self.cleanup.append(self.extension)
+        self.extension.register(self.apiclient, self.cluster.id, 'Cluster')
+        details = {
+            'url': random_gen(),
+            'zoneid': self.cluster.zoneid,
+            'podid': self.cluster.podid,
+            'username': 'External',
+            'password': 'External'
+        }
+        self.host = Host.create(
+            self.apiclient,
+            self.cluster,
+            details,
+            hypervisor=self.cluster.hypervisortype
+        )
+        self.cleanup.append(self.host)
+        template_name = "ext-" + random_gen()
+        template_data = {
+            "name": template_name,
+            "displaytext": template_name,
+            "format": self.host.hypervisor,
+            "hypervisor": self.host.hypervisor,
+            "ostype": "Other Linux (64-bit)",
+            "url": template_name,
+            "requireshvm": "True",
+            "ispublic": "True",
+            "isextractable": "True",
+            "extensionid": self.extension.id
+        }
+        self.template = Template.register(
+            self.apiclient,
+            template_data,
+            zoneid=self.zone.id,
+            hypervisor=self.cluster.hypervisortype
+        )
+        self.cleanup.append(self.template)
+        logging.info("Waiting for 3 seconds for template to be ready")
+        time.sleep(3)
+        self.compute_offering = ServiceOffering.create(
+            self.apiclient,
+            self.services["service_offerings"]["tiny"])
+        self.cleanup.append(self.compute_offering)
+        self.network_offering = NetworkOffering.create(
+            self.apiclient,
+            self.services["l2-network_offering"],
+        )
+        self.cleanup.append(self.network_offering)
+        self.network_offering.update(self.apiclient, state='Enabled')
+        self.services["network"]["networkoffering"] = self.network_offering.id
+        self.l2_network = Network.create(
+            self.apiclient,
+            self.services["l2-network"],
+            zoneid=self.zone.id,
+            networkofferingid=self.network_offering.id
+        )
+        self.cleanup.append(self.l2_network)
+        self.services["virtual_machine"]["zoneid"] = self.zone.id
+        self.services["virtual_machine"]["template"] = self.template.id
+        self.virtual_machine = VirtualMachine.create(
+            self.apiclient,
+            self.services["virtual_machine"],
+            templateid=self.template.id,
+            serviceofferingid=self.compute_offering.id,
+            networkids=[self.l2_network.id]
+        )
+        self.cleanup.append(self.virtual_machine)
+        self.assertEqual(
+            self.virtual_machine.state,
+            'Running',
+            "VM not in Running state"
+        )
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 0db89372581..d34d5480efc 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -265,7 +265,11 @@ known_categories = {
     'listGuiThemes': 'GUI Theme',
     'createGuiTheme': 'GUI Theme',
     'updateGuiTheme': 'GUI Theme',
-    'removeGuiTheme': 'GUI Theme'
+    'removeGuiTheme': 'GUI Theme',
+    'Extension' : 'Extension',
+    'Extensions' : 'Extension',
+    'CustomAction' : 'Extension',
+    'CustomActions' : 'Extension'
 }
 
 
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index acd6a1450ed..97bfe43896a 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1577,6 +1577,8 @@ class Template:
             cmd.directdownload = services["directdownload"]
         if "checksum" in services:
             cmd.checksum = services["checksum"]
+        if "extensionid" in services:
+            cmd.extensionid = services["extensionid"]
 
         # Register Template
         template = apiclient.registerTemplate(cmd)
@@ -7362,6 +7364,129 @@ class Webhook:
         [setattr(cmd, k, v) for k, v in list(kwargs.items())]
         return apiclient.deleteWebhookDelivery(cmd)
 
+class Extension:
+    """Manage Extension Life cycle"""
+
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+    @classmethod
+    def create(cls, apiclient, name, type, **kwargs):
+        """Create Extension"""
+        cmd = createExtension.createExtensionCmd()
+        cmd.name = name
+        cmd.type = type
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+
+        return Extension(apiclient.createExtension(cmd).__dict__)
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
+        cmd = listExtensions.listExtensionsCmd()
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.listExtensions(cmd)
+
+    def delete(self, apiclient, unregisterresources=True, removeactions=True, cleanup=True):
+        """Delete Extension"""
+        if unregisterresources:
+            cmd = listExtensions.listExtensionsCmd()
+            cmd.id = self.id
+            extension = apiclient.listExtensions(cmd)[0]
+            if extension is not None and extension.resources is not None and len(extension.resources) > 0:
+                for resource in extension.resources:
+                    self.unregister(apiclient, resource.id, resource.type)
+        if unregisterresources:
+            actions = self.list_custom_actions(apiclient)
+            if actions is not None and len(actions) > 0:
+                for action in actions:
+                    cmd = deleteCustomAction.deleteCustomActionCmd()
+                    cmd.id = action.id
+                    apiclient.deleteCustomAction(cmd)
+        cmd = deleteExtension.deleteExtensionCmd()
+        cmd.id = self.id
+        cmd.cleanup=cleanup
+        apiclient.deleteExtension(cmd)
+
+    def update(self, apiclient, **kwargs):
+        """Update Extension"""
+
+        cmd = updateExtension.updateExtensionCmd()
+        cmd.id = self.id
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.updateExtension(cmd)
+
+    def list_custom_actions(self, apiclient, **kwargs):
+        """List Extension Custom Actions"""
+
+        cmd = listCustomActions.listCustomActionsCmd()
+        cmd.extensionid = self.id
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.listCustomActions(cmd)
+
+    def register(self, apiclient, resource_id, resource_type, **kwargs):
+        """Register Extension"""
+
+        cmd = registerExtension.registerExtensionCmd()
+        cmd.extensionid = self.id
+        cmd.resourceid = resource_id
+        cmd.resourcetype = resource_type
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.registerExtension(cmd)
+
+    def unregister(self, apiclient, resource_id, resource_type, **kwargs):
+        """Unregister Extension"""
+
+        cmd = unregisterExtension.unregisterExtensionCmd()
+        cmd.extensionid = self.id
+        cmd.resourceid = resource_id
+        cmd.resourcetype = resource_type
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.unregisterExtension(cmd)
+
+class ExtensionCustomAction:
+    """Manage Extension Custom Action Life cycle"""
+
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+    @classmethod
+    def create(cls, apiclient, extensionid, name, **kwargs):
+        """Create Custom Action"""
+        cmd = addCustomAction.addCustomActionCmd()
+        cmd.extensionid = extensionid
+        cmd.name = name
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+
+        return ExtensionCustomAction(apiclient.addCustomAction(cmd).__dict__)
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
+        cmd = listCustomActions.listCustomActionsCmd()
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.listCustomActions(cmd)
+
+    def delete(self, apiclient):
+        """Delete CustomAction"""
+        cmd = deleteCustomAction.deleteCustomActionCmd()
+        cmd.id = self.id
+        apiclient.deleteCustomAction(cmd)
+
+    def update(self, apiclient, **kwargs):
+        """Update CustomAction"""
+
+        cmd = updateCustomAction.updateCustomActionCmd()
+        cmd.id = self.id
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.updateCustomAction(cmd)
+
+    def run(self, apiclient, resourceid, **kwargs):
+        """Run CustomAction"""
+
+        cmd = runCustomAction.runCustomActionCmd()
+        cmd.customactionid = self.id
+        cmd.resourceid = resourceid
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.runCustomAction(cmd)
 
 class ZoneIpv4Subnet:
     """Manage IPv4 Subnet for Zone"""
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index e26cd4d494e..4ec03d375a3 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -230,12 +230,13 @@
 "label.action.update.storage.pool": "Update storage pool",
 "label.action.unmanage.volume": "Unmanage Volume",
 "label.action.unmanage.volumes": "Unmanage Volumes",
+"label.action.unregister.extension.resource": "Unregister extension resource",
 "label.action.update.host": "Update host",
 "label.action.update.security.groups": "Update security groups",
 "label.action.update.offering.access": "Update offering access",
 "label.action.update.resource.count": "Update resource count",
-"label.action.value": "Action/Value",
 "label.action.userdata.reset": "Reset Userdata",
+"label.action.value": "Action/Value",
 "label.action.vmsnapshot.create": "Take Instance Snapshot",
 "label.action.vmsnapshot.delete": "Delete Instance Snapshot",
 "label.action.vmsnapshot.revert": "Revert to Instance Snapshot",
@@ -259,9 +260,11 @@
 "label.add.cluster": "Add cluster",
 "label.add.compute.offering": "Add compute offering",
 "label.add.condition": "Add condition",
+"label.add.custom.action": "Add Custom Action",
 "label.add.disk.offering": "Add disk offering",
 "label.add.domain": "Add domain",
 "label.add.egress.rule": "Add egress rule",
+"label.add.external.details": "Add external details",
 "label.add.f5.device": "Add F5 device",
 "label.add.firewall": "Add firewall rule",
 "label.add.firewallrule": "Add Firewall Rule",
@@ -375,6 +378,7 @@
 "label.allocatedonly": "Allocated",
 "label.allocationstate": "Allocation state",
 "label.allow": "Allow",
+"label.allowedroletypes": "Allowed Role Types",
 "label.allow.duplicate.macaddresses": "Allow duplicate MAC addresses",
 "label.allowuserdrivenbackups": "Allow User driven backups",
 "label.annotation": "Comment",
@@ -570,6 +574,7 @@
 "label.computeonly.offering.tooltip": "Option to specify root disk related information in the compute offering or to directly link a disk offering to the compute offering",
 "label.conditions": "Conditions",
 "label.configuration": "Configuration",
+"label.configuration.details": "Configuration Details",
 "label.configure": "Configure",
 "label.configure.health.monitor": "Configure Health Monitor",
 "label.configure.app": "Configure the App",
@@ -642,6 +647,7 @@
 "label.create.account": "Create Account",
 "label.create.asnrange": "Create AS Range",
 "label.create.backup": "Start backup",
+"label.create.extension": "Create Extension",
 "label.create.sharedfs": "Create Shared FileSystem",
 "label.create.network": "Create new Network",
 "label.create.nfs.secondary.staging.storage": "Create NFS secondary staging storage",
@@ -677,6 +683,9 @@
 "label.current.storage": "Current storage",
 "label.currentpassword": "Current password",
 "label.custom": "Custom",
+"label.customactionid": "Custom Action",
+"label.customactions": "Custom Actions",
+"label.custom.actions": "Custom Actions",
 "label.customconstrained": "Custom constrained",
 "label.customdisksize": "Custom disk size",
 "label.customunconstrained": "Custom unconstrained",
@@ -731,11 +740,12 @@
 "label.delete.ciscoasa1000v": "Delete CiscoASA1000v",
 "label.delete.ciscovnmc.resource": "Delete CiscoVNMC resource",
 "label.delete.condition": "Delete condition",
+"label.delete.custom.action": "Delete Custom Action",
 "label.delete.dedicated.vlan.range": "Deleted dedicated VLAN/VNI range.",
 "label.delete.domain": "Delete domain",
 "label.delete.events": "Delete events",
+"label.delete.extension": "Delete Extension",
 "label.delete.f5": "Delete F5",
-"label.destroy.sharedfs": "Destroy Shared FileSystem",
 "label.delete.gateway": "Delete gateway",
 "label.delete.icon": "Delete icon",
 "label.delete.instance.group": "Delete Instance group",
@@ -814,6 +824,7 @@
 "label.destroying": "Destroying",
 "label.destroyed": "Destroyed",
 "label.destroy.router": "Destroy router",
+"label.destroy.sharedfs": "Destroy Shared FileSystem",
 "label.deststartport": "Destination Start Port",
 "label.desttaguuid": "Destination Tag",
 "label.details": "Details",
@@ -825,6 +836,8 @@
 "label.directdownload": "Direct download",
 "label.direction": "Direction",
 "label.disable.autoscale.vmgroup": "Disable AutoScaling Group",
+"label.disable.custom.action": "Disable Custom Action",
+"label.disable.extension": "Disable Extension",
 "label.disable.host": "Disable host",
 "label.disable.network.offering": "Disable Network offering",
 "label.disable.provider": "Disable provider",
@@ -937,6 +950,8 @@
 "label.elastic": "Elastic",
 "label.email": "Email",
 "label.enable.autoscale.vmgroup": "Enable AutoScaling Group",
+"label.enable.custom.action": "Enable Custom Action",
+"label.enable.extension": "Enable Extension",
 "label.enable.host": "Enable Host",
 "label.enable.network.offering": "Enable Network offering",
 "label.enable.oauth": "Enable OAuth Login",
@@ -968,6 +983,7 @@
 "label.entityid": "Entity",
 "label.entitytype": "Entity Type",
 "label.error": "Error",
+"label.errormessage": "Error message",
 "label.error.caught": "Error caught",
 "label.error.code": "Error code",
 "label.error.file.read": "Cannot read file.",
@@ -995,14 +1011,22 @@
 "label.existing": "Existing",
 "label.execute": "Execute",
 "label.expunge": "Expunge",
- "label.expunge.sharedfs": "Expunge Shared FileSystem",
+"label.expunge.sharedfs": "Expunge Shared FileSystem",
 "label.expungevmgraceperiod": "Expunge Instance grace period (in sec)",
 "label.expunged": "Expunged",
 "label.expunging": "Expunging",
 "label.export.rules": "Export Rules",
 "label.ext.hostname.tooltip": "External Host Name or IP Address",
-"label.external.managed": "ExternalManaged",
+"label.extension": "Extension",
+"label.extensions": "Extensions",
+"label.extensionid": "Extension",
+"label.extensionname": "Extension",
 "label.external": "External",
+"label.external.managed": "ExternalManaged",
+"label.external.details": "External provisioning details",
+"label.externaldetails": "External details",
+"label.external.details.tooltip": "Details that will be passed to the external provisioner while deploying an instance",
+"label.externalprovisioner": "External provisioner",
 "label.external.link": "External link",
 "label.externalid": "External Id",
 "label.externalloadbalanceripaddress": "External load balancer IP address.",
@@ -1173,6 +1197,7 @@
 "label.import.role": "Import role",
 "label.import.volume": "Import Volume",
 "label.inactive": "Inactive",
+"label.inbuilt": "Inbuilt",
 "label.in.progress": "in progress",
 "label.in.progress.for": "in progress for",
 "label.info": "Info",
@@ -1433,7 +1458,6 @@
 "label.management.server": "Management server",
 "label.management.servers": "Management servers",
 "label.management.server.peers": "Peers",
-"label.managementservername": "Management Server",
 "label.managementservers": "Number of management servers",
 "label.matchall": "Match all",
 "label.max": "Max.",
@@ -1687,6 +1711,9 @@
 "label.operator.less.or.equal": "Less than or equals to",
 "label.operator.equal": "Equals to",
 "label.optional": "Optional",
+"label.options": "Options",
+"label.orchestrator": "Orchestrator",
+"label.orchestratorrequirespreparevm": "Requires Prepare Instance",
 "label.order": "Order",
 "label.os": "Operating System",
 "label.oscategoryid": "OS category",
@@ -1728,6 +1755,7 @@
 "label.palo.alto.firewall": "Palo Alto firewall",
 "label.palp": "Palo Alto log profile",
 "label.params": "Parameters",
+"label.parameters": "Parameters",
 "label.param.name": "Parameter name",
 "label.param.value": "Parameter value",
 "label.parentdomainname": "Parent domain",
@@ -1740,6 +1768,8 @@
 "label.password.tooltip": "The password for the Host",
 "label.passwordenabled": "Password enabled",
 "label.path": "Path",
+"label.pathready": "Path Ready",
+"label.pathstate": "Path State",
 "label.patp": "Palo Alto threat profile",
 "label.pavr": "Virtual router",
 "label.payload": "Payload",
@@ -1931,6 +1961,7 @@
 "label.redundantvpcrouter": "Redundant VPC",
 "label.refresh": "Refresh",
 "label.region": "Region",
+"label.register.extension": "Register Extension",
 "label.register.oauth": "Register OAuth",
 "label.register.template": "Register Template",
 "label.register.user.data": "Register User Data",
@@ -2052,6 +2083,7 @@
 "label.rules.file.import.description": "Click or drag rule definitions CSV file to import.",
 "label.rules.file.to.import": "Rule definitions CSV file to import",
 "label.run.proxy.locally": "Run proxy locally",
+"label.run.custom.action": "Run Action",
 "label.running": "Running",
 "label.running.vms": "Running Instances",
 "label.s2scustomergatewayid": "Site to site customer gateway ID",
@@ -2225,6 +2257,7 @@
 "label.podstorageaccessgroups": "Pod Storage Access Groups",
 "label.zonestorageaccessgroups": "Zone Storage Access Groups",
 "label.uefi.supported": "UEFI supported",
+"label.unregister.extension": "Unregister Extension",
 "label.usediops": "IOPS used",
 "label.userdataid": "Userdata ID",
 "label.userdataname": "Userdata name",
@@ -2304,6 +2337,7 @@
 "label.subnet": "Subnet",
 "label.succeeded": "Succeeded",
 "label.success": "Success",
+"label.successmessage": "Success message",
 "label.success.migrations": "Successful migrations",
 "label.success.set": "Successfully set",
 "label.success.updated": "Successfully updated",
@@ -2470,6 +2504,8 @@
 "label.update.autoscale.vmgroup": "Update AutoScaling Group",
 "label.update.bgp.peer": "Update BGP peer",
 "label.update.condition": "Update condition",
+"label.update.custom.action": "Update Custom Action",
+"label.update.extension": "Update Extension",
 "label.update.sharedfs": "Update Shared FileSystem",
 "label.update.instance.group": "Update Instance group",
 "label.update.ip.range": "Update IP range",
@@ -2534,6 +2570,8 @@
 "label.utilization": "Utilization",
 "label.uuid": "ID",
 "label.value": "Value",
+"label.validationformat": "Validation Format",
+"label.valueoptions": "Values Options",
 "label.vcenter": "VMware datacenter vCenter",
 "label.vcenter.datacenter": "vCenter datacenter",
 "label.vcenter.datastore": "vCenter datastore",
@@ -2751,7 +2789,9 @@
 "message.action.delete.backup.offering": "Please confirm that you want to delete this backup offering?",
 "message.action.delete.backup.repository": "Please confirm that you want to delete this backup repository?",
 "message.action.delete.cluster": "Please confirm that you want to delete this cluster.",
+"message.action.delete.custom.action": "Please confirm that you want to delete this custom action.",
 "message.action.delete.domain": "Please confirm that you want to delete this domain.",
+"message.action.delete.extension": "Please confirm that you want to delete the extension",
 "message.action.delete.external.firewall": "Please confirm that you would like to remove this external firewall. Warning: If you are planning to add back the same external firewall, you must reset usage data on the device.",
 "message.action.delete.external.load.balancer": "Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.",
 "message.action.delete.ingress.rule": "Please confirm that you want to delete this ingress rule.",
@@ -2823,6 +2863,7 @@
 "message.action.reboot.systemvm": "Please confirm that you want to reboot this system VM.",
 "message.action.recover.sharedfs": "Please confirm that you would like to recover this Shared FileSystem.",
 "message.action.recover.volume": "Please confirm that you would like to recover this volume.",
+"message.action.register.extension": "Register the extension to a resource",
 "message.action.release.asnumber": "Please confirm that you want to release this AS Number.",
 "message.action.release.ip": "Please confirm that you want to release this IP.",
 "message.action.remove.host": "Please confirm that you want to remove this host.",
@@ -2855,6 +2896,7 @@
 "message.action.unmanage.volumes": "Please confirm that you want to unmanage the Volumes.",
 "message.action.vmsnapshot.delete": "Please confirm that you want to delete this Instance Snapshot. <br>Please notice that the Instance will be paused before the Snapshot deletion, and resumed after deletion, if it runs on KVM.",
 "message.activate.project": "Are you sure you want to activate this project?",
+"message.add.custom.action.parameters": "Parameters to be made available while running the custom action.",
 "message.add.egress.rule.failed": "Adding new egress rule failed.",
 "message.add.egress.rule.processing": "Adding new egress rule...",
 "message.add.failed": "Adding failed.",
@@ -2863,6 +2905,10 @@
 "message.add.firewall.rule.processing": "Adding new Firewall rule...",
 "message.add.firewallrule.failed": "Adding Firewall Rule failed",
 "message.add.host": "Please specify the following parameters to add a new host.",
+"message.add.extension.custom.action.details": "Details to be sent to the extension during execution of this action.",
+"message.add.extension.details": "Details to be sent to the extension on any operation.",
+"message.add.extension.resource.details": "Details to be sent to the extension during any operation for this resource.",
+"message.add.orchestrator.resource.details": "Details to be sent to the hypervisor.",
 "message.add.host.sshkey": "WARNING: In order to add a host with SSH key, you must ensure your hypervisor host has been configured correctly.",
 "message.add.iprange.processing": "Adding IP Range...",
 "message.add.ipv4.subnet.for.guest.network.failed": "Failed to add IPv4 subnet for guest network",
@@ -2995,6 +3041,8 @@
 "message.confirm.delete.traffic.type": "Please confirm that you would like to delete traffic type.",
 "message.confirm.destroy.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router. Please confirm that you would like to destroy this router.",
 "message.confirm.disable.autoscale.vmgroup": "Please confirm that you want to disable this autoscaling group.",
+"message.confirm.disable.custom.action": "Please confirm that you want to disable this custom action.",
+"message.confirm.disable.extension": "Please confirm that you want to disable this extension.",
 "message.confirm.disable.host": "Please confirm that you want to disable the host.",
 "message.confirm.disable.network.offering": "Are you sure you want to disable this Network offering?",
 "message.confirm.disable.provider": "Please confirm that you would like to disable this provider.",
@@ -3002,6 +3050,8 @@
 "message.confirm.disable.vpc.offering": "Are you sure you want to disable this VPC offering?",
 "message.confirm.disable.webhook": "Please confirm that you want to disable this webhook.",
 "message.confirm.enable.autoscale.vmgroup": "Please confirm that you want to enable this autoscaling group.",
+"message.confirm.enable.custom.action": "Please confirm that you want to enable this custom action.",
+"message.confirm.enable.extension": "Please confirm that you want to enable this extension.",
 "message.confirm.enable.host": "Please confirm that you want to enable the host.",
 "message.confirm.enable.network.offering": "Are you sure you want to enable this Network offering?",
 "message.confirm.enable.provider": "Please confirm that you would like to enable this provider.",
@@ -3127,6 +3177,8 @@
 "message.desc.register.user.data": "Please fill in the following data to register a User data.",
 "message.desc.register.cni.config": "Please fill in the following data to register CNI Configuration as user data.",
 "message.desc.registered.user.data": "Registered a User Data.",
+"message.desc.validationformat": "Specifies the format used to validate the parameter value, such as EMAIL, URL, UUID, DECIMAL, etc.",
+"message.desc.valueoptions": "Provide a comma-separated list of values that will appear as selectable options for this parameter",
 "message.desc.zone": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
 "message.desc.zone.edge": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. An edge zone consists of one or more hosts (each of which provides local storage as primary storage servers). Only shared and L2 Networks can be deployed in such zones and functionalities that require secondary storages are not supported.",
 "message.drs.plan.description": "The maximum number of live migrations allowed for DRS. Configure DRS under the settings tab before generating a plan or to enable automatic DRS for the cluster.",
@@ -3217,6 +3269,9 @@
 "message.error.host.username": "Please enter host username.",
 "message.error.hypervisor.type": "Please select hypervisor type.",
 "message.error.input.value": "Please enter value.",
+"message.error.input.invalidemail": "Please enter a valid email.",
+"message.error.input.invalidurl": "Please enter a valid URL.",
+"message.error.input.invaliduuid": "Please enter a valid UUID.",
 "message.error.internal.dns1": "Please enter internal DNS 1",
 "message.error.internallb.instance.port": "Please specify a Instance port.",
 "message.error.internallb.name": "Please specify a name for the internal LB.",
@@ -3340,6 +3395,7 @@
 "message.host.controlstate.retry": "Some actions on this Instance will fail, if so please wait a while and retry.",
 "message.host.dedicated": "Host Dedicated",
 "message.host.dedication.released": "Host dedication released.",
+"message.host.external.datadisk": "Usage of data disks for the selected template is not applicable",
 "message.import.running.instance.warning": "The selected VM is powered-on on the VMware Datacenter. The recommended state to convert a VMware VM into KVM is powered-off after a graceful shutdown of the guest OS.",
 "message.import.volume": "Please specify the domain, account or project name. <br>If not set, the volume will be imported for the caller.",
 "message.info.cloudian.console": "Cloudian Management Console should open in another window.",
@@ -3538,6 +3594,7 @@
 "message.restart.vm.to.update.settings": "Update in fields other than name and display name will require the Instance to be restarted.",
 "message.restart.vpc": "Please confirm that you want to restart the VPC.",
 "message.restart.vpc.remark": "Please confirm that you want to restart the VPC <p><i>Remark: making a non-redundant VPC redundant will force a clean up. The Networks will not be available for a couple of minutes</i>.</p>",
+"message.running.custom.action": "Running action",
 "message.scale.processing": "Scale in progress",
 "message.scaledown.policies": "Please add at least a ScaleDown policy. The AutoScale Group will be scaled down when all conditions in a ScaleDown policy are matched. ScaleDown policies will be checked after ScaleUp policies.",
 "message.scaledown.policy.continue": "Please add at least condition to ScaleDown policy to continue",
@@ -3641,6 +3698,7 @@
 "message.success.create.account": "Successfully created Account",
 "message.success.create.asnrange": "Successfully created AS Range",
 "message.success.create.bucket": "Successfully created bucket",
+"message.success.create.extension": "Successfully created Extension",
 "message.success.create.sharedfs": "Successfully created Shared FileSystem",
 "message.success.create.internallb": "Successfully created Internal Load Balancer",
 "message.success.create.isolated.network": "Successfully created isolated Network",
@@ -3659,6 +3717,7 @@
 "message.success.delete.acl.rule": "Successfully removed ACL rule",
 "message.success.delete.backup.schedule": "Successfully deleted configure Instance backup schedule",
 "message.success.delete.bgp.peer": "Successfully deleted BGP peer",
+"message.success.delete.custom.action": "Successfully deleted Custom Action",
 "message.success.delete.icon": "Successfully deleted icon of",
 "message.success.delete.interface.static.route": "Successfully removed interface Static Route",
 "message.success.delete.ipv4.subnet": "Successfully removed IPv4 subnet",
@@ -3685,6 +3744,7 @@
 "message.success.migration": "Migration completed successfully",
 "message.success.move.acl.order": "Successfully moved ACL rule",
 "message.success.recurring.snapshot": "Successfully recurring Snapshots",
+"message.success.register.extension": "Successfully registered Extension",
 "message.success.register.iso": "Successfully registered ISO",
 "message.success.register.keypair": "Successfully registered SSH key pair",
 "message.success.register.template": "Successfully registered Template",
@@ -3714,10 +3774,13 @@
 "message.success.scale.kubernetes": "Successfully scaled Kubernetes cluster",
 "message.success.unmanage.instance": "Successfully unmanaged Instance",
 "message.success.unmanage.volume": "Successfully unmanaged Volume",
+"message.success.unregister.extension": "Successfull unregistered Extension",
 "message.success.update.account": "Successfully updated Account",
 "message.success.update.bgp.peer": "Successfully updated BGP peer",
 "message.success.update.bucket": "Successfully updated bucket",
 "message.success.update.condition": "Successfully updated condition",
+"message.success.update.custom.action": "Successfully updated Custom Action",
+"message.success.update.extension": "Successfully updated Extension",
 "message.success.update.sharedfs": "Successfully updated Shared FileSystem",
 "message.success.update.ipaddress": "Successfully updated IP address",
 "message.success.update.iprange": "Successfully updated IP range",
@@ -3850,6 +3913,7 @@
 "message.zone.detail.hint": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
 "message.validate.min": "Please enter a value greater than or equal to {0}.",
 "message.action.delete.object.storage": "Please confirm that you want to delete this Object Store",
+"message.action.unregister.extension.resource": "Please confirm that you want to unregister extension with this resource",
 "message.bgp.peers.null": "Please note, if no BGP peers are selected, the VR will connect to <br> (1) dedicated BGP peers the owner can access, if the owner has dedicated BGP peers and account setting use.system.bgp.peers is set to false; <br> (2) all BGP peers the owner can access, otherwise.<br>",
 "message.bucket.delete": "Please confirm that you want to delete this Bucket",
 "migrate.from": "Migrate from",
diff --git a/ui/src/components/view/ActionButton.vue b/ui/src/components/view/ActionButton.vue
index 14128a5ce55..7733efdf66e 100644
--- a/ui/src/components/view/ActionButton.vue
+++ b/ui/src/components/view/ActionButton.vue
@@ -17,7 +17,7 @@
 
 <template>
   <span class="row-action-button">
-    <a-tooltip arrowPointAtCenter placement="bottomRight" v-if="resource && resource.id && dataView">
+    <a-tooltip arrowPointAtCenter placement="bottomRight" v-if="resource && resource.id && dataView && resource.hypervisor !== 'External'">
       <template #title>
         {{ $t('label.view.console') }}
       </template>
@@ -29,7 +29,7 @@
         icon="code"
       />
     </a-tooltip>
-    <a-tooltip arrowPointAtCenter placement="bottomRight" v-if="resource && resource.id && dataView">
+    <a-tooltip arrowPointAtCenter placement="bottomRight" v-if="resource && resource.id && dataView && resource.hypervisor !== 'External'">
       <template #title>
         {{ $t('label.copy.consoleurl') }}
       </template>
diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
index c04a1937816..3a4d0fa043b 100644
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@ -135,6 +135,9 @@
           <div v-else-if="$route.meta.name === 'kubernetes' && item === 'cniconfigname'">
               <router-link :to="{ path: '/cniconfiguration/' + dataResource.cniconfigurationid }">{{ dataResource.cniconfigname }}</router-link>
           </div>
+          <div v-else-if="item === 'allowedroletypes' && Array.isArray(dataResource[item])">
+            {{ dataResource[item].join(', ') }}
+          </div>
           <div v-else>{{ dataResource[item] }}</div>
         </div>
       </a-list-item>
@@ -173,6 +176,27 @@
           <div>{{ dataResource[item].rbd_default_data_pool }}</div>
         </div>
       </a-list-item>
+      <a-list-item v-else-if="item === 'details' && ['extension', 'customaction'].includes($route.meta.name) && dataResource[item] && Object.keys(dataResource[item]).length > 0">
+        <div>
+          <strong>{{ $t('label.configuration.details') }}</strong>
+          <br/>
+          <div>
+            <object-list-table :data-map="dataResource[item]" />
+          </div>
+        </div>
+      </a-list-item>
+      <a-list-item v-else-if="item === 'parameters' && ['customaction'].includes($route.meta.name) && Array.isArray(dataResource[item]) && dataResource[item].length > 0">
+        <div>
+          <strong>{{ $t('label.' + String(item).toLowerCase()) }}</strong>
+          <br/>
+          <div>
+            <object-list-table :showHeader="true" :data-array="dataResource[item]" />
+          </div>
+        </div>
+      </a-list-item>
+      <external-configuration-details
+        v-else-if="item === 'externaldetails' && (['host', 'computeoffering'].includes($route.meta.name) || (['cluster'].includes($route.meta.name) && dataResource.extensionid))"
+        :resource="dataResource" />
     </template>
     <HostInfo :resource="dataResource" v-if="$route.meta.name === 'host' && 'listHosts' in $store.getters.apis" />
     <DedicateData :resource="dataResource" v-if="dedicatedSectionActive" />
@@ -184,6 +208,8 @@
 import DedicateData from './DedicateData'
 import HostInfo from '@/views/infra/HostInfo'
 import VmwareData from './VmwareData'
+import ObjectListTable from '@/components/view/ObjectListTable'
+import ExternalConfigurationDetails from '@/views/extension/ExternalConfigurationDetails'
 import { genericCompare } from '@/utils/sort'
 
 export default {
@@ -191,7 +217,9 @@ export default {
   components: {
     DedicateData,
     HostInfo,
-    VmwareData
+    VmwareData,
+    ObjectListTable,
+    ExternalConfigurationDetails
   },
   props: {
     resource: {
@@ -229,13 +257,14 @@ export default {
   },
   computed: {
     customDisplayItems () {
-      var items = ['ip4routes', 'ip6routes', 'privatemtu', 'publicmtu', 'provider', 'details']
+      var items = ['ip4routes', 'ip6routes', 'privatemtu', 'publicmtu', 'provider', 'details', 'parameters']
       if (this.$route.meta.name === 'webhookdeliveries') {
         items.push('startdate')
         items.push('enddate')
-      }
-      if (this.$route.meta.name === 'vm') {
+      } else if (this.$route.meta.name === 'vm') {
         items.push('leaseexpirydate')
+      } else if (['cluster', 'host', 'computeoffering'].includes(this.$route.meta.name)) {
+        items.push('externaldetails')
       }
       return items
     },
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index c5e771de5a6..baedfc12170 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -61,6 +61,9 @@
                   <a-tag v-if="resource.instancename">
                     {{ resource.instancename }}
                   </a-tag>
+                  <a-tag :color="$config.theme['@link-color']" v-if="$route.path.startsWith('/extension') && !resource.isuserdefined">
+                    {{ $t('label.inbuilt') }}
+                  </a-tag>
                   <a-tag v-if="resource.type">
                     <span v-if="['USER.LOGIN', 'USER.LOGOUT', 'ROUTER.HEALTH.CHECKS', 'FIREWALL.CLOSE', 'ALERT.SERVICE.DOMAINROUTER'].includes(resource.type)">{{ $t(resource.type.toLowerCase()) }}</span>
                     <span v-else>
@@ -702,6 +705,14 @@
                 <span v-else>{{ resource.userdataname || resource.userdataid }}</span>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.extensionid">
+              <div class="resource-detail-item__label">{{ $t('label.extensionid') }}</div>
+              <div class="resource-detail-item__details">
+                <appstore-add-outlined />
+                <router-link v-if="$router.resolve('/extension/' + resource.extensionid).matched[0].redirect !== '/exception/404'" :to="{ path: '/extension/' + resource.extensionid }">{{ resource.extensionname || resource.extensionid }}</router-link>
+                <span v-else>{{ resource.extensionname || resource.extensionid }}</span>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="resource.owner">
               <div class="resource-detail-item__label">{{ $t('label.owners') }}</div>
               <div class="resource-detail-item__details">
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 403c097a67e..8f9d17ff23b 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -114,6 +114,9 @@
                   }"/>
               </a-tooltip>
           </span>
+          <span v-if="$route.path.startsWith('/extension') && !record.isuserdefined" style="padding-left: 10px;">
+            <a-tag :color="$config.theme['@link-color']">{{ $t('label.inbuilt') }}</a-tag>
+          </span>
         </span>
       </template>
       <template v-if="column.key === 'templatetype'">
@@ -273,6 +276,9 @@
       <template v-if="column.key === 'agentstate'">
         <status :text="text ? text : ''" displayText />
       </template>
+      <template v-if="column.key === 'availability' && $route.path.startsWith('/extension')">
+        <status :text="text ? text : ''" displayText />
+      </template>
       <template v-if="column.key === 'cpunumber'">
         <span>{{ record.serviceofferingdetails?.mincpunumber && record.serviceofferingdetails?.maxcpunumber ? `${record.serviceofferingdetails.mincpunumber} - ${record.serviceofferingdetails.maxcpunumber}` : record.cpunumber }}</span>
       </template>
@@ -482,6 +488,10 @@
         <router-link v-if="$router.resolve('/webhook/' + record.webhookid).matched[0].redirect !== '/exception/404'" :to="{ path: '/webhook/' + record.webhookid }">{{ text }}</router-link>
         <span v-else>  {{ text }} </span>
       </template>
+      <template v-if="column.key === 'extensionname'">
+        <router-link v-if="$router.resolve('/extension/' + record.extensionid).matched[0].redirect !== '/exception/404'" :to="{ path: '/extension/' + record.extensionid }">{{ text }}</router-link>
+        <span v-else>  {{ text + record}} </span>
+      </template>
       <template v-if="column.key === 'success'">
         <status :text="text ? 'success' : 'error'" />
       </template>
@@ -760,7 +770,7 @@ export default {
         '/zone', '/pod', '/cluster', '/host', '/storagepool', '/imagestore', '/systemvm', '/router', '/ilbvm', '/annotation',
         '/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering',
         '/tungstenfabric', '/oauthsetting', '/guestos', '/guestoshypervisormapping', '/webhook', 'webhookdeliveries', '/quotatariff', '/sharedfs',
-        '/ipv4subnets', '/managementserver'].join('|'))
+        '/ipv4subnets', '/managementserver', '/extension'].join('|'))
         .test(this.$route.path)
     },
     enableGroupAction () {
diff --git a/ui/src/components/view/ObjectListTable.vue b/ui/src/components/view/ObjectListTable.vue
new file mode 100644
index 00000000000..540dff15577
--- /dev/null
+++ b/ui/src/components/view/ObjectListTable.vue
@@ -0,0 +1,89 @@
+// 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.
+
+<template>
+  <a-table
+    style="margin: 10px 0;"
+    :columns="columns"
+    :data-source="computedDataSource"
+    :pagination="false"
+    :bordered="true"
+    :showHeader="false"
+    :rowKey="record => record.id">
+    <template #bodyCell="{ text }">
+      {{ text }}
+    </template>
+  </a-table>
+</template>
+
+<script>
+
+export default {
+  name: 'ObjectListTable',
+  props: {
+    dataMap: {
+      type: Object,
+      default: null
+    },
+    dataArray: {
+      type: Array,
+      default: null
+    }
+  },
+  beforeCreate () {
+    this.defaultColumns = [
+      {
+        title: this.$t('label.key'),
+        dataIndex: 'key'
+      },
+      {
+        title: this.$t('label.value'),
+        dataIndex: 'value'
+      }
+    ]
+  },
+  computed: {
+    columns () {
+      if (this.dataArray && this.dataArray.length > 0) {
+        const cols = []
+        Object.keys(this.dataArray[0]).forEach(key => {
+          cols.push({
+            title: this.$t('label.' + key),
+            dataIndex: key
+          })
+        })
+        return cols
+      }
+      return this.defaultColumns
+    },
+    computedDataSource () {
+      if (this.dataArray) {
+        return this.dataArray
+      }
+      if (!this.dataMap || this.dataMap.length === 0) {
+        return []
+      }
+      const data = Object.keys(this.dataMap).map((key, i) => ({
+        id: i + 1,
+        key,
+        value: this.dataMap[key]
+      }))
+      return data
+    }
+  }
+}
+</script>
diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue
index 969957b1455..7621aaba8e8 100644
--- a/ui/src/components/view/SearchView.vue
+++ b/ui/src/components/view/SearchView.vue
@@ -72,7 +72,7 @@
                       v-for="(opt, idx) in field.opts"
                       :key="idx"
                       :value="['account'].includes(field.name) ? opt.name : opt.id"
-                      :label="$t((['storageid'].includes(field.name) || !opt.path) ? opt.name : opt.path)">
+                      :label="$t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name)">
                       <div>
                         <span v-if="(field.name.startsWith('zone'))">
                           <span v-if="opt.icon">
@@ -89,7 +89,7 @@
                         <span v-if="(field.name.startsWith('managementserver'))">
                           <status :text="opt.state" />
                         </span>
-                        {{ $t((['storageid'].includes(field.name) || !opt.path) ? opt.name : opt.path) }}
+                        {{ $t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name) }}
                       </div>
                     </a-select-option>
                   </a-select>
@@ -309,7 +309,8 @@ export default {
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
           'type', 'scope', 'managementserverid', 'serviceofferingid',
           'diskofferingid', 'networkid', 'usagetype', 'restartrequired',
-          'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype'].includes(item)
+          'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype',
+          'extensionid'].includes(item)
         ) {
           type = 'list'
         } else if (item === 'tags') {
@@ -485,6 +486,7 @@ export default {
       let usageTypeIndex = -1
       let volumeIndex = -1
       let osCategoryIndex = -1
+      let extensionIndex = -1
 
       if (arrayField.includes('type')) {
         if (this.$route.path === '/alert') {
@@ -504,6 +506,12 @@ export default {
         promises.push(await this.fetchZones(searchKeyword))
       }
 
+      if (arrayField.includes('extensionid')) {
+        extensionIndex = this.fields.findIndex(item => item.name === 'extensionid')
+        this.fields[extensionIndex].loading = true
+        promises.push(await this.fetchExtensions(searchKeyword))
+      }
+
       if (arrayField.includes('domainid')) {
         domainIndex = this.fields.findIndex(item => item.name === 'domainid')
         this.fields[domainIndex].loading = true
@@ -607,6 +615,12 @@ export default {
             this.fields[zoneIndex].opts = this.sortArray(zones[0].data)
           }
         }
+        if (extensionIndex > -1) {
+          const extensions = response.filter(item => item.type === 'extensionid')
+          if (extensions && extensions.length > 0) {
+            this.fields[extensionIndex].opts = this.sortArray(extensions[0].data)
+          }
+        }
         if (domainIndex > -1) {
           const domain = response.filter(item => item.type === 'domainid')
           if (domain && domain.length > 0) {
@@ -704,6 +718,9 @@ export default {
         if (zoneIndex > -1) {
           this.fields[zoneIndex].loading = false
         }
+        if (extensionIndex > -1) {
+          this.fields[extensionIndex].loading = false
+        }
         if (domainIndex > -1) {
           this.fields[domainIndex].loading = false
         }
@@ -796,6 +813,19 @@ export default {
         })
       })
     },
+    fetchExtensions (searchKeyword) {
+      return new Promise((resolve, reject) => {
+        getAPI('listExtensions', { details: 'min', showicon: true, keyword: searchKeyword }).then(json => {
+          const extensions = json.listextensionsresponse.extension
+          resolve({
+            type: 'extensionid',
+            data: extensions
+          })
+        }).catch(error => {
+          reject(error.response.headers['x-description'])
+        })
+      })
+    },
     fetchDomains (searchKeyword) {
       return new Promise((resolve, reject) => {
         getAPI('listDomains', { listAll: true, details: 'min', showicon: true, keyword: searchKeyword }).then(json => {
diff --git a/ui/src/components/widgets/DetailsInput.vue b/ui/src/components/widgets/DetailsInput.vue
new file mode 100644
index 00000000000..eeab0e3d528
--- /dev/null
+++ b/ui/src/components/widgets/DetailsInput.vue
@@ -0,0 +1,186 @@
+// 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.
+
+<template>
+  <div>
+    <div class="input-row">
+      <a-form-item no-style>
+        <a-input v-model:value="newKey" :placeholder="$t('label.key')" class="input-field" />
+      </a-form-item>
+      <a-form-item no-style>
+        <a-input v-model:value="newValue" :placeholder="$t('label.value')" class="input-field" />
+      </a-form-item>
+      <a-button type="primary" class="add-button" @click="addEntry" :disabled="!newKey || !newValue">
+        Add
+      </a-button>
+    </div>
+
+    <a-table
+      :columns="columns"
+      :dataSource="tableData"
+      rowKey="key"
+      size="small"
+      :pagination="false"
+      :showHeader="showTableHeaders"
+      class="table"
+    >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'actions'">
+          <template v-if="record.editing">
+            <div class="flex-gap">
+              <tooltip-button :tooltip="$t('label.ok')" icon="check-outlined" @onClick="saveEdit(record)" />
+              <tooltip-button :tooltip="$t('label.cancel')" icon="close-outlined" @onClick="cancelEdit(record)" />
+            </div>
+          </template>
+          <template v-else>
+            <div class="flex-gap">
+              <tooltip-button :tooltip="$t('label.edit')" icon="edit-outlined" @onClick="editRow(record)" />
+              <tooltip-button type="danger" :tooltip="$t('label.remove')" icon="delete-outlined" @onClick="removeEntry(record.key)" />
+            </div>
+          </template>
+        </template>
+
+        <template v-else-if="record.editing">
+          <a-form-item no-style>
+            <a-input v-model:value="editBuffer[column.key]" />
+          </a-form-item>
+        </template>
+
+        <template v-else>
+          {{ record[column.key] }}
+        </template>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+import TooltipButton from '@/components/widgets/TooltipButton'
+
+export default {
+  name: 'DetailsInput',
+  components: { TooltipButton },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    },
+    showTableHeaders: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      columns: [
+        { title: this.$t('label.key'), dataIndex: 'key', key: 'key', width: '40%' },
+        { title: this.$t('label.value'), dataIndex: 'value', key: 'value', width: '40%' },
+        { title: this.$t('label.actions'), key: 'actions', width: '20%' }
+      ],
+      newKey: '',
+      newValue: '',
+      tableData: [],
+      editBuffer: {}
+    }
+  },
+  created () {
+    if (this.value && typeof this.value === 'object') {
+      this.tableData = this.mapToTableData(this.value)
+    }
+  },
+  watch: {
+    value (newVal) {
+      this.tableData = this.mapToTableData(newVal)
+    }
+  },
+  emits: ['update:value'],
+  methods: {
+    mapToTableData (obj) {
+      return Object.entries(obj || {}).map(([key, value]) => ({
+        key,
+        value,
+        editing: false
+      }))
+    },
+    addEntry () {
+      if (!this.newKey || !this.newValue) return
+      const existingIndex = this.tableData.findIndex(row => row.key === this.newKey)
+      if (existingIndex !== -1) {
+        this.tableData[existingIndex].value = this.newValue
+      } else {
+        this.tableData.push({ key: this.newKey, value: this.newValue, editing: false })
+      }
+      this.updateData()
+      this.newKey = ''
+      this.newValue = ''
+    },
+    removeEntry (key) {
+      this.tableData = this.tableData.filter(item => item.key !== key)
+      this.updateData()
+    },
+    editRow (record) {
+      this.editBuffer = {
+        key: record.key,
+        value: record.value
+      }
+      record.editing = true
+    },
+    cancelEdit (record) {
+      record.editing = false
+      this.editBuffer = {}
+    },
+    saveEdit (record) {
+      record.key = this.editBuffer.key
+      record.value = this.editBuffer.value
+      record.editing = false
+      this.updateData()
+    },
+    updateData () {
+      const obj = {}
+      this.tableData.forEach(({ key, value }) => {
+        obj[key] = value
+      })
+      this.$emit('update:value', obj)
+    }
+  }
+}
+</script>
+<style lang="css" scoped>
+.input-row {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 16px;
+}
+
+.input-field {
+  flex: 1; /* each takes half of the remaining 80% */
+}
+
+.add-button {
+  width: 20%;
+  min-width: 100px; /* optional: prevents it from getting too narrow */
+}
+
+.table {
+  width: 100%;
+}
+
+.flex-gap {
+  display: flex;
+  gap: 8px;
+}
+</style>
diff --git a/ui/src/components/widgets/Status.vue b/ui/src/components/widgets/Status.vue
index 22a8236d6cd..809f7a8a7a3 100644
--- a/ui/src/components/widgets/Status.vue
+++ b/ui/src/components/widgets/Status.vue
@@ -97,6 +97,12 @@ export default {
           case 'Up':
             state = this.$t('state.up')
             break
+          case 'Yes':
+            state = this.$t('label.yes')
+            break
+          case 'no':
+            state = this.$t('label.no')
+            break
         }
         return state.charAt(0).toUpperCase() + state.slice(1)
       }
@@ -124,6 +130,7 @@ export default {
         case 'success':
         case 'poweron':
         case 'primary':
+        case 'yes':
           status = 'success'
           break
         case 'alert':
@@ -138,6 +145,7 @@ export default {
         case 'poweroff':
         case 'stopped':
         case 'failed':
+        case 'no':
           status = 'error'
           break
         case 'migrating':
diff --git a/ui/src/config/router.js b/ui/src/config/router.js
index aa85f452b73..582fbaaf2f3 100644
--- a/ui/src/config/router.js
+++ b/ui/src/config/router.js
@@ -38,6 +38,8 @@ import infra from '@/config/section/infra'
 import zone from '@/config/section/zone'
 import offering from '@/config/section/offering'
 import config from '@/config/section/config'
+import extension from '@/config/section/extension'
+import customaction from '@/config/section/extension/customaction'
 import tools from '@/config/section/tools'
 import quota from '@/config/section/plugin/quota'
 import cloudian from '@/config/section/plugin/cloudian'
@@ -221,6 +223,8 @@ export function asyncRouterMap () {
       generateRouterMap(zone),
       generateRouterMap(offering),
       generateRouterMap(config),
+      generateRouterMap(extension),
+      generateRouterMap(customaction),
       generateRouterMap(tools),
       generateRouterMap(quota),
       generateRouterMap(cloudian),
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 719ed25671f..2310598d961 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -81,7 +81,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'tags'],
+      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'extensionid', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
           'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'arch', 'boottype', 'bootmode', 'account',
@@ -182,7 +182,7 @@ export default {
           message: 'message.reinstall.vm',
           dataView: true,
           popup: true,
-          show: (record) => { return ['Running', 'Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ReinstallVm.vue')))
         },
@@ -200,7 +200,7 @@ export default {
             return args
           },
           show: (record) => {
-            return (((['Running'].includes(record.state) && record.hypervisor !== 'LXC') ||
+            return record.hypervisor !== 'External' && (((['Running'].includes(record.state) && record.hypervisor !== 'LXC') ||
               (['Stopped'].includes(record.state) && (!['KVM', 'LXC'].includes(record.hypervisor) ||
               (record.hypervisor === 'KVM' && ['PowerFlex', 'Filesystem', 'NetworkFilesystem', 'SharedMountPoint'].includes(record.pooltype))))) && record.vmtype !== 'sharedfsvm')
           },
@@ -219,9 +219,9 @@ export default {
           dataView: true,
           popup: true,
           show: (record, store) => {
-            return (record.hypervisor !== 'KVM') ||
+            return record.hypervisor !== 'External' && ((record.hypervisor !== 'KVM') ||
               ['Stopped', 'Destroyed'].includes(record.state) ||
-              store.features.kvmsnapshotenabled
+              store.features.kvmsnapshotenabled)
           },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' && record.hypervisor === 'KVM' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/CreateSnapshotWizard.vue')))
@@ -234,7 +234,7 @@ export default {
           docHelp: 'adminguide/virtual_machines.html#backup-offerings',
           dataView: true,
           args: ['virtualmachineid', 'backupofferingid'],
-          show: (record) => { return !record.backupofferingid },
+          show: (record) => { return record.hypervisor !== 'External' && !record.backupofferingid },
           mapping: {
             backupofferingid: {
               api: 'listBackupOfferings',
@@ -300,7 +300,7 @@ export default {
           docHelp: 'adminguide/templates.html#attaching-an-iso-to-a-vm',
           dataView: true,
           popup: true,
-          show: (record) => { return ['Running', 'Stopped'].includes(record.state) && !record.isoid && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && !record.isoid && record.vmtype !== 'sharedfsvm' },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' || record.hostcontrolstate === 'Maintenance' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/AttachIso.vue')))
         },
@@ -317,7 +317,7 @@ export default {
             }
             return args
           },
-          show: (record) => { return ['Running', 'Stopped'].includes(record.state) && 'isoid' in record && record.isoid && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && 'isoid' in record && record.isoid && record.vmtype !== 'sharedfsvm' },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' || record.hostcontrolstate === 'Maintenance' },
           mapping: {
             virtualmachineid: {
@@ -332,7 +332,7 @@ export default {
           docHelp: 'adminguide/virtual_machines.html#change-affinity-group-for-an-existing-vm',
           dataView: true,
           args: ['affinitygroupids'],
-          show: (record) => { return ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ChangeAffinity'))),
           popup: true
         },
@@ -342,7 +342,7 @@ export default {
           label: 'label.scale.vm',
           docHelp: 'adminguide/virtual_machines.html#how-to-dynamically-scale-cpu-and-ram',
           dataView: true,
-          show: (record) => { return (['Stopped'].includes(record.state) || (['Running'].includes(record.state) && record.hypervisor !== 'LXC')) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && (['Stopped'].includes(record.state) || (['Running'].includes(record.state) && record.hypervisor !== 'LXC')) && record.vmtype !== 'sharedfsvm' },
           disabled: (record) => { return record.state === 'Running' && !record.isdynamicallyscalable },
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ScaleVM.vue')))
@@ -353,7 +353,7 @@ export default {
           label: 'label.migrate.instance.to.host',
           docHelp: 'adminguide/virtual_machines.html#moving-vms-between-hosts-manual-live-migration',
           dataView: true,
-          show: (record, store) => { return ['Running'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
+          show: (record, store) => { return record.hypervisor !== 'External' && ['Running'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' },
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/MigrateWizard.vue')))
@@ -365,7 +365,7 @@ export default {
           message: 'message.migrate.instance.to.ps',
           docHelp: 'adminguide/virtual_machines.html#moving-vms-between-hosts-manual-live-migration',
           dataView: true,
-          show: (record, store) => { return ['Stopped'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
+          show: (record, store) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
           disabled: (record) => { return record.hostcontrolstate === 'Offline' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/MigrateVMStorage'))),
           popup: true
@@ -377,7 +377,7 @@ export default {
           message: 'message.action.instance.reset.password',
           dataView: true,
           args: ['password'],
-          show: (record) => { return ['Stopped'].includes(record.state) && record.passwordenabled },
+          show: (record) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && record.passwordenabled },
           response: (result) => {
             return {
               message: result.virtualmachine && result.virtualmachine.password ? `The password of VM <b>${result.virtualmachine.displayname}</b> is <b>${result.virtualmachine.password}</b>` : null,
@@ -393,7 +393,7 @@ export default {
           message: 'message.desc.reset.ssh.key.pair',
           docHelp: 'adminguide/virtual_machines.html#resetting-ssh-keys',
           dataView: true,
-          show: (record) => { return ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ResetSshKeyPair')))
         },
@@ -404,7 +404,7 @@ export default {
           message: 'message.desc.reset.userdata',
           docHelp: 'adminguide/virtual_machines.html#resetting-userdata',
           dataView: true,
-          show: (record) => { return ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
+          show: (record) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' },
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ResetUserData')))
         },
@@ -415,7 +415,7 @@ export default {
           dataView: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/AssignInstance'))),
           popup: true,
-          show: (record) => { return ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' }
+          show: (record) => { return record.hypervisor !== 'External' && ['Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm' }
         },
         {
           api: 'recoverVirtualMachine',
@@ -423,7 +423,16 @@ export default {
           label: 'label.recover.vm',
           message: 'message.recover.vm',
           dataView: true,
-          show: (record, store) => { return ['Destroyed'].includes(record.state) && store.features.allowuserexpungerecovervm && record.vmtype !== 'sharedfsvm' }
+          show: (record, store) => { return record.hypervisor !== 'External' && ['Destroyed'].includes(record.state) && store.features.allowuserexpungerecovervm && record.vmtype !== 'sharedfsvm' }
+        },
+        {
+          api: 'runCustomAction',
+          icon: 'play-square-outlined',
+          label: 'label.run.custom.action',
+          dataView: true,
+          component: shallowRef(defineAsyncComponent(() => import('@/views/extension/RunCustomAction'))),
+          popup: true,
+          show: (record) => { return ['External'].includes(record.hypervisor) }
         },
         {
           api: 'unmanageVirtualMachine',
@@ -431,7 +440,7 @@ export default {
           label: 'label.action.unmanage.virtualmachine',
           message: 'message.action.unmanage.virtualmachine',
           dataView: true,
-          show: (record) => { return ['Running', 'Stopped'].includes(record.state) && ['VMware', 'KVM'].includes(record.hypervisor) && record.vmtype !== 'sharedfsvm' }
+          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && ['VMware', 'KVM'].includes(record.hypervisor) && record.vmtype !== 'sharedfsvm' }
         },
         {
           api: 'expungeVirtualMachine',
diff --git a/ui/src/config/section/extension.js b/ui/src/config/section/extension.js
new file mode 100644
index 00000000000..4c6d9ebf076
--- /dev/null
+++ b/ui/src/config/section/extension.js
@@ -0,0 +1,147 @@
+// 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.
+
+import { shallowRef, defineAsyncComponent } from 'vue'
+import store from '@/store'
+
+export default {
+  name: 'extension',
+  title: 'label.extensions',
+  icon: 'appstore-add-outlined',
+  docHelp: 'adminguide/extensions.html',
+  permission: ['listExtensions'],
+  params: (dataView) => {
+    const params = {}
+    if (!dataView) {
+      params.details = 'min'
+    }
+    return params
+  },
+  resourceType: 'Extension',
+  columns: () => {
+    var fields = ['name', 'state', 'type', 'path',
+      {
+        availability: (record) => {
+          if (record.pathready) {
+            return 'Ready'
+          }
+          return 'Not Ready'
+        }
+      }, 'created']
+    return fields
+  },
+  details: ['name', 'description', 'id', 'type', 'details', 'path', 'pathready', 'isuserdefined', 'orchestratorrequirespreparevm', 'created'],
+  filters: ['orchestrator'],
+  tabs: [{
+    name: 'details',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
+  },
+  {
+    name: 'resources',
+    component: shallowRef(defineAsyncComponent(() => import('@/views/extension/ExtensionResourcesTab.vue')))
+  },
+  {
+    name: 'customactions',
+    component: shallowRef(defineAsyncComponent(() => import('@/views/extension/ExtensionCustomActionsTab.vue')))
+  },
+  {
+    name: 'events',
+    resourceType: 'Extension',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/EventsTab.vue'))),
+    show: () => { return 'listEvents' in store.getters.apis }
+  }],
+  related: [
+    {
+      name: 'vm',
+      title: 'label.instances',
+      param: 'extensionid'
+    },
+    {
+      name: 'template',
+      title: 'label.templates',
+      param: 'extensionid'
+    }
+  ],
+  actions: [
+    {
+      api: 'createExtension',
+      icon: 'plus-outlined',
+      label: 'label.create.extension',
+      docHelp: 'adminguide/extensions.html',
+      listView: true,
+      popup: true,
+      component: shallowRef(defineAsyncComponent(() => import('@/views/extension/CreateExtension.vue')))
+    },
+    {
+      api: 'updateExtension',
+      icon: 'edit-outlined',
+      label: 'label.update.extension',
+      dataView: true,
+      popup: true,
+      component: shallowRef(defineAsyncComponent(() => import('@/views/extension/UpdateExtension.vue')))
+    },
+    {
+      api: 'registerExtension',
+      icon: 'api-outlined',
+      label: 'label.register.extension',
+      message: 'message.action.register.extension',
+      dataView: true,
+      popup: true,
+      component: shallowRef(defineAsyncComponent(() => import('@/views/extension/RegisterExtension.vue')))
+    },
+    {
+      api: 'updateExtension',
+      icon: 'play-circle-outlined',
+      label: 'label.enable.extension',
+      message: 'message.confirm.enable.extension',
+      dataView: true,
+      groupAction: true,
+      popup: true,
+      defaultArgs: { state: 'Enabled' },
+      groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+      show: (record) => { return ['Disabled'].includes(record.state) }
+    },
+    {
+      api: 'updateExtension',
+      icon: 'pause-circle-outlined',
+      label: 'label.disable.extension',
+      message: 'message.confirm.disable.extension',
+      dataView: true,
+      groupAction: true,
+      popup: true,
+      defaultArgs: { state: 'Disabled' },
+      groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+      show: (record) => { return ['Enabled'].includes(record.state) }
+    },
+    {
+      api: 'deleteExtension',
+      icon: 'delete-outlined',
+      label: 'label.delete.extension',
+      message: 'message.action.delete.extension',
+      dataView: true,
+      popup: true,
+      args: ['id', 'cleanup'],
+      mapping: {
+        id: {
+          value: (record, params) => { return record.id }
+        },
+        cleanup: false
+      },
+      show: (record) => { return record.isuserdefined }
+    }
+  ]
+}
diff --git a/ui/src/config/section/extension/customaction.js b/ui/src/config/section/extension/customaction.js
new file mode 100644
index 00000000000..e01f9bc944b
--- /dev/null
+++ b/ui/src/config/section/extension/customaction.js
@@ -0,0 +1,94 @@
+// 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.
+
+import { shallowRef, defineAsyncComponent } from 'vue'
+import store from '@/store'
+
+export default {
+  name: 'customaction',
+  title: 'label.custom.actions',
+  icon: 'play-square-outlined',
+  docHelp: 'adminguide/extensions.html#custom-actions',
+  permission: ['listCustomActions'],
+  resourceType: 'ExtensionCustomAction',
+  hidden: true,
+  columns: ['name', 'extensionname', 'enabled', 'created'],
+  details: ['name', 'id', 'description', 'extensionname', 'allowedroletypes', 'resourcetype', 'parameters', 'timeout', 'successmessage', 'errormessage', 'details', 'created'],
+  tabs: [{
+    name: 'details',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
+  },
+  {
+    name: 'events',
+    resourceType: 'ExtensionCustomAction',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/EventsTab.vue'))),
+    show: () => { return 'listEvents' in store.getters.apis }
+  }],
+  actions: [
+    {
+      api: 'addCustomAction',
+      icon: 'plus-outlined',
+      label: 'label.add.custom.action',
+      docHelp: 'adminguide/extensions.html#custom-actions',
+      listView: true,
+      popup: true,
+      show: (record) => { return false }, // Hidden for now
+      component: shallowRef(defineAsyncComponent(() => import('@/views/extension/AddCustomAction.vue')))
+    },
+    {
+      api: 'updateCustomAction',
+      icon: 'edit-outlined',
+      label: 'label.update.custom.action',
+      message: 'message.action.update.extension',
+      dataView: true,
+      popup: true,
+      component: shallowRef(defineAsyncComponent(() => import('@/views/extension/UpdateCustomAction.vue')))
+    },
+    {
+      api: 'updateCustomAction',
+      icon: 'play-circle-outlined',
+      label: 'label.enable.custom.action',
+      message: 'message.confirm.enable.custom.action',
+      dataView: true,
+      groupAction: true,
+      popup: true,
+      defaultArgs: { enabled: true },
+      groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+      show: (record) => { return !record.enabled }
+    },
+    {
+      api: 'updateCustomAction',
+      icon: 'pause-circle-outlined',
+      label: 'label.disable.custom.action',
+      message: 'message.confirm.disable.custom.action',
+      dataView: true,
+      groupAction: true,
+      popup: true,
+      defaultArgs: { enabled: false },
+      groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+      show: (record) => { return record.enabled }
+    },
+    {
+      api: 'deleteCustomAction',
+      icon: 'delete-outlined',
+      label: 'label.delete.custom.action',
+      message: 'message.action.delete.custom.action',
+      dataView: true,
+      popup: true
+    }
+  ]
+}
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js
index a00224c6377..f0458088b24 100644
--- a/ui/src/config/section/image.js
+++ b/ui/src/config/section/image.js
@@ -58,7 +58,7 @@ export default {
         return fields
       },
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'arch', 'format', 'ostypename', 'size', 'physicalsize', 'isready', 'passwordenabled',
+        var fields = ['name', 'id', 'displaytext', 'checksum', 'hypervisor', 'arch', 'format', 'externalprovisioner', 'ostypename', 'size', 'physicalsize', 'isready', 'passwordenabled',
           'crossZones', 'templatetype', 'directdownload', 'deployasis', 'ispublic', 'isfeatured', 'isextractable', 'isdynamicallyscalable', 'crosszones', 'type',
           'account', 'domain', 'created', 'userdatadetails', 'userdatapolicy', 'forcks']
         if (['Admin'].includes(store.getters.userInfo.roletype)) {
@@ -67,7 +67,7 @@ export default {
         return fields
       },
       searchFilters: () => {
-        var filters = ['name', 'zoneid', 'tags', 'arch', 'oscategoryid', 'templatetype']
+        var filters = ['name', 'zoneid', 'tags', 'arch', 'oscategoryid', 'templatetype', 'extensionid']
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
           filters.push('storageid')
           filters.push('imagestoreid')
diff --git a/ui/src/config/section/infra/clusters.js b/ui/src/config/section/infra/clusters.js
index c03a1716a8d..ad6c59dda42 100644
--- a/ui/src/config/section/infra/clusters.js
+++ b/ui/src/config/section/infra/clusters.js
@@ -35,7 +35,7 @@ export default {
     fields.push('zonename')
     return fields
   },
-  details: ['name', 'id', 'allocationstate', 'clustertype', 'managedstate', 'arch', 'hypervisortype', 'podname', 'zonename', 'drsimbalance', 'storageaccessgroups', 'podstorageaccessgroups', 'zonestorageaccessgroups'],
+  details: ['name', 'id', 'allocationstate', 'clustertype', 'managedstate', 'arch', 'hypervisortype', 'externalprovisioner', 'podname', 'zonename', 'drsimbalance', 'storageaccessgroups', 'podstorageaccessgroups', 'zonestorageaccessgroups', 'externaldetails'],
   related: [{
     name: 'host',
     title: 'label.hosts',
@@ -57,7 +57,8 @@ export default {
     component: shallowRef(defineAsyncComponent(() => import('@/components/view/SettingsTab.vue')))
   }, {
     name: 'drs',
-    component: shallowRef(defineAsyncComponent(() => import('@/views/infra/ClusterDRSTab.vue')))
+    component: shallowRef(defineAsyncComponent(() => import('@/views/infra/ClusterDRSTab.vue'))),
+    show: (resource) => { return resource.hypervisortype !== 'External' }
   }, {
     name: 'comments',
     component: shallowRef(defineAsyncComponent(() => import('@/components/view/AnnotationsTab.vue')))
@@ -132,7 +133,7 @@ export default {
       dataView: true,
       defaultArgs: { iterations: null },
       args: ['iterations'],
-      show: (record) => { return record.managedstate === 'Managed' }
+      show: (record) => { return record.hypervisortype !== 'External' && record.managedstate === 'Managed' }
     },
     {
       api: 'enableOutOfBandManagementForCluster',
@@ -141,7 +142,7 @@ export default {
       message: 'label.outofbandmanagement.enable',
       dataView: true,
       show: (record) => {
-        return record?.resourcedetails?.outOfBandManagementEnabled === 'false'
+        return record.hypervisortype !== 'External' && record?.resourcedetails?.outOfBandManagementEnabled === 'false'
       },
       args: ['clusterid'],
       mapping: {
@@ -157,7 +158,7 @@ export default {
       message: 'label.outofbandmanagement.disable',
       dataView: true,
       show: (record) => {
-        return !(record?.resourcedetails?.outOfBandManagementEnabled === 'false')
+        return record.hypervisortype !== 'External' && !(record?.resourcedetails?.outOfBandManagementEnabled === 'false')
       },
       args: ['clusterid'],
       mapping: {
@@ -173,7 +174,7 @@ export default {
       message: 'label.ha.enable',
       dataView: true,
       show: (record) => {
-        return record?.resourcedetails?.resourceHAEnabled === 'false'
+        return record.hypervisortype !== 'External' && record?.resourcedetails?.resourceHAEnabled === 'false'
       },
       args: ['clusterid'],
       mapping: {
@@ -189,7 +190,7 @@ export default {
       message: 'label.ha.disable',
       dataView: true,
       show: (record) => {
-        return !(record?.resourcedetails?.resourceHAEnabled === 'false')
+        return record.hypervisortype !== 'External' && !(record?.resourcedetails?.resourceHAEnabled === 'false')
       },
       args: ['clusterid'],
       mapping: {
@@ -209,6 +210,9 @@ export default {
         clusterids: {
           value: (record) => { return record.id }
         }
+      },
+      show: (record) => {
+        return record.hypervisortype !== 'External'
       }
     },
     {
diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js
index 474177918e4..81e25a9c794 100644
--- a/ui/src/config/section/infra/hosts.js
+++ b/ui/src/config/section/infra/hosts.js
@@ -45,7 +45,7 @@ export default {
     fields.push('managementservername')
     return fields
   },
-  details: ['name', 'id', 'resourcestate', 'ipaddress', 'hypervisor', 'arch', 'type', 'clustername', 'podname', 'zonename', 'storageaccessgroups', 'clusterstorageaccessgroups', 'podstorageaccessgroups', 'zonestorageaccessgroups', 'managementservername', 'disconnected', 'created'],
+  details: ['name', 'id', 'resourcestate', 'ipaddress', 'hypervisor', 'externalprovisioner', 'arch', 'type', 'clustername', 'podname', 'zonename', 'storageaccessgroups', 'clusterstorageaccessgroups', 'podstorageaccessgroups', 'zonestorageaccessgroups', 'managementservername', 'disconnected', 'created', 'externaldetails'],
   tabs: [{
     name: 'details',
     component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
@@ -87,6 +87,7 @@ export default {
       label: 'label.action.change.password',
       dataView: true,
       popup: true,
+      show: (record) => { return record.hypervisor !== 'External' },
       component: shallowRef(defineAsyncComponent(() => import('@/views/infra/ChangeHostPassword.vue')))
     },
     {
@@ -169,6 +170,7 @@ export default {
       docHelp: 'adminguide/hosts.html#out-of-band-management',
       dataView: true,
       popup: true,
+      show: (record) => { return record.hypervisor !== 'External' },
       component: shallowRef(defineAsyncComponent(() => import('@/views/infra/ConfigureHostOOBM')))
     },
     {
@@ -179,7 +181,7 @@ export default {
       docHelp: 'adminguide/hosts.html#out-of-band-management',
       dataView: true,
       show: (record) => {
-        return !(record?.outofbandmanagement?.enabled === true)
+        return record.hypervisor !== 'External' && !(record?.outofbandmanagement?.enabled === true)
       },
       args: ['hostid'],
       mapping: {
@@ -196,7 +198,7 @@ export default {
       docHelp: 'adminguide/hosts.html#out-of-band-management',
       dataView: true,
       show: (record) => {
-        return record?.outofbandmanagement?.enabled === true
+        return record.hypervisor !== 'External' && record?.outofbandmanagement?.enabled === true
       },
       args: ['hostid'],
       mapping: {
@@ -213,7 +215,7 @@ export default {
       docHelp: 'adminguide/hosts.html#out-of-band-management',
       dataView: true,
       show: (record) => {
-        return record?.outofbandmanagement?.enabled === true
+        return record.hypervisor !== 'External' && record?.outofbandmanagement?.enabled === true
       },
       args: ['hostid', 'action'],
       mapping: {
@@ -233,7 +235,7 @@ export default {
       docHelp: 'adminguide/hosts.html#out-of-band-management',
       dataView: true,
       show: (record) => {
-        return record?.outofbandmanagement?.enabled === true
+        return record.hypervisor !== 'External' && record?.outofbandmanagement?.enabled === true
       },
       args: ['hostid', 'password'],
       mapping: {
@@ -268,7 +270,7 @@ export default {
       docHelp: 'adminguide/reliability.html#ha-for-hosts',
       dataView: true,
       show: (record) => {
-        return !(record?.hostha?.haenable === true)
+        return record.hypervisor !== 'External' && !(record?.hostha?.haenable === true)
       },
       args: ['hostid'],
       mapping: {
diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js
index ed519100b19..de18b84100c 100644
--- a/ui/src/config/section/offering.js
+++ b/ui/src/config/section/offering.js
@@ -16,6 +16,7 @@
 // under the License.
 import { shallowRef, defineAsyncComponent } from 'vue'
 import store from '@/store'
+import { getFilteredExternalDetails } from '@/utils/extension'
 
 export default {
   name: 'offering',
@@ -40,7 +41,7 @@ export default {
       filters: ['active', 'inactive'],
       columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'leaseexpiryaction']
+        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'leaseexpiryaction', 'externaldetails']
         if (store.getters.apis.createServiceOffering &&
           store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
           fields.splice(6, 0, 'vspherestoragepolicy')
@@ -95,7 +96,12 @@ export default {
         label: 'label.edit',
         docHelp: 'adminguide/service_offerings.html#modifying-or-deleting-a-service-offering',
         dataView: true,
-        args: ['name', 'displaytext', 'storagetags', 'hosttags']
+        args: ['name', 'displaytext', 'storageatags', 'hosttags', 'externaldetails'],
+        mapping: {
+          externaldetails: {
+            transformedvalue: (record) => { return getFilteredExternalDetails(record.serviceofferingdetails) }
+          }
+        }
       }, {
         api: 'updateServiceOffering',
         icon: 'lock-outlined',
diff --git a/ui/src/core/lazy_lib/icons_use.js b/ui/src/core/lazy_lib/icons_use.js
index 01ffa2e6859..82cd1ae5a46 100644
--- a/ui/src/core/lazy_lib/icons_use.js
+++ b/ui/src/core/lazy_lib/icons_use.js
@@ -19,6 +19,7 @@ import {
   AimOutlined,
   ApartmentOutlined,
   ApiOutlined,
+  AppstoreAddOutlined,
   AppstoreOutlined,
   ArrowDownOutlined,
   ArrowRightOutlined,
@@ -137,6 +138,7 @@ import {
   PictureOutlined,
   PieChartOutlined,
   PlayCircleOutlined,
+  PlaySquareOutlined,
   PlusCircleOutlined,
   PlusOutlined,
   PlusSquareOutlined,
@@ -191,6 +193,7 @@ export default {
     app.component('AimOutlined', AimOutlined)
     app.component('ApartmentOutlined', ApartmentOutlined)
     app.component('ApiOutlined', ApiOutlined)
+    app.component('AppstoreAddOutlined', AppstoreAddOutlined)
     app.component('AppstoreOutlined', AppstoreOutlined)
     app.component('ArrowDownOutlined', ArrowDownOutlined)
     app.component('ArrowRightOutlined', ArrowRightOutlined)
@@ -309,6 +312,7 @@ export default {
     app.component('PictureOutlined', PictureOutlined)
     app.component('PieChartOutlined', PieChartOutlined)
     app.component('PlayCircleOutlined', PlayCircleOutlined)
+    app.component('PlaySquareOutlined', PlaySquareOutlined)
     app.component('PlusCircleOutlined', PlusCircleOutlined)
     app.component('PlusOutlined', PlusOutlined)
     app.component('PlusSquareOutlined', PlusSquareOutlined)
diff --git a/ui/src/main.js b/ui/src/main.js
index 2bd9d945e9a..f117fb57810 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -39,7 +39,8 @@ import {
   localesPlugin,
   dialogUtilPlugin,
   cpuArchitectureUtilPlugin,
-  imagesUtilPlugin
+  imagesUtilPlugin,
+  extensionsUtilPlugin
 } from './utils/plugins'
 import { VueAxios } from './utils/request'
 import directives from './utils/directives'
@@ -61,6 +62,7 @@ vueApp.use(genericUtilPlugin)
 vueApp.use(dialogUtilPlugin)
 vueApp.use(cpuArchitectureUtilPlugin)
 vueApp.use(imagesUtilPlugin)
+vueApp.use(extensionsUtilPlugin)
 vueApp.use(extensions)
 vueApp.use(directives)
 
diff --git a/ui/src/utils/extension.js b/ui/src/utils/extension.js
new file mode 100644
index 00000000000..cd8d0c4daca
--- /dev/null
+++ b/ui/src/utils/extension.js
@@ -0,0 +1,30 @@
+// 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.
+
+export function getFilteredExternalDetails (details) {
+  if (!details || typeof details !== 'object') {
+    return null
+  }
+  const prefix = 'External:'
+  const result = {}
+  for (const key in details) {
+    if (key.startsWith(prefix)) {
+      result[key.substring(prefix.length)] = details[key]
+    }
+  }
+  return Object.keys(result).length > 0 ? result : null
+}
diff --git a/ui/src/utils/plugins.js b/ui/src/utils/plugins.js
index a8b9b54fc9e..61456d98b12 100644
--- a/ui/src/utils/plugins.js
+++ b/ui/src/utils/plugins.js
@@ -32,6 +32,7 @@ export const pollJobPlugin = {
        * @param {String} [name='']
        * @param {String} [title='']
        * @param {String} [description='']
+       * @param {Boolean} [showSuccessMessage=true]
        * @param {String} [successMessage=Success]
        * @param {Function} [successMethod=() => {}]
        * @param {String} [errorMessage=Error]
@@ -49,6 +50,7 @@ export const pollJobPlugin = {
         name = '',
         title = '',
         description = '',
+        showSuccessMessage = true,
         successMessage = i18n.global.t('label.success'),
         successMethod = () => {},
         errorMessage = i18n.global.t('label.error'),
@@ -92,18 +94,22 @@ export const pollJobPlugin = {
         const result = json.queryasyncjobresultresponse
         eventBus.emit('update-job-details', { jobId, resourceId })
         if (result.jobstatus === 1) {
-          var content = successMessage
-          if (successMessage === 'Success' && action && action.label) {
-            content = i18n.global.t(action.label)
+          if (showSuccessMessage) {
+            var content = successMessage
+            if (successMessage === 'Success' && action && action.label) {
+              content = i18n.global.t(action.label)
+            }
+            if (name) {
+              content = content + ' - ' + name
+            }
+            message.success({
+              content,
+              key: jobId,
+              duration: 2
+            })
+          } else {
+            message.destroy(jobId)
           }
-          if (name) {
-            content = content + ' - ' + name
-          }
-          message.success({
-            content,
-            key: jobId,
-            duration: 2
-          })
           store.dispatch('AddHeaderNotice', {
             key: jobId,
             title,
@@ -384,6 +390,8 @@ export const resourceTypePlugin = {
           return 'kubernetes'
         case 'KubernetesSupportedVersion':
           return 'kubernetesiso'
+        case 'ExtensionCustomAction':
+          return 'customaction'
         case 'SystemVm':
         case 'PhysicalNetwork':
         case 'Backup':
@@ -413,6 +421,7 @@ export const resourceTypePlugin = {
         case 'AutoScaleVmGroup':
         case 'QuotaTariff':
         case 'GuestOsCategory':
+        case 'Extension':
           return resourceType.toLowerCase()
       }
       return ''
@@ -557,8 +566,12 @@ export const cpuArchitectureUtilPlugin = {
 
 export const imagesUtilPlugin = {
   install (app) {
-    app.config.globalProperties.$fetchTemplateTypes = function () {
-      const baseTypes = ['USER', 'VNF']
+    app.config.globalProperties.$fetchTemplateTypes = function (hypervisor) {
+      const baseTypes = ['USER']
+      if (hypervisor === 'External') {
+        return baseTypes.map(type => ({ id: type, name: type, description: type }))
+      }
+      baseTypes.push('VNF')
       const adminTypes = ['SYSTEM', 'BUILTIN', 'ROUTING']
       const types = [...baseTypes]
       if (store.getters.userInfo?.roletype === 'Admin') {
@@ -568,3 +581,19 @@ export const imagesUtilPlugin = {
     }
   }
 }
+
+export const extensionsUtilPlugin = {
+  install (app) {
+    app.config.globalProperties.$fetchCustomActionRoleTypes = function () {
+      const roleTypes = []
+      const roleTypesList = ['Admin', 'Resource Admin', 'Domain Admin', 'User']
+      roleTypesList.forEach((item) => {
+        roleTypes.push({
+          id: item.replace(' ', ''),
+          description: item
+        })
+      })
+      return roleTypes
+    }
+  }
+}
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index ab086cf189f..589def212a2 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -51,7 +51,7 @@
                     <template #suffixIcon><filter-outlined class="ant-select-suffix" /></template>
                     <a-select-option
                       v-if="['Admin', 'DomainAdmin'].includes($store.getters.userInfo.roletype) &&
-                      ['vm', 'iso', 'template', 'pod', 'cluster', 'host', 'systemvm', 'router', 'storagepool', 'kubernetes', 'computeoffering', 'systemoffering', 'diskoffering', 'sharedfs'].includes($route.name) ||
+                      ['vm', 'iso', 'template', 'pod', 'cluster', 'host', 'systemvm', 'router', 'storagepool', 'kubernetes', 'computeoffering', 'systemoffering', 'diskoffering', 'sharedfs', 'extension'].includes($route.name) ||
                       ['account'].includes($route.name)"
                       key="all"
                       :label="$t('label.all')">
@@ -363,6 +363,9 @@
                     {{ opt.name && opt.type ? opt.name + ' (' + opt.type + ')' : opt.name || opt.description }}
                   </a-select-option>
                 </a-select>
+                <details-input
+                  v-else-if="field.type==='map'"
+                  v-model:value="form[field.name]" />
                 <a-input-number
                   v-else-if="field.type==='long'"
                   v-focus="fieldIndex === firstIndex"
@@ -473,6 +476,7 @@ import OsLogo from '@/components/widgets/OsLogo'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import BulkActionProgress from '@/components/view/BulkActionProgress'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'Resource',
@@ -485,7 +489,8 @@ export default {
     BulkActionProgress,
     TooltipLabel,
     OsLogo,
-    ResourceIcon
+    ResourceIcon,
+    DetailsInput
   },
   mixins: [mixinDevice],
   provide: function () {
@@ -648,7 +653,8 @@ export default {
   },
   watch: {
     '$route' (to, from) {
-      if (to.fullPath !== from.fullPath && !to.fullPath.includes('action/') && to?.query?.tab !== 'browser') {
+      console.log('DEBUG - Route changed from', from.fullPath, 'to', to.fullPath)
+      if (to.fullPath !== from.fullPath && !to.fullPath.includes('/action/') && to?.query?.tab !== 'browser') {
         if ('page' in to.query) {
           this.page = Number(to.query.page)
           this.pageSize = Number(to.query.pagesize)
@@ -692,7 +698,7 @@ export default {
         return this.$route.query.filter
       }
       const routeName = this.$route.name
-      if ((this.projectView && routeName === 'vm') || (['Admin', 'DomainAdmin'].includes(this.$store.getters.userInfo.roletype) && ['vm', 'iso', 'template', 'pod', 'cluster', 'host', 'systemvm', 'router', 'storagepool'].includes(routeName)) || ['account', 'guestnetwork', 'guestvlans', 'oauthsetting', 'guestos', 'guestoshypervisormapping', 'kubernetes', 'asnumbers', 'networkoffering'].includes(routeName)) {
+      if ((this.projectView && routeName === 'vm') || (['Admin', 'DomainAdmin'].includes(this.$store.getters.userInfo.roletype) && ['vm', 'iso', 'template', 'pod', 'cluster', 'host', 'systemvm', 'router', 'storagepool'].includes(routeName)) || ['account', 'guestnetwork', 'guestvlans', 'oauthsetting', 'guestos', 'guestoshypervisormapping', 'kubernetes', 'asnumbers', 'networkoffering', 'extension'].includes(routeName)) {
         return 'all'
       }
       if (['publicip'].includes(routeName)) {
@@ -763,10 +769,13 @@ export default {
       const refreshed = ('irefresh' in params)
 
       params.listall = true
+
+      this.dataView = !!(this.$route?.params?.id || !!this.$route?.query?.dataView)
+
       if (this.$route.meta.params) {
         const metaParams = this.$route.meta.params
         if (typeof metaParams === 'function') {
-          Object.assign(params, metaParams())
+          Object.assign(params, metaParams(this.dataView))
         } else {
           Object.assign(params, metaParams)
         }
@@ -810,14 +819,9 @@ export default {
         'vpc', 'securitygroups', 'publicip', 'vpncustomergateway', 'template', 'iso', 'event', 'kubernetes', 'sharedfs',
         'autoscalevmgroup', 'vnfapp', 'webhook'].includes(this.$route.name)
 
-      if ((this.$route && this.$route.params && this.$route.params.id) || this.$route.query.dataView) {
-        this.dataView = true
-        if (!refreshed) {
-          this.resource = {}
-          this.$emit('change-resource', this.resource)
-        }
-      } else {
-        this.dataView = false
+      if (this.dataView && !refreshed) {
+        this.resource = {}
+        this.$emit('change-resource', this.resource)
       }
 
       if (this.dataView && ['Admin'].includes(this.$store.getters.userInfo.roletype) && this.routeName === 'volume') {
@@ -1424,6 +1428,15 @@ export default {
           this.form[field.name] = fieldValue
         } else if (field.type === 'boolean' && field.name === 'rebalance' && this.currentAction.api === 'cancelMaintenance') {
           this.form[field.name] = true
+        } else if (field.type === 'map') {
+          const transformedValue = this.currentAction.mapping?.[field.name]?.transformedvalue
+          if (typeof transformedValue === 'function') {
+            this.form[field.name] = transformedValue(this.resource)
+          } else if (typeof transformedValue === 'object' && transformedValue !== null) {
+            this.form[field.name] = { ...transformedValue }
+          } else {
+            this.form[field.name] = {}
+          }
         }
       })
     },
@@ -1624,6 +1637,10 @@ export default {
               } else {
                 params[key] = param.opts[input].name
               }
+            } else if (param.type === 'map' && typeof input === 'object') {
+              Object.entries(values.externaldetails).forEach(([key, value]) => {
+                params[param.name + '[0].' + key] = value
+              })
             } else {
               params[key] = input
             }
@@ -1819,6 +1836,12 @@ export default {
         }
       } else if (['computeoffering', 'systemoffering', 'diskoffering'].includes(this.$route.name)) {
         query.state = filter
+      } else if (['extension'].includes(this.$route.name)) {
+        if (filter === 'all') {
+          delete query.type
+        } else {
+          query.type = filter
+        }
       }
       query.filter = filter
       query.page = '1'
diff --git a/ui/src/views/compute/CreateKubernetesCluster.vue b/ui/src/views/compute/CreateKubernetesCluster.vue
index ac9d3f5fd8a..7a2bcec49b9 100644
--- a/ui/src/views/compute/CreateKubernetesCluster.vue
+++ b/ui/src/views/compute/CreateKubernetesCluster.vue
@@ -732,9 +732,7 @@ export default {
 
       getAPI('listHypervisors', params).then(json => {
         const listResponse = json.listhypervisorsresponse.hypervisor || []
-        if (listResponse) {
-          this.selectedZoneHypervisors = listResponse
-        }
+        this.selectedZoneHypervisors = listResponse.filter(hypervisor => hypervisor.name !== 'External')
       }).finally(() => {
         this.hypervisorLoading = false
       })
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index ac98f35d806..3a7b015e533 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -165,7 +165,7 @@
                           :key="templateKey"
                           @handle-search-filter="filters => fetchAllTemplates(filters)"
                           @update-template-iso="updateFieldValue" />
-                        <div>
+                        <div v-if="!isTemplateHypervisorExternal">
                           {{ $t('label.override.rootdisk.size') }}
                           <a-switch
                             v-model:checked="form.rootdisksizeitem"
@@ -291,7 +291,7 @@
                         <a-input v-model:value="form.memory"/>
                       </a-form-item>
                     </span>
-                    <span v-if="imageType!=='isoid'">
+                    <span v-if="imageType!=='isoid' && !isTemplateHypervisorExternal">
                       {{ $t('label.override.root.diskoffering') }}
                       <a-switch
                         v-model:checked="showOverrideDiskOfferingOption"
@@ -370,9 +370,10 @@
               <a-step
                 v-else
                 :title="imageType === 'templateid' ? $t('label.data.disk') : $t('label.disk.size')"
+                :disabled="isTemplateHypervisorExternal ? true : false"
                 :status="zoneSelected ? 'process' : 'wait'">
                 <template #description>
-                  <div v-if="zoneSelected">
+                  <div v-if="zoneSelected && !isTemplateHypervisorExternal">
                     <disk-offering-selection
                       :items="options.diskOfferings"
                       :row-count="rowCount.diskOfferings"
@@ -398,6 +399,9 @@
                       <a-input v-model:value="form.size"/>
                     </a-form-item>
                   </div>
+                  <div v-else-if="isTemplateHypervisorExternal" style="margin-bottom: 20px; margin-top: 7px">
+                    {{ $t('message.host.external.datadisk') }}
+                  </div>
                 </template>
               </a-step>
               <a-step
@@ -571,7 +575,7 @@
                       ref="bootintosetup">
                       <a-switch v-model:checked="form.bootintosetup" />
                     </a-form-item>
-                    <a-form-item name="dynamicscalingenabled" ref="dynamicscalingenabled">
+                    <a-form-item name="dynamicscalingenabled" ref="dynamicscalingenabled" v-if="!!template && !isTemplateHypervisorExternal">
                       <template #label>
                         <tooltip-label :title="$t('label.dynamicscalingenabled')" :tooltip="$t('label.dynamicscalingenabled.tooltip')"/>
                       </template>
@@ -811,6 +815,17 @@
                         :filterOption="filterOption"
                       ></a-select>
                     </a-form-item>
+                    <a-form-item name="externaldetails" ref="externaldetails" v-if="imageType === 'templateid' && isTemplateHypervisorExternal">
+                      <template #label>
+                        <tooltip-label :title="$t('label.externaldetails')" :tooltip="apiParams.externaldetails.description" />
+                      </template>
+                      <a-switch v-model:checked="externalDetailsEnabled" @change="onExternalDetailsEnabledChange"/>
+                      <a-card v-if="externalDetailsEnabled" style="margin-top: 10px">
+                        <div style="margin-bottom: 10px">{{ $t('message.add.orchestrator.resource.details') }}</div>
+                        <details-input
+                          v-model:value="form.externaldetails" />
+                      </a-card>
+                    </a-form-item>
                     <a-form-item :label="$t('label.action.start.instance')" name="startvm" ref="startvm">
                       <a-switch v-model:checked="form.startvm" />
                     </a-form-item>
@@ -907,6 +922,7 @@ import UserDataSelection from '@views/compute/wizard/UserDataSelection'
 import SecurityGroupSelection from '@views/compute/wizard/SecurityGroupSelection'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 import InstanceNicsNetworkSelectListView from '@/components/view/InstanceNicsNetworkSelectListView'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'Wizard',
@@ -931,7 +947,8 @@ export default {
     ComputeSelection,
     SecurityGroupSelection,
     TooltipLabel,
-    InstanceNicsNetworkSelectListView
+    InstanceNicsNetworkSelectListView,
+    DetailsInput
   },
   props: {
     visible: {
@@ -1106,7 +1123,9 @@ export default {
       },
       architectureTypes: {
         opts: []
-      }
+      },
+      externalDetailsEnabled: false,
+      selectedExtensionId: null
     }
   },
   computed: {
@@ -1474,6 +1493,9 @@ export default {
     },
     guestOsCategoriesSelectionDisallowed () {
       return (!this.queryGuestOsCategoryId || this.options.guestOsCategories.length === 0) && (!!this.queryTemplateId || !!this.queryIsoId)
+    },
+    isTemplateHypervisorExternal () {
+      return !!this.template && this.template.hypervisor === 'External'
     }
   },
   watch: {
@@ -1641,6 +1663,9 @@ export default {
       this.doUserdataAppend = false
     }
   },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('deployVirtualMachine')
+  },
   created () {
     this.initForm()
     this.dataPreFill = this.preFillContent && Object.keys(this.preFillContent).length > 0 ? this.preFillContent : {}
@@ -1951,6 +1976,7 @@ export default {
           if (template.details['vmware-to-kvm-mac-addresses']) {
             this.dataPreFill.macAddressArray = JSON.parse(template.details['vmware-to-kvm-mac-addresses'])
           }
+          this.dataPreFill.hypervisorType = template.hypervisor
         }
       } else if (name === 'isoid') {
         this.imageType = 'isoid'
@@ -2123,19 +2149,11 @@ export default {
     },
     changeArchitecture (arch) {
       this.selectedArchitecture = arch
-      if (this.isModernImageSelection) {
-        this.fetchGuestOsCategories()
-        return
-      }
-      this.fetchImages()
+      this.updateImages()
     },
     changeImageType (imageType) {
       this.imageType = imageType
-      if (this.isModernImageSelection) {
-        this.fetchGuestOsCategories()
-      } else {
-        this.fetchImages()
-      }
+      this.updateImages()
     },
     handleSubmitAndStay (e) {
       this.form.stayonpage = true
@@ -2357,6 +2375,12 @@ export default {
           deployVmData.projectid = this.owner.projectid
         }
 
+        if (this.imageType === 'templateid' && this.template && this.template.hypervisor === 'External' && values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([key, value]) => {
+            deployVmData['externaldetails[0].' + key] = value
+          })
+        }
+
         const title = this.$t('label.launch.vm')
         const description = values.name || ''
         const password = this.$t('label.password')
@@ -2573,6 +2597,9 @@ export default {
       if (this.isZoneSelectedMultiArch) {
         args.arch = this.selectedArchitecture
       }
+      if (this.selectedExtensionId) {
+        args.extensionid = this.selectedExtensionId
+      }
       args.account = store.getters.project?.id ? null : this.owner.account
       args.domainid = store.getters.project?.id ? null : this.owner.domainid
       args.projectid = store.getters.project?.id || this.owner.projectid
@@ -2772,7 +2799,7 @@ export default {
       this.fetchOptions(this.params.hosts, 'hosts')
       if (this.clusterId && Array.isArray(this.options.clusters)) {
         const cluster = this.options.clusters.find(c => c.id === this.clusterId)
-        this.handleArchResourceSelected(cluster.arch)
+        this.handleComputeResourceSelected(cluster)
       }
     },
     onSelectHostId (value) {
@@ -2782,15 +2809,40 @@ export default {
       }
       if (this.hostId && Array.isArray(this.options.hosts)) {
         const host = this.options.hosts.find(h => h.id === this.hostId)
-        this.handleArchResourceSelected(host.arch)
+        this.handleComputeResourceSelected(host)
       }
     },
-    handleArchResourceSelected (resourceArch) {
-      if (!resourceArch || !this.isZoneSelectedMultiArch || this.selectedArchitecture === resourceArch) {
+    updateImages () {
+      if (this.isModernImageSelection) {
+        this.fetchGuestOsCategories()
         return
       }
-      this.selectedArchitecture = resourceArch
-      this.changeArchitecture(resourceArch, this.tabKey === 'templateid')
+      this.fetchImages()
+    },
+    handleComputeResourceSelected (computeResource) {
+      if (!computeResource) {
+        this.selectedExtensionId = null
+        return
+      }
+      const resourceArch = computeResource.arch
+      const needArchChange = resourceArch &&
+        this.isZoneSelectedMultiArch &&
+        this.selectedArchitecture !== resourceArch
+      const resourceHypervisor = computeResource.hypervisor || computeResource.hypervisortype
+      const resourceExtensionId = resourceHypervisor === 'External' ? computeResource.extensionid : null
+      const needExtensionIdChange = this.selectedExtensionId !== resourceExtensionId
+      if (!needArchChange && !needExtensionIdChange) {
+        return
+      }
+      if (needArchChange && !needExtensionIdChange) {
+        this.changeArchitecture(resourceArch, this.imageType === 'templateid')
+        return
+      }
+      this.selectedExtensionId = resourceExtensionId
+      if (needArchChange) {
+        this.selectedArchitecture = resourceArch
+      }
+      this.updateImages()
     },
     onSelectGuestOsCategory (value) {
       this.form.guestoscategoryid = value
@@ -3113,6 +3165,12 @@ export default {
         return Promise.reject(this.$t('message.error.number'))
       }
       return Promise.resolve()
+    },
+    onExternalDetailsEnabledChange (val) {
+      if (val || !this.form.externaldetails) {
+        return
+      }
+      this.form.externaldetails = undefined
     }
   }
 }
diff --git a/ui/src/views/compute/InstanceTab.vue b/ui/src/views/compute/InstanceTab.vue
index fa50e6e79b7..8dc90efae06 100644
--- a/ui/src/views/compute/InstanceTab.vue
+++ b/ui/src/views/compute/InstanceTab.vue
@@ -39,7 +39,7 @@
           style="width: 100%; margin-bottom: 10px"
           @click="showAddVolModal"
           :loading="loading"
-          :disabled="!('createVolume' in $store.getters.apis) || this.vm.state === 'Error'">
+          :disabled="!('createVolume' in $store.getters.apis) || this.vm.state === 'Error' || resource.hypervisor === 'External'">
           <template #icon><plus-outlined /></template> {{ $t('label.action.create.volume.add') }}
         </a-button>
         <volumes-tab :resource="vm" :loading="loading" />
diff --git a/ui/src/views/extension/AddCustomAction.vue b/ui/src/views/extension/AddCustomAction.vue
new file mode 100644
index 00000000000..f74255fa8de
--- /dev/null
+++ b/ui/src/views/extension/AddCustomAction.vue
@@ -0,0 +1,247 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :rules="rules"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item name="extensionid" ref="extensionid" v-if="!extension">
+        <template #label>
+          <tooltip-label :title="$t('label.extensionid')" :tooltip="apiParams.extensionid.description"/>
+        </template>
+          <infinite-scroll-select
+            v-model:value="form.extensionid"
+            :placeholder="apiParams.extensionid.description"
+            api="listExtensions"
+            :apiParams="extensionsApiParams"
+            resourceType="extension"
+            defaultIcon="appstore-add-outlined" />
+      </a-form-item>
+      <a-form-item name="name" ref="name">
+        <template #label>
+          <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
+        </template>
+        <a-input
+          v-model:value="form.name"
+          :placeholder="apiParams.name.description"
+          v-focus="true" />
+      </a-form-item>
+      <a-form-item name="description" ref="description">
+        <template #label>
+          <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+        </template>
+        <a-input
+          v-model:value="form.description"
+          :placeholder="apiParams.description.description" />
+      </a-form-item>
+      <a-form-item ref="allowedroletypes" name="allowedroletypes">
+        <template #label>
+          <tooltip-label :title="$t('label.allowedroletypes')" :tooltip="apiParams.allowedroletypes.description"/>
+        </template>
+        <a-select
+          showSearch
+          mode="multiple"
+          v-model:value="form.allowedroletypes"
+          :placeholder="apiParams.allowedroletypes.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }" >
+          <a-select-option v-for="opt in roleTypes" :key="opt.id" :label="opt.description || opt.id">
+            {{ opt.description || opt.id }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="parameters" ref="parameters">
+        <template #label>
+          <tooltip-label :title="$t('label.parameters')" :tooltip="apiParams.parameters.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.custom.action.parameters') }}</div>
+        <parameters-input
+          v-model:value="form.parameters" />
+      </a-form-item>
+      <a-form-item name="successmessage" ref="successmessage">
+        <template #label>
+          <tooltip-label :title="$t('label.successmessage')" :tooltip="apiParams.successmessage.description"/>
+        </template>
+        <a-input
+          v-model:value="form.successmessage"
+          :placeholder="apiParams.successmessage.description" />
+      </a-form-item>
+      <a-form-item name="errormessage" ref="errormessage">
+        <template #label>
+          <tooltip-label :title="$t('label.errormessage')" :tooltip="apiParams.errormessage.description"/>
+        </template>
+        <a-input
+          v-model:value="form.errormessage"
+          :placeholder="apiParams.errormessage.description" />
+      </a-form-item>
+      <a-form-item name="details" ref="details">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.details.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.custom.action.details') }}</div>
+        <details-input
+          v-model:value="form.details" />
+      </a-form-item>
+      <a-form-item name="timeout" ref="timeout">
+        <template #label>
+          <tooltip-label :title="$t('label.timeout')" :tooltip="apiParams.timeout.description"/>
+        </template>
+        <a-input-number
+          v-model:value="form.timeout"
+          :placeholder="apiParams.timeout.description"
+          :min="1" />
+      </a-form-item>
+      <a-form-item name="enabled" ref="enabled">
+        <template #label>
+          <tooltip-label :title="$t('label.enabled')" :tooltip="apiParams.enabled.description"/>
+        </template>
+        <a-switch v-model:checked="form.enabled" />
+      </a-form-item>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import InfiniteScrollSelect from '@/components/widgets/InfiniteScrollSelect'
+import ParametersInput from '@/views/extension/ParametersInput'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'AddCustomAction',
+  components: {
+    TooltipLabel,
+    InfiniteScrollSelect,
+    ParametersInput,
+    DetailsInput
+  },
+  props: {
+    extension: {
+      type: Object,
+      default: null
+    }
+  },
+  inject: ['parentFetchData'],
+  data () {
+    return {
+      roleTypes: [],
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('addCustomAction')
+    this.extensionsApiParams = {
+      listall: true
+    }
+  },
+  created () {
+    this.initForm()
+    if (this.extension) {
+      this.form.extensionid = this.extension.id
+    }
+    this.roleTypes = this.$fetchCustomActionRoleTypes()
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({
+        enabled: true,
+        timeout: 5
+      })
+      this.rules = reactive({
+        extensionid: [{ required: true, message: `${this.$t('message.error.select')}` }],
+        name: [{ required: true, message: `${this.$t('message.error.name')}` }]
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          extensionid: values.extensionid || this.extension.id,
+          name: values.name,
+          enabled: values.enabled
+        }
+        const keys = ['description', 'allowedroletypes', 'successmessage', 'errormessage', 'timeout']
+        for (const key of keys) {
+          if (values[key]) {
+            params[key] = Array.isArray(values[key]) ? values[key].join(',') : values[key]
+          }
+        }
+        if (values.parameters) {
+          values.parameters.forEach((param, index) => {
+            Object.keys(param).forEach(key => {
+              params['parameters[' + index + '].' + key] = param[key]
+            })
+          })
+        }
+        if (values.details) {
+          Object.entries(values.details).forEach(([key, value]) => {
+            params['details[0].' + key] = value
+          })
+        }
+        postAPI('addCustomAction', params).then(response => {
+          this.$emit('refresh-data')
+          this.$notification.success({
+            message: this.$t('label.create.extension'),
+            description: this.$t('message.success.create.extension')
+          })
+          this.closeAction()
+          this.parentFetchData()
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 100vw;
+  @media (min-width: 1000px) {
+    width: 950px;
+  }
+}
+</style>
diff --git a/ui/src/views/extension/CreateExtension.vue b/ui/src/views/extension/CreateExtension.vue
new file mode 100644
index 00000000000..11d0c776e4d
--- /dev/null
+++ b/ui/src/views/extension/CreateExtension.vue
@@ -0,0 +1,256 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :rules="rules"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item name="name" ref="name">
+        <template #label>
+          <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
+        </template>
+        <a-input
+          v-model:value="form.name"
+          :placeholder="apiParams.name.description"
+          @change="updatePath"
+          v-focus="true" />
+      </a-form-item>
+      <a-form-item name="description" ref="description">
+        <template #label>
+          <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+        </template>
+        <a-input
+          v-model:value="form.description"
+          :placeholder="apiParams.description.description" />
+      </a-form-item>
+      <a-form-item name="path" ref="path">
+        <template #label>
+          <tooltip-label :title="$t('label.path')" :tooltip="apiParams.path.description"/>
+        </template>
+        <div class="entry-point-input-container">
+          <span v-if="!!safeName" :title="extenstionBasePath" class="entry-point-input-base-path">
+            {{ extenstionBasePath }}
+          </span>
+          <a-input
+            v-model:value="form.path"
+            :placeholder="apiParams.path.description"
+            @input="markPathModified"
+            class="entry-point-input-relative-path"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item ref="type" name="type">
+        <template #label>
+          <tooltip-label :title="$t('label.type')" :tooltip="apiParams.type.description"/>
+        </template>
+        <a-select
+          showSearch
+          v-model:value="form.type"
+          :placeholder="apiParams.type.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }" >
+          <a-select-option v-for="opt in extensionTypes" :key="opt.id" :label="opt.description || opt.id">
+            {{ opt.description || opt.id }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="orchestratorrequirespreparevm" ref="orchestratorrequirespreparevm" v-if="form.type === 'Orchestrator'">
+        <template #label>
+          <tooltip-label :title="$t('label.orchestratorrequirespreparevm')" :tooltip="apiParams.orchestratorrequirespreparevm.description"/>
+        </template>
+        <a-switch v-model:checked="form.orchestratorrequirespreparevm" />
+      </a-form-item>
+      <a-form-item name="details" ref="details">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.details.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.details') }}</div>
+        <details-input
+          v-model:value="form.details" />
+      </a-form-item>
+      <a-form-item name="state" ref="state">
+        <template #label>
+          <tooltip-label :title="$t('label.enabled')" :tooltip="apiParams.state.description"/>
+        </template>
+        <a-switch v-model:checked="form.state" />
+      </a-form-item>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'CreateExtension',
+  components: {
+    TooltipLabel,
+    DetailsInput
+  },
+  data () {
+    return {
+      pathModified: false,
+      extensionTypes: [],
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('createExtension')
+  },
+  created () {
+    this.initForm()
+    this.fetchExtensionTypes()
+  },
+  computed: {
+    safeName () {
+      var value = this.form.name
+      if (!value || value.length === 0) {
+        return ''
+      }
+      return value.replace(/[^a-zA-Z0-9._-]/g, '').toLowerCase()
+    },
+    extenstionBasePath () {
+      return (this.$store.getters.features.extensionspath || '[EXTENSIONS_PATH]') + '/' + this.safeName + '/'
+    }
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({
+        state: false
+      })
+      this.rules = reactive({
+        name: [{ required: true, message: `${this.$t('message.error.name')}` }],
+        type: [{ required: true, message: `${this.$t('message.error.select')}` }]
+      })
+    },
+    fetchExtensionTypes () {
+      this.extensionTypes = []
+      const extensionTypesList = ['Orchestrator']
+      extensionTypesList.forEach((item) => {
+        this.extensionTypes.push({
+          id: item,
+          description: item
+        })
+      })
+      this.form.type = this.extensionTypes?.[0]?.id
+    },
+    markPathModified () {
+      this.pathModified = true
+    },
+    updatePath () {
+      if (this.pathModified) {
+        return
+      }
+      var value = this.safeName
+      if (value.length === 0) {
+        this.form.path = undefined
+        return
+      }
+      this.form.path = value + '.sh'
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          name: values.name,
+          type: values.type,
+          state: values.state ? 'Enabled' : 'Disabled'
+        }
+        if (values.description) {
+          params.description = values.description
+        }
+        var path = values.path
+        if (!path) {
+          path = this.safeName + '.sh'
+        }
+        params.path = this.safeName + '/' + path
+        if (values.details) {
+          Object.entries(values.details).forEach(([key, value]) => {
+            params['details[0].' + key] = value
+          })
+        }
+        postAPI('createExtension', params).then(response => {
+          this.$emit('refresh-data')
+          this.$notification.success({
+            message: this.$t('label.create.extension'),
+            description: this.$t('message.success.create.extension')
+          })
+          this.closeAction()
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+  @media (min-width: 600px) {
+    width: 550px;
+  }
+}
+
+.entry-point-input-container {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.entry-point-input-base-path {
+  max-width: 70%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.entry-point-input-relative-path {
+  flex: 1 1 0%;
+  min-width: 0;
+}
+</style>
diff --git a/ui/src/views/extension/ExtensionCustomActionsTab.vue b/ui/src/views/extension/ExtensionCustomActionsTab.vue
new file mode 100644
index 00000000000..a7b6d59c1cf
--- /dev/null
+++ b/ui/src/views/extension/ExtensionCustomActionsTab.vue
@@ -0,0 +1,274 @@
+// 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.
+
+<template>
+  <div>
+    <a-button
+      type="primary"
+      style="width: 100%; margin-bottom: 10px"
+      @click="showAddCustomActionModal"
+      :loading="tabLoading"
+      :disabled="!('addCustomAction' in $store.getters.apis)">
+      <template #icon><plus-outlined /></template> {{ $t('label.add.custom.action') }}
+    </a-button>
+    <a-table
+      size="small"
+      :columns="columns"
+      :dataSource="extensionCustomActions"
+      :rowKey="item => item.id"
+      :pagination="false"
+      :rowExpandable="(record) => record.parameters && Object.keys(record.parameters).length > 0">
+      <template #bodyCell="{ column, text, record }">
+        <template v-if="column.key === 'name'">
+          <router-link :to="{ path: '/customaction/' + record.id }">
+            {{ text }}
+          </router-link>
+        </template>
+        <template v-if="['enabled'].includes(column.key)">
+          <status :text="text ? 'Enabled' : 'Disabled'" displayText />
+        </template>
+        <template v-if="['created'].includes(column.key)">
+          {{ text && $toLocaleDate(text) }}
+        </template>
+        <template v-if="column.key === 'actions'">
+          <span style="margin-right: 5px">
+            <tooltip-button
+              v-if="'updateCustomAction' in $store.getters.apis"
+              :tooltip="$t('label.update.custom.action')"
+              icon="edit-outlined"
+              @click="openUpdateCustomActionModal(record)" />
+          </span>
+          <span style="margin-right: 5px">
+            <a-popconfirm
+              v-if="'updateCustomAction' in $store.getters.apis"
+              placement="topRight"
+              :title="record.enabled ? $t('message.confirm.disable.custom.action') : $t('message.confirm.enable.custom.action')"
+              :ok-text="$t('label.yes')"
+              :cancel-text="$t('label.no')"
+              :loading="updateLoading"
+              @confirm="updateCustomAction(record)"
+            >
+              <tooltip-button
+                :tooltip="record.enabled ? $t('label.disable.custom.action') : $t('label.enable.custom.action')"
+                :icon="record.enabled ? 'pause-circle-outlined' : 'play-circle-outlined'" />
+            </a-popconfirm>
+          </span>
+          <span style="margin-right: 5px">
+            <a-popconfirm
+              v-if="'deleteCustomAction' in $store.getters.apis"
+              placement="topRight"
+              :title="$t('message.action.delete.custom.action')"
+              :ok-text="$t('label.yes')"
+              :cancel-text="$t('label.no')"
+              :loading="deleteLoading"
+              @confirm="deleteCustomAction(record)"
+            >
+              <tooltip-button
+                :tooltip="$t('label.delete.custom.action')"
+                type="primary"
+                :danger="true"
+                icon="delete-outlined" />
+            </a-popconfirm>
+          </span>
+        </template>
+      </template>
+      <template #expandedRowRender="{ record }">
+        <strong>{{ $t('label.parameters') }}</strong>
+        <object-list-table
+          :showHeader="true"
+          :data-array="record.parameters" />
+      </template>
+    </a-table>
+
+    <a-modal
+      style="min-width: 1000px;"
+      :visible="showAddCustomAction"
+      :title="$t('label.add.custom.action')"
+      :maskClosable="false"
+      :closable="true"
+      :footer="null"
+      @cancel="closeModals">
+      <add-custom-action :extension="resource" @close-action="closeModals" />
+    </a-modal>
+
+    <a-modal
+      style="min-width: 1000px;"
+      :visible="showUpdateCustomAction"
+      :title="$t('label.update.custom.action')"
+      :maskClosable="false"
+      :closable="true"
+      :footer="null"
+      @cancel="closeModals">
+      <update-custom-action
+      :key="customActionForUpdate.id"
+      :resource="customActionForUpdate"
+      @close-action="closeModals" />
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { getAPI, postAPI } from '@/api'
+import ObjectListTable from '@/components/view/ObjectListTable.vue'
+import TooltipButton from '@/components/widgets/TooltipButton'
+import AddCustomAction from '@/views/extension/AddCustomAction.vue'
+import UpdateCustomAction from '@/views/extension/UpdateCustomAction.vue'
+import Status from '@/components/widgets/Status'
+
+export default {
+  name: 'ExtensionCustomActionsTab',
+  components: {
+    ObjectListTable,
+    TooltipButton,
+    AddCustomAction,
+    UpdateCustomAction,
+    Status
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      tabLoading: false,
+      columns: [
+        {
+          key: 'name',
+          title: this.$t('label.name'),
+          dataIndex: 'name'
+        },
+        {
+          key: 'enabled',
+          title: this.$t('label.state'),
+          dataIndex: 'enabled'
+        },
+        {
+          title: this.$t('label.resourcetype'),
+          dataIndex: 'resourcetype'
+        },
+        {
+          key: 'created',
+          title: this.$t('label.created'),
+          dataIndex: 'created'
+        },
+        {
+          key: 'actions',
+          title: this.$t('label.actions')
+        }
+      ],
+      page: 1,
+      pageSize: 20,
+      totalCount: 0,
+      showAddCustomAction: false,
+      updateLoading: false,
+      deleteLoading: false,
+      showUpdateCustomAction: false,
+      customActionForUpdate: {}
+    }
+  },
+  computed: {
+    extensionResources () {
+      return this.resource?.resources || []
+    }
+  },
+  created () {
+    this.fetchData()
+  },
+  watch: {
+    resource: {
+      handler () {
+        this.fetchCustomActions()
+      }
+    }
+  },
+  methods: {
+    fetchData () {
+      this.fetchCustomActions()
+    },
+    fetchCustomActions () {
+      this.extensionCustomActions = []
+      if (!this.resource.id) {
+        return
+      }
+      const params = {
+        page: this.page,
+        pagesize: this.pageSize,
+        extensionid: this.resource.id,
+        listall: true
+      }
+      this.tabLoading = true
+      getAPI('listCustomActions', params).then(json => {
+        this.extensionCustomActions = []
+        this.totalCount = json?.listcustomactionsresponse?.count || 0
+        this.extensionCustomActions = json?.listcustomactionsresponse?.extensioncustomaction || []
+        this.tabLoading = false
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    showAddCustomActionModal () {
+      this.showAddCustomAction = true
+    },
+    openUpdateCustomActionModal (action) {
+      this.customActionForUpdate = action
+      this.showUpdateCustomAction = true
+    },
+    closeModals () {
+      this.showAddCustomAction = false
+      this.showUpdateCustomAction = false
+      this.customActionForUpdate = {}
+    },
+    updateCustomAction (record) {
+      const params = {
+        id: record.id,
+        enabled: !record.enabled
+      }
+      this.updateLoading = true
+      postAPI('updateCustomAction', params).then(json => {
+        this.fetchCustomActions()
+        this.$notification.success({
+          message: record.enabled ? this.$t('label.disable.custom.action') : this.$t('label.enable.custom.action'),
+          description: this.$t('message.success.update.custom.action')
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.updateLoading = false
+      })
+    },
+    deleteCustomAction (record) {
+      const params = {
+        id: record.id
+      }
+      this.deleteLoading = true
+      postAPI('deleteCustomAction', params).then(json => {
+        this.fetchCustomActions()
+        this.$notification.success({
+          message: this.$t('label.delete.custom.action'),
+          description: this.$t('message.success.delete.custom.action')
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.deleteLoading = false
+      })
+    }
+  }
+}
+</script>
diff --git a/ui/src/views/extension/ExtensionResourcesTab.vue b/ui/src/views/extension/ExtensionResourcesTab.vue
new file mode 100644
index 00000000000..c69c79306c8
--- /dev/null
+++ b/ui/src/views/extension/ExtensionResourcesTab.vue
@@ -0,0 +1,135 @@
+// 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.
+
+<template>
+  <div>
+    <a-table
+      size="small"
+      :columns="columns"
+      :dataSource="extensionResources"
+      :rowKey="item => item.id"
+      :pagination="false"
+      :rowExpandable="(record) => record.details && Object.keys(record.details).length > 0">
+      <template #bodyCell="{ column, text, record }">
+        <template v-if="column.key === 'name'">
+          <router-link :to="{ path: '/' + record.type.toLowerCase() + '/' + record.id }">
+            {{ text }}
+          </router-link>
+        </template>
+        <template v-if="['created'].includes(column.key)">
+          {{ text && $toLocaleDate(text) }}
+        </template>
+        <template v-if="column.key === 'actions'">
+          <span style="margin-right: 5px">
+            <a-popconfirm
+              v-if="'unregisterExtension' in $store.getters.apis"
+              placement="topRight"
+              :title="$t('message.action.unregister.extension.resource')"
+              :ok-text="$t('label.yes')"
+              :cancel-text="$t('label.no')"
+              :loading="unregisterLoading"
+              @confirm="unregisterExtension(record)"
+            >
+              <tooltip-button
+                :tooltip="$t('label.action.unregister.extension.resource')"
+                type="primary"
+                :danger="true"
+                icon="delete-outlined" />
+            </a-popconfirm>
+          </span>
+        </template>
+      </template>
+      <template #expandedRowRender="{ record }">
+        <strong>{{ $t('label.details') }}</strong>
+        <object-list-table
+          :data-map="record.details" />
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+import { postAPI } from '@/api'
+import eventBus from '@/config/eventBus'
+import ObjectListTable from '@/components/view/ObjectListTable.vue'
+import TooltipButton from '@/components/widgets/TooltipButton'
+
+export default {
+  name: 'ExtensionResourcesTab',
+  components: {
+    ObjectListTable,
+    TooltipButton
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      tabLoading: false,
+      columns: [
+        {
+          key: 'name',
+          title: this.$t('label.name'),
+          dataIndex: 'name'
+        },
+        {
+          title: this.$t('label.type'),
+          dataIndex: 'type'
+        },
+        {
+          key: 'created',
+          title: this.$t('label.created'),
+          dataIndex: 'created'
+        },
+        {
+          key: 'actions',
+          title: this.$t('label.actions')
+        }
+      ],
+      unregisterLoading: false
+    }
+  },
+  computed: {
+    extensionResources () {
+      return this.resource?.resources || []
+    }
+  },
+  methods: {
+    unregisterExtension (record) {
+      const params = {
+        extensionid: this.resource.id,
+        resourceid: record.id,
+        resourcetype: record.type
+      }
+      postAPI('unregisterExtension', params).then(json => {
+        eventBus.emit('async-job-complete', null)
+        this.$notification.success({
+          message: this.$t('label.unregister.extension'),
+          description: this.$t('message.success.unregister.extension')
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.deleteLoading = false
+      })
+    }
+  }
+}
+</script>
diff --git a/ui/src/views/extension/ExternalConfigurationDetails.vue b/ui/src/views/extension/ExternalConfigurationDetails.vue
new file mode 100644
index 00000000000..4322651ea3e
--- /dev/null
+++ b/ui/src/views/extension/ExternalConfigurationDetails.vue
@@ -0,0 +1,115 @@
+// 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.
+
+<template>
+  <a-list-item v-if="['host', 'computeoffering'].includes($route.meta.name) && filteredExternalDetails">
+    <div>
+      <strong>{{ ['computeoffering'].includes($route.meta.name) ? $t('label.externaldetails') : $t('label.configuration.details') }}</strong>
+      <div>
+        <object-list-table :data-map="filteredExternalDetails" />
+      </div>
+    </div>
+  </a-list-item>
+  <a-list-item v-else-if="['cluster'].includes($route.meta.name)">
+    <div>
+      <strong>{{ $t('label.configuration.details') }}</strong>
+      <div>
+        <object-list-table :data-map="extensionResourceDetails" />
+      </div>
+    </div>
+  </a-list-item>
+</template>
+
+<script>
+import { getAPI } from '@/api'
+import ObjectListTable from '@/components/view/ObjectListTable'
+import { getFilteredExternalDetails } from '@/utils/extension'
+
+export default {
+  name: 'ExternalConfigurationDetails',
+  components: {
+    ObjectListTable
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      extension: {},
+      loading: false
+    }
+  },
+  created () {
+    this.fetchData()
+  },
+  watch: {
+    resource: {
+      deep: true,
+      handler (newItem, oldItem) {
+        if (newItem && newItem.id !== oldItem.id) {
+          this.fetchData()
+        }
+      }
+    }
+  },
+  computed: {
+    filteredExternalDetails () {
+      const detailsKeys = {
+        host: 'details',
+        computeoffering: 'serviceofferingdetails'
+      }
+      const detailsKey = detailsKeys[this.$route.meta.name]
+      if (!detailsKey || !this.resource) {
+        return null
+      }
+      return getFilteredExternalDetails(this.resource[detailsKey])
+    },
+    extensionResourceDetails () {
+      if (!this.resource?.id || !this.extension?.resources) {
+        return null
+      }
+      const resource = this.extension.resources.find(r => r.id === this.resource.id)
+      if (!resource || !resource.details || typeof resource.details !== 'object') {
+        return null
+      }
+      return resource.details
+    }
+  },
+  methods: {
+    fetchData () {
+      if (!['cluster'].includes(this.$route.meta.name)) {
+        return
+      }
+      this.loading = true
+      const params = {
+        id: this.resource.extensionid,
+        details: 'resource'
+      }
+      getAPI('listExtensions', params).then(json => {
+        this.extension = json.listextensionsresponse.extension[0]
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loading = false
+      })
+    }
+  }
+}
+</script>
diff --git a/ui/src/views/extension/ParametersInput.vue b/ui/src/views/extension/ParametersInput.vue
new file mode 100644
index 00000000000..f77b0471eaa
--- /dev/null
+++ b/ui/src/views/extension/ParametersInput.vue
@@ -0,0 +1,328 @@
+// 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.
+
+<template>
+  <a-card>
+    <a-row :gutter="[16, 8]">
+      <a-col :span="18">
+        <a-row :gutter="[16, 8]">
+          <a-col :span="18">
+            <a-form-item no-style>
+              <tooltip-label :title="$t('label.name')" />
+              <a-input
+                v-model:value="newParam.name"
+                :placeholder="$t('label.name')"
+                class="input-field"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" style="display: flex; align-items: flex-end;">
+            <a-form-item no-style>
+              <a-checkbox
+                v-model:checked="newParam.required"
+                class="required-checkbox"
+              >
+                Required
+              </a-checkbox>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item no-style>
+              <tooltip-label :title="$t('label.type')" />
+              <a-select
+                v-model:value="newParam.type"
+                :placeholder="$t('label.type')"
+                class="input-field"
+                @change="onNewParamTypeChange"
+              >
+                <a-select-option
+                  v-for="t in types"
+                  :key="t"
+                  :value="t"
+                >
+                  {{ t }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item no-style>
+              <tooltip-label :title="$t('label.validationformat')" :tooltip="$t('message.desc.validationformat')" />
+              <a-select
+                :disabled="!['NUMBER', 'STRING'].includes(newParam.type)"
+                v-model:value="newParam.validationformat"
+                :placeholder="$t('message.desc.validationformat')"
+                class="input-field"
+              >
+                <a-select-option
+                  v-for="t in newParamFormats"
+                  :key="t"
+                  :value="t"
+                >
+                  {{ t }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item no-style>
+              <tooltip-label :title="$t('label.valueoptions')" :tooltip="$t('message.desc.valueoptions')" />
+              <a-input
+                :disabled="!['NUMBER', 'STRING'].includes(newParam.type)"
+                v-model:value="newParam.valueoptions"
+                :placeholder="$t('message.desc.valueoptions')"
+                class="input-field"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-col>
+      <a-col :span="6" style="display: flex; align-items: flex-end; justify-content: center;">
+        <a-button
+          type="primary"
+          class="add-button"
+          @click="addEntry"
+          :disabled="!newParam.name || !newParam.type"
+        >
+          Add
+        </a-button>
+      </a-col>
+    </a-row>
+    <a-table
+      :columns="columns"
+      :dataSource="tableData"
+      rowKey="name"
+      size="small"
+      :pagination="false"
+      :showHeader="showTableHeaders"
+      class="table"
+    >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'actions'">
+          <template v-if="record.editing">
+            <div class="flex-gap">
+              <tooltip-button :tooltip="$t('label.ok')" icon="check-outlined" @onClick="saveEdit(record)" />
+              <tooltip-button :tooltip="$t('label.cancel')" icon="close-outlined" @onClick="cancelEdit(record)" />
+            </div>
+          </template>
+          <template v-else>
+            <div class="flex-gap">
+              <tooltip-button :tooltip="$t('label.edit')" icon="edit-outlined" @onClick="editRow(record)" />
+              <tooltip-button type="danger" :tooltip="$t('label.remove')" icon="delete-outlined" @onClick="removeEntry(record.name)" />
+            </div>
+          </template>
+        </template>
+
+        <template v-else-if="record.editing">
+          <a-form-item no-style>
+            <a-input v-if="column.key === 'name'" v-model:value="editBuffer.name" />
+          </a-form-item>
+          <a-form-item no-style>
+            <a-select v-if="column.key === 'type'" v-model:value="editBuffer.type" @change="onEditBufferTypeChange">
+              <a-select-option v-for="t in types" :key="t" :value="t">{{ t }}</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item no-style>
+            <a-select v-if="column.key === 'validationformat'" :disabled="!['NUMBER', 'STRING'].includes(editBuffer.type)" v-model:value="editBuffer.validationformat">
+              <a-select-option v-for="t in editBufferFormats" :key="t" :value="t">{{ t }}</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item no-style>
+            <a-input v-if="column.key === 'valueoptions'" :disabled="!['NUMBER', 'STRING'].includes(editBuffer.type)" v-model:value="editBuffer.valueoptions" />
+          </a-form-item>
+          <a-form-item no-style>
+            <a-checkbox v-if="column.key === 'required'" v-model:checked="editBuffer.required" />
+          </a-form-item>
+        </template>
+
+        <template v-else>
+          <template v-if="column.key === 'required'">{{ record.required ? 'Yes' : 'No' }}</template>
+          <template v-else-if="column.key === 'valueoptions'">
+            {{ Array.isArray(record.valueoptions) ? record.valueoptions.join(',') : record.valueoptions }}
+          </template>
+          <template v-else>{{ record[column.key] }}</template>
+        </template>
+      </template>
+    </a-table>
+  </a-card>
+</template>
+
+<script>
+import TooltipButton from '@/components/widgets/TooltipButton'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+
+export default {
+  name: 'ParametersInput',
+  components: {
+    TooltipButton,
+    TooltipLabel
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    showTableHeaders: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      newParam: {},
+      columns: [
+        { title: this.$t('label.name'), dataIndex: 'name', key: 'name', width: '20%' },
+        { title: this.$t('label.type'), dataIndex: 'type', key: 'type', width: '15%' },
+        { title: this.$t('label.validationformat'), dataIndex: 'validationformat', key: 'validationformat', width: '15%' },
+        { title: this.$t('label.valueoptions'), dataIndex: 'valueoptions', key: 'valueoptions', width: '25%' },
+        { title: this.$t('label.required'), dataIndex: 'required', key: 'required', width: '10%' },
+        { title: this.$t('label.actions'), key: 'actions', width: '15%' }
+      ],
+      tableData: [],
+      editBuffer: null
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler (newVal) {
+        this.tableData = (newVal || []).map(p => ({
+          ...p,
+          editing: false
+        }))
+      }
+    }
+  },
+  emits: ['update:value'],
+  computed: {
+    types () {
+      return [
+        'BOOLEAN',
+        'DATE',
+        'NUMBER',
+        'STRING'
+      ]
+    },
+    newParamFormats () {
+      return this.getFormatOptions(this.newParam?.type)
+    },
+    editBufferFormats () {
+      return this.getFormatOptions(this.editBuffer?.type)
+    }
+  },
+  methods: {
+    getFormatOptions (type) {
+      const formats = ['NONE']
+      if (type === 'STRING') {
+        formats.push('EMAIL', 'PASSWORD', 'URL', 'UUID')
+      } else if (type === 'NUMBER') {
+        formats.push('DECIMAL')
+      }
+      return formats
+    },
+    resetFormatAndOptions (obj) {
+      delete obj.validationformat
+      delete obj.valueoptions
+    },
+    onNewParamTypeChange () {
+      this.resetFormatAndOptions(this.newParam)
+    },
+    onEditBufferTypeChange () {
+      this.resetFormatAndOptions(this.editBuffer)
+    },
+    addEntry () {
+      const existingIndex = this.tableData.findIndex(row => row.name === this.newParam.name)
+      if (existingIndex !== -1) {
+        this.tableData[existingIndex] = { ...this.newParam }
+      } else {
+        this.tableData.push({ ...this.newParam, editing: false })
+      }
+      this.updateData()
+      this.newParam = {}
+    },
+    removeEntry (name) {
+      this.tableData = this.tableData.filter(item => item.name !== name)
+      this.updateData()
+    },
+    editRow (record) {
+      this.editBuffer = { ...record }
+      if (Array.isArray(this.editBuffer.valueoptions)) {
+        this.editBuffer.valueoptions = this.editBuffer.valueoptions.join(',')
+      }
+      record.editing = true
+    },
+    cancelEdit (record) {
+      record.editing = false
+      this.editBuffer = {}
+    },
+    saveEdit (record) {
+      if (!this.editBuffer) return
+      Object.assign(record, this.editBuffer)
+      if (!this.editBuffer.validationformat) {
+        delete record.validationformat
+      }
+      if (!this.editBuffer.valueoptions) {
+        delete record.valueoptions
+      }
+      record.editing = false
+      this.updateData()
+      this.editBuffer = {}
+    },
+    updateData () {
+      const data = this.tableData.map(({ name, type, validationformat, valueoptions, required }) => ({
+        name,
+        type,
+        validationformat,
+        valueoptions: Array.isArray(valueoptions) ? valueoptions.join(',') : valueoptions,
+        required
+      }))
+      this.$emit('update:value', data)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.input-row {
+  display: grid;
+  grid-template-columns: 1fr auto; /* First column flexible, second column auto-sized */
+  grid-template-rows: auto auto auto;
+  gap: 8px 16px; /* row-gap and column-gap */
+  align-items: center;
+}
+.grid-cell {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.input-field {
+  width: 100%;
+}
+.add-button {
+  white-space: nowrap;
+}
+
+.table {
+  margin-top: 10px;
+  width: 100%;
+}
+
+.flex-gap {
+  display: flex;
+  gap: 8px;
+}
+</style>
diff --git a/ui/src/views/extension/RegisterExtension.vue b/ui/src/views/extension/RegisterExtension.vue
new file mode 100644
index 00000000000..f856c181f8c
--- /dev/null
+++ b/ui/src/views/extension/RegisterExtension.vue
@@ -0,0 +1,200 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item ref="resourcetype" name="resourcetype">
+        <template #label>
+          <tooltip-label :title="$t('label.resourcetype')" :tooltip="apiParams.resourcetype.description"/>
+        </template>
+        <a-select
+          showSearch
+          v-model:value="form.resourcetype"
+          :placeholder="apiParams.resourcetype.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          @change="handleResourceTypeChange" >
+          <a-select-option v-for="opt in resourceTypes" :key="opt.id" :label="opt.description || opt.id">
+            {{ opt.description || opt.id }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item ref="resourceid" name="resourceid">
+        <template #label>
+          <tooltip-label :title="$t('label.resourceid')" :tooltip="apiParams.resourceid.description"/>
+        </template>
+        <a-select
+          showSearch
+          v-model:value="form.resourceid"
+          :placeholder="apiParams.resourceid.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }" >
+          <a-select-option v-for="opt in resources.opts" :key="opt.id" :label="opt.name || opt.description">
+            {{ opt.name || opt.description }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item>
+        <template #label>
+          <tooltip-label :title="$t('label.details')" :tooltip="apiParams.details.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.resource.details') }}</div>
+        <details-input
+          v-model:value="form.details" />
+      </a-form-item>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { getAPI, postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'RegisterExtension',
+  components: {
+    TooltipLabel,
+    DetailsInput
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      resourceTypes: [],
+      resources: {
+        loading: false,
+        opts: []
+      },
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('registerExtension')
+  },
+  created () {
+    this.initForm()
+    this.fetchExtensionResourceTypes()
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({})
+      this.rules = reactive({
+        resourcetype: [{ required: true, message: `${this.$t('message.error.select')}` }],
+        resourceid: [{ required: true, message: `${this.$t('message.error.select')}` }]
+      })
+    },
+    fetchExtensionResourceTypes () {
+      this.resourceTypes = []
+      const resourceTypesList = ['Cluster']
+      resourceTypesList.forEach((item) => {
+        this.resourceTypes.push({
+          id: item,
+          description: item
+        })
+      })
+    },
+    handleResourceTypeChange (id) {
+      this.resources.opts = []
+      if (!id) {
+        return
+      }
+      this.resources.loading = true
+      const resourceApi = 'list' + id + 's'
+      const type = id.toLowerCase()
+      const params = {}
+      if (['cluster'].includes(type)) {
+        params.hypervisor = 'External'
+      }
+      getAPI(resourceApi, params).then(json => {
+        this.resources.opts = json?.[resourceApi.toLowerCase() + 'response']?.[type] || []
+      }).finally(() => {
+        this.resources.loading = false
+        this.form.resourceid = this.resources?.opts?.[0]?.id || null
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          extensionid: this.resource.id,
+          resourcetype: values.resourcetype,
+          resourceid: values.resourceid
+        }
+        if (values.details) {
+          Object.entries(values.details).forEach(([key, value]) => {
+            params['details[0].' + key] = value
+          })
+        }
+        postAPI('registerExtension', params).then(response => {
+          this.$emit('refresh-data')
+          this.$notification.success({
+            message: this.$t('label.register.extension'),
+            description: this.$t('message.success.register.extension')
+          })
+          this.closeAction()
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+  @media (min-width: 600px) {
+    width: 550px;
+  }
+}
+</style>
diff --git a/ui/src/views/extension/RunCustomAction.vue b/ui/src/views/extension/RunCustomAction.vue
new file mode 100644
index 00000000000..bd26cf7f375
--- /dev/null
+++ b/ui/src/views/extension/RunCustomAction.vue
@@ -0,0 +1,386 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :rules="rules"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item name="customactionid" ref="customactionid">
+        <template #label>
+          <tooltip-label :title="$t('label.action')" :tooltip="apiParams.customactionid.description"/>
+        </template>
+        <a-select
+          showSearch
+          v-model:value="form.customactionid"
+          :placeholder="apiParams.customactionid.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          @change="onCustomActionChange" >
+          <a-select-option v-for="opt in customActions" :key="opt.id" :label="opt.name || opt.id">
+            {{ opt.name || opt.id }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-card v-if="form.customactionid && (!!currentDescription || !!currentParameters && currentParameters.length > 0)" style="margin-bottom: 10px;">
+        <div v-if="!!currentDescription">
+          {{ currentDescription }}
+          <a-divider v-if="!!currentParameters && currentParameters.length > 0"/>
+        </div>
+        <div v-for="(field, fieldIndex) in currentParameters" :key="fieldIndex">
+          <a-form-item :name="field.name" :ref="field.name">
+            <template #label>
+              <tooltip-label :title="field.name" :tooltip="field.name"/>
+            </template>
+            <a-switch
+              v-if="field.type === 'BOOLEAN'"
+              v-model:checked="form[field.name]"
+              :placeholder="field.name"
+              v-focus="fieldIndex === 0"
+            />
+            <a-date-picker
+              v-else-if="field.type === 'DATE'"
+              show-time
+              v-model:value="form[field.name]"
+              :placeholder="field.name"
+              v-focus="fieldIndex === 0"
+            />
+            <a-select
+              v-else-if="field.valueoptions && field.valueoptions.length > 0"
+              v-model:value="form[field.name]"
+              :placeholder="field.name">
+              <a-select-option v-for="t in field.valueoptions" :key="t" :value="t">{{ t }}</a-select-option>
+            </a-select>
+            <a-input-number
+              v-else-if="['NUMBER'].includes(field.type)"
+              :precision="['DECIMAL'].includes(field.validationformat) ? 2 : 0"
+              v-focus="fieldIndex === 0"
+              v-model:value="form[field.name]"
+              :placeholder="field.name" />
+            <a-input-password
+              v-else-if="['STRING'].includes(field.type) && ['PASSWORD'].includes(field.validationformat)"
+              v-focus="fieldIndex === 0"
+              v-model:value="form[field.name]"
+              :placeholder="field.name" />
+            <a-input
+              v-else
+              v-focus="fieldIndex === 0"
+              v-model:value="form[field.name]"
+              :placeholder="field.name" />
+          </a-form-item>
+        </div>
+      </a-card>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw, h } from 'vue'
+import { getAPI, postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'RunCustomAction',
+  components: {
+    TooltipLabel,
+    DetailsInput
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      customActions: [],
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('runCustomAction')
+  },
+  created () {
+    this.initForm()
+    this.fetchCustomActions()
+  },
+  computed: {
+    datePattern () {
+      return 'YYYY-MM-DDTHH:mm:ssZ'
+    },
+    resourceType () {
+      const metaResourceType = this.$route.meta.resourceType
+      if (metaResourceType && !['UserVm', 'DomainRouter', 'SystemVm'].includes(metaResourceType)) {
+        return metaResourceType
+      }
+      return 'VirtualMachine'
+    },
+    currentAction () {
+      if (!this.customActions || this.customActions.length === 0 || !this.form.customactionid) {
+        return []
+      }
+      return this.customActions.find(i => i.id === this.form.customactionid)
+    },
+    currentDescription () {
+      return this.currentAction?.description || ''
+    },
+    currentParameters () {
+      return this.currentAction?.parameters || []
+    }
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({})
+      this.rules = reactive({
+        customactionid: [{ required: true, message: `${this.$t('message.error.select')}` }]
+      })
+    },
+    fetchCustomActions () {
+      this.loading = true
+      this.customActions = []
+      const params = {
+        resourcetype: this.resourceType,
+        resourceid: this.resource.id,
+        enabled: true
+      }
+      getAPI('listCustomActions', params).then(json => {
+        this.customActions = json?.listcustomactionsresponse?.extensioncustomaction || []
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    onCustomActionChange () {
+      Object.keys(this.rules).forEach(key => {
+        if (key !== 'customactionid') {
+          delete this.rules[key]
+        }
+      })
+      Object.keys(this.form).forEach(key => {
+        if (key !== 'customactionid') {
+          delete this.form[key]
+        }
+      })
+      if (this.currentParameters && this.currentParameters.length > 0) {
+        this.currentParameters.forEach(field => {
+          const required = !!field.required
+          const fieldRules = []
+          if (field.type === 'BOOLEAN') {
+            this.form[field.name] = false
+          }
+          // Required rule
+          if (required) {
+            fieldRules.push({
+              required: true,
+              message: `${this.$t('message.error.input.value', { field: field.name })}`
+            })
+          }
+          if (field.type === 'STRING' && field.validationformat) {
+            let validator
+            switch (field.validationformat) {
+              case 'EMAIL':
+                validator = {
+                  type: 'email',
+                  message: this.$t('message.error.input.invalidemail')
+                }
+                break
+              case 'URL':
+                validator = {
+                  type: 'url',
+                  message: this.$t('message.error.input.invalidurl')
+                }
+                break
+              case 'UUID':
+                validator = {
+                  pattern: /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i,
+                  message: this.$t('message.error.input.invaliduuid')
+                }
+                break
+            }
+            if (validator) {
+              fieldRules.push(validator)
+            }
+          }
+          if (fieldRules.length > 0) {
+            this.rules[field.name] = fieldRules
+          }
+        })
+      }
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          resourcetype: this.resourceType,
+          resourceid: this.resource.id,
+          customactionid: values.customactionid
+        }
+        var keys = Object.keys(values)
+        keys = keys.filter(k => k !== 'customactionid')
+        for (const key of keys) {
+          var value = values[key]
+          if (value !== undefined && value != null &&
+              (typeof value !== 'string' || (typeof value === 'string' && value.trim().length > 0))) {
+            const fieldDef = this.currentParameters.find(f => f.name === key)
+            if (fieldDef?.type === 'DATE') {
+              value = value.format(this.datePattern)
+            }
+            params['parameters[0].' + key] = value
+          }
+        }
+        postAPI('runCustomAction', params).then(response => {
+          this.$pollJob({
+            jobId: response.runcustomactionresponse.jobid,
+            title: this.currentAction.name || this.$t('label.run.custom.action'),
+            description: this.currentAction.description || this.currentAction.name,
+            showSuccessMessage: false,
+            successMethod: (result) => {
+              this.$emit('refresh-data')
+              const actionResponse = result.jobresult?.customactionresult || {}
+              const success = actionResponse.success || false
+              const message = actionResponse?.result?.message || (success ? 'Success' : 'Failed')
+              const details = actionResponse?.result?.details
+              let printExtensionMessage = false
+              let extensionMessage = null
+              try {
+                const parsedDetails = JSON.parse(details)
+                printExtensionMessage = String(parsedDetails?.printmessage).toLowerCase() === 'true'
+                extensionMessage = parsedDetails?.message
+              } catch (_) {}
+              const modalType = success ? this.$success : this.$error
+              const contentElements = [h('p', `${message}`)]
+              if (extensionMessage && !Array.isArray(extensionMessage) && typeof extensionMessage === 'object' && Object.keys(extensionMessage).length > 0) {
+                extensionMessage = [extensionMessage]
+              }
+              if (Array.isArray(extensionMessage) && extensionMessage.length > 0 && printExtensionMessage) {
+                contentElements.push(
+                  h('div', {
+                    style: {
+                      marginTop: '1em',
+                      maxHeight: '50vh',
+                      maxWidth: '100%',
+                      overflow: 'auto',
+                      backgroundColor: '#f6f6f6',
+                      border: '1px solid #ddd',
+                      borderRadius: '4px',
+                      display: 'block'
+                    }
+                  }, [
+                    h('table', {
+                      style: {
+                        width: '100%',
+                        minWidth: 'max-content',
+                        borderCollapse: 'collapse',
+                        whiteSpace: 'pre-wrap'
+                      }
+                    }, [
+                      h('thead', [
+                        h('tr', Object.keys(extensionMessage[0]).map(key =>
+                          h('th', {
+                            style: {
+                              padding: '8px',
+                              border: '1px solid #ddd',
+                              textAlign: 'left',
+                              fontWeight: 'bold',
+                              backgroundColor: '#fafafa'
+                            }
+                          }, key)
+                        ))
+                      ]),
+                      h('tbody', extensionMessage.map(row =>
+                        h('tr', Object.values(row).map(value =>
+                          h('td', {
+                            style: {
+                              padding: '8px',
+                              border: '1px solid #ddd',
+                              fontFamily: 'monospace'
+                            }
+                          }, String(value))
+                        ))
+                      ))
+                    ])
+                  ])
+                )
+              } else if (printExtensionMessage === 'true') {
+                contentElements.push(
+                  h('div', {
+                    style: {
+                      marginTop: '1em',
+                      maxHeight: '50vh',
+                      padding: '10px',
+                      overflowY: 'auto',
+                      backgroundColor: '#f6f6f6',
+                      border: '1px solid #ddd',
+                      borderRadius: '4px',
+                      fontFamily: 'monospace',
+                      whiteSpace: 'pre-wrap',
+                      wordBreak: 'break-word'
+                    }
+                  }, String(extensionMessage))
+                )
+              }
+
+              modalType({
+                title: this.currentAction.name || this.$t('label.run.custom.action'),
+                content: h('div', contentElements),
+                width: '700px',
+                okText: this.$t('label.ok')
+              })
+            },
+            errorMessage: this.currentAction.name || this.$t('label.run.custom.action'),
+            loadingMessage: this.$t('message.running.custom.action'),
+            catchMessage: this.$t('error.fetching.async.job.result')
+          })
+          this.closeAction()
+        }).catch(error => {
+          this.$notifyError(error)
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+  @media (min-width: 600px) {
+    width: 550px;
+  }
+}
+</style>
diff --git a/ui/src/views/extension/UpdateCustomAction.vue b/ui/src/views/extension/UpdateCustomAction.vue
new file mode 100644
index 00000000000..008882a5238
--- /dev/null
+++ b/ui/src/views/extension/UpdateCustomAction.vue
@@ -0,0 +1,232 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :rules="rules"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item name="description" ref="description">
+        <template #label>
+          <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+        </template>
+        <a-input
+          v-model:value="form.description"
+          :placeholder="apiParams.description.description"
+          v-focus="true" />
+      </a-form-item>
+      <a-form-item ref="allowedroletypes" name="allowedroletypes">
+        <template #label>
+          <tooltip-label :title="$t('label.allowedroletypes')" :tooltip="apiParams.allowedroletypes.description"/>
+        </template>
+        <a-select
+          showSearch
+          mode="multiple"
+          v-model:value="form.allowedroletypes"
+          :placeholder="apiParams.allowedroletypes.description"
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }" >
+          <a-select-option v-for="opt in roleTypes" :key="opt.id" :label="opt.description || opt.id">
+            {{ opt.description || opt.id }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="parameters" ref="parameters">
+        <template #label>
+          <tooltip-label :title="$t('label.parameters')" :tooltip="apiParams.parameters.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.custom.action.parameters') }}</div>
+        <parameters-input
+          v-model:value="form.parameters" />
+      </a-form-item>
+      <a-form-item name="successmessage" ref="successmessage">
+        <template #label>
+          <tooltip-label :title="$t('label.successmessage')" :tooltip="apiParams.successmessage.description"/>
+        </template>
+        <a-input
+          v-model:value="form.successmessage"
+          :placeholder="apiParams.successmessage.description" />
+      </a-form-item>
+      <a-form-item name="errormessage" ref="errormessage">
+        <template #label>
+          <tooltip-label :title="$t('label.errormessage')" :tooltip="apiParams.errormessage.description"/>
+        </template>
+        <a-input
+          v-model:value="form.errormessage"
+          :placeholder="apiParams.errormessage.description" />
+      </a-form-item>
+      <a-form-item name="details" ref="details">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.details.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.custom.action.details') }}</div>
+        <details-input
+          v-model:value="form.details" />
+      </a-form-item>
+      <a-form-item name="timeout" ref="timeout">
+        <template #label>
+          <tooltip-label :title="$t('label.timeout')" :tooltip="apiParams.timeout.description"/>
+        </template>
+        <a-input-number
+          v-model:value="form.timeout"
+          :placeholder="apiParams.timeout.description"
+          :min="1" />
+      </a-form-item>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import ParametersInput from '@/views/extension/ParametersInput'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'AddCustomAction',
+  components: {
+    TooltipLabel,
+    ParametersInput,
+    DetailsInput
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  inject: ['parentFetchData'],
+  data () {
+    return {
+      roleTypes: [],
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('updateCustomAction')
+    this.extensionsApiParams = {
+      listall: true
+    }
+  },
+  created () {
+    this.initForm()
+    this.roleTypes = this.$fetchCustomActionRoleTypes()
+  },
+  methods: {
+    fixParamatersOptions (params) {
+      if (!params) {
+        return
+      }
+      for (var param of params) {
+        if (!param.options || param.options.length === 0) {
+          continue
+        }
+        param.options = param.options.join(',')
+      }
+      return params
+    },
+    initForm () {
+      this.formRef = ref()
+      const formData = {
+        parameters: this.fixParamatersOptions(this.resource.parameters)
+      }
+      const keys = ['description', 'allowedroletypes', 'successmessage', 'errormessage', 'details', 'timeout']
+      for (const key of keys) {
+        formData[key] = this.resource[key]
+      }
+      this.form = reactive(formData)
+      this.rules = reactive({})
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          id: this.resource.id
+        }
+        const keys = ['description', 'allowedroletypes', 'successmessage', 'errormessage', 'timeout']
+        for (const key of keys) {
+          if (values[key] !== undefined || values[key] !== null) {
+            params[key] = Array.isArray(values[key]) ? values[key].join(',') : values[key]
+          }
+        }
+        if (values.parameters && values.parameters.length > 0) {
+          values.parameters.forEach((param, index) => {
+            Object.keys(param).forEach(key => {
+              const val = param[key]
+              params['parameters[' + index + '].' + key] = Array.isArray(val) ? val.join(',') : val
+            })
+          })
+        } else {
+          params.cleanupparameters = true
+        }
+        if (values.details && Object.keys(values.details).length > 0) {
+          Object.entries(values.details).forEach(([key, value]) => {
+            params['details[0].' + key] = value
+          })
+        } else {
+          params.cleanupdetails = true
+        }
+        postAPI('updateCustomAction', params).then(response => {
+          this.$emit('refresh-data')
+          this.$notification.success({
+            message: this.$t('label.update.custom.action'),
+            description: this.$t('message.success.update.custom.action')
+          })
+          this.closeAction()
+          this.parentFetchData()
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 100vw;
+  @media (min-width: 1000px) {
+    width: 950px;
+  }
+}
+</style>
diff --git a/ui/src/views/extension/UpdateExtension.vue b/ui/src/views/extension/UpdateExtension.vue
new file mode 100644
index 00000000000..192a339b43a
--- /dev/null
+++ b/ui/src/views/extension/UpdateExtension.vue
@@ -0,0 +1,160 @@
+// 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.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :loading="loading"
+      layout="vertical"
+      @finish="handleSubmit">
+      <a-form-item name="description" ref="description">
+        <template #label>
+          <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+        </template>
+        <a-input
+          v-model:value="form.description"
+          :placeholder="apiParams.description.description"
+          v-focus="true" />
+      </a-form-item>
+      <a-form-item name="orchestratorrequirespreparevm" ref="orchestratorrequirespreparevm" v-if="resource.type === 'Orchestrator'">
+        <template #label>
+          <tooltip-label :title="$t('label.orchestratorrequirespreparevm')" :tooltip="apiParams.orchestratorrequirespreparevm.description"/>
+        </template>
+        <a-switch v-model:checked="form.orchestratorrequirespreparevm" />
+      </a-form-item>
+      <a-form-item name="details" ref="details">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.details.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.details') }}</div>
+        <details-input
+          v-model:value="form.details" />
+      </a-form-item>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { getAPI, postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
+
+export default {
+  name: 'RegisterExtension',
+  components: {
+    TooltipLabel,
+    DetailsInput
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('updateExtension')
+  },
+  created () {
+    this.initForm()
+    this.fetchData()
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({
+        description: this.resource.description,
+        details: this.resource.details,
+        orchestratorrequirespreparevm: this.resource.orchestratorrequirespreparevm
+      })
+    },
+    fetchData () {
+      this.loading = true
+      getAPI('listExtensions', { id: this.resource.id }).then(json => {
+        this.form.details = json?.listextensionsresponse?.extension?.[0]?.details
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        this.loading = true
+        const params = {
+          id: this.resource.id
+        }
+        const keys = ['description', 'orchestratorrequirespreparevm']
+        for (const key of keys) {
+          if (values[key] !== undefined || values[key] !== null) {
+            params[key] = values[key]
+          }
+        }
+        if (values.details && Object.keys(values.details).length > 0) {
+          Object.entries(values.details).forEach(([key, value]) => {
+            params['details[0].' + key] = value
+          })
+        } else {
+          params.cleanupdetails = true
+        }
+        postAPI('updateExtension', params).then(response => {
+          this.$emit('refresh-data')
+          this.$notification.success({
+            message: this.$t('label.update.extension'),
+            description: this.$t('message.success.update.extension')
+          })
+          this.closeAction()
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+  @media (min-width: 600px) {
+    width: 550px;
+  }
+}
+</style>
diff --git a/ui/src/views/iam/CreateRole.vue b/ui/src/views/iam/CreateRole.vue
index 3f6013acd80..11cecf69efe 100644
--- a/ui/src/views/iam/CreateRole.vue
+++ b/ui/src/views/iam/CreateRole.vue
@@ -143,7 +143,7 @@ export default {
   },
   watch: {
     '$route' (to, from) {
-      if (to.fullPath !== from.fullPath && !to.fullPath.includes('action/')) {
+      if (to.fullPath !== from.fullPath && !to.fullPath.includes('/action/')) {
         this.fetchRoles()
       }
     },
diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue
index 7467d965b87..47c99db8b9c 100644
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@@ -194,7 +194,7 @@
             </a-form-item>
           </a-col>
           <a-col :md="24" :lg="12">
-            <a-form-item ref="format" name="format">
+            <a-form-item ref="format" name="format" v-if="!hyperExternalShow">
               <template #label>
                 <tooltip-label :title="$t('label.format')" :tooltip="apiParams.format.description"/>
               </template>
@@ -212,10 +212,38 @@
                 </a-select-option>
               </a-select>
             </a-form-item>
+            <a-form-item ref="extensionid" name="extensionid" v-if="hyperExternalShow">
+              <template #label>
+                <tooltip-label :title="$t('label.extensionid')" :tooltip="apiParams.extensionid.description"/>
+              </template>
+              <a-select
+                v-model:value="form.extensionid"
+                :placeholder="apiParams.extensionid.description"
+                showSearch
+                optionFilterProp="label"
+                :filterOption="(input, option) => {
+                  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }" >
+                <a-select-option v-for="extension in extensionsList" :key="extension.id" :label="extension.name || extension.description">
+                  {{ extension.name || extension.description }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12">
-          <a-col :md="24" :lg="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
+        <a-form-item name="externaldetails" ref="externaldetails" v-if="hyperExternalShow">
+          <template #label>
+            <tooltip-label :title="$t('label.externaldetails')" :tooltip="apiParams.externaldetails.description"/>
+          </template>
+          <a-switch v-model:checked="externalDetailsEnabled" @change="onExternalDetailsEnabledChange"/>
+          <a-card v-if="externalDetailsEnabled" style="margin-top: 10px">
+            <div style="margin-bottom: 10px">{{ $t('message.add.orchestrator.resource.details') }}</div>
+            <details-input
+              v-model:value="form.externaldetails" />
+          </a-card>
+        </a-form-item>
+        <a-row :gutter="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
+          <a-col :md="24" :lg="12">
             <a-form-item ref="directdownload" name="directdownload">
               <template #label>
                 <tooltip-label :title="$t('label.directdownload')" :tooltip="apiParams.directdownload.description"/>
@@ -479,6 +507,7 @@ import { axios } from '../../utils/request'
 import { mixinForm } from '@/utils/mixin'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'RegisterOrUploadTemplate',
@@ -495,7 +524,8 @@ export default {
   },
   components: {
     ResourceIcon,
-    TooltipLabel
+    TooltipLabel,
+    DetailsInput
   },
   data () {
     return {
@@ -518,6 +548,7 @@ export default {
       userdatapolicylist: {},
       defaultOsId: null,
       hyperKVMShow: false,
+      hyperExternalShow: false,
       hyperCustomShow: false,
       hyperXenServerShow: false,
       hyperVMWShow: false,
@@ -536,7 +567,8 @@ export default {
       domainid: null,
       account: null,
       customHypervisorName: 'Custom',
-      architectureTypes: {}
+      architectureTypes: {},
+      externalDetailsEnabled: false
     }
   },
   beforeCreate () {
@@ -580,7 +612,8 @@ export default {
         hypervisor: [{ type: 'number', required: true, message: this.$t('message.error.select') }],
         format: [{ required: true, message: this.$t('message.error.select') }],
         ostypeid: [{ required: true, message: this.$t('message.error.select') }],
-        groupenabled: [{ type: 'array' }]
+        groupenabled: [{ type: 'array' }],
+        extensionid: [{ required: true, message: this.$t('message.error.select') }]
       })
     },
     fetchData () {
@@ -599,6 +632,7 @@ export default {
           this.fetchXenServerProvider()
         }
       }
+      this.fetchExtensionsList()
     },
     handleFormChange (e) {
       this.currentForm = e.target.value
@@ -667,6 +701,17 @@ export default {
         this.loading = false
       })
     },
+    fetchExtensionsList () {
+      this.loading = true
+      getAPI('listExtensions', {
+      }).then(response => {
+        this.extensionsList = response.listextensionsresponse.extension || []
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     fetchZone () {
       const params = {}
       let listZones = []
@@ -920,6 +965,10 @@ export default {
             description: 'BareMetal'
           })
           break
+        case 'External':
+          this.hyperExternalShow = true
+          this.selectedFormat = 'External'
+          break
         case 'Ovm':
           format.push({
             id: 'RAW',
@@ -997,6 +1046,7 @@ export default {
       this.hyperXenServerShow = false
       this.hyperVMWShow = false
       this.hyperKVMShow = false
+      this.hyperExternalShow = false
       this.hyperCustomShow = false
       this.deployasis = false
       this.allowDirectDownload = false
@@ -1010,9 +1060,19 @@ export default {
       this.fetchRootDisk(hyperVisor)
       this.fetchNicAdapterTypes()
       this.fetchKeyboardType()
+      this.templateTypes.opts = this.$fetchTemplateTypes(hyperVisor)
+      if (this.form.templatetype && !this.templateTypes.opts.find(opt => opt.id === this.form.templatetype)) {
+        this.form.templatetype = undefined
+      }
 
       this.form.rootDiskControllerType = this.rootDisk.opts.length > 0 ? 'osdefault' : ''
     },
+    onExternalDetailsEnabledChange (val) {
+      if (val || !this.form.externaldetails) {
+        return
+      }
+      this.form.externaldetails = undefined
+    },
     handleSubmit (e) {
       e.preventDefault()
       if (this.loading) return
@@ -1048,6 +1108,10 @@ export default {
               const name = input[index]
               params[name] = true
             }
+          } else if (key === 'externaldetails') {
+            Object.entries(input).forEach(([k, v]) => {
+              params['externaldetails[0].' + k] = v
+            })
           } else {
             const formattedDetailData = {}
             switch (key) {
@@ -1077,6 +1141,9 @@ export default {
         if (!('requireshvm' in params)) { // handled as default true by API
           params.requireshvm = false
         }
+        if (this.selectedFormat === 'External') {
+          params.format = 'External'
+        }
         if (this.currentForm === 'Create') {
           this.loading = true
           postAPI('registerTemplate', params).then(json => {
diff --git a/ui/src/views/image/UpdateTemplate.vue b/ui/src/views/image/UpdateTemplate.vue
index 117b53bbc28..0576cbb71fd 100644
--- a/ui/src/views/image/UpdateTemplate.vue
+++ b/ui/src/views/image/UpdateTemplate.vue
@@ -186,8 +186,8 @@
             v-model:value="form.templatetype"
             :placeholder="apiParams.templatetype.description"
             @change="val => { selectedTemplateType = val }">
-            <a-select-option v-for="opt in templatetypes" :key="opt">
-              {{ opt }}
+            <a-select-option v-for="opt in templatetypes" :key="opt.id">
+              {{ opt.name || opt.description }}
             </a-select-option>
           </a-select>
         </a-form-item>
@@ -247,7 +247,7 @@ export default {
   },
   data () {
     return {
-      templatetypes: ['BUILTIN', 'USER', 'SYSTEM', 'ROUTING', 'VNF'],
+      templatetypes: [],
       emptyAllowedFields: ['templatetag'],
       rootDisk: {},
       nicAdapterType: {},
@@ -270,6 +270,7 @@ export default {
   },
   created () {
     this.initForm()
+    this.templatetypes = this.$fetchTemplateTypes(this.resource.hypervisor)
     this.rootDisk.loading = false
     this.rootDisk.opts = []
     this.nicAdapterType.loading = false
diff --git a/ui/src/views/infra/ClusterAdd.vue b/ui/src/views/infra/ClusterAdd.vue
index f59521588de..7fee1f11bf6 100644
--- a/ui/src/views/infra/ClusterAdd.vue
+++ b/ui/src/views/infra/ClusterAdd.vue
@@ -16,14 +16,23 @@
 // under the License.
 
 <template>
-  <a-spin :spinning="loading">
-    <div class="form" v-ctrl-enter="handleSubmitForm">
-      <div class="form__item">
-        <div class="form__label"><span class="required">* </span>{{ $t('label.zonenamelabel') }}</div>
+  <div class="form-layout" v-ctrl-enter="handleSubmitForm">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :loading="loading"
+      :rules="rules"
+      layout="vertical"
+      @submit="handleSubmitForm">
+      <a-form-item name="zoneid" ref="zoneid">
+        <template #label>
+          <tooltip-label :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>
+        </template>
         <a-select
-          v-model:value="zoneId"
+          v-model:value="form.zoneid"
           @change="fetchPods"
           v-focus="true"
+          :placeholder="apiParams.zoneid.description"
           showSearch
           optionFilterProp="label"
           :filterOption="(input, option) => {
@@ -41,46 +50,13 @@
             </span>
           </a-select-option>
         </a-select>
-      </div>
-
-      <div class="form__item">
-        <div class="form__label">{{ $t('label.hypervisor') }}</div>
+      </a-form-item>
+      <a-form-item name="podid" ref="podid">
+        <template #label>
+          <tooltip-label :title="$t('label.podid')" :tooltip="apiParams.podid.description"/>
+        </template>
         <a-select
-          v-model:value="hypervisor"
-          @change="hypervisor => onChangeHypervisor(hypervisor)"
-          showSearch
-          optionFilterProp="value"
-          :filterOption="(input, option) => {
-            return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }" >
-          <a-select-option
-            v-for="hv in hypervisorsList"
-            :value="hv.name"
-            :key="hv.name">
-            {{ hv.name }}
-          </a-select-option>
-        </a-select>
-      </div>
-
-      <div class="form__item">
-        <div class="form__label">{{ $t('label.arch') }}</div>
-        <a-select
-          showSearch
-          optionFilterProp="label"
-          :filterOption="(input, option) => {
-            return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }"
-          v-model:value="selectedArchitecture">
-          <a-select-option v-for="opt in architectureTypes.opts" :key="opt.id">
-            {{ opt.name || opt.description }}
-          </a-select-option>
-        </a-select>
-      </div>
-
-      <div class="form__item">
-        <div class="form__label">{{ $t('label.podname') }}</div>
-        <a-select
-          v-model:value="podId"
+          v-model:value="form.podid"
           showSearch
           optionFilterProp="label"
           :filterOption="(input, option) => {
@@ -94,55 +70,115 @@
             {{ pod.name }}
           </a-select-option>
         </a-select>
-      </div>
-
-      <div class="form__item">
-        <div class="form__label"><span class="required">* </span>{{ $t('label.clusternamelabel') }}</div>
-        <span class="required required-label" ref="requiredCluster">{{ $t('label.required') }}</span>
-        <a-input :placeholder="placeholder.clustername" v-model:value="clustername"></a-input>
-      </div>
-
-      <template v-if="hypervisor === 'VMware'">
-        <div class="form__item">
-          <div class="form__label">{{ $t('label.vcenter.host') }}</div>
-          <a-input v-model:value="host"></a-input>
-        </div>
-
-        <div class="form__item">
-          <div class="form__label">{{ $t('label.vcenterdatacenter') }}</div>
-          <a-input v-model:value="dataCenter"></a-input>
-        </div>
-
-        <div class="form__item" name="useDefaultVMwareCred">
-          <div class="form__label">{{ $t('label.use.existing.vcenter.credentials.from.zone') }}</div>
-          <a-switch v-model="useDefaultVMwareCred" :checked="useDefaultVMwareCred" @change="onChangeUseDefaultVMwareCred()" />
-        </div>
-
-        <template v-if="useDefaultVMwareCred === false">
-          <div class="form__item">
-            <div class="form__label"><span class="required">* </span>{{ $t('label.vcenterusername') }}</div>
-            <span class="required required-label" ref="requiredUsername">{{ $t('label.required') }}</span>
-            <a-input v-model:value="username"></a-input>
-          </div>
-
-          <div class="form__item">
-            <div class="form__label"><span class="required">* </span>{{ $t('label.vcenterpassword') }}</div>
-            <span class="required required-label" ref="requiredPassword">{{ $t('label.required') }}</span>
-            <a-input type="password" v-model:value="password"></a-input>
-          </div>
+      </a-form-item>
+      <a-form-item name="clustername" ref="clustername">
+        <template #label>
+          <tooltip-label :title="$t('label.clustername')" :tooltip="apiParams.clustername.description"/>
         </template>
-      </template>
-
-      <div class="form__item">
-        <div class="form__label">{{ $t('label.isdedicated') }}</div>
-        <a-checkbox @change="toggleDedicated" />
+        <a-input :placeholder="apiParams.clustername.description" v-model:value="form.clustername"></a-input>
+      </a-form-item>
+      <a-row :gutter="12">
+        <a-col :md="24" :lg="form.hypervisor === 'External' ? 12 : 24">
+          <a-form-item name="hypervisor" ref="hypervisor">
+            <template #label>
+              <tooltip-label :title="$t('label.hypervisor')" :tooltip="apiParams.hypervisor.description"/>
+            </template>
+            <a-select
+              v-model:value="form.hypervisor"
+              @change="hypervisor => onChangeHypervisor(hypervisor)"
+              showSearch
+              optionFilterProp="value"
+              :filterOption="(input, option) => {
+                return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              }" >
+              <a-select-option
+                v-for="hv in hypervisorsList"
+                :value="hv.name"
+                :key="hv.name">
+                {{ hv.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :md="24" :lg="12" v-if="form.hypervisor === 'External'">
+          <a-form-item name="extensionid" ref="extensionid">
+            <template #label>
+              <tooltip-label :title="$t('label.extensionid')" :tooltip="apiParams.extensionid.description"/>
+            </template>
+            <a-select
+              v-model:value="form.extensionid"
+              showSearch
+              optionFilterProp="label"
+              :filterOption="(input, option) => {
+                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              }" >
+              <a-select-option
+                v-for="extension in extensionsList"
+                :value="extension.id"
+                :key="extension.id"
+                :label="extension.name">
+                {{ extension.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-form-item name="externaldetails" ref="externaldetails" v-if="form.hypervisor === 'External' && !!form.extensionid">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.externaldetails.description"/>
+        </template>
+        <a-switch v-model:checked="externalDetailsEnabled" @change="onExternalDetailsEnabledChange"/>
+        <a-card v-if="externalDetailsEnabled" style="margin-top: 10px">
+          <div style="margin-bottom: 10px">{{ $t('message.add.extension.resource.details') }}</div>
+          <details-input
+            v-model:value="form.externaldetails" />
+        </a-card>
+      </a-form-item>
+      <a-form-item name="arch" ref="arch">
+        <template #label>
+          <tooltip-label :title="$t('label.arch')" :tooltip="apiParams.arch.description"/>
+        </template>
+        <a-select
+          showSearch
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          v-model:value="form.arch">
+          <a-select-option v-for="opt in architectureTypes.opts" :key="opt.id">
+            {{ opt.name || opt.description }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <div v-if="form.hypervisor === 'VMware'">
+        <a-form-item name="host" ref="host" :label="$t('label.vcenter.host')">
+          <a-input v-model:value="form.host"></a-input>
+        </a-form-item>
+        <a-form-item name="datacenter" ref="datacenter" :label="$t('label.vcenterdatacenter')">
+          <a-input v-model:value="form.dataCenter"></a-input>
+        </a-form-item>
+        <a-form-item name="usedefaultvmwarecred" ref="usedefaultvmwarecred" :label="$t('label.use.existing.vcenter.credentials.from.zone')">
+          <a-switch v-model:checked="form.usedefaultvmwarecred" @change="onChangeUseDefaultVMwareCred()" />
+        </a-form-item>
+        <div v-if="form.usedefaultvmwarecred === false">
+          <a-form-item name="username" ref="username" :label="$t('label.vcenterusername')">
+            <a-input v-model:value="form.username"></a-input>
+          </a-form-item>
+          <a-form-item name="password" ref="password" :label="$t('label.vcenterpassword')">
+            <a-input type="password" v-model:value="form.password" />
+          </a-form-item>
+        </div>
       </div>
 
+      <a-form-item name="isdedicated" ref="isdedicated" :label="$t('label.isdedicated')">
+        <a-switch v-model:checked="showDedicated" @change="toggleDedicated" />
+      </a-form-item>
+
       <template v-if="showDedicated">
         <DedicateDomain
           @domainChange="id => dedicatedDomainId = id"
           @accountChange="id => dedicatedAccount = id"
-          :error="domainError" />
+          :error="false" />
       </template>
 
       <a-divider />
@@ -151,21 +187,27 @@
         <a-button @click="() => $emit('close-action')">{{ $t('label.cancel') }}</a-button>
         <a-button @click="handleSubmitForm" ref="submit" type="primary">{{ $t('label.ok') }}</a-button>
       </div>
-
-    </div>
-  </a-spin>
+    </a-form>
+  </div>
 </template>
 
 <script>
+import { ref, reactive, toRaw } from 'vue'
 import { getAPI, postAPI } from '@/api'
+import { mixinForm } from '@/utils/mixin'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
 import DedicateDomain from '../../components/view/DedicateDomain'
 import ResourceIcon from '@/components/view/ResourceIcon'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'ClusterAdd',
+  mixins: [mixinForm],
   components: {
+    TooltipLabel,
     DedicateDomain,
-    ResourceIcon
+    ResourceIcon,
+    DetailsInput
   },
   props: {
     resource: {
@@ -177,56 +219,58 @@ export default {
   data () {
     return {
       loading: false,
-      zoneId: null,
-      hypervisor: null,
-      podId: null,
-      clustername: null,
       clustertype: 'CloudManaged',
-      username: null,
-      password: null,
-      url: null,
-      useDefaultVMwareCred: true,
-      host: null,
-      dataCenter: null,
-      ovm3pool: null,
-      ovm3cluster: null,
-      ovm3vip: null,
       zonesList: [],
       hypervisorsList: [],
+      extensionsList: [],
       podsList: [],
       showDedicated: false,
       dedicatedDomainId: null,
       dedicatedAccount: null,
-      domainError: false,
-      params: [],
       architectureTypes: {},
-      selectedArchitecture: null,
-      placeholder: {
-        clustername: null
-      }
+      externalDetailsEnabled: false
     }
   },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('addCluster')
+  },
   created () {
+    this.initForm()
     this.fetchData()
   },
   methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({
+        usedefaultvmwarecred: false
+      })
+      this.rules = reactive({
+        zoneid: [{ required: true, message: this.$t('message.error.select') }],
+        podid: [{ required: true, message: this.$t('message.error.select') }],
+        clustername: [{ required: true, message: this.$t('message.error.required.input') }],
+        hypervisor: [{ required: true, message: this.$t('message.error.select') }],
+        host: [{ required: true, message: this.$t('message.error.required.input') }],
+        datacenter: [{ required: true, message: this.$t('message.error.required.input') }],
+        username: [{ required: true, message: this.$t('message.error.required.input') }],
+        password: [{ required: true, message: this.$t('message.error.required.input') }]
+      })
+    },
     fetchData () {
       this.fetchZones()
       this.fetchHypervisors()
+      this.fetchExtensionsList()
       this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
-      this.selectedArchitecture = this.architectureTypes?.opts?.[0]?.id || null
-      this.params = this.$store.getters.apis.addCluster.params
-      Object.keys(this.placeholder).forEach(item => { this.returnPlaceholder(item) })
+      this.form.arch = this.architectureTypes?.opts?.[0]?.id || null
     },
     fetchZones () {
       this.loading = true
       getAPI('listZones', { showicon: true }).then(response => {
         this.zonesList = response.listzonesresponse.zone || []
-        this.zoneId = this.zonesList[0].id || null
         this.fetchPods()
       }).catch(error => {
         this.$notifyError(error)
       }).finally(() => {
+        this.form.zoneid = this.zonesList?.[0]?.id || null
         this.loading = false
       })
     },
@@ -234,10 +278,10 @@ export default {
       this.loading = true
       getAPI('listHypervisors').then(response => {
         this.hypervisorsList = response.listhypervisorsresponse.hypervisor || []
-        this.hypervisor = this.hypervisorsList[0].name || null
       }).catch(error => {
         this.$notifyError(error)
       }).finally(() => {
+        this.form.hypervisor = this.hypervisorsList?.[0]?.name || null
         this.loading = false
       })
     },
@@ -247,10 +291,22 @@ export default {
         zoneid: this.zoneId
       }).then(response => {
         this.podsList = response.listpodsresponse.pod || []
-        this.podId = this.podsList[0].id || null
       }).catch(error => {
         this.$notifyError(error)
       }).finally(() => {
+        this.form.podid = this.podsList?.[0]?.id || null
+        this.loading = false
+      })
+    },
+    fetchExtensionsList () {
+      this.loading = true
+      getAPI('listExtensions', {
+      }).then(response => {
+        this.extensionsList = response.listextensionsresponse.extension || []
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.extensionsList.unshift({ id: null, name: '' })
         this.loading = false
       })
     },
@@ -258,12 +314,12 @@ export default {
       this.loading = true
       this.clustertype = 'ExternalManaged'
       getAPI('listVmwareDcs', {
-        zoneid: this.zoneId
+        zoneid: this.form.zoneId
       }).then(response => {
         var vmwaredcs = response.listvmwaredcsresponse.VMwareDC
         if (vmwaredcs !== null) {
-          this.host = vmwaredcs[0].vcenter
-          this.dataCenter = vmwaredcs[0].name
+          this.form.host = vmwaredcs[0].vcenter
+          this.form.dataCenter = vmwaredcs[0].name
         }
       }).catch(error => {
         this.$notification.error({
@@ -278,69 +334,62 @@ export default {
     toggleDedicated () {
       this.dedicatedDomainId = null
       this.dedicatedAccount = null
-      this.showDedicated = !this.showDedicated
     },
     handleSubmitForm () {
       if (this.loading) return
-      if (!this.clustername) {
-        this.$refs.requiredCluster.classList.add('required-label--visible')
-        return
-      }
-      this.$refs.requiredCluster.classList.remove('required-label--visible')
-
-      if (this.hypervisor === 'VMware' && this.useDefaultVMwareCred === false) {
-        if (!this.username) {
-          this.$refs.requiredUsername.classList.add('required-label--visible')
-          return
+      this.formRef.value.validate().then(() => {
+        const formRaw = toRaw(this.form)
+        const values = this.handleRemoveFields(formRaw)
+        if (values.hypervisor === 'Ovm3') {
+          values.ovm3pool = 'on'
+          values.ovm3cluster = 'undefined'
+          values.ovm3vip = ''
         }
-        if (!this.password) {
-          this.$refs.requiredPassword.classList.add('required-label--visible')
-          return
-        }
-        this.$refs.requiredUsername.classList.remove('required-label--visible')
-        this.$refs.requiredPassword.classList.remove('required-label--visible')
-      }
-
-      if (this.hypervisor === 'Ovm3') {
-        this.ovm3pool = 'on'
-        this.ovm3cluster = 'undefined'
-        this.ovm3vip = ''
-      }
-      this.addCluster()
+        this.addCluster(values)
+      })
     },
-    addCluster () {
-      let clustername = this.clustername
-
-      if (this.hypervisor === 'VMware') {
-        const clusternameVal = this.clustername
-        this.url = `http://${this.host}/${this.dataCenter}/${clusternameVal}`
-        clustername = `${this.host}/${this.dataCenter}/${clusternameVal}`
+    addCluster (values) {
+      var clustername = values.clustername
+      var url = ''
+      if (values.hypervisor === 'VMware') {
+        clustername = `${this.host}/${this.dataCenter}/${clustername}`
+        url = `http://${clustername}`
       }
       this.loading = true
       this.parentToggleLoading()
       var data = {
-        zoneId: this.zoneId,
-        hypervisor: this.hypervisor,
+        zoneid: values.zoneid,
+        hypervisor: values.hypervisor,
         clustertype: this.clustertype,
-        podId: this.podId,
+        podid: values.podid,
         clustername: clustername,
-        arch: this.selectedArchitecture,
-        url: this.url
+        arch: values.arch,
+        url: url
       }
-      if (this.ovm3pool) {
-        data.ovm3pool = this.ovm3pool
+      if (values.ovm3pool) {
+        data.ovm3pool = values.ovm3pool
       }
-      if (this.ovm3cluster) {
-        data.ovm3cluster = this.ovm3cluster
+      if (values.ovm3cluster) {
+        data.ovm3cluster = values.ovm3cluster
       }
-      if (this.ovm3vip) {
-        data.ovm3vip = this.ovm3vip
+      if (values.ovm3vip) {
+        data.ovm3vip = values.ovm3vip
       }
-      if (this.username) {
-        data.username = this.username
+      if (values.username) {
+        data.username = values.username
       }
-      if (this.password) {
-        data.password = this.password
+      if (values.password) {
+        data.password = values.password
+      }
+      if (values.hypervisor === 'External') {
+        if (values.extensionid) {
+          data.extensionid = values.extensionid
+        }
+        if (values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([k, v]) => {
+            data['externaldetails[0].' + k] = v
+          })
+        }
       }
       postAPI('addCluster', data).then(response => {
         const cluster = response.addclusterresponse.cluster[0] || {}
@@ -396,11 +445,13 @@ export default {
     },
     onChangeHypervisor (hypervisor) {
       this.clustertype = 'CloudManaged'
-      this.username = null
-      this.password = null
-      this.url = null
-      this.host = null
-      this.dataCenter = null
+      this.form.username = null
+      this.form.password = null
+      this.form.url = null
+      this.form.host = null
+      this.form.datacenter = null
+      this.form.extensionid = null
+      this.form.externaldetails = null
       this.ovm3pool = null
       this.ovm3cluster = null
       this.ovm3vip = null
@@ -409,38 +460,26 @@ export default {
       }
     },
     onChangeUseDefaultVMwareCred () {
-      this.useDefaultVMwareCred = !this.useDefaultVMwareCred
-      if (this.useDefaultVMwareCred) {
-        this.username = null
-        this.password = null
+      if (this.form.usedefaultvmwarecred) {
+        this.form.username = null
+        this.form.password = null
       }
     },
-    returnPlaceholder (field) {
-      this.params.find(i => {
-        if (i.name === field) this.placeholder[field] = i.description
-      })
+    onExternalDetailsEnabledChange (val) {
+      if (val || !this.form.externaldetails) {
+        return
+      }
+      this.form.externaldetails = undefined
     }
   }
 }
 </script>
 
 <style scoped lang="scss">
-  .form {
-
-    &__label {
-      margin-bottom: 5px;
-    }
-
-    &__item {
-      margin-bottom: 20px;
-    }
-
-    .ant-select {
-      width: 85vw;
-
-      @media (min-width: 760px) {
-        width: 400px;
-      }
+  .form-layout {
+    width: 60vw;
+    @media (min-width: 600px) {
+      width: 550px;
     }
   }
 
diff --git a/ui/src/views/infra/HostAdd.vue b/ui/src/views/infra/HostAdd.vue
index 6119410af3e..4cc179ac467 100644
--- a/ui/src/views/infra/HostAdd.vue
+++ b/ui/src/views/infra/HostAdd.vue
@@ -16,230 +16,238 @@
 // under the License.
 
 <template>
-  <a-spin :spinning="loading">
-    <div class="form-layout" v-ctrl-enter="handleSubmitForm">
-      <div class="form">
-        <a-form
-          :ref="formRef"
-          :model="form"
-          :rules="rules"
-          layout="vertical"
-          @submit="handleSubmitForm">
-          <a-form-item name="zoneid" ref="zoneid">
-            <template #label>
-              <tooltip-label :title="$t('label.zonenamelabel')" :tooltip="placeholder.zoneid"/>
+  <div class="form-layout" v-ctrl-enter="handleSubmitForm">
+    <a-form
+      :ref="formRef"
+      :model="form"
+      :loading="loading"
+      :rules="rules"
+      layout="vertical"
+      @submit="handleSubmitForm">
+      <a-form-item name="zoneid" ref="zoneid">
+        <template #label>
+          <tooltip-label :title="$t('label.zonenamelabel')" :tooltip="placeholder.zoneid"/>
+        </template>
+        <a-select
+          v-focus="true"
+          v-model:value="form.zoneid"
+          :placeholder="placeholder.zoneid"
+          showSearch
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          @change="fetchPods">
+          <a-select-option
+            v-for="zone in zonesList"
+            :value="zone.id"
+            :key="zone.id"
+            :label="zone.name">
+            <span>
+              <resource-icon v-if="zone.icon" :image="zone.icon.base64image" size="1x" style="margin-right: 5px"/>
+              <global-outlined v-else style="margin-right: 5px" />
+              {{ zone.name }}
+            </span>
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="podid" ref="podid">
+        <template #label>
+          <tooltip-label :title="$t('label.podname')" :tooltip="placeholder.podid"/>
+        </template>
+        <a-select
+          v-model:value="form.podid"
+          :placeholder="placeholder.podid"
+          showSearch
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          @change="fetchClusters">
+          <a-select-option
+            v-for="pod in podsList"
+            :value="pod.id"
+            :key="pod.id"
+            :label="pod.name">
+            {{ pod.name }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="clusterid" ref="clusterid">
+        <template #label>
+          <tooltip-label :title="$t('label.clustername')" :tooltip="placeholder.clusterid"/>
+        </template>
+        <a-select
+          v-model:value="form.clusterid"
+          :placeholder="placeholder.clusterid"
+          showSearch
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          @change="handleChangeCluster">
+          <a-select-option
+            v-for="cluster in clustersList"
+            :value="cluster.id"
+            :key="cluster.id"
+            :label="cluster.name">
+            {{ cluster.name }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="hostname" ref="hostname">
+        <template #label>
+          <tooltip-label
+            :title="selectedClusterHyperVisorType === 'VMware' ? $t('label.esx.host') : $t('label.hostnamelabel')"
+            :tooltip="placeholder.url"/>
+        </template>
+        <a-input
+          v-model:value="form.hostname"
+          :placeholder="placeholder.url"></a-input>
+      </a-form-item>
+      <a-form-item name="username" ref="username" v-if="!['VMware', 'External'].includes(selectedClusterHyperVisorType)">
+        <template #label>
+          <tooltip-label :title="$t('label.username')" :tooltip="placeholder.username"/>
+        </template>
+        <a-input
+          v-model:value="form.username"
+          :placeholder="placeholder.username"></a-input>
+      </a-form-item>
+      <a-form-item name="authmethod" ref="authmethod" v-if="!['VMware', 'External'].includes(selectedClusterHyperVisorType)">
+        <template #label>
+          <tooltip-label :title="$t('label.authentication.method')" :tooltip="$t('label.authentication.method')"/>
+        </template>
+        <a-radio-group
+          v-model:value="form.authmethod"
+          buttonStyle="solid"
+          @change="selected => { handleAuthMethodChange(selected.target.value) }">
+          <a-radio-button value="password">
+            {{ $t('label.password') }}
+          </a-radio-button>
+          <a-radio-button value="sshkey" v-if="selectedClusterHyperVisorType === 'KVM'">
+            {{ $t('label.authentication.sshkey') }}
+          </a-radio-button>
+        </a-radio-group>
+        <div v-if="authMethod === 'sshkey'">
+          <a-alert type="warning">
+            <template #message>
+              <span style="display:block;width:300px;word-wrap:break-word;" v-html="$t('message.add.host.sshkey')" />
             </template>
-            <a-select
-              v-focus="true"
-              v-model:value="form.zoneid"
-              :placeholder="placeholder.zoneid"
-              showSearch
-              optionFilterProp="label"
-              :filterOption="(input, option) => {
-                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }"
-              @change="fetchPods">
-              <a-select-option
-                v-for="zone in zonesList"
-                :value="zone.id"
-                :key="zone.id"
-                :label="zone.name">
-                <span>
-                  <resource-icon v-if="zone.icon" :image="zone.icon.base64image" size="1x" style="margin-right: 5px"/>
-                  <global-outlined v-else style="margin-right: 5px" />
-                  {{ zone.name }}
-                </span>
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item name="podid" ref="podid">
-            <template #label>
-              <tooltip-label :title="$t('label.podname')" :tooltip="placeholder.podid"/>
-            </template>
-            <a-select
-              v-model:value="form.podid"
-              :placeholder="placeholder.podid"
-              showSearch
-              optionFilterProp="label"
-              :filterOption="(input, option) => {
-                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }"
-              @change="fetchClusters">
-              <a-select-option
-                v-for="pod in podsList"
-                :value="pod.id"
-                :key="pod.id"
-                :label="pod.name">
-                {{ pod.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item name="clusterid" ref="clusterid">
-            <template #label>
-              <tooltip-label :title="$t('label.clustername')" :tooltip="placeholder.clusterid"/>
-            </template>
-            <a-select
-              v-model:value="form.clusterid"
-              :placeholder="placeholder.clusterid"
-              showSearch
-              optionFilterProp="label"
-              :filterOption="(input, option) => {
-                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }"
-              @change="handleChangeCluster">
-              <a-select-option
-                v-for="cluster in clustersList"
-                :value="cluster.id"
-                :key="cluster.id"
-                :label="cluster.name">
-                {{ cluster.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item name="hostname" ref="hostname">
-            <template #label>
-              <tooltip-label
-                :title="selectedClusterHyperVisorType === 'VMware' ? $t('label.esx.host') : $t('label.hostnamelabel')"
-                :tooltip="placeholder.url"/>
-            </template>
-            <a-input
-              v-model:value="form.hostname"
-              :placeholder="placeholder.url"></a-input>
-          </a-form-item>
-          <a-form-item name="username" ref="username" v-if="selectedClusterHyperVisorType !== 'VMware'">
-            <template #label>
-              <tooltip-label :title="$t('label.username')" :tooltip="placeholder.username"/>
-            </template>
-            <a-input
-              v-model:value="form.username"
-              :placeholder="placeholder.username"></a-input>
-          </a-form-item>
-          <a-form-item name="authmethod" ref="authmethod" v-if="selectedClusterHyperVisorType !== 'VMware'">
-            <template #label>
-              <tooltip-label :title="$t('label.authentication.method')" :tooltip="$t('label.authentication.method')"/>
-            </template>
-            <a-radio-group
-              v-model:value="form.authmethod"
-              buttonStyle="solid"
-              @change="selected => { handleAuthMethodChange(selected.target.value) }">
-              <a-radio-button value="password">
-                {{ $t('label.password') }}
-              </a-radio-button>
-              <a-radio-button value="sshkey" v-if="selectedClusterHyperVisorType === 'KVM'">
-                {{ $t('label.authentication.sshkey') }}
-              </a-radio-button>
-            </a-radio-group>
-            <div v-if="authMethod === 'sshkey'">
-              <a-alert type="warning">
-                <template #message>
-                  <span style="display:block;width:300px;word-wrap:break-word;" v-html="$t('message.add.host.sshkey')" />
-                </template>
-              </a-alert>
-            </div>
-          </a-form-item>
-          <a-form-item name="password" ref="password" v-if="selectedClusterHyperVisorType !== 'VMware' && authMethod === 'password'">
-            <template #label>
-              <tooltip-label :title="$t('label.password')" :tooltip="placeholder.password"/>
-            </template>
-            <a-input-password
-              v-model:value="form.password"
-              :placeholder="placeholder.password" />
-          </a-form-item>
-          <a-form-item name="agentusername" ref="agentusername" v-if="selectedClusterHyperVisorType === 'Ovm3'">
-            <template #label>
-              <tooltip-label :title="$t('label.agent.username')" :tooltip="$t('label.agent.username')"/>
-            </template>
-            <a-input
-              v-model:value="form.agentusername"
-              :placeholder="$t('label.agent.username')" />
-          </a-form-item>
-          <a-form-item name="agentpassword" ref="agentpassword" v-if="selectedClusterHyperVisorType === 'Ovm3'">
-            <template #label>
-              <tooltip-label :title="$t('label.agent.password')" :tooltip="$t('label.agent.password')"/>
-            </template>
-            <a-input
-              v-model:value="form.agentpassword"
-              :placeholder="$t('label.agent.password')" />
-          </a-form-item>
-          <a-form-item name="agentport" ref="agentport" v-if="selectedClusterHyperVisorType === 'Ovm3'">
-            <template #label>
-              <tooltip-label :title="$t('label.agentport')" :tooltip="$t('label.agentport')"/>
-            </template>
-            <a-input
-              v-model:value="form.agentport"
-              :placeholder="$t('label.agentport')" />
-          </a-form-item>
-          <a-form-item name="baremetalcpucores" ref="baremetalcpucores" v-if="selectedClusterHyperVisorType === 'BareMetal'">
-            <template #label>
-              <tooltip-label :title="$t('label.baremetalcpucores')" :tooltip="$t('label.baremetalcpucores')"/>
-            </template>
-            <a-input
-              v-model:value="form.baremetalcpucores"
-              :placeholder="$t('label.baremetalcpucores')" />
-          </a-form-item>
-          <a-form-item name="baremetalcpu" ref="baremetalcpu" v-if="selectedClusterHyperVisorType === 'BareMetal'">
-            <template #label>
-              <tooltip-label :title="$t('label.baremetalcpu')" :tooltip="$t('label.baremetalcpu')"/>
-            </template>
-            <a-input
-              v-model:value="form.baremetalcpu"
-              :placeholder="$t('label.baremetalcpu')" />
-          </a-form-item>
-          <a-form-item name="baremetalmemory" ref="baremetalmemory" v-if="selectedClusterHyperVisorType === 'BareMetal'">
-            <template #label>
-              <tooltip-label :title="$t('label.baremetalmemory')" :tooltip="$t('label.baremetalmemory')"/>
-            </template>
-            <a-input
-              v-model:value="form.baremetalmemory"
-              :placeholder="$t('label.baremetalmemory')" />
-          </a-form-item>
-          <a-form-item name="baremetalmac" ref="baremetalmac" v-if="selectedClusterHyperVisorType === 'BareMetal'">
-            <template #label>
-              <tooltip-label :title="$t('label.baremetalmac')" :tooltip="$t('label.baremetalmac')"/>
-            </template>
-            <a-input
-              v-model:value="form.baremetalmac"
-              :placeholder="$t('label.baremetalmac')" />
-          </a-form-item>
-          <a-form-item name="hosttags" ref="hosttags">
-            <template #label>
-              <tooltip-label :title="$t('label.hosttags')" :tooltip="placeholder.hosttags"/>
-            </template>
-            <a-select
-              mode="tags"
-              showSearch
-              optionFilterProp="value"
-              :filterOption="(input, option) => {
-                return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }"
-              v-model:value="form.hosttags"
-              :placeholder="placeholder.hosttags">
-              <a-select-option v-for="tag in hostTagsList" :key="tag.name">{{ tag.name }}</a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item name="isdedicated" ref="isdedicated">
-            <template #label>
-              <tooltip-label :title="$t('label.isdedicated')"/>
-            </template>
-            <a-checkbox @change="toggleDedicated"></a-checkbox>
-          </a-form-item>
-          <template v-if="showDedicated">
-            <DedicateDomain
-              @domainChange="id => dedicatedDomainId = id"
-              @accountChange="id => dedicatedAccount = id"
-              :error="domainError" />
-          </template>
+          </a-alert>
+        </div>
+      </a-form-item>
+      <a-form-item name="password" ref="password" v-if="!['VMware', 'External'].includes(selectedClusterHyperVisorType) && authMethod === 'password'">
+        <template #label>
+          <tooltip-label :title="$t('label.password')" :tooltip="placeholder.password"/>
+        </template>
+        <a-input-password
+          v-model:value="form.password"
+          :placeholder="placeholder.password" />
+      </a-form-item>
+      <a-form-item name="agentusername" ref="agentusername" v-if="selectedClusterHyperVisorType === 'Ovm3'">
+        <template #label>
+          <tooltip-label :title="$t('label.agent.username')" :tooltip="$t('label.agent.username')"/>
+        </template>
+        <a-input
+          v-model:value="form.agentusername"
+          :placeholder="$t('label.agent.username')" />
+      </a-form-item>
+      <a-form-item name="agentpassword" ref="agentpassword" v-if="selectedClusterHyperVisorType === 'Ovm3'">
+        <template #label>
+          <tooltip-label :title="$t('label.agent.password')" :tooltip="$t('label.agent.password')"/>
+        </template>
+        <a-input
+          v-model:value="form.agentpassword"
+          :placeholder="$t('label.agent.password')" />
+      </a-form-item>
+      <a-form-item name="agentport" ref="agentport" v-if="selectedClusterHyperVisorType === 'Ovm3'">
+        <template #label>
+          <tooltip-label :title="$t('label.agentport')" :tooltip="$t('label.agentport')"/>
+        </template>
+        <a-input
+          v-model:value="form.agentport"
+          :placeholder="$t('label.agentport')" />
+      </a-form-item>
+      <a-form-item name="baremetalcpucores" ref="baremetalcpucores" v-if="selectedClusterHyperVisorType === 'BareMetal'">
+        <template #label>
+          <tooltip-label :title="$t('label.baremetalcpucores')" :tooltip="$t('label.baremetalcpucores')"/>
+        </template>
+        <a-input
+          v-model:value="form.baremetalcpucores"
+          :placeholder="$t('label.baremetalcpucores')" />
+      </a-form-item>
+      <a-form-item name="baremetalcpu" ref="baremetalcpu" v-if="selectedClusterHyperVisorType === 'BareMetal'">
+        <template #label>
+          <tooltip-label :title="$t('label.baremetalcpu')" :tooltip="$t('label.baremetalcpu')"/>
+        </template>
+        <a-input
+          v-model:value="form.baremetalcpu"
+          :placeholder="$t('label.baremetalcpu')" />
+      </a-form-item>
+      <a-form-item name="baremetalmemory" ref="baremetalmemory" v-if="selectedClusterHyperVisorType === 'BareMetal'">
+        <template #label>
+          <tooltip-label :title="$t('label.baremetalmemory')" :tooltip="$t('label.baremetalmemory')"/>
+        </template>
+        <a-input
+          v-model:value="form.baremetalmemory"
+          :placeholder="$t('label.baremetalmemory')" />
+      </a-form-item>
+      <a-form-item name="baremetalmac" ref="baremetalmac" v-if="selectedClusterHyperVisorType === 'BareMetal'">
+        <template #label>
+          <tooltip-label :title="$t('label.baremetalmac')" :tooltip="$t('label.baremetalmac')"/>
+        </template>
+        <a-input
+          v-model:value="form.baremetalmac"
+          :placeholder="$t('label.baremetalmac')" />
+      </a-form-item>
+      <a-form-item name="hosttags" ref="hosttags">
+        <template #label>
+          <tooltip-label :title="$t('label.hosttags')" :tooltip="placeholder.hosttags"/>
+        </template>
+        <a-select
+          mode="tags"
+          showSearch
+          optionFilterProp="value"
+          :filterOption="(input, option) => {
+            return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          v-model:value="form.hosttags"
+          :placeholder="placeholder.hosttags">
+          <a-select-option v-for="tag in hostTagsList" :key="tag.name">{{ tag.name }}</a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item name="externaldetails" ref="externaldetails" v-if="selectedClusterHyperVisorType === 'External'">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.externaldetails.description"/>
+        </template>
+        <a-switch v-model:checked="externalDetailsEnabled" @change="onExternalDetailsEnabledChange"/>
+        <a-card v-if="externalDetailsEnabled" style="margin-top: 10px">
+          <div style="margin-bottom: 10px">{{ $t('message.add.extension.resource.details') }}</div>
+          <details-input
+            v-model:value="form.externaldetails" />
+        </a-card>
+      </a-form-item>
+      <a-form-item name="isdedicated" ref="isdedicated">
+        <template #label>
+          <tooltip-label :title="$t('label.isdedicated')"/>
+        </template>
+        <a-checkbox @change="toggleDedicated"></a-checkbox>
+      </a-form-item>
+      <template v-if="showDedicated">
+        <DedicateDomain
+          @domainChange="id => dedicatedDomainId = id"
+          @accountChange="id => dedicatedAccount = id"
+          :error="domainError" />
+      </template>
 
-          <a-divider></a-divider>
+      <a-divider></a-divider>
 
-          <div :span="24" class="action-button">
-            <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
-            <a-button @click="handleSubmitForm" ref="submit" type="primary">{{ $t('label.ok') }}</a-button>
-          </div>
-        </a-form>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button @click="handleSubmitForm" ref="submit" type="primary">{{ $t('label.ok') }}</a-button>
       </div>
-    </div>
-  </a-spin>
+    </a-form>
+  </div>
 </template>
 
 <script>
@@ -249,6 +257,7 @@ import { mixinForm } from '@/utils/mixin'
 import DedicateDomain from '../../components/view/DedicateDomain'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'HostAdd',
@@ -256,7 +265,8 @@ export default {
   components: {
     DedicateDomain,
     ResourceIcon,
-    TooltipLabel
+    TooltipLabel,
+    DetailsInput
   },
   props: {
     resource: {
@@ -272,7 +282,6 @@ export default {
       clustersList: [],
       podsList: [],
       hostTagsList: [],
-      url: null,
       authMethod: 'password',
       selectedCluster: null,
       selectedClusterHyperVisorType: null,
@@ -290,7 +299,8 @@ export default {
         password: null,
         hosttags: null,
         isdedicated: null
-      }
+      },
+      externalDetailsEnabled: false
     }
   },
   computed: {
@@ -303,6 +313,9 @@ export default {
       return rules
     }
   },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('addHost')
+  },
   created () {
     this.initForm()
     this.fetchData()
@@ -422,13 +435,17 @@ export default {
         const formRaw = toRaw(this.form)
         const values = this.handleRemoveFields(formRaw)
 
-        if (values.hostname.indexOf('http://') === -1) {
-          this.url = `http://${values.hostname}`
-        } else {
-          this.url = values.hostname
+        var url = values.hostname
+        if (values.hostname.indexOf('http://') === -1 && this.selectedClusterHyperVisorType !== 'External') {
+          url = `http://${values.hostname}`
         }
 
-        const args = {
+        if (this.selectedClusterHyperVisorType === 'External') {
+          values.username = 'external'
+          values.password = 'external'
+        }
+
+        var args = {
           zoneid: values.zoneid,
           podid: values.podid,
           clusterid: values.clusterid,
@@ -437,7 +454,7 @@ export default {
           hosttags: values.hosttags ? values.hosttags.join() : null,
           username: values.username,
           password: this.authMethod !== 'password' ? '' : values.password,
-          url: this.url,
+          url: url,
           agentusername: values.agentusername,
           agentpassword: values.agentpassword,
           agentport: values.agentport
@@ -449,6 +466,11 @@ export default {
           args.memory = values.baremetalmemory
           args.hostmac = values.baremetalmac
         }
+        if (values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([key, value]) => {
+            args['externaldetails[0].' + key] = value
+          })
+        }
         Object.keys(args).forEach((key) => (args[key] == null) && delete args[key])
         this.loading = true
         postAPI('addHost', args).then(response => {
@@ -468,7 +490,8 @@ export default {
           this.loading = false
         })
       }).catch(error => {
-        this.formRef.value.scrollToField(error.errorFields[0].name)
+        console.log(error)
+        this.formRef.value.scrollToField(error?.errorFields[0]?.name)
       })
     },
     dedicateHost (hostId) {
@@ -512,28 +535,22 @@ export default {
     },
     closeAction () {
       this.$emit('close-action')
+    },
+    onExternalDetailsEnabledChange (val) {
+      if (val || !this.form.externaldetails) {
+        return
+      }
+      this.form.externaldetails = undefined
     }
   }
 }
 </script>
 
 <style lang="scss">
-  .form {
-    &__label {
-      margin-bottom: 5px;
-
-      .required {
-        margin-left: 10px;
-      }
-    }
-    &__item {
-      margin-bottom: 20px;
-    }
-    .ant-select {
-      width: 85vw;
-      @media (min-width: 760px) {
-        width: 400px;
-      }
+  .form-layout {
+    width: 60vw;
+    @media (min-width: 600px) {
+      width: 550px;
     }
   }
 
diff --git a/ui/src/views/infra/HostUpdate.vue b/ui/src/views/infra/HostUpdate.vue
index 956ea7298ef..fc41082e009 100644
--- a/ui/src/views/infra/HostUpdate.vue
+++ b/ui/src/views/infra/HostUpdate.vue
@@ -81,6 +81,14 @@
           </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item name="externaldetails" ref="externaldetails" v-if="resource.hypervisor === 'External'">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.externaldetails.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.resource.details') }}</div>
+        <details-input
+          v-model:value="form.externaldetails" />
+      </a-form-item>
 
       <div :span="24" class="action-button">
         <a-button :loading="loading" @click="onCloseAction">{{ $t('label.cancel') }}</a-button>
@@ -94,11 +102,14 @@
 import { ref, reactive, toRaw } from 'vue'
 import { getAPI, postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
+import { getFilteredExternalDetails } from '@/utils/extension'
 
 export default {
-  name: 'EditVM',
+  name: 'HostUpdate',
   components: {
-    TooltipLabel
+    TooltipLabel,
+    DetailsInput
   },
   props: {
     action: {
@@ -130,6 +141,11 @@ export default {
     this.fetchOsCategories()
     this.fetchStorageAccessGroupsData()
   },
+  computed: {
+    resourceExternalDetails () {
+      return getFilteredExternalDetails(this.resource.details)
+    }
+  },
   methods: {
     initForm () {
       this.formRef = ref()
@@ -140,7 +156,8 @@ export default {
         storageaccessgroups: this.resource.storageaccessgroups
           ? this.resource.storageaccessgroups.split(',')
           : [],
-        oscategoryid: this.resource.oscategoryid
+        oscategoryid: this.resource.oscategoryid,
+        externaldetails: this.resourceExternalDetails
       })
       this.rules = reactive({})
     },
@@ -173,7 +190,6 @@ export default {
     handleSubmit () {
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
-        console.log(values)
         const params = {}
         params.id = this.resource.id
         params.name = values.name
@@ -182,6 +198,11 @@ export default {
         if (values.istagarule !== undefined) {
           params.istagarule = values.istagarule
         }
+        if (values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([key, value]) => {
+            params['externaldetails[0].' + key] = value
+          })
+        }
         this.loading = true
 
         postAPI('updateHost', params).then(json => {
@@ -232,10 +253,9 @@ export default {
 
 <style scoped lang="less">
 .form-layout {
-  width: 80vw;
-
+  width: 60vw;
   @media (min-width: 600px) {
-    width: 450px;
+    width: 550px;
   }
 
   .action-button {
diff --git a/ui/src/views/network/NicsTab.vue b/ui/src/views/network/NicsTab.vue
index 90db1d20388..0c62da47536 100644
--- a/ui/src/views/network/NicsTab.vue
+++ b/ui/src/views/network/NicsTab.vue
@@ -22,7 +22,7 @@
       style="width: 100%; margin-bottom: 10px"
       @click="showAddNicModal"
       :loading="loadingNic"
-      :disabled="!('addNicToVirtualMachine' in $store.getters.apis)">
+      :disabled="!('addNicToVirtualMachine' in $store.getters.apis) || resource.hypervisor === 'External'">
       <template #icon><plus-outlined /></template> {{ $t('label.network.addvm') }}
     </a-button>
     <NicsTable :resource="resource" :loading="loading">
@@ -32,7 +32,7 @@
           @confirm="setAsDefault(record.nic)"
           :okText="$t('label.yes')"
          :cancelText="$t('label.no')"
-          v-if="!record.nic.isdefault"
+          v-if="!record.nic.isdefault && resource.hypervisor !== 'External'"
         >
           <tooltip-button
             tooltipPlacement="bottom"
@@ -41,14 +41,14 @@
             icon="check-square-outlined" />
         </a-popconfirm>
         <tooltip-button
-          v-if="record.nic.type !== 'L2'"
+          v-if="record.nic.type !== 'L2' && resource.hypervisor !== 'External'"
           tooltipPlacement="bottom"
           :tooltip="$t('label.change.ip.address')"
           icon="swap-outlined"
           :disabled="!('updateVmNicIp' in $store.getters.apis)"
           @onClick="onChangeIPAddress(record)" />
         <tooltip-button
-          v-if="record.nic.type !== 'L2'"
+          v-if="record.nic.type !== 'L2' && resource.hypervisor !== 'External'"
           tooltipPlacement="bottom"
           :tooltip="$t('label.edit.secondary.ips')"
           icon="environment-outlined"
@@ -59,7 +59,7 @@
           @confirm="removeNIC(record.nic)"
           :okText="$t('label.yes')"
           :cancelText="$t('label.no')"
-          v-if="!record.nic.isdefault"
+          v-if="!record.nic.isdefault && resource.hypervisor !== 'External'"
         >
           <tooltip-button
             tooltipPlacement="bottom"
diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue
index 6a203c14a7f..08d782451d4 100644
--- a/ui/src/views/offering/AddComputeOffering.vue
+++ b/ui/src/views/offering/AddComputeOffering.vue
@@ -383,7 +383,7 @@
           </template>
           <a-switch v-model:checked="form.computeonly" :checked="computeonly" @change="val => { computeonly = val }"/>
         </a-form-item>
-        <a-card>
+        <a-card style="margin-bottom: 10px;">
           <span v-if="computeonly">
             <a-form-item name="storagetype" ref="storagetype">
               <template #label>
@@ -612,7 +612,19 @@
             <a-switch v-model:checked="form.diskofferingstrictness" :checked="diskofferingstrictness" @change="val => { diskofferingstrictness = val }"/>
           </a-form-item>
         </a-card>
+        <a-form-item name="externaldetails" ref="externaldetails">
+          <template #label>
+            <tooltip-label :title="$t('label.externaldetails')" :tooltip="apiParams.externaldetails.description"/>
+          </template>
+          <a-switch v-model:checked="externalDetailsEnabled" @change="onExternalDetailsEnabledChange"/>
+          <a-card v-if="externalDetailsEnabled" style="margin-top: 10px">
+            <div style="margin-bottom: 10px">{{ $t('message.add.orchestrator.resource.details') }}</div>
+            <details-input
+              v-model:value="form.externaldetails" />
+          </a-card>
+        </a-form-item>
       </a-form>
+      <br/>
       <div :span="24" class="action-button">
         <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
         <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ $t('label.ok') }}</a-button>
@@ -629,6 +641,7 @@ import { isAdmin } from '@/role'
 import { mixinForm } from '@/utils/mixin'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
 import store from '@/store'
 
 export default {
@@ -637,7 +650,8 @@ export default {
   components: {
     AddDiskOffering,
     ResourceIcon,
-    TooltipLabel
+    TooltipLabel,
+    DetailsInput
   },
   data () {
     return {
@@ -730,7 +744,8 @@ export default {
       defaultLeaseDuration: 90,
       defaultLeaseExpiryAction: 'STOP',
       leaseduration: undefined,
-      leaseexpiryaction: undefined
+      leaseexpiryaction: undefined,
+      externalDetailsEnabled: false
     }
   },
   beforeCreate () {
@@ -984,6 +999,12 @@ export default {
         this.vGpuVisible = false
       }
     },
+    onExternalDetailsEnabledChange (val) {
+      if (val || !this.form.externaldetails) {
+        return
+      }
+      this.form.externaldetails = undefined
+    },
     handleSubmit (e) {
       e.preventDefault()
       if (this.loading) return
@@ -1139,6 +1160,12 @@ export default {
         if (values.storagepolicy) {
           params.storagepolicy = values.storagepolicy
         }
+        if (values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([key, value]) => {
+            params['externaldetails[0].' + key] = value
+          })
+        }
+
         postAPI('createServiceOffering', params).then(json => {
           const message = this.isSystem
             ? `${this.$t('message.create.service.offering')}: `
diff --git a/utils/src/main/java/com/cloud/utils/FileUtil.java b/utils/src/main/java/com/cloud/utils/FileUtil.java
index eea7c0f8561..8a1d3d32ec1 100644
--- a/utils/src/main/java/com/cloud/utils/FileUtil.java
+++ b/utils/src/main/java/com/cloud/utils/FileUtil.java
@@ -160,4 +160,19 @@ public class FileUtil {
     public static String readResourceFile(String resource) throws IOException {
         return IOUtils.toString(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResourceAsStream(resource)), com.cloud.utils.StringUtils.getPreferredCharset());
     }
+
+    public static boolean deleteRecursively(Path path) throws IOException {
+        LOGGER.debug("Deleting path: {}", path);
+        if (Files.isDirectory(path)) {
+            try (Stream<Path> entries = Files.list(path)) {
+                List<Path> list = entries.collect(Collectors.toList());
+                for (Path entry : list) {
+                    if (!deleteRecursively(entry)) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return Files.deleteIfExists(path);
+    }
 }
diff --git a/utils/src/main/java/com/cloud/utils/json/JsonMergeUtil.java b/utils/src/main/java/com/cloud/utils/json/JsonMergeUtil.java
new file mode 100644
index 00000000000..4653e57278c
--- /dev/null
+++ b/utils/src/main/java/com/cloud/utils/json/JsonMergeUtil.java
@@ -0,0 +1,108 @@
+// 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.
+
+package com.cloud.utils.json;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public class JsonMergeUtil {
+
+    private static final JsonParser parser = new JsonParser();
+
+    public static String mergeJsonPatch(String originalJsonStr, String patchJsonStr) {
+        JsonObject originalJson = parser.parse(originalJsonStr).getAsJsonObject();
+        JsonObject patchJson = parser.parse(patchJsonStr).getAsJsonObject();
+        mergeJson(originalJson, patchJson);
+        return originalJson.toString();
+    }
+
+    private static void mergeJson(JsonObject target, JsonObject patch) {
+        Set<Map.Entry<String, JsonElement>> entries = patch.entrySet();
+        for (Map.Entry<String, JsonElement> entry : entries) {
+            String key = entry.getKey();
+            JsonElement patchValue = entry.getValue();
+
+            if (!target.has(key) || patchValue.isJsonNull()) {
+                target.add(key, patchValue);
+                continue;
+            }
+
+            JsonElement targetValue = target.get(key);
+
+            if (targetValue.isJsonObject() && patchValue.isJsonObject()) {
+                mergeJson(targetValue.getAsJsonObject(), patchValue.getAsJsonObject());
+            } else if (targetValue.isJsonArray() && patchValue.isJsonArray()) {
+                JsonArray merged = tryMergeArrayByUuid(targetValue.getAsJsonArray(), patchValue.getAsJsonArray());
+                target.add(key, merged);
+            } else {
+                target.add(key, patchValue); // primitive or incompatible
+            }
+        }
+    }
+
+    private static JsonArray tryMergeArrayByUuid(JsonArray original, JsonArray patch) {
+        if (anyElementNotHaveUuid(original) || anyElementNotHaveUuid(patch)) {
+            return patch;
+        }
+
+        Map<String, JsonObject> originalMap = new HashMap<>();
+        for (int i = 0; i < original.size(); i++) {
+            JsonObject obj = original.get(i).getAsJsonObject();
+            String uuid = obj.get("uuid").getAsString();
+            originalMap.put(uuid, cloneJsonObject(obj));
+        }
+
+        for (int i = 0; i < patch.size(); i++) {
+            JsonObject patchObj = patch.get(i).getAsJsonObject();
+            String uuid = patchObj.get("uuid").getAsString();
+            if (originalMap.containsKey(uuid)) {
+                mergeJson(originalMap.get(uuid), patchObj);
+            } else {
+                originalMap.put(uuid, cloneJsonObject(patchObj));
+            }
+        }
+
+        JsonArray result = new JsonArray();
+        for (JsonObject obj : originalMap.values()) {
+            result.add(obj);
+        }
+        return result;
+    }
+
+    private static boolean anyElementNotHaveUuid(JsonArray array) {
+        for (int i = 0; i < array.size(); i++) {
+            JsonElement e = array.get(i);
+            if (!e.isJsonObject()) return true;
+            JsonObject obj = e.getAsJsonObject();
+            if (!obj.has("uuid")) return true;
+        }
+        return false;
+    }
+
+    private static JsonObject cloneJsonObject(JsonObject original) {
+        // Gson 1.7.2 does not have deepCopy; use serialize+deserialize
+        return parser.parse(original.toString()).getAsJsonObject();
+    }
+}
diff --git a/utils/src/test/java/com/cloud/utils/json/JsonMergeUtilTest.java b/utils/src/test/java/com/cloud/utils/json/JsonMergeUtilTest.java
new file mode 100644
index 00000000000..ec01abb512e
--- /dev/null
+++ b/utils/src/test/java/com/cloud/utils/json/JsonMergeUtilTest.java
@@ -0,0 +1,108 @@
+// 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.
+
+package com.cloud.utils.json;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JsonMergeUtilTest {
+
+    @Test
+    public void testMergePatchIntoObjectJson() {
+        String base = "{\n" +
+                "  \"id\": 20,\n" +
+                "  \"name\": \"i-2-20-QA\",\n" +
+                "  \"state\": \"Starting\",\n" +
+                "  \"type\": \"User\",\n" +
+                "  \"cpus\": 1,\n" +
+                "  \"minSpeed\": 500,\n" +
+                "  \"maxSpeed\": 500,\n" +
+                "  \"minRam\": 536870912,\n" +
+                "  \"maxRam\": 536870912,\n" +
+                "  \"arch\": \"x86_64\",\n" +
+                "  \"bootArgs\": \"\",\n" +
+                "  \"enableHA\": false,\n" +
+                "  \"limitCpuUse\": false,\n" +
+                "  \"enableDynamicallyScaleVm\": false,\n" +
+                "  \"vncPassword\": \"qWI23VL8vzAYpeKcdMF_Kw\",\n" +
+                "  \"details\": {\n" +
+                "    \"deployvm\": \"true\",\n" +
+                "    \"External:tempalteid\": \"1\"\n" +
+                "  },\n" +
+                "  \"uuid\": \"ba4024c3-a2fd-4fb9-af9e-e4a4b2be59dc\",\n" +
+                "  \"enterHardwareSetup\": false,\n" +
+                "  \"disks\": [\n" +
+                "    {\n" +
+                "      \"data\": {\n" +
+                "        \"org.apache.cloudstack.storage.to.TemplateObjectTO\": {\n" +
+                "          \"id\": 0,\n" +
+                "          \"format\": \"ISO\",\n" +
+                "          \"accountId\": 0,\n" +
+                "          \"hvm\": false,\n" +
+                "          \"bootable\": false,\n" +
+                "          \"directDownload\": false,\n" +
+                "          \"deployAsIs\": false,\n" +
+                "          \"followRedirects\": false\n" +
+                "        }\n" +
+                "      },\n" +
+                "      \"diskSeq\": 3,\n" +
+                "      \"type\": \"ISO\"\n" +
+                "    }\n" +
+                "  ],\n" +
+                "  \"nics\": [\n" +
+                "    {\n" +
+                "      \"deviceId\": 0,\n" +
+                "      \"networkRateMbps\": 200,\n" +
+                "      \"defaultNic\": true,\n" +
+                "      \"pxeDisable\": false,\n" +
+                "      \"nicUuid\": \"f3188e9f-37ba-4853-b711-d6f60dddc5a2\",\n" +
+                "      \"details\": {\n" +
+                "        \"MacLearning\": \"false\",\n" +
+                "        \"ForgedTransmits\": \"true\",\n" +
+                "        \"PromiscuousMode\": \"false\",\n" +
+                "        \"MacAddressChanges\": \"true\"\n" +
+                "      },\n" +
+                "      \"dpdkEnabled\": false,\n" +
+                "      \"networkId\": 208,\n" +
+                "      \"networkSegmentName\": \"D1-A2-Z1-S208\",\n" +
+                "      \"uuid\": \"e754f4e2-5a1c-4686-995e-1d2eb1235eb4\",\n" +
+                "      \"mac\": \"02:01:00:d0:00:10\",\n" +
+                "      \"dns1\": \"10.147.28.6\",\n" +
+                "      \"broadcastType\": \"Vlan\",\n" +
+                "      \"type\": \"Guest\",\n" +
+                "      \"broadcastUri\": \"vlan://166\",\n" +
+                "      \"isolationUri\": \"vlan://166\",\n" +
+                "      \"securityGroupEnabled\": false\n" +
+                "    }\n" +
+                "  ],\n" +
+                "  \"configDriveLocation\": \"SECONDARY\",\n" +
+                "  \"guestOsDetails\": {},\n" +
+                "  \"extraConfig\": {},\n" +
+                "  \"networkIdToNetworkNameMap\": {\n" +
+                "    \"208\": \"D1-A2-Z1-S208\"\n" +
+                "  },\n" +
+                "  \"metadataManufacturer\": \"Apache Software Foundation\",\n" +
+                "  \"metadataProductName\": \"CloudStack External Hypervisor\"\n" +
+                "}";
+        String mac = "52:54:00:30:CE:91";
+        String patch = "{\"nics\":[{\"uuid\":\"e754f4e2-5a1c-4686-995e-1d2eb1235eb4\",\"mac\":\"" + mac + "\"}]}";
+        String merged = JsonMergeUtil.mergeJsonPatch(base, patch);
+        System.out.println(merged);
+        Assert.assertTrue(merged.contains(mac));
+    }
+}

From 21dde2b9a281823464db1473cfd46ad9b4c6283b Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Mon, 28 Jul 2025 05:57:15 -0300
Subject: [PATCH 75/94] [DB] Add force recreate parameter to
 cloudstack-setup-databases script (#11239)

---
 setup/bindir/cloud-setup-databases.in | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index e2d5b50fe6b..8c453edda44 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -129,6 +129,12 @@ class DBDeployer(object):
         (value, index) = self.dbDotProperties[key]
         return value
 
+    def areCloudDatabasesCreated(self):
+        cmd = "SELECT CASE WHEN COUNT(DISTINCT SCHEMA_NAME) >= 1 THEN 1 ELSE 0 END AS schema_exists \
+              FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME IN ('cloud', 'cloud_usage');"
+        databases = self.runMysql(cmd, "databases", self.rootuser != None)
+        return databases.replace("schema_exists", "").strip() == "1"
+
     def runMysql(self, text, table, isRoot=False):
         kwargs = {}
         if not isRoot:
@@ -151,7 +157,7 @@ class DBDeployer(object):
             open(self.tmpMysqlFile, 'w').write(text)
             mysqlCmds.append('<')
             mysqlCmds.append(self.tmpMysqlFile)
-            runCmd(mysqlCmds)
+            return runCmd(mysqlCmds)
 
         except Exception as e:
             err = '''Encountering an error when executing mysql script
@@ -233,6 +239,10 @@ for full help
             ("DROP USER 'cloud'@'%' ;", "DO NULL;")
         )
 
+        if self.areCloudDatabasesCreated() and not self.options.forcerecreate:
+            self.errorAndExit("Aborting script as the databases (cloud, cloud_usage) already exist.\n" \
+                              "Please use the --force-recreate parameter if you want to recreate the schemas.")
+
         scriptsToRun = ["create-database","create-schema", "create-database-premium","create-schema-premium"]
         if self.options.schemaonly:
             scriptsToRun = ["create-schema", "create-schema-premium"]
@@ -610,6 +620,9 @@ for example:
                           help="Creates the db schema without having to pass root credentials - " \
                                "Please note: The databases (cloud, cloud_usage) and user (cloud) has to be configured " \
                                "manually prior to running this script when using this flag.")
+        self.parser.add_option("--force-recreate", action="store_true", dest="forcerecreate", default=False,
+                               help="Force recreation of the existing DB schemas. This option is disabled by default." \
+                               "Please note: The databases (cloud, cloud_usage) and its tables data will be lost and recreated.")
 
         self.parser.add_option("-a", "--auto", action="store", type="string", dest="serversetup", default="",
                           help="Path to an XML file describing an automated unattended cloud setup")

From ca6d2dc57ecca52d3a0847038bc9c6e8c7a0c00a Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Mon, 28 Jul 2025 05:20:42 -0400
Subject: [PATCH 76/94] Prevent multi-select dropdown menu from floating on
 scrolling through the form (#11237)

---
 ui/src/views/offering/AddComputeOffering.vue | 9 +++++++++
 ui/src/views/offering/AddDiskOffering.vue    | 4 ++++
 ui/src/views/offering/AddNetworkOffering.vue | 3 +++
 ui/src/views/offering/AddVpcOffering.vue     | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue
index 80d200f1f25..ddf000d6f00 100644
--- a/ui/src/views/offering/AddComputeOffering.vue
+++ b/ui/src/views/offering/AddComputeOffering.vue
@@ -47,6 +47,7 @@
             <tooltip-label :title="$t('label.systemvmtype')" :tooltip="apiParams.systemvmtype.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.systemvmtype"
             showSearch
             optionFilterProp="label"
@@ -214,6 +215,7 @@
             <tooltip-label :title="$t('label.deploymentplanner')" :tooltip="apiParams.deploymentplanner.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.deploymentplanner"
             showSearch
             optionFilterProp="label"
@@ -245,6 +247,7 @@
         </a-form-item>
         <a-form-item name="pcidevice" ref="pcidevice" :label="$t('label.gpu')" v-if="!isSystem">
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.pcidevice"
             showSearch
             optionFilterProp="label"
@@ -260,6 +263,7 @@
         </a-form-item>
         <a-form-item name="vgputype" ref="vgputype" :label="$t('label.vgputype')" v-if="vGpuVisible">
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.vgputype"
             showSearch
             optionFilterProp="label"
@@ -281,6 +285,7 @@
           </template>
           <a-select
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.domainid"
             showSearch
             optionFilterProp="label"
@@ -305,6 +310,7 @@
           <a-select
             id="zone-selection"
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.zoneid"
             showSearch
             optionFilterProp="label"
@@ -331,6 +337,7 @@
             <tooltip-label :title="$t('label.vmware.storage.policy')" :tooltip="apiParams.storagepolicy.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.storagepolicy"
             :placeholder="apiParams.storagepolicy.description"
             showSearch
@@ -519,6 +526,7 @@
                   </template>
                   <a-select
                     mode="tags"
+                    :getPopupContainer="(trigger) => trigger.parentNode"
                     v-model:value="form.storagetags"
                     showSearch
                     optionFilterProp="value"
@@ -558,6 +566,7 @@
               <br /><br />
               <a-form-item :label="$t('label.disk.offerings')" name="diskofferingid" ref="diskofferingid">
                 <a-select
+                  :getPopupContainer="(trigger) => trigger.parentNode"
                   v-model:value="form.diskofferingid"
                   :loading="loading"
                   :placeholder="$t('label.diskoffering')">
diff --git a/ui/src/views/offering/AddDiskOffering.vue b/ui/src/views/offering/AddDiskOffering.vue
index 576721d48cc..700e90f1766 100644
--- a/ui/src/views/offering/AddDiskOffering.vue
+++ b/ui/src/views/offering/AddDiskOffering.vue
@@ -202,6 +202,7 @@
             <tooltip-label :title="$t('label.storagetags')" :tooltip="apiParams.tags.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             mode="tags"
             v-model:value="form.tags"
             showSearch
@@ -226,6 +227,7 @@
           </template>
           <a-select
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.domainid"
             showSearch
             optionFilterProp="label"
@@ -250,6 +252,7 @@
           <a-select
             id="zone-selection"
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.zoneid"
             showSearch
             optionFilterProp="label"
@@ -273,6 +276,7 @@
             <tooltip-label :title="$t('label.vmware.storage.policy')" :tooltip="apiParams.storagepolicy.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.storagepolicy"
             :placeholder="apiParams.storagepolicy.description"
             showSearch
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
index 17359e4e0c0..435952413cd 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -248,6 +248,7 @@
             <tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             showSearch
             optionFilterProp="label"
             v-model:value="form.serviceofferingid"
@@ -430,6 +431,7 @@
           </template>
           <a-select
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.domainid"
             showSearch
             optionFilterProp="label"
@@ -454,6 +456,7 @@
           <a-select
             id="zone-selection"
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.zoneid"
             showSearch
             optionFilterProp="label"
diff --git a/ui/src/views/offering/AddVpcOffering.vue b/ui/src/views/offering/AddVpcOffering.vue
index 738a03a9b2e..94a5f8a60b1 100644
--- a/ui/src/views/offering/AddVpcOffering.vue
+++ b/ui/src/views/offering/AddVpcOffering.vue
@@ -104,6 +104,7 @@
             <tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/>
           </template>
           <a-select
+            :getPopupContainer="(trigger) => trigger.parentNode"
             showSearch
             optionFilterProp="label"
             v-model:value="form.serviceofferingid"
@@ -126,6 +127,7 @@
           </template>
           <a-select
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.domainid"
             showSearch
             optionFilterProp="label"
@@ -150,6 +152,7 @@
           <a-select
             id="zone-selection"
             mode="multiple"
+            :getPopupContainer="(trigger) => trigger.parentNode"
             v-model:value="form.zoneid"
             showSearch
             optionFilterProp="label"

From 1a9efe8de3c14fb85d3b4afa24b29088029117de Mon Sep 17 00:00:00 2001
From: "Suyang(Dawson) Chen" <dawson0xff@gmail.com>
Date: Mon, 28 Jul 2025 05:37:01 -0400
Subject: [PATCH 77/94] Add unit tests for getConfigResources in
 ModuleDefinitionSet and improve context readability (#11042)

---
 .../ModuleBasedContextFactoryTest.java        | 79 ++++++++++++++-----
 ...table.xml => base-context-inheritable.xml} |  0
 .../{test-context.xml => base-context.xml}    |  0
 ...{test-context.xml => child1-1-context.xml} |  0
 .../child1/child1-context-inheritable.xml     | 24 ++++++
 ...erride.xml => child1-context-override.xml} |  0
 .../{test-context.xml => child1-context.xml}  |  0
 .../{test-context.xml => child2-context.xml}  |  0
 8 files changed, 85 insertions(+), 18 deletions(-)
 rename framework/spring/module/src/test/resources/testhierarchy/base/{test-context-inheritable.xml => base-context-inheritable.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/base/{test-context.xml => base-context.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child1-1/{test-context.xml => child1-1-context.xml} (100%)
 create mode 100644 framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-inheritable.xml
 rename framework/spring/module/src/test/resources/testhierarchy/child1/{test-context-override.xml => child1-context-override.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child1/{test-context.xml => child1-context.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child2/{test-context.xml => child2-context.xml} (100%)

diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
index d8d109f6575..884665efed2 100644
--- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
+++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java
@@ -18,27 +18,31 @@
  */
 package org.apache.cloudstack.spring.module.factory;
 
+import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator;
+import org.apache.cloudstack.spring.module.model.ModuleDefinition;
+import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.IOException;
-import java.util.Collection;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.context.ApplicationContext;
-
-import org.apache.cloudstack.spring.module.locator.impl.ClasspathModuleDefinitionLocator;
-import org.apache.cloudstack.spring.module.model.ModuleDefinition;
-import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet;
-
 public class ModuleBasedContextFactoryTest {
 
     Collection<ModuleDefinition> defs;
+    ModuleBasedContextFactory factory = new ModuleBasedContextFactory();
 
     @Before
     public void setUp() throws IOException {
@@ -51,8 +55,6 @@ public class ModuleBasedContextFactoryTest {
     @Test
     public void testLoad() throws IOException {
 
-        ModuleBasedContextFactory factory = new ModuleBasedContextFactory();
-
         ModuleDefinitionSet set = factory.loadModules(defs, "base");
 
         assertNotNull(set.getApplicationContext("base"));
@@ -63,8 +65,6 @@ public class ModuleBasedContextFactoryTest {
 
         InitTest.initted = false;
 
-        ModuleBasedContextFactory factory = new ModuleBasedContextFactory();
-
         ModuleDefinitionSet set = factory.loadModules(defs, "base");
 
         assertTrue(!InitTest.initted);
@@ -73,7 +73,6 @@ public class ModuleBasedContextFactoryTest {
 
     @Test
     public void testExcluded() throws IOException {
-        ModuleBasedContextFactory factory = new ModuleBasedContextFactory();
         ModuleDefinitionSet set = factory.loadModules(defs, "base");
 
         assertNull(set.getApplicationContext("excluded"));
@@ -83,7 +82,6 @@ public class ModuleBasedContextFactoryTest {
 
     @Test
     public void testBeans() throws IOException {
-        ModuleBasedContextFactory factory = new ModuleBasedContextFactory();
         ModuleDefinitionSet set = factory.loadModules(defs, "base");
 
         testBeansInContext(set, "base", 1, new String[] {"base"}, new String[] {"child1", "child2", "child1-1"});
@@ -92,6 +90,51 @@ public class ModuleBasedContextFactoryTest {
         testBeansInContext(set, "child1-1", 3, new String[] {"base", "child1", "child1-1"}, new String[] {"child2"});
     }
 
+    @Test
+    public void testEmptyNameConfigResources() throws IOException {
+        ModuleDefinitionSet set = factory.loadModules(defs, "base");
+        testConfigResourcesArray(new String[] {}, set.getConfigResources(""));
+    }
+
+    @Test
+    public void testBaseConfigResources() throws IOException {
+        ModuleDefinitionSet set = factory.loadModules(defs, "base");
+        testConfigResourcesArray(new String[] {"base-context.xml", "base-context-inheritable.xml"}, set.getConfigResources("base"));
+    }
+
+    @Test
+    public void testChild1ConfigResources() throws IOException {
+        ModuleDefinitionSet set = factory.loadModules(defs, "base");
+        testConfigResourcesArray(new String[] {
+                "child1-context.xml", "child1-context-inheritable.xml",
+                "base-context-inheritable.xml", "child1-context-override.xml"
+        }, set.getConfigResources("child1"));
+    }
+
+    @Test
+    public void testChild2ConfigResources() throws IOException {
+        ModuleDefinitionSet set = factory.loadModules(defs, "base");
+        testConfigResourcesArray(new String[] {
+                "child2-context.xml", "base-context-inheritable.xml"
+        }, set.getConfigResources("child2"));
+    }
+
+    @Test
+    public void testChild1_1ConfigResources() throws IOException {
+        ModuleDefinitionSet set = factory.loadModules(defs, "base");
+        testConfigResourcesArray(new String[] {
+                "child1-1-context.xml", "child1-context-inheritable.xml", "base-context-inheritable.xml"
+        }, set.getConfigResources("child1-1"));
+    }
+
+    private void testConfigResourcesArray(String[] expected, Resource[] actual) {
+        assertEquals(expected.length, actual.length);
+        List<String> actualFileNameList = Arrays.stream(actual).map(Resource::getFilename).collect(Collectors.toList());
+        for (int i = 0; i < expected.length; i++) {
+            assertEquals(expected[i], actualFileNameList.get(i));
+        }
+    }
+
     protected void testBeansInContext(ModuleDefinitionSet set, String name, int order, String[] parents, String[] notTheres) {
         ApplicationContext context = set.getApplicationContext(name);
 
diff --git a/framework/spring/module/src/test/resources/testhierarchy/base/test-context-inheritable.xml b/framework/spring/module/src/test/resources/testhierarchy/base/base-context-inheritable.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/base/test-context-inheritable.xml
rename to framework/spring/module/src/test/resources/testhierarchy/base/base-context-inheritable.xml
diff --git a/framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/base/base-context.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml
rename to framework/spring/module/src/test/resources/testhierarchy/base/base-context.xml
diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child1-1/child1-1-context.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml
rename to framework/spring/module/src/test/resources/testhierarchy/child1-1/child1-1-context.xml
diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-inheritable.xml b/framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-inheritable.xml
new file mode 100644
index 00000000000..2cea17e97e3
--- /dev/null
+++ b/framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-inheritable.xml
@@ -0,0 +1,24 @@
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>
diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml b/framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-override.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml
rename to framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-override.xml
diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child1/child1-context.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml
rename to framework/spring/module/src/test/resources/testhierarchy/child1/child1-context.xml
diff --git a/framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child2/child2-context.xml
similarity index 100%
rename from framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml
rename to framework/spring/module/src/test/resources/testhierarchy/child2/child2-context.xml

From 82396b621ed9fbb5a7c07a540a46d55c2581cd4f Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Mon, 28 Jul 2025 15:21:55 +0530
Subject: [PATCH 78/94] appliance: bump systemvmtemplate version to 4.20.2

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../systemvmtemplate/scripts/configure_systemvm_services.sh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index 2629eba92e9..626f7cd6de8 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -19,7 +19,7 @@
 set -e
 set -x
 
-CLOUDSTACK_RELEASE=4.20.1
+CLOUDSTACK_RELEASE=4.20.2
 
 function configure_apache2() {
    # Enable ssl, rewrite and auth

From 45edf82efafc52da9e4eecfcfdcdaf760c3c233f Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Mon, 28 Jul 2025 17:54:00 +0530
Subject: [PATCH 79/94] [UI] Fix for local storage enable/disable toggle in
 edit zone (#11309)

---
 ui/src/views/infra/ZoneUpdate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/infra/ZoneUpdate.vue b/ui/src/views/infra/ZoneUpdate.vue
index cc6630da538..26968f25127 100644
--- a/ui/src/views/infra/ZoneUpdate.vue
+++ b/ui/src/views/infra/ZoneUpdate.vue
@@ -93,7 +93,7 @@
         <template #label>
           <tooltip-label :title="$t('label.localstorageenabled')" :tooltip="apiParams.localstorageenabled.description"/>
         </template>
-        <a-switch v-model:value="form.localstorageenabled" />
+        <a-switch v-model:checked="form.localstorageenabled" />
       </a-form-item>
 
       <a-form-item name="storageaccessgroups" ref="storageaccessgroups">

From 524f0d80db00eeb9f60aee952146dd874f753d67 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 28 Jul 2025 17:56:25 +0530
Subject: [PATCH 80/94] server: fix NaN values for external resource metrics
 (#11302)

CPU and RAM values for external resource metrics was showing NaN values. This fixes the behaviour.

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

diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
index fd963179aa2..66472597f97 100644
--- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -207,8 +207,7 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                 hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
                 hostResponse.setMemoryAllocated(mem);
                 hostResponse.setMemoryAllocatedBytes(mem);
-                String memoryAllocatedPercentage = decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%";
-                hostResponse.setMemoryAllocatedPercentage(memoryAllocatedPercentage);
+                hostResponse.setMemoryAllocatedPercentage(calculateResourceAllocatedPercentage(mem, memWithOverprovisioning));
 
                 String hostTags = host.getTag();
                 hostResponse.setHostTags(hostTags);
@@ -401,6 +400,9 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
     }
 
     private String calculateResourceAllocatedPercentage(float resource, float resourceWithOverProvision) {
+        if (resource == 0 || resourceWithOverProvision == 0) {
+            return "0.00%";
+        }
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
         return decimalFormat.format(((float)resource / resourceWithOverProvision * 100.0f)) + "%";
     }

From d693736ee822bd10f49f2a9fbd6d30449fda57fc Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 28 Jul 2025 18:29:17 +0530
Subject: [PATCH 81/94] ui: fix NAN% used memory for vm (#11307)

---
 ui/src/config/section/compute.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 2310598d961..1b4d1da32a4 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -54,8 +54,8 @@ export default {
         const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
           {
             memoryused: (record) => {
-              if (record.memoryintfreekbs <= 0 || record.memorykbs <= 0) {
-                return '-'
+              if (!record.memoryintfreekbs || record.memoryintfreekbs <= 0 || record.memorykbs <= 0) {
+                return ''
               }
               return parseFloat(100.0 * (record.memorykbs - record.memoryintfreekbs) / record.memorykbs).toFixed(2) + '%'
             }

From 9fee6dae34cc233ee6644ed6fe5499d3103f9f3a Mon Sep 17 00:00:00 2001
From: Harikrishna <harikrishna.patnala@gmail.com>
Date: Mon, 28 Jul 2025 19:41:12 +0530
Subject: [PATCH 82/94] Fix local storage pool disconnect issue (#11200)

---
 .../java/com/cloud/storage/listener/StoragePoolMonitor.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java
index 01fcb43c4c4..b432858f2e0 100644
--- a/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java
+++ b/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java
@@ -168,7 +168,6 @@ public class StoragePoolMonitor implements Listener {
                     throw new ConnectionException(true, String.format("Unable to prepare OCFS2 nodes for pool %s", pool));
                 }
 
-                Long hostId = host.getId();
                 if (logger.isDebugEnabled()) {
                     logger.debug("Host {} connected, connecting host to shared pool {} and sending storage pool information ...", host, pool);
                 }
@@ -185,6 +184,9 @@ public class StoragePoolMonitor implements Listener {
             // Disconnect any pools which are not expected to be connected
             for (StoragePoolHostVO poolToDisconnect: previouslyConnectedPools) {
                 StoragePoolVO pool = _poolDao.findById(poolToDisconnect.getPoolId());
+                if (!pool.isShared()) {
+                    continue;
+                }
                 try {
                     _storageManager.disconnectHostFromSharedPool(host, pool);
                     _storagePoolHostDao.deleteStoragePoolHostDetails(host.getId(), pool.getId());

From 4aed972e78c44674a2f65683f2f4434bd39de979 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 29 Jul 2025 10:25:52 +0530
Subject: [PATCH 83/94] api,server,extensions: allow updating extension
 resource map details (#11303)

* api,server,extensions: allow updating extension resource map details

This PR makes changes for allowing updating details for an extension resource mapping.
Currently, extensions only support Cluster to be registered therefore changes has been added to updateCluster functionality.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../admin/cluster/UpdateClusterCmd.java       | 12 +++
 .../extensions/manager/ExtensionsManager.java |  6 ++
 .../manager/ExtensionsManagerImpl.java        | 39 ++++++++++
 .../manager/ExtensionsManagerImplTest.java    | 76 +++++++++++++++++++
 .../cloud/resource/ResourceManagerImpl.java   | 17 ++++-
 .../ExternalConfigurationDetails.vue          |  3 +-
 ui/src/views/infra/ClusterUpdate.vue          | 41 +++++++++-
 7 files changed, 190 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index 816285e3430..c160cfd2e03 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.cluster;
 
+import java.util.Map;
+
 import com.cloud.cpu.CPU;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 
@@ -60,6 +62,12 @@ public class UpdateClusterCmd extends BaseCmd {
             since = "4.20")
     private String arch;
 
+    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
+            type = CommandType.MAP,
+            description = "Details in key/value pairs to be added to the extension-resource mapping. Use the format externaldetails[i].<key>=<value>. Example: externaldetails[0].endpoint.url=https://example.com",
+            since = "4.21.0")
+    protected Map externalDetails;
+
     public String getClusterName() {
         return clusterName;
     }
@@ -122,6 +130,10 @@ public class UpdateClusterCmd extends BaseCmd {
         return CPU.CPUArch.fromType(arch);
     }
 
+    public Map<String, String> getExternalDetails() {
+        return convertDetailsToMap(externalDetails);
+    }
+
     @Override
     public void execute() {
         Cluster cluster = _resourceService.getCluster(getId());
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
index 8b9ad96b3c4..82174872e87 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
@@ -46,6 +46,7 @@ import org.apache.cloudstack.framework.extensions.command.ExtensionServerActionB
 
 import com.cloud.host.Host;
 import com.cloud.org.Cluster;
+import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
 
 public interface ExtensionsManager extends Manager {
@@ -87,4 +88,9 @@ public interface ExtensionsManager extends Manager {
     Map<String, Map<String, String>> getExternalAccessDetails(Host host, Map<String, String> vmDetails);
 
     String handleExtensionServerCommands(ExtensionServerActionBaseCommand cmd);
+
+    Pair<Boolean, ExtensionResourceMap> extensionResourceMapDetailsNeedUpdate(final long resourceId,
+                      final ExtensionResourceMap.ResourceType resourceType, final Map<String, String> details);
+
+    void updateExtensionResourceMapDetails(final long extensionResourceMapId, final Map<String, String> details);
 }
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
index 3087f184dde..5abf0f424a7 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
@@ -1478,6 +1478,45 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana
         return GsonHelper.getGson().toJson(answers);
     }
 
+    @Override
+    public Pair<Boolean, ExtensionResourceMap> extensionResourceMapDetailsNeedUpdate(long resourceId,
+                     ExtensionResourceMap.ResourceType resourceType, Map<String, String> externalDetails) {
+        if (MapUtils.isEmpty(externalDetails)) {
+            return new Pair<>(false, null);
+        }
+        ExtensionResourceMapVO extensionResourceMapVO =
+                extensionResourceMapDao.findByResourceIdAndType(resourceId, resourceType);
+        if (extensionResourceMapVO == null) {
+            return new Pair<>(true, null);
+        }
+        Map<String, String> mapDetails =
+                extensionResourceMapDetailsDao.listDetailsKeyPairs(extensionResourceMapVO.getId());
+        if (MapUtils.isEmpty(mapDetails) || mapDetails.size() != externalDetails.size()) {
+            return new Pair<>(true, extensionResourceMapVO);
+        }
+        for (Map.Entry<String, String> entry : externalDetails.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            if (!value.equals(mapDetails.get(key))) {
+                return new Pair<>(true, extensionResourceMapVO);
+            }
+        }
+        return new Pair<>(false, extensionResourceMapVO);
+    }
+
+    @Override
+    public void updateExtensionResourceMapDetails(long extensionResourceMapId, Map<String, String> details) {
+        if (MapUtils.isEmpty(details)) {
+            return;
+        }
+        List<ExtensionResourceMapDetailsVO> detailsList = new ArrayList<>();
+        for (Map.Entry<String, String> entry : details.entrySet()) {
+            detailsList.add(new ExtensionResourceMapDetailsVO(extensionResourceMapId, entry.getKey(),
+                    entry.getValue()));
+        }
+        extensionResourceMapDetailsDao.saveDetails(detailsList);
+    }
+
     @Override
     public Long getExtensionIdForCluster(long clusterId) {
         ExtensionResourceMapVO map = extensionResourceMapDao.findByResourceIdAndType(clusterId,
diff --git a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
index 00bf915831b..fcceb16523e 100644
--- a/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
+++ b/framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
@@ -1742,6 +1742,82 @@ public class ExtensionsManagerImplTest {
         assertTrue(json.contains("\"result\":false"));
     }
 
+    @Test
+    public void extensionResourceMapDetailsNeedUpdateReturnsTrueWhenNoResourceMapExists() {
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(null);
+        Map<String, String> externalDetails = Map.of("key", "value");
+        Pair<Boolean, ExtensionResourceMap> result = extensionsManager.extensionResourceMapDetailsNeedUpdate(1L,
+            ExtensionResourceMap.ResourceType.Cluster, externalDetails);
+        assertTrue(result.first());
+        assertNull(result.second());
+    }
+
+    @Test
+    public void extensionResourceMapDetailsNeedUpdateReturnsFalseWhenDetailsMatch() {
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(resourceMap);
+        when(extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId())).thenReturn(Map.of("key", "value"));
+        Map<String, String> externalDetails = Map.of("key", "value");
+        Pair<Boolean, ExtensionResourceMap> result = extensionsManager.extensionResourceMapDetailsNeedUpdate(1L,
+            ExtensionResourceMap.ResourceType.Cluster, externalDetails);
+        assertFalse(result.first());
+        assertEquals(resourceMap, result.second());
+    }
+
+    @Test
+    public void extensionResourceMapDetailsNeedUpdateReturnsTrueWhenDetailsDiffer() {
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(resourceMap);
+        when(extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId())).thenReturn(Map.of("key", "oldValue"));
+        Map<String, String> externalDetails = Map.of("key", "newValue");
+        Pair<Boolean, ExtensionResourceMap> result = extensionsManager.extensionResourceMapDetailsNeedUpdate(1L,
+            ExtensionResourceMap.ResourceType.Cluster, externalDetails);
+        assertTrue(result.first());
+        assertEquals(resourceMap, result.second());
+    }
+
+    @Test
+    public void extensionResourceMapDetailsNeedUpdateReturnsTrueWhenExternalDetailsHaveExtraKeys() {
+        ExtensionResourceMapVO resourceMap = mock(ExtensionResourceMapVO.class);
+        when(extensionResourceMapDao.findByResourceIdAndType(1L, ExtensionResourceMap.ResourceType.Cluster)).thenReturn(resourceMap);
+        when(extensionResourceMapDetailsDao.listDetailsKeyPairs(resourceMap.getId())).thenReturn(Map.of("key", "value"));
+        Map<String, String> externalDetails = Map.of("key", "value", "extra", "something");
+        Pair<Boolean, ExtensionResourceMap> result = extensionsManager.extensionResourceMapDetailsNeedUpdate(1L,
+            ExtensionResourceMap.ResourceType.Cluster, externalDetails);
+        assertTrue(result.first());
+        assertEquals(resourceMap, result.second());
+    }
+
+    @Test
+    public void updateExtensionResourceMapDetails_SavesDetails_WhenDetailsProvided() {
+        long resourceMapId = 100L;
+        Map<String, String> details = Map.of("foo", "bar", "baz", "qux");
+        extensionsManager.updateExtensionResourceMapDetails(resourceMapId, details);
+        verify(extensionResourceMapDetailsDao).saveDetails(any());
+    }
+
+    @Test
+    public void updateExtensionResourceMapDetails_RemovesDetails_WhenDetailsIsNull() {
+        long resourceMapId = 101L;
+        extensionsManager.updateExtensionResourceMapDetails(resourceMapId, null);
+        verify(extensionResourceMapDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test
+    public void updateExtensionResourceMapDetails_RemovesDetails_WhenDetailsIsEmpty() {
+        long resourceMapId = 102L;
+        extensionsManager.updateExtensionResourceMapDetails(resourceMapId, Collections.emptyMap());
+        verify(extensionResourceMapDetailsDao, never()).saveDetails(any());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void updateExtensionResourceMapDetails_ThrowsException_WhenSaveFails() {
+        long resourceMapId = 103L;
+        Map<String, String> details = Map.of("foo", "bar");
+        doThrow(CloudRuntimeException.class).when(extensionResourceMapDetailsDao).saveDetails(any());
+        extensionsManager.updateExtensionResourceMapDetails(resourceMapId, details);
+    }
+
     @Test
     public void getExtensionIdForCluster_WhenMappingExists_ReturnsExtensionId() {
         long clusterId = 1L;
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 999b46e9f9f..936dfd9cf95 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -189,6 +189,7 @@ import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
+import com.cloud.utils.Pair;
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.UriUtils;
@@ -223,8 +224,8 @@ import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.VmDetailConstants;
-import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.google.gson.Gson;
 
 @Component
@@ -1224,9 +1225,18 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         String managedstate = cmd.getManagedstate();
         String name = cmd.getClusterName();
         CPU.CPUArch arch = cmd.getArch();
+        final Map<String, String> externalDetails = cmd.getExternalDetails();
 
         // Verify cluster information and update the cluster if needed
         boolean doUpdate = false;
+        Pair<Boolean, ExtensionResourceMap> needDetailsUpdateMapPair =
+                extensionsManager.extensionResourceMapDetailsNeedUpdate(cluster.getId(),
+                ExtensionResourceMap.ResourceType.Cluster, externalDetails);
+        if (Boolean.TRUE.equals(needDetailsUpdateMapPair.first()) && needDetailsUpdateMapPair.second() == null) {
+            throw new InvalidParameterValueException(
+                    String.format("Cluster: %s is not registered with any extension, details cannot be updated",
+                            cluster.getName()));
+        }
 
         if (StringUtils.isNotBlank(name)) {
             if(cluster.getHypervisorType() == HypervisorType.VMware) {
@@ -1311,6 +1321,11 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             _clusterDao.update(cluster.getId(), cluster);
         }
 
+        if (Boolean.TRUE.equals(needDetailsUpdateMapPair.first())) {
+            ExtensionResourceMap extensionResourceMap = needDetailsUpdateMapPair.second();
+            extensionsManager.updateExtensionResourceMapDetails(extensionResourceMap.getId(), externalDetails);
+        }
+
         if (newManagedState != null && !newManagedState.equals(oldManagedState)) {
             if (newManagedState.equals(Managed.ManagedState.Unmanaged)) {
                 boolean success = false;
diff --git a/ui/src/views/extension/ExternalConfigurationDetails.vue b/ui/src/views/extension/ExternalConfigurationDetails.vue
index 4322651ea3e..e7b3f298fe2 100644
--- a/ui/src/views/extension/ExternalConfigurationDetails.vue
+++ b/ui/src/views/extension/ExternalConfigurationDetails.vue
@@ -94,7 +94,8 @@ export default {
   },
   methods: {
     fetchData () {
-      if (!['cluster'].includes(this.$route.meta.name)) {
+      if (!['cluster'].includes(this.$route.meta.name) || !this.resource.extensionid) {
+        this.extension = {}
         return
       }
       this.loading = true
diff --git a/ui/src/views/infra/ClusterUpdate.vue b/ui/src/views/infra/ClusterUpdate.vue
index a0284a6f6c8..1af7f420e66 100644
--- a/ui/src/views/infra/ClusterUpdate.vue
+++ b/ui/src/views/infra/ClusterUpdate.vue
@@ -71,6 +71,14 @@
           </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item name="externaldetails" ref="externaldetails" v-if="resource.hypervisortype === 'External' && resource.extensionid">
+        <template #label>
+          <tooltip-label :title="$t('label.configuration.details')" :tooltip="apiParams.externaldetails.description"/>
+        </template>
+        <div style="margin-bottom: 10px">{{ $t('message.add.extension.resource.details') }}</div>
+        <details-input
+          v-model:value="form.externaldetails" />
+      </a-form-item>
 
       <div :span="24" class="action-button">
         <a-button :loading="loading" @click="onCloseAction">{{ $t('label.cancel') }}</a-button>
@@ -84,11 +92,13 @@
 import { ref, reactive, toRaw } from 'vue'
 import { getAPI, postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import DetailsInput from '@/components/widgets/DetailsInput'
 
 export default {
   name: 'ClusterUpdate',
   components: {
-    TooltipLabel
+    TooltipLabel,
+    DetailsInput
   },
   props: {
     action: {
@@ -145,6 +155,7 @@ export default {
     fetchData () {
       this.fetchArchitectureTypes()
       this.fetchStorageAccessGroupsData()
+      this.fetchExtensionResourceMapDetails()
     },
     fetchArchitectureTypes () {
       this.architectureTypes.opts = []
@@ -159,13 +170,39 @@ export default {
       })
       this.architectureTypes.opts = typesList
     },
+    fetchExtensionResourceMapDetails () {
+      this.form.externaldetails = null
+      if (!this.resource.id || !this.resource.extensionid) {
+        return
+      }
+      this.loading = true
+      const params = {
+        id: this.resource.extensionid,
+        details: 'resource'
+      }
+      getAPI('listExtensions', params).then(json => {
+        const resources = json?.listextensionsresponse?.extension?.[0]?.resources || []
+        const resourceMap = resources.find(r => r.id === this.resource.id)
+        if (resourceMap && resourceMap.details && typeof resourceMap.details === 'object') {
+          this.form.externaldetails = resourceMap.details
+        }
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     handleSubmit () {
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
-        console.log(values)
         const params = {}
         params.id = this.resource.id
         params.clustername = values.name
+        if (values.externaldetails) {
+          Object.entries(values.externaldetails).forEach(([key, value]) => {
+            params['externaldetails[0].' + key] = value
+          })
+        }
         this.loading = true
 
         postAPI('updateCluster', params).then(json => {

From a32738c52ed6ac98fadb6a3702db7a3c779999e9 Mon Sep 17 00:00:00 2001
From: Manoj Kumar <manojkr.itbhu@gmail.com>
Date: Tue, 29 Jul 2025 11:41:30 +0530
Subject: [PATCH 84/94] Prevent infinite autoscaling (#11244)

* Prevent infinite autoscaling

* Update server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java   | 2 ++
 .../network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java     | 9 +++++++++
 .../cloud/configuration/ConfigurationManagerImpl.java    | 2 ++
 .../main/java/com/cloud/network/as/AutoScaleManager.java | 6 ++++++
 .../java/com/cloud/network/as/AutoScaleManagerImpl.java  | 8 +++++++-
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
index 4b25c63403e..409042e7e33 100644
--- a/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
+++ b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
@@ -35,4 +35,6 @@ public interface AutoScaleVmGroupVmMapDao extends GenericDao<AutoScaleVmGroupVmM
     public boolean removeByVm(long vmId);
 
     public boolean removeByGroup(long vmGroupId);
+
+    int getErroredInstanceCount(long vmGroupId);
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
index 8fca4c26f9a..6e47cfec577 100644
--- a/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
@@ -115,4 +115,13 @@ public class AutoScaleVmGroupVmMapDaoImpl extends GenericDaoBase<AutoScaleVmGrou
         sc.setParameters("vmGroupId", vmGroupId);
         return remove(sc) >= 0;
     }
+
+    @Override
+    public int getErroredInstanceCount(long vmGroupId) {
+        SearchCriteria<Integer> sc = CountBy.create();
+        sc.setParameters("vmGroupId", vmGroupId);
+        sc.setJoinParameters("vmSearch", "states", State.Error);
+        final List<Integer> results = customSearch(sc, null);
+        return results.get(0);
+    }
 }
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 4c03122e463..b10b6950340 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -47,6 +47,7 @@ import javax.naming.ConfigurationException;
 
 
 import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.network.as.AutoScaleManager;
 import com.cloud.user.AccountManagerImpl;
 import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.host.HostTagVO;
@@ -570,6 +571,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         configValuesForValidation.add(UserDataManager.VM_USERDATA_MAX_LENGTH_STRING);
         configValuesForValidation.add(UnmanagedVMsManager.RemoteKvmInstanceDisksCopyTimeout.key());
         configValuesForValidation.add(UnmanagedVMsManager.ConvertVmwareInstanceToKvmTimeout.key());
+        configValuesForValidation.add(AutoScaleManager.AutoScaleErroredInstanceThreshold.key());
     }
 
     private void weightBasedParametersForValidation() {
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManager.java b/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
index cf6aab6a7bb..26598879a51 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
@@ -38,6 +38,12 @@ public interface AutoScaleManager extends AutoScaleService {
             "The Number of worker threads to scan the autoscale vm groups.",
             false);
 
+    ConfigKey<Integer> AutoScaleErroredInstanceThreshold = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Integer.class,
+            "autoscale.errored.instance.threshold",
+            "10",
+            "The number of Error Instances allowed in autoscale vm groups for scale up.",
+            true);
+
     void checkAutoScaleUser(Long autoscaleUserId, long accountId);
 
     boolean deleteAutoScaleVmGroupsByAccount(Long accountId);
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index 5bbd85c2415..8e6b7222da2 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1716,6 +1716,11 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
             s_logger.warn("number of VM will greater than the maximum in this group if scaling up, so do nothing more");
             return false;
         }
+        int erroredInstanceCount = autoScaleVmGroupVmMapDao.getErroredInstanceCount(asGroup.getId());
+        if (erroredInstanceCount > AutoScaleManager.AutoScaleErroredInstanceThreshold.value()) {
+            s_logger.warn("Number of Errored Instances are greater than the threshold in this group for scaling up, so do nothing more");
+            return false;
+        }
         return true;
     }
 
@@ -2202,7 +2207,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         return new ConfigKey<?>[] {
                 AutoScaleStatsInterval,
                 AutoScaleStatsCleanupDelay,
-                AutoScaleStatsWorker
+                AutoScaleStatsWorker,
+                AutoScaleErroredInstanceThreshold
         };
     }
 

From b92c1965b97d2c1c92abd231e9fef29fddd00efa Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Tue, 29 Jul 2025 17:41:22 +1000
Subject: [PATCH 85/94] README: add `Contributors Avatars` and `Star History`
 (#11311)

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index f66a4dc6f97..28d7d7396f4 100644
--- a/README.md
+++ b/README.md
@@ -160,3 +160,11 @@ The following provides more details on the included cryptographic software:
 * CloudStack makes use of the Bouncy Castle general-purpose encryption library.
 * CloudStack can optionally interact with and control OpenSwan-based VPNs.
 * CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.
+
+## Star History
+
+[![Apache CloudStack Star History](https://api.star-history.com/svg?repos=apache/cloudstack&type=Date)](https://www.star-history.com/#apache/cloudstack&Date)
+
+## Contributors
+
+[![Apache CloudStack Contributors](https://contrib.rocks/image?repo=apache/cloudstack&anon=0&max=500)](https://github.com/apache/cloudstack/graphs/contributors)

From f6ad184ea2d3195adfd35ef559a167c84382862e Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Tue, 29 Jul 2025 13:46:24 +0530
Subject: [PATCH 86/94] Feature: Add support for GPU with KVM hosts (#11143)

This PR allows attaching of GPU devices via PCI, mdev or VF to an Instance for KVM.

It allows the operator to discover the GPU devices on the KVM host and create a Compute Offering with GPU support based on the available GPU devices on the host. Once the operator has created the Compute offering, it can be used by users to launch Instances with GPU devices.
---
 .github/workflows/ci.yml                      |    1 +
 .../agent/properties/AgentProperties.java     |   27 +
 .../com/cloud/agent/api/VgpuTypesInfo.java    |  164 +-
 .../com/cloud/agent/api/to/GPUDeviceTO.java   |   33 +-
 .../com/cloud/configuration/Resource.java     |    3 +-
 .../main/java/com/cloud/event/EventTypes.java |   33 +
 .../com/cloud/offering/ServiceOffering.java   |    4 +
 .../com/cloud/user/ResourceLimitService.java  |   12 +-
 .../apache/cloudstack/api/ApiConstants.java   |   16 +
 .../org/apache/cloudstack/api/BaseCmd.java    |    3 +
 .../command/admin/gpu/CreateGpuCardCmd.java   |  122 ++
 .../command/admin/gpu/CreateGpuDeviceCmd.java |  123 ++
 .../admin/gpu/CreateVgpuProfileCmd.java       |  131 ++
 .../command/admin/gpu/DeleteGpuCardCmd.java   |   75 +
 .../command/admin/gpu/DeleteGpuDeviceCmd.java |   78 +
 .../admin/gpu/DeleteVgpuProfileCmd.java       |   76 +
 .../admin/gpu/DiscoverGpuDevicesCmd.java      |   63 +
 .../admin/gpu/ListGpuDevicesCmdByAdmin.java   |   74 +
 .../command/admin/gpu/ManageGpuDeviceCmd.java |   78 +
 .../admin/gpu/UnmanageGpuDeviceCmd.java       |   79 +
 .../command/admin/gpu/UpdateGpuCardCmd.java   |   99 ++
 .../command/admin/gpu/UpdateGpuDeviceCmd.java |  109 ++
 .../admin/gpu/UpdateVgpuProfileCmd.java       |  129 ++
 .../offering/CreateServiceOfferingCmd.java    |   32 +
 .../api/command/user/gpu/ListGpuCardsCmd.java |   96 ++
 .../command/user/gpu/ListGpuDevicesCmd.java   |   65 +
 .../command/user/gpu/ListVgpuProfilesCmd.java |   80 +
 .../offering/ListServiceOfferingsCmd.java     |   22 +
 .../api/command/user/vm/ListVMsCmd.java       |   10 +
 .../api/response/AccountResponse.java         |   27 +
 .../api/response/DomainResponse.java          |   24 +
 .../api/response/GpuCardResponse.java         |  109 ++
 .../api/response/GpuDeviceResponse.java       |  227 +++
 .../cloudstack/api/response/HostResponse.java |   24 +
 .../api/response/ProjectResponse.java         |   27 +
 .../ResourceLimitAndCountResponse.java        |    6 +
 .../api/response/ServiceOfferingResponse.java |  120 ++
 .../api/response/UserVmResponse.java          |  108 ++
 .../api/response/VgpuProfileResponse.java     |  135 ++
 .../cloudstack/api/response/ZoneResponse.java |   24 +
 .../org/apache/cloudstack/gpu/GpuCard.java    |   69 +
 .../org/apache/cloudstack/gpu/GpuDevice.java  |   42 +
 .../org/apache/cloudstack/gpu/GpuService.java |  157 ++
 .../apache/cloudstack/gpu/VgpuProfile.java    |   74 +
 .../admin/gpu/CreateGpuCardCmdTest.java       |   90 +
 .../admin/gpu/CreateGpuDeviceCmdTest.java     |  100 ++
 .../admin/gpu/CreateVgpuProfileCmdTest.java   |  108 ++
 .../admin/gpu/DeleteGpuCardCmdTest.java       |   45 +
 .../admin/gpu/DeleteGpuDeviceCmdTest.java     |   47 +
 .../admin/gpu/DeleteVgpuProfileCmdTest.java   |   45 +
 .../admin/gpu/DiscoverGpuDevicesCmdTest.java  |   38 +
 .../gpu/ListGpuDevicesCmdByAdminTest.java     |   65 +
 .../admin/gpu/ManageGpuDeviceCmdTest.java     |   47 +
 .../admin/gpu/UnmanageGpuDeviceCmdTest.java   |   47 +
 .../admin/gpu/UpdateGpuCardCmdTest.java       |   72 +
 .../admin/gpu/UpdateGpuDeviceCmdTest.java     |   91 +
 .../admin/gpu/UpdateVgpuProfileCmdTest.java   |  108 ++
 .../CreateServiceOfferingCmdTest.java         |   19 +
 .../command/user/gpu/ListGpuCardsCmdTest.java |   82 +
 .../user/gpu/ListGpuDevicesCmdTest.java       |   36 +
 .../user/gpu/ListVgpuProfilesCmdTest.java     |   63 +
 .../cloud/agent/api/GetGPUStatsAnswer.java    |   17 +
 .../agent/api/StartupRoutingCommand.java      |   11 +-
 .../java/com/cloud/resource/Discoverer.java   |    1 -
 .../com/cloud/resource/ResourceManager.java   |   47 +-
 .../cloud/vm/VirtualMachineManagerImpl.java   |   23 +-
 .../vm/VirtualMachineManagerImplTest.java     |    3 +
 .../configuration/dao/ResourceCountDao.java   |   14 -
 .../dao/ResourceCountDaoImpl.java             |   13 -
 .../main/java/com/cloud/gpu/GpuCardVO.java    |  147 ++
 .../main/java/com/cloud/gpu/GpuDeviceVO.java  |  200 +++
 .../main/java/com/cloud/gpu/VGPUTypesVO.java  |   32 +-
 .../java/com/cloud/gpu/VgpuProfileVO.java     |  191 +++
 .../java/com/cloud/gpu/dao/GpuCardDao.java    |   39 +
 .../com/cloud/gpu/dao/GpuCardDaoImpl.java     |  122 ++
 .../java/com/cloud/gpu/dao/GpuDeviceDao.java  |   71 +
 .../com/cloud/gpu/dao/GpuDeviceDaoImpl.java   |  260 +++
 .../com/cloud/gpu/dao/HostGpuGroupsDao.java   |   12 +
 .../cloud/gpu/dao/HostGpuGroupsDaoImpl.java   |   78 +
 .../com/cloud/gpu/dao/VGPUTypesDaoImpl.java   |   59 +-
 .../com/cloud/gpu/dao/VgpuProfileDao.java     |   33 +
 .../com/cloud/gpu/dao/VgpuProfileDaoImpl.java |  110 ++
 .../com/cloud/service/ServiceOfferingVO.java  |   37 +
 .../cloud/service/dao/ServiceOfferingDao.java |    3 +
 .../service/dao/ServiceOfferingDaoImpl.java   |    9 +
 .../java/com/cloud/vm/dao/UserVmDaoImpl.java  |    1 +
 .../com/cloud/vm/dao/VMInstanceDaoImpl.java   |   32 +-
 ...spring-engine-schema-core-daos-context.xml |    3 +
 .../META-INF/db/schema-42010to42100.sql       |   62 +
 .../META-INF/db/views/cloud.account_view.sql  |    8 +
 .../META-INF/db/views/cloud.domain_view.sql   |    8 +
 .../db/views/cloud.service_offering_view.sql  |   16 +
 .../META-INF/db/views/cloud.user_vm_view.sql  |   15 +-
 .../com/cloud/gpu/dao/GpuCardDaoImplTest.java |   57 +
 .../cloud/gpu/dao/GpuDeviceDaoImplTest.java   |  277 +++
 .../cloud/gpu/dao/VgpuProfileDaoImplTest.java |   70 +
 .../resource/LibvirtComputingResource.java    |  222 ++-
 .../kvm/resource/LibvirtGpuDef.java           |  102 ++
 .../kvm/resource/LibvirtKvmAgentHook.java     |   89 +-
 .../LibvirtGetGPUStatsCommandWrapper.java     |   37 +
 .../wrapper/LibvirtMigrateCommandWrapper.java |  117 ++
 .../LibvirtComputingResourceTest.java         |  351 +++-
 .../kvm/resource/LibvirtGpuDefTest.java       |  142 ++
 .../kvm/resource/LibvirtKvmAgentHookTest.java |   43 +
 .../LibvirtMigrateCommandWrapperTest.java     |  219 +++
 .../cloud/agent/manager/MockAgentManager.java |    7 +
 .../agent/manager/MockAgentManagerImpl.java   |  194 ++-
 .../agent/manager/MockVmManagerImpl.java      |   60 +-
 .../agent/manager/SimulatorManagerImpl.java   |    5 +-
 .../cloud/resource/SimulatorDiscoverer.java   |    2 +
 .../com/cloud/simulator/MockGpuDevice.java    |   42 +
 .../com/cloud/simulator/MockGpuDeviceVO.java  |  313 ++++
 .../cloud/simulator/dao/MockGpuDeviceDao.java |   43 +
 .../simulator/dao/MockGpuDeviceDaoImpl.java   |   67 +
 .../core/spring-simulator-core-context.xml    |    1 +
 .../metrics/PrometheusExporterImpl.java       |   11 +
 scripts/vm/hypervisor/kvm/gpudiscovery.sh     |  734 ++++++++
 .../allocator/impl/FirstFitAllocator.java     |   35 +-
 .../java/com/cloud/api/ApiResponseHelper.java |   14 +-
 .../com/cloud/api/query/QueryManagerImpl.java |   21 +
 .../cloud/api/query/ViewResponseHelper.java   |    7 +
 .../api/query/dao/AccountJoinDaoImpl.java     |   13 +
 .../api/query/dao/DataCenterJoinDaoImpl.java  |   11 +
 .../api/query/dao/DomainJoinDaoImpl.java      |   13 +
 .../cloud/api/query/dao/HostJoinDaoImpl.java  |    6 +
 .../query/dao/ServiceOfferingJoinDaoImpl.java |   10 +
 .../api/query/dao/UserVmJoinDaoImpl.java      |   30 +-
 .../com/cloud/api/query/vo/AccountJoinVO.java |   14 +
 .../com/cloud/api/query/vo/DomainJoinVO.java  |   21 +
 .../api/query/vo/ServiceOfferingJoinVO.java   |   84 +
 .../com/cloud/api/query/vo/UserVmJoinVO.java  |   78 +
 .../ConfigurationManagerImpl.java             |   31 +-
 .../deploy/DeploymentPlanningManagerImpl.java |   11 +-
 .../com/cloud/deploy/FirstFitPlanner.java     |    9 +-
 .../cloud/hypervisor/HypervisorGuruBase.java  |   25 +-
 .../cloud/resource/ResourceManagerImpl.java   |  161 +-
 .../ResourceLimitManagerImpl.java             |  123 +-
 .../cloud/server/ManagementServerImpl.java    |   35 +-
 .../com/cloud/storage/StorageManagerImpl.java |    2 +-
 .../java/com/cloud/vm/UserVmManagerImpl.java  |   42 +-
 .../apache/cloudstack/gpu/GpuServiceImpl.java | 1385 +++++++++++++++
 .../spring-server-core-managers-context.xml   |    2 +
 .../allocator/impl/FirstFitAllocatorTest.java |   18 +-
 .../DeploymentPlanningManagerImplTest.java    |    6 +
 .../resource/MockResourceManagerImpl.java     |   21 +-
 .../ResourceLimitManagerImplTest.java         |   88 +
 .../com/cloud/vm/FirstFitPlannerTest.java     |    1 +
 .../vpc/MockResourceLimitManagerImpl.java     |   15 +
 .../cloudstack/gpu/GpuServiceImplTest.java    | 1495 +++++++++++++++++
 setup/db/create-schema-simulator.sql          |   28 +
 .../smoke/test_deploy_vgpu_enabled_vm.py      |  233 ++-
 tools/apidoc/gen_toc.py                       |    2 +
 tools/marvin/marvin/lib/base.py               |   95 ++
 ui/public/locales/en.json                     |   71 +-
 ui/src/components/view/GPUDevicesTab.vue      |  902 ++++++++++
 ui/src/components/view/GPUSummaryTab.vue      |  301 ++++
 ui/src/components/view/GPUTab.vue             |  440 +++++
 ui/src/components/view/InfoCard.vue           |   52 +
 ui/src/components/view/ListView.vue           |  621 +++++--
 ui/src/components/view/ResourceCountUsage.vue |    3 +-
 ui/src/components/view/SearchView.vue         |  104 +-
 ui/src/components/view/VgpuProfilesTab.vue    |  405 +++++
 ui/src/components/widgets/Status.vue          |    6 +
 ui/src/config/section/compute.js              |    4 +-
 ui/src/config/section/config.js               |   91 +
 ui/src/config/section/infra.js                |   21 +
 ui/src/config/section/infra/hosts.js          |    6 +-
 ui/src/config/section/infra/zones.js          |    2 +-
 ui/src/config/section/offering.js             |    6 +-
 ui/src/core/ext.js                            |    4 +-
 ui/src/core/lazy_lib/icons_use.js             |    2 +
 ui/src/views/AutogenView.vue                  |  239 ++-
 .../views/compute/CreateAutoScaleVmGroup.vue  |    1 +
 ui/src/views/compute/DeployVM.vue             |   17 +-
 ui/src/views/compute/DeployVnfAppliance.vue   |    1 +
 ui/src/views/compute/InstanceTab.vue          |   11 +
 ui/src/views/compute/MigrateWizard.vue        |    3 +-
 ui/src/views/compute/ScaleVM.vue              |    1 +
 .../wizard/ComputeOfferingSelection.vue       |  105 +-
 ui/src/views/dashboard/UsageDashboard.vue     |   13 +-
 ui/src/views/offering/AddComputeOffering.vue  |  211 ++-
 .../unit/views/compute/MigrateWizard.spec.js  |   10 +-
 .../java/com/cloud/utils/script/Script.java   |    1 -
 183 files changed, 16229 insertions(+), 605 deletions(-)
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GpuCardResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GpuDeviceResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/VgpuProfileResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuDevice.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuService.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/gpu/VgpuProfile.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdminTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmdTest.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/GpuDeviceVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/VgpuProfileVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDaoImpl.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java
 create mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/GpuCardDaoImplTest.java
 create mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/GpuDeviceDaoImplTest.java
 create mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/VgpuProfileDaoImplTest.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDef.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetGPUStatsCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java
 create mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDevice.java
 create mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDeviceVO.java
 create mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDao.java
 create mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDaoImpl.java
 create mode 100755 scripts/vm/hypervisor/kvm/gpudiscovery.sh
 create mode 100644 server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/gpu/GpuServiceImplTest.java
 create mode 100644 ui/src/components/view/GPUDevicesTab.vue
 create mode 100644 ui/src/components/view/GPUSummaryTab.vue
 create mode 100644 ui/src/components/view/GPUTab.vue
 create mode 100644 ui/src/components/view/VgpuProfilesTab.vue

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d1a295e6149..8c61ca8e4dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,6 +140,7 @@ jobs:
                   smoke/test_vm_deployment_planner
                   smoke/test_vm_strict_host_tags
                   smoke/test_vm_schedule
+                  smoke/test_deploy_vgpu_enabled_vm
                   smoke/test_vm_life_cycle
                   smoke/test_vm_lifecycle_unmanage_import
                   smoke/test_vm_snapshot_kvm
diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
index 68255e30c75..47255762a05 100644
--- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
+++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -221,6 +221,15 @@ public class AgentProperties{
      */
     public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_XML_TRANSFORMER_SCRIPT = new Property<>("agent.hooks.libvirt_vm_xml_transformer.script", "libvirt-vm-xml-transformer.groovy");
 
+    /**
+     * This property is used with the agent.hooks.basedir property to define the Libvirt VM XML transformer shell script.<br>
+     * The shell script is used to execute the Libvirt VM XML transformer script.<br>
+     * For more information see the agent.properties file.<br>
+     * Data type: String.<br>
+     * Default value: <code>libvirt-vm-xml-transformer.sh</code>
+     */
+    public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_XML_TRANSFORMER_SHELL_SCRIPT = new Property<>("agent.hooks.libvirt_vm_xml_transformer.shell_script", "libvirt-vm-xml-transformer.sh");
+
     /**
      * This property is used with the agent.hooks.basedir and agent.hooks.libvirt_vm_xml_transformer.script properties to define the Libvirt VM XML transformer method.<br>
      * Libvirt XML transformer hook does XML-to-XML transformation.<br>
@@ -241,6 +250,15 @@ public class AgentProperties{
      */
     public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_ON_START_SCRIPT = new Property<>("agent.hooks.libvirt_vm_on_start.script", "libvirt-vm-state-change.groovy");
 
+    /**
+     * This property is used with the agent.hooks.basedir property to define the Libvirt VM on start shell script.<br>
+     * The shell script is used to execute the Libvirt VM on start script.<br>
+     * For more information see the agent.properties file.<br>
+     * Data type: String.<br>
+     * Default value: <code>libvirt-vm-state-change.sh</code>
+     */
+    public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_ON_START_SHELL_SCRIPT = new Property<>("agent.hooks.libvirt_vm_on_start.shell_script", "libvirt-vm-state-change.sh");
+
     /**
      * This property is used with the agent.hooks.basedir and agent.hooks.libvirt_vm_on_start.script properties to define the Libvirt VM on start method.<br>
      * The hook is called right after Libvirt successfully launched the VM.<br>
@@ -260,6 +278,15 @@ public class AgentProperties{
      */
     public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_ON_STOP_SCRIPT = new Property<>("agent.hooks.libvirt_vm_on_stop.script", "libvirt-vm-state-change.groovy");
 
+    /**
+     * This property is used with the agent.hooks.basedir property to define the Libvirt VM on stop shell script.<br>
+     * The shell script is used to execute the Libvirt VM on stop script.<br>
+     * For more information see the agent.properties file.<br>
+     * Data type: String.<br>
+     * Default value: <code>libvirt-vm-state-change.sh</code>
+     */
+    public static final Property<String> AGENT_HOOKS_LIBVIRT_VM_ON_STOP_SHELL_SCRIPT = new Property<>("agent.hooks.libvirt_vm_on_stop.shell_script", "libvirt-vm-state-change.sh");
+
     /**
      * This property is used with the agent.hooks.basedir and agent.hooks.libvirt_vm_on_stop.script properties to define the Libvirt VM on stop method.<br>
      * The hook is called right after libvirt successfully stopped the VM.<br>
diff --git a/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java b/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java
index 85ffc189820..5515a9c48bc 100644
--- a/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java
+++ b/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java
@@ -15,10 +15,24 @@
 // specific language governing permissions and limitations
 // under the License.
 package com.cloud.agent.api;
+
+import org.apache.cloudstack.gpu.GpuDevice;
+
 public class VgpuTypesInfo {
 
+    private boolean passthroughEnabled = true;
+    private GpuDevice.DeviceType deviceType;
+    private String parentBusAddress;
+    private String busAddress;
+    private String numaNode;
+    private String pciRoot;
+    private String deviceId;
+    private String deviceName;
+    private String vendorId;
+    private String vendorName;
     private String modelName;
     private String groupName;
+    private String vmName;
     private Long maxHeads;
     private Long videoRam;
     private Long maxResolutionX;
@@ -26,6 +40,7 @@ public class VgpuTypesInfo {
     private Long maxVgpuPerGpu;
     private Long remainingCapacity;
     private Long maxCapacity;
+    private boolean display = false;
 
     public String getModelName() {
         return modelName;
@@ -39,22 +54,42 @@ public class VgpuTypesInfo {
         return videoRam;
     }
 
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
     public Long getMaxHeads() {
         return maxHeads;
     }
 
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
     public Long getMaxResolutionX() {
         return maxResolutionX;
     }
 
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
     public Long getMaxResolutionY() {
         return maxResolutionY;
     }
 
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+
     public Long getMaxVpuPerGpu() {
         return maxVgpuPerGpu;
     }
 
+    public void setMaxVgpuPerGpu(Long maxVgpuPerGpu) {
+        this.maxVgpuPerGpu = maxVgpuPerGpu;
+    }
+
     public Long getRemainingCapacity() {
         return remainingCapacity;
     }
@@ -71,8 +106,133 @@ public class VgpuTypesInfo {
         this.maxCapacity = maxCapacity;
     }
 
-    public VgpuTypesInfo(String groupName, String modelName, Long videoRam, Long maxHeads, Long maxResolutionX, Long maxResolutionY, Long maxVgpuPerGpu,
-            Long remainingCapacity, Long maxCapacity) {
+    public boolean isPassthroughEnabled() {
+        return passthroughEnabled;
+    }
+
+    public void setPassthroughEnabled(boolean passthroughEnabled) {
+        this.passthroughEnabled = passthroughEnabled;
+    }
+
+    public GpuDevice.DeviceType getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(GpuDevice.DeviceType deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getParentBusAddress() {
+        return parentBusAddress;
+    }
+
+    public void setParentBusAddress(String parentBusAddress) {
+        this.parentBusAddress = parentBusAddress;
+    }
+
+    public String getBusAddress() {
+        return busAddress;
+    }
+
+    public void setBusAddress(String busAddress) {
+        this.busAddress = busAddress;
+    }
+
+    public String getNumaNode() {
+        return numaNode;
+    }
+
+    public void setNumaNode(String numaNode) {
+        this.numaNode = numaNode;
+    }
+
+    public String getPciRoot() {
+        return pciRoot;
+    }
+
+    public void setPciRoot(String pciRoot) {
+        this.pciRoot = pciRoot;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public boolean isDisplay() {
+        return display;
+    }
+
+    public void setDisplay(boolean display) {
+        this.display = display;
+    }
+
+    public VgpuTypesInfo(GpuDevice.DeviceType deviceType, String groupName, String modelName, String busAddress,
+            String vendorId, String vendorName, String deviceId, String deviceName, String numaNode, String pciRoot
+    ) {
+        this.deviceType = deviceType;
+        this.groupName = groupName;
+        this.modelName = modelName;
+        this.busAddress = busAddress;
+        this.deviceId = deviceId;
+        this.deviceName = deviceName;
+        this.vendorId = vendorId;
+        this.vendorName = vendorName;
+        this.numaNode = numaNode;
+        this.pciRoot = pciRoot;
+    }
+
+    public VgpuTypesInfo(GpuDevice.DeviceType deviceType, String groupName, String modelName, String busAddress,
+                         String vendorId, String vendorName, String deviceId, String deviceName
+    ) {
+        this.deviceType = deviceType;
+        this.groupName = groupName;
+        this.modelName = modelName;
+        this.busAddress = busAddress;
+        this.deviceId = deviceId;
+        this.deviceName = deviceName;
+        this.vendorId = vendorId;
+        this.vendorName = vendorName;
+    }
+
+    public VgpuTypesInfo(String groupName, String modelName, Long videoRam, Long maxHeads, Long maxResolutionX,
+            Long maxResolutionY, Long maxVgpuPerGpu, Long remainingCapacity, Long maxCapacity
+    ) {
         this.groupName = groupName;
         this.modelName = modelName;
         this.videoRam = videoRam;
diff --git a/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java b/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java
index 4afe080477b..6e9cee06dd3 100644
--- a/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java
@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.agent.api.to;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import com.cloud.agent.api.VgpuTypesInfo;
 
@@ -24,9 +26,23 @@ public class GPUDeviceTO {
 
     private String gpuGroup;
     private String vgpuType;
+    private int gpuCount;
     private HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails = new HashMap<String, HashMap<String, VgpuTypesInfo>>();
+    private List<VgpuTypesInfo> gpuDevices = new ArrayList<>();
 
-    public GPUDeviceTO( String gpuGroup, String vgpuType, HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails) {
+    public GPUDeviceTO(String gpuGroup, String vgpuType, int gpuCount,
+                       HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails,
+                       List<VgpuTypesInfo> gpuDevices) {
+        this.gpuGroup = gpuGroup;
+        this.vgpuType = vgpuType;
+        this.groupDetails = groupDetails;
+        this.gpuCount = gpuCount;
+        this.gpuDevices = gpuDevices;
+
+    }
+
+    public GPUDeviceTO(String gpuGroup, String vgpuType,
+                       HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails) {
         this.gpuGroup = gpuGroup;
         this.vgpuType = vgpuType;
         this.groupDetails = groupDetails;
@@ -48,6 +64,14 @@ public class GPUDeviceTO {
         this.vgpuType = vgpuType;
     }
 
+    public int getGpuCount() {
+        return gpuCount;
+    }
+
+    public void setGpuCount(int gpuCount) {
+        this.gpuCount = gpuCount;
+    }
+
     public HashMap<String, HashMap<String, VgpuTypesInfo>> getGroupDetails() {
         return groupDetails;
     }
@@ -56,4 +80,11 @@ public class GPUDeviceTO {
         this.groupDetails = groupDetails;
     }
 
+    public List<VgpuTypesInfo> getGpuDevices() {
+        return gpuDevices;
+    }
+
+    public void setGpuDevices(List<VgpuTypesInfo> gpuDevices) {
+        this.gpuDevices = gpuDevices;
+    }
 }
diff --git a/api/src/main/java/com/cloud/configuration/Resource.java b/api/src/main/java/com/cloud/configuration/Resource.java
index c7bf44de76c..97be7f9d64c 100644
--- a/api/src/main/java/com/cloud/configuration/Resource.java
+++ b/api/src/main/java/com/cloud/configuration/Resource.java
@@ -37,7 +37,8 @@ public interface Resource {
         backup("backup", 12),
         backup_storage("backup_storage", 13),
         bucket("bucket", 14),
-        object_storage("object_storage", 15);
+        object_storage("object_storage", 15),
+        gpu("gpu", 16);
 
         private String name;
         private int ordinal;
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index beed8432df2..a8777d5c75b 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -31,6 +31,9 @@ import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
 import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.extension.ExtensionCustomAction;
+import org.apache.cloudstack.gpu.GpuCard;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.cloudstack.gpu.VgpuProfile;
 import org.apache.cloudstack.ha.HAConfig;
 import org.apache.cloudstack.network.BgpPeer;
 import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
@@ -378,6 +381,21 @@ public class EventTypes {
     public static final String EVENT_DISK_OFFERING_EDIT = "DISK.OFFERING.EDIT";
     public static final String EVENT_DISK_OFFERING_DELETE = "DISK.OFFERING.DELETE";
 
+    // GPU Cards
+    public static final String EVENT_GPU_CARD_CREATE = "GPU.CARD.CREATE";
+    public static final String EVENT_GPU_CARD_EDIT = "GPU.CARD.EDIT";
+    public static final String EVENT_GPU_CARD_DELETE = "GPU.CARD.DELETE";
+
+    // vGPU Profile
+    public static final String EVENT_VGPU_PROFILE_CREATE = "VGPU.PROFILE.CREATE";
+    public static final String EVENT_VGPU_PROFILE_EDIT = "VGPU.PROFILE.EDIT";
+    public static final String EVENT_VGPU_PROFILE_DELETE = "VGPU.PROFILE.DELETE";
+
+    // GPU Devices
+    public static final String EVENT_GPU_DEVICE_CREATE = "GPU.DEVICE.CREATE";
+    public static final String EVENT_GPU_DEVICE_EDIT = "GPU.DEVICE.EDIT";
+    public static final String EVENT_GPU_DEVICE_DELETE = "GPU.DEVICE.DELETE";
+
     // Network offerings
     public static final String EVENT_NETWORK_OFFERING_CREATE = "NETWORK.OFFERING.CREATE";
     public static final String EVENT_NETWORK_OFFERING_ASSIGN = "NETWORK.OFFERING.ASSIGN";
@@ -1026,6 +1044,21 @@ public class EventTypes {
         entityEventDetails.put(EVENT_DISK_OFFERING_EDIT, DiskOffering.class);
         entityEventDetails.put(EVENT_DISK_OFFERING_DELETE, DiskOffering.class);
 
+        // GPU Cards
+        entityEventDetails.put(EVENT_GPU_CARD_CREATE, GpuCard.class);
+        entityEventDetails.put(EVENT_GPU_CARD_EDIT, GpuCard.class);
+        entityEventDetails.put(EVENT_GPU_CARD_DELETE, GpuCard.class);
+
+        // vGPU Profiles
+        entityEventDetails.put(EVENT_VGPU_PROFILE_CREATE, VgpuProfile.class);
+        entityEventDetails.put(EVENT_VGPU_PROFILE_EDIT, VgpuProfile.class);
+        entityEventDetails.put(EVENT_VGPU_PROFILE_DELETE, VgpuProfile.class);
+
+        // GPU Devices
+        entityEventDetails.put(EVENT_GPU_DEVICE_CREATE, GpuDevice.class);
+        entityEventDetails.put(EVENT_GPU_DEVICE_EDIT, GpuDevice.class);
+        entityEventDetails.put(EVENT_GPU_DEVICE_DELETE, GpuDevice.class);
+
         // Network offerings
         entityEventDetails.put(EVENT_NETWORK_OFFERING_CREATE, NetworkOffering.class);
         entityEventDetails.put(EVENT_NETWORK_OFFERING_ASSIGN, NetworkOffering.class);
diff --git a/api/src/main/java/com/cloud/offering/ServiceOffering.java b/api/src/main/java/com/cloud/offering/ServiceOffering.java
index acb7a9f1cf9..532123e4373 100644
--- a/api/src/main/java/com/cloud/offering/ServiceOffering.java
+++ b/api/src/main/java/com/cloud/offering/ServiceOffering.java
@@ -142,4 +142,8 @@ public interface ServiceOffering extends InfrastructureEntity, InternalIdentity,
     Boolean getDiskOfferingStrictness();
 
     void setDiskOfferingStrictness(boolean diskOfferingStrictness);
+
+    Long getVgpuProfileId();
+
+    Integer getGpuCount();
 }
diff --git a/api/src/main/java/com/cloud/user/ResourceLimitService.java b/api/src/main/java/com/cloud/user/ResourceLimitService.java
index 2f4ad1347be..49b20fe2fef 100644
--- a/api/src/main/java/com/cloud/user/ResourceLimitService.java
+++ b/api/src/main/java/com/cloud/user/ResourceLimitService.java
@@ -50,8 +50,14 @@ public interface ResourceLimitService {
                 "The default maximum number of projects that can be created for an account",false);
     static final ConfigKey<Long> DefaultMaxDomainProjects = new ConfigKey<>("Domain Defaults",Long.class,"max.domain.projects","50",
                         "The default maximum number of projects that can be created for a domain",false);
+    static final ConfigKey<Long> DefaultMaxAccountGpus = new ConfigKey<>("Account Defaults",Long.class,"max.account.gpus","20",
+            "The default maximum number of GPU devices that can be used for an account", false);
+    static final ConfigKey<Long> DefaultMaxDomainGpus = new ConfigKey<>("Domain Defaults",Long.class,"max.domain.gpus","20",
+            "The default maximum number of GPU devices that can be used for a domain", false);
+    static final ConfigKey<Long> DefaultMaxProjectGpus = new ConfigKey<>("Project Defaults",Long.class,"max.project.gpus","20",
+            "The default maximum number of GPU devices that can be used for a project", false);
 
-    static final List<ResourceType> HostTagsSupportingTypes = List.of(ResourceType.user_vm, ResourceType.cpu, ResourceType.memory);
+    static final List<ResourceType> HostTagsSupportingTypes = List.of(ResourceType.user_vm, ResourceType.cpu, ResourceType.memory, ResourceType.gpu);
     static final List<ResourceType> StorageTagsSupportingTypes = List.of(ResourceType.volume, ResourceType.primary_storage);
 
     /**
@@ -284,4 +290,8 @@ public interface ResourceLimitService {
     void incrementVmMemoryResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long memory);
     void decrementVmMemoryResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long memory);
 
+    void checkVmGpuResourceLimit(Account owner, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) throws ResourceAllocationException;
+    void incrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu);
+    void decrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu);
+
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 00382b76f32..4fef598d311 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -69,6 +69,7 @@ public class ApiConstants {
     public static final String BOOTABLE = "bootable";
     public static final String BIND_DN = "binddn";
     public static final String BIND_PASSWORD = "bindpass";
+    public static final String BUS_ADDRESS = "busaddress";
     public static final String BYTES_READ_RATE = "bytesreadrate";
     public static final String BYTES_READ_RATE_MAX = "bytesreadratemax";
     public static final String BYTES_READ_RATE_MAX_LENGTH = "bytesreadratemaxlength";
@@ -162,6 +163,7 @@ public class ApiConstants {
     public static final String DESTINATION_ZONE_ID = "destzoneid";
     public static final String DETAILS = "details";
     public static final String DEVICE_ID = "deviceid";
+    public static final String DEVICE_NAME = "devicename";
     public static final String DIRECT_DOWNLOAD = "directdownload";
     public static final String DISK = "disk";
     public static final String DISK_OFFERING_ID = "diskofferingid";
@@ -388,6 +390,7 @@ public class ApiConstants {
     public static final String NEW_START_IP = "newstartip";
     public static final String NEW_END_IP = "newendip";
     public static final String KUBERNETES_NODE_VERSION = "kubernetesnodeversion";
+    public static final String NUMA_NODE = "numanode";
     public static final String NUM_RETRIES = "numretries";
     public static final String OFFER_HA = "offerha";
     public static final String OS_DISTRIBUTION = "osdistribution";
@@ -404,6 +407,13 @@ public class ApiConstants {
     public static final String OS_TYPE_ID = "ostypeid";
     public static final String OS_DISPLAY_NAME = "osdisplayname";
     public static final String OS_NAME_FOR_HYPERVISOR = "osnameforhypervisor";
+    public static final String GPU_CARD_ID = "gpucardid";
+    public static final String GPU_CARD_NAME = "gpucardname";
+    public static final String GPU_COUNT = "gpucount";
+    public static final String GPU_DISPLAY = "gpudisplay";
+    public static final String GPU_DEVICE_TYPE = "gpudevicetype";
+    public static final String GPU_ENABLED = "gpuenabled";
+    public static final String MAX_VGPU_PER_PHYSICAL_GPU = "maxvgpuperphysicalgpu";
     public static final String GUEST_OS_LIST = "guestoslist";
     public static final String GUEST_OS_COUNT = "guestoscount";
     public static final String OS_MAPPING_CHECK_ENABLED = "osmappingcheckenabled";
@@ -415,9 +425,11 @@ public class ApiConstants {
     public static final String PARENT = "parent";
     public static final String PARENT_ID = "parentid";
     public static final String PARENT_DOMAIN_ID = "parentdomainid";
+    public static final String PARENT_GPU_DEVICE_ID = "parentgpudeviceid";
     public static final String PARENT_SUBNET = "parentsubnet";
     public static final String PARENT_TEMPLATE_ID = "parenttemplateid";
     public static final String PASSWORD = "password";
+    public static final String PCI_ROOT = "pciroot";
     public static final String CURRENT_PASSWORD = "currentpassword";
     public static final String SHOULD_UPDATE_PASSWORD = "update_passwd_on_host";
     public static final String PASSWORD_ENABLED = "passwordenabled";
@@ -588,6 +600,10 @@ public class ApiConstants {
     public static final String VALIDATION_FORMAT = "validationformat";
     public static final String VALUE = "value";
     public static final String VALUE_OPTIONS = "valueoptions";
+    public static final String VENDOR_ID = "vendorid";
+    public static final String VENDOR_NAME = "vendorname";
+    public static final String VGPU_PROFILE_ID = "vgpuprofileid";
+    public static final String VGPU_PROFILE_NAME = "vgpuprofilename";
     public static final String VIRTUAL_MACHINE = "virtualmachine";
     public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
     public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
index 317d72eb971..8f47d51b19d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
@@ -39,6 +39,7 @@ import org.apache.cloudstack.affinity.AffinityGroupService;
 import org.apache.cloudstack.alert.AlertService;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gpu.GpuService;
 import org.apache.cloudstack.network.RoutedIpv4Manager;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
 import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
@@ -131,6 +132,8 @@ public abstract class BaseCmd {
     @Inject
     public UserVmService _userVmService;
     @Inject
+    public GpuService gpuService;
+    @Inject
     public ManagementService _mgr;
     @Inject
     public StorageService _storageService;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java
new file mode 100644
index 00000000000..2faad89bf67
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java
@@ -0,0 +1,122 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.gpu.GpuCard;
+
+
+@APICommand(name = "createGpuCard", description = "Creates a GPU card definition in the system",
+        responseObject = GpuCardResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0")
+public class CreateGpuCardCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.DEVICE_ID, type = CommandType.STRING, required = true,
+            description = "the device ID of the GPU card")
+    private String deviceId;
+
+    @Parameter(name = ApiConstants.DEVICE_NAME, type = CommandType.STRING, required = true,
+            description = "the device name of the GPU card")
+    private String deviceName;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true,
+            description = "the display name of the GPU card")
+    private String name;
+
+    @Parameter(name = ApiConstants.VENDOR_NAME, type = CommandType.STRING, required = true,
+            description = "the vendor name of the GPU card")
+    private String vendorName;
+
+    @Parameter(name = ApiConstants.VENDOR_ID, type = CommandType.STRING, required = true,
+            description = "the vendor ID of the GPU card")
+    private String vendorId;
+
+    // Optional parameters for the passthrough vGPU profile display properties
+    @Parameter(name = ApiConstants.VIDEORAM, type = CommandType.LONG,
+            description = "the video RAM size in MB for the passthrough vGPU profile")
+    private Long videoRam;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    @Override
+    public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException,
+            ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+        try {
+            GpuCard gpuCard = gpuService.createGpuCard(this);
+            if (gpuCard != null) {
+                GpuCardResponse response = new GpuCardResponse(gpuCard);
+                response.setResponseName(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create GPU card");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create GPU card: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java
new file mode 100644
index 00000000000..e6386082a44
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java
@@ -0,0 +1,123 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.StringUtils;
+
+
+@APICommand(name = "createGpuDevice", description = "Creates a GPU device manually on a host",
+            responseObject = GpuDeviceResponse.class, since = "4.21.0", requestHasSensitiveInfo = false,
+            responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
+public class CreateGpuDeviceCmd extends BaseCmd {
+
+    @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true,
+               description = "ID of the host where the GPU device is located")
+    private Long hostId;
+
+    @Parameter(name = ApiConstants.BUS_ADDRESS, type = CommandType.STRING, required = true,
+               description = "PCI bus address of the GPU device (e.g., 0000:01:00.0) or UUID for MDEV devices.")
+    private String busAddress;
+
+    @Parameter(name = ApiConstants.GPU_CARD_ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+               required = true, description = "ID of the GPU card type")
+    private Long gpuCardId;
+
+    @Parameter(name = ApiConstants.VGPU_PROFILE_ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class,
+               required = true, description = "ID of the vGPU profile")
+    private Long vgpuProfileId;
+
+    @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING,
+               description = "Type of GPU device (PCI, MDEV, VGPUOnly). Defaults to PCI.")
+    private String type;
+
+    @Parameter(name = ApiConstants.PARENT_GPU_DEVICE_ID, type = CommandType.UUID, entityType = GpuDeviceResponse.class,
+               description = "ID of the parent GPU device (for virtual GPU devices)")
+    private Long parentGpuDeviceId;
+
+    @Parameter(name = ApiConstants.NUMA_NODE, type = CommandType.STRING,
+            description = "NUMA node of the GPU device (e.g., 0, 1, etc.). This is optional and can be used to "
+                          + "specify the NUMA node for the GPU device which is used during allocation. Defaults to -1")
+    private String numaNode;
+
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public String getBusAddress() {
+        return busAddress;
+    }
+
+    public Long getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public GpuDevice.DeviceType getType() {
+        GpuDevice.DeviceType deviceType = GpuDevice.DeviceType.PCI;
+        if (StringUtils.isNotBlank(type)) {
+            deviceType = EnumUtils.getEnumIgnoreCase(GpuDevice.DeviceType.class, type);
+            if (deviceType == null) {
+                throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid GPU device type: " + type);
+            }
+        }
+        return deviceType;
+    }
+
+    public Long getParentGpuDeviceId() {
+        return parentGpuDeviceId;
+    }
+
+    public String getNumaNode() {
+        if (StringUtils.isBlank(numaNode)) {
+            return "-1"; // Default value for NUMA node
+        }
+        return numaNode;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            GpuDeviceResponse response = gpuService.createGpuDevice(this);
+            response.setResponseName(getCommandName());
+            setResponseObject(response);
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java
new file mode 100644
index 00000000000..3210773b6f4
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java
@@ -0,0 +1,131 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+
+
+@APICommand(name = "createVgpuProfile", description = "Creates a vGPU profile in the system",
+            responseObject = VgpuProfileResponse.class, requestHasSensitiveInfo = false,
+            responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin})
+public class CreateVgpuProfileCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true,
+               description = "the name of the vGPU profile")
+    private String name;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING,
+               description = "the description of the vGPU profile")
+    private String description;
+
+    @Parameter(name = ApiConstants.GPU_CARD_ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+               required = true, description = "the GPU card ID associated with this GPU device")
+    private Long cardId;
+
+    @Parameter(name = ApiConstants.MAX_VGPU_PER_PHYSICAL_GPU, type = CommandType.LONG,
+               description = "Max vGPU per physical GPU. This is used to calculate capacity.")
+    private Long maxVgpuPerPgpu;
+
+    @Parameter(name = ApiConstants.VIDEORAM, type = CommandType.LONG,
+               description = "the video RAM size in MB")
+    private Long videoRam;
+
+    @Parameter(name = ApiConstants.MAXHEADS, type = CommandType.LONG,
+               description = "the maximum number of display heads")
+    private Long maxHeads;
+
+    @Parameter(name = ApiConstants.MAXRESOLUTIONX, type = CommandType.LONG,
+               description = "the maximum X resolution")
+    private Long maxResolutionX;
+
+    @Parameter(name = ApiConstants.MAXRESOLUTIONY, type = CommandType.LONG,
+               description = "the maximum Y resolution")
+    private Long maxResolutionY;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public Long getMaxVgpuPerPgpu() {
+        return maxVgpuPerPgpu;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            VgpuProfileResponse response = gpuService.createVgpuProfile(this);
+            if (response != null) {
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vGPU profile");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+                    "Failed to create vGPU profile: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java
new file mode 100644
index 00000000000..9a510ecdead
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java
@@ -0,0 +1,75 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
+
+@APICommand(name = "deleteGpuCard", description = "Deletes a GPU card definition from the system",
+            responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+            since = "4.21.0", authorized = {RoleType.Admin})
+public class DeleteGpuCardCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuCardResponse.class, required = true,
+               description = "the ID of the GPU card")
+    private Long id;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            boolean success = gpuService.deleteGpuCard(this);
+            if (success) {
+                SuccessResponse response = new SuccessResponse(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete GPU card");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete GPU card: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java
new file mode 100644
index 00000000000..9224afc66ec
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java
@@ -0,0 +1,78 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
+import java.util.List;
+
+@APICommand(name = "deleteGpuDevice", description = "Deletes a vGPU profile from the system",
+        responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0", authorized = {RoleType.Admin})
+public class DeleteGpuDeviceCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+            entityType = GpuDeviceResponse.class, required = true,
+            description = "comma separated list of IDs of the GPU device")
+    private List<Long> ids;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            boolean success = gpuService.deleteGpuDevices(this);
+            if (success) {
+                SuccessResponse response = new SuccessResponse(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete vGPU profile");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+                    "Failed to delete vGPU profile: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java
new file mode 100644
index 00000000000..a09a04199f5
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java
@@ -0,0 +1,76 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+
+
+@APICommand(name = "deleteVgpuProfile", description = "Deletes a vGPU profile from the system",
+            responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+            since = "4.21.0", authorized = {RoleType.Admin})
+public class DeleteVgpuProfileCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class, required = true,
+               description = "the ID of the vGPU profile")
+    private Long id;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            boolean success = gpuService.deleteVgpuProfile(this);
+            if (success) {
+                SuccessResponse response = new SuccessResponse(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete vGPU profile");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+                    "Failed to delete vGPU profile: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java
new file mode 100644
index 00000000000..2ac07a9fb3a
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java
@@ -0,0 +1,63 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.context.CallContext;
+
+
+@APICommand(name = "discoverGpuDevices", description = "Discovers available GPU devices on a host",
+            responseObject = GpuDeviceResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+            since = "4.21.0", authorized = {RoleType.Admin})
+public class DiscoverGpuDevicesCmd extends BaseListCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = HostResponse.class, required = true,
+               description = "ID of the host")
+    private Long id;
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation //////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public void execute() {
+        CallContext.current().setEventDetails("Discovering GPU Devices on host id: " + getId());
+        ListResponse<GpuDeviceResponse> response = gpuService.discoverGpuDevices(this);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java
new file mode 100644
index 00000000000..b3c57713fcd
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java
@@ -0,0 +1,74 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuDevicesCmd;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+
+
+@APICommand(name = "listGpuDevices", description = "Lists all available GPU devices",
+        responseView = ResponseObject.ResponseView.Full,
+        responseObject = GpuDeviceResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0")
+public class ListGpuDevicesCmdByAdmin extends ListGpuDevicesCmd implements AdminCmd {
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuDeviceResponse.class,
+            description = "ID of the GPU device")
+    private Long id;
+
+    @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
+            description = "the host ID where the GPU device is attached")
+    private Long hostId;
+
+    @Parameter(name = ApiConstants.GPU_CARD_ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+            description = "the GPU card ID associated with the GPU device")
+    private Long gpuCardId;
+
+    @Parameter(name = ApiConstants.VGPU_PROFILE_ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class,
+            description = "the vGPU profile ID assigned to the GPU device")
+    private Long vgpuProfileId;
+
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public Long getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java
new file mode 100644
index 00000000000..5dfe6c3deee
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java
@@ -0,0 +1,78 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
+import java.util.List;
+
+@APICommand(name = "manageGpuDevice", description = "Manages a GPU device", responseObject = SuccessResponse.class,
+            requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.21.0",
+            authorized = {RoleType.Admin})
+public class ManageGpuDeviceCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+               entityType = GpuDeviceResponse.class, required = true,
+               description = "comma separated list of IDs of the GPU device")
+    private List<Long> ids;
+
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            if (gpuService.enableGpuDevice(this)) {
+                SuccessResponse response = new SuccessResponse();
+                response.setResponseName(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to enable GPU device");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to enable GPU device: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java
new file mode 100644
index 00000000000..46de23ec44b
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java
@@ -0,0 +1,79 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+
+import java.util.List;
+
+@APICommand(name = "unmanageGpuDevice", description = "Unmanage a GPU device", responseObject = SuccessResponse.class,
+            requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.21.0",
+            authorized = {RoleType.Admin})
+public class UnmanageGpuDeviceCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+               entityType = GpuDeviceResponse.class, required = true,
+               description = "comma separated list of IDs of the GPU device")
+    private List<Long> ids;
+
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            if (gpuService.disableGpuDevice(this)) {
+                SuccessResponse response = new SuccessResponse();
+                response.setResponseName(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disable GPU device");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+                    "Failed to disable GPU device: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java
new file mode 100644
index 00000000000..0061149a985
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java
@@ -0,0 +1,99 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.gpu.GpuCard;
+
+
+@APICommand(name = "updateGpuCard", description = "Updates a GPU card definition in the system",
+            responseObject = GpuCardResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+            since = "4.21.0", authorized = {RoleType.Admin})
+public class UpdateGpuCardCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuCardResponse.class, required = true,
+               description = "the ID of the GPU card")
+    private Long id;
+
+    @Parameter(name = ApiConstants.DEVICE_NAME, type = CommandType.STRING,
+               description = "the device name of the GPU card")
+    private String deviceName;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the display name of the GPU card")
+    private String name;
+
+    @Parameter(name = ApiConstants.VENDOR_NAME, type = CommandType.STRING,
+               description = "the vendor name of the GPU card")
+    private String vendorName;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            GpuCard gpuCard = gpuService.updateGpuCard(this);
+            if (gpuCard != null) {
+                GpuCardResponse response = new GpuCardResponse(gpuCard);
+                response.setResponseName(getCommandName());
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update GPU card");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update GPU card: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java
new file mode 100644
index 00000000000..5ad6e6e1a6f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java
@@ -0,0 +1,109 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.StringUtils;
+
+
+@APICommand(name = "updateGpuDevice", description = "Updates an existing GPU device",
+            responseObject = GpuDeviceResponse.class, since = "4.21.0", requestHasSensitiveInfo = false,
+            responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
+public class UpdateGpuDeviceCmd extends BaseCmd {
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuDeviceResponse.class, required = true,
+               description = "ID of the GPU device to update")
+    private Long id;
+
+    @Parameter(name = ApiConstants.GPU_CARD_ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+               description = "New GPU card ID")
+    private Long gpuCardId;
+
+    @Parameter(name = ApiConstants.VGPU_PROFILE_ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class,
+               description = "New vGPU profile ID")
+    private Long vgpuProfileId;
+
+    @Parameter(name = "type", type = CommandType.STRING, description = "New type of GPU device (PCI, MDEV, VGPUOnly)")
+    private String type;
+
+    @Parameter(name = "parentgpudeviceid", type = CommandType.UUID, entityType = GpuDeviceResponse.class,
+               description = "New parent GPU device ID (for virtual GPU devices)")
+    private Long parentGpuDeviceId;
+
+    @Parameter(name = ApiConstants.NUMA_NODE, type = CommandType.STRING,
+               description = "New NUMA node of the GPU device")
+    private String numaNode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public Long getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public GpuDevice.DeviceType getType() {
+        GpuDevice.DeviceType deviceType = null;
+        if (StringUtils.isNotBlank(type)) {
+            deviceType = EnumUtils.getEnumIgnoreCase(GpuDevice.DeviceType.class, type);
+            if (deviceType == null) {
+                throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid GPU device type: " + type);
+            }
+        }
+        return deviceType;
+    }
+
+    public Long getParentGpuDeviceId() {
+        return parentGpuDeviceId;
+    }
+
+    public String getNumaNode() {
+        return numaNode;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            GpuDeviceResponse response = gpuService.updateGpuDevice(this);
+            response.setResponseName(getCommandName());
+            setResponseObject(response);
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java
new file mode 100644
index 00000000000..c8d60739bd4
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java
@@ -0,0 +1,129 @@
+// 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.
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+
+
+@APICommand(name = "updateVgpuProfile", description = "Updates a vGPU profile in the system",
+            responseObject = VgpuProfileResponse.class, requestHasSensitiveInfo = false,
+            responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin})
+public class UpdateVgpuProfileCmd extends BaseCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class, required = true,
+               description = "the ID of the vGPU profile")
+    private Long id;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the vGPU profile")
+    private String profileName;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING,
+               description = "the description of the vGPU profile")
+    private String description;
+
+    @Parameter(name = ApiConstants.MAX_VGPU_PER_PHYSICAL_GPU, type = CommandType.LONG,
+               description = "the maximum number of vGPUs per physical GPU")
+    private Long maxVgpuPerPgpu;
+
+    @Parameter(name = ApiConstants.VIDEORAM, type = CommandType.LONG,
+               description = "the video RAM size in MB")
+    private Long videoRam;
+
+    @Parameter(name = ApiConstants.MAXHEADS, type = CommandType.LONG,
+               description = "the maximum number of display heads")
+    private Long maxHeads;
+
+    @Parameter(name = ApiConstants.MAXRESOLUTIONX, type = CommandType.LONG,
+               description = "the maximum X resolution")
+    private Long maxResolutionX;
+
+    @Parameter(name = ApiConstants.MAXRESOLUTIONY, type = CommandType.LONG,
+               description = "the maximum Y resolution")
+    private Long maxResolutionY;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getProfileName() {
+        return profileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Long getMaxVgpuPerPgpu() {
+        return maxVgpuPerPgpu;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    @Override
+    public void execute() {
+        try {
+            VgpuProfileResponse response = gpuService.updateVgpuProfile(this);
+            if (response != null) {
+                setResponseObject(response);
+            } else {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vGPU profile");
+            }
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+                    "Failed to update vGPU profile: " + e.getMessage());
+        }
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 019ed58febb..3d20ed50a5d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -32,6 +32,7 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
 import org.apache.cloudstack.api.response.VsphereStoragePoliciesResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
@@ -263,6 +264,25 @@ public class CreateServiceOfferingCmd extends BaseCmd {
             description = "Lease expiry action, valid values are STOP and DESTROY")
     private String leaseExpiryAction;
 
+    @Parameter(name = ApiConstants.VGPU_PROFILE_ID,
+            type = CommandType.UUID,
+            entityType = VgpuProfileResponse.class,
+            description = "the ID of the vGPU profile to which service offering should be mapped",
+            since = "4.21")
+    private Long vgpuProfileId;
+
+    @Parameter(name = ApiConstants.GPU_COUNT,
+            type = CommandType.INTEGER,
+            description = "Count of GPUs to be used with this service offering. This is applicable only when passed with vGPU profile.",
+            since = "4.21")
+    private Integer gpuCount;
+
+    @Parameter(name = ApiConstants.GPU_DISPLAY,
+            type = CommandType.BOOLEAN,
+            description = "Whether to enable GPU display for this service offering. This is applicable only when passed with vGPU profile. Defaults to false.",
+            since = "4.21")
+    private Boolean gpuDisplay;
+
     @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
             type = CommandType.MAP,
             description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
@@ -529,6 +549,18 @@ public class CreateServiceOfferingCmd extends BaseCmd {
         return Boolean.TRUE.equals(purgeResources);
     }
 
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
+    public Boolean getGpuDisplay() {
+        return Boolean.TRUE.equals(gpuDisplay);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java
new file mode 100644
index 00000000000..b035ecbe71b
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java
@@ -0,0 +1,96 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+
+@APICommand(name = "listGpuCards", description = "Lists all available GPU cards",
+        responseObject = GpuCardResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0")
+public class ListGpuCardsCmd extends BaseListCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+            description = "ID of the GPU card")
+    private Long id;
+
+    @Parameter(name = ApiConstants.VENDOR_NAME, type = CommandType.STRING,
+            description = "vendor name of the GPU card")
+    private String vendorName;
+
+    @Parameter(name = ApiConstants.VENDOR_ID, type = CommandType.STRING,
+            description = "vendor ID of the GPU card")
+    private String vendorId;
+
+    @Parameter(name = ApiConstants.DEVICE_ID, type = CommandType.STRING,
+            description = "device ID of the GPU card")
+    private String deviceId;
+
+    @Parameter(name = ApiConstants.DEVICE_NAME, type = CommandType.STRING,
+            description = "device name of the GPU card")
+    private String deviceName;
+
+    @Parameter(name = ApiConstants.ACTIVE_ONLY, type = CommandType.BOOLEAN,
+            description = "If true, only GPU cards which have a device will be listed. If false, all GPU cards will be listed.")
+    private Boolean activeOnly;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public boolean getActiveOnly() {
+        return Boolean.TRUE.equals(activeOnly);
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override public void execute() {
+        ListResponse<GpuCardResponse> response = gpuService.listGpuCards(this);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java
new file mode 100644
index 00000000000..19c92062851
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java
@@ -0,0 +1,65 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.command.user.UserCmd;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.context.CallContext;
+
+@APICommand(name = "listGpuDevices", description = "Lists all available GPU devices",
+        responseView = ResponseObject.ResponseView.Restricted,
+        responseObject = GpuDeviceResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListGpuDevicesCmd extends BaseListCmd implements UserCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class,
+            description = "the virtual machine ID to which the GPU device is allocated")
+    private Long vmId;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getVmId() {
+        return vmId;
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation //////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override
+    public void execute() {
+        CallContext.current().setEventDetails("Listing GPU devices");
+        ListResponse<GpuDeviceResponse> response = gpuService.listGpuDevices(this);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java
new file mode 100644
index 00000000000..85bf91d7aee
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java
@@ -0,0 +1,80 @@
+// 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.
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+
+@APICommand(name = "listVgpuProfiles", description = "Lists all available vGPU profiles",
+        responseObject = VgpuProfileResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.21.0")
+public class ListVgpuProfilesCmd extends BaseListCmd {
+
+    /// //////////////////////////////////////////////////
+    /// ///////////// API parameters /////////////////////
+    /// //////////////////////////////////////////////////
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VgpuProfileResponse.class,
+            description = "ID of the vGPU profile")
+    private Long id;
+
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "name of the vGPU profile")
+    private String name;
+
+    @Parameter(name = ApiConstants.GPU_CARD_ID, type = CommandType.UUID, entityType = GpuCardResponse.class,
+            description = "the GPU card ID associated with this GPU device")
+    private Long cardId;
+
+    @Parameter(name = ApiConstants.ACTIVE_ONLY, type = CommandType.BOOLEAN,
+            description = "If true, only vGPU profiles which have a device will be listed. If false, all vGPU profiles will be listed.")
+    private Boolean activeOnly;
+
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public boolean getActiveOnly() {
+        return Boolean.TRUE.equals(activeOnly);
+    }
+
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
+
+    @Override public void execute() {
+        ListResponse<VgpuProfileResponse> response = gpuService.listVgpuProfiles(this);
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
index 1b3f531e370..3b693fe57b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
@@ -26,6 +26,7 @@ import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -110,6 +111,19 @@ public class ListServiceOfferingsCmd extends BaseListProjectAndAccountResourcesC
             since = "4.20.0")
     private Long templateId;
 
+    @Parameter(name = ApiConstants.VGPU_PROFILE_ID,
+            type = CommandType.UUID,
+            entityType = VgpuProfileResponse.class,
+            description = "The ID of the vGPU profile that listed offerings must support",
+            since = "4.21.0")
+    private Long vgpuProfileId;
+
+    @Parameter(name = ApiConstants.GPU_ENABLED,
+            type = CommandType.BOOLEAN,
+            description = "Flag to indicate if the service offering supports GPU. If set to true, only service offerings that support GPU will be returned.",
+            since = "4.21.0")
+    private Boolean gpuEnabled;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -171,6 +185,14 @@ public class ListServiceOfferingsCmd extends BaseListProjectAndAccountResourcesC
         return templateId;
     }
 
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public Boolean getGpuEnabled() {
+        return gpuEnabled;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index 8489a0a68a0..a561b6fd24f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -172,6 +172,12 @@ public class ListVMsCmd extends BaseListRetrieveOnlyResourceCountCmd implements
             since = "4.21.0")
     private Boolean onlyLeasedInstances = false;
 
+    @Parameter(name = ApiConstants.GPU_ENABLED,
+            type = CommandType.BOOLEAN,
+            description = "Flag to indicate if the VMs should be filtered by GPU support. If set to true, only VMs that support GPU will be returned.",
+            since = "4.21.0")
+    private Boolean gpuEnabled;
+
     @Parameter(name = ApiConstants.EXTENSION_ID, type = CommandType.UUID,
             entityType = ExtensionResponse.class, description = "The ID of the Orchestrator extension for the VM",
             since = "4.21.0")
@@ -324,6 +330,10 @@ public class ListVMsCmd extends BaseListRetrieveOnlyResourceCountCmd implements
         return BooleanUtils.toBoolean(onlyLeasedInstances);
     }
 
+    public Boolean getGpuEnabled() {
+        return gpuEnabled;
+    }
+
     public Long getExtensionId() {
         return extensionId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
index aaad7f985fc..3c99e2cbec6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
@@ -231,6 +231,18 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
     @Param(description = "the total memory (in MB) available to be created for this account", since = "4.2.0")
     private String memoryAvailable;
 
+    @SerializedName("gpulimit")
+    @Param(description = "the total number of gpus the account can own", since = "4.21.0")
+    private String gpuLimit;
+
+    @SerializedName("gputotal")
+    @Param(description = "the total number of gpus owned by account", since = "4.21.0")
+    private Long gpuTotal;
+
+    @SerializedName("gpuavailable")
+    @Param(description = "the total number of gpus available to be created for this account", since = "4.21.0")
+    private String gpuAvailable;
+
     @SerializedName("primarystoragelimit")
     @Param(description = "the total primary storage space (in GiB) the account can own", since = "4.2.0")
     private String primaryStorageLimit;
@@ -489,6 +501,21 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
         this.vmRunning = vmRunning;
     }
 
+    @Override
+    public void setGpuLimit(String gpuLimit) {
+        this.gpuLimit = gpuLimit;
+    }
+
+    @Override
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
+    @Override
+    public void setGpuAvailable(String gpuAvailable) {
+        this.gpuAvailable = gpuAvailable;
+    }
+
     public void setState(String state) {
         this.state = state;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
index 74fa2cbb1e4..e2246a1d531 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
@@ -183,6 +183,15 @@ public class DomainResponse extends BaseResponseWithAnnotations implements Resou
     @SerializedName("memoryavailable") @Param(description="the total memory (in MB) available to be created for this domain", since="4.2.0")
     private String memoryAvailable;
 
+    @SerializedName("gpulimit") @Param(description="the total number of gpus the domain can own", since="4.21.0")
+    private String gpuLimit;
+
+    @SerializedName("gputotal") @Param(description="the total number of gpus owned by domain", since="4.21.0")
+    private Long gpuTotal;
+
+    @SerializedName("gpuavailable") @Param(description="the total number of gpus available to be created for this domain", since="4.21.0")
+    private String gpuAvailable;
+
     @SerializedName("primarystoragelimit") @Param(description="the total primary storage space (in GiB) the domain can own", since="4.2.0")
     private String primaryStorageLimit;
 
@@ -478,6 +487,21 @@ public class DomainResponse extends BaseResponseWithAnnotations implements Resou
         this.memoryAvailable = memoryAvailable;
     }
 
+    @Override
+    public void setGpuLimit(String gpuLimit) {
+        this.gpuLimit = gpuLimit;
+    }
+
+    @Override
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
+    @Override
+    public void setGpuAvailable(String gpuAvailable) {
+        this.gpuAvailable = gpuAvailable;
+    }
+
     @Override
     public void setPrimaryStorageLimit(String primaryStorageLimit) {
         this.primaryStorageLimit = primaryStorageLimit;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/GpuCardResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GpuCardResponse.java
new file mode 100644
index 00000000000..ad91b3490ef
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/GpuCardResponse.java
@@ -0,0 +1,109 @@
+// 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.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.gpu.GpuCard;
+
+@EntityReference(value = GpuCard.class)
+public class GpuCardResponse extends BaseResponse {
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the ID of the GPU card")
+    protected String id;
+
+    @SerializedName("deviceid")
+    @Param(description = "the device ID of the GPU card")
+    protected String deviceId;
+
+    @SerializedName("devicename")
+    @Param(description = "the device name of the GPU card")
+    protected String deviceName;
+
+    @SerializedName("name")
+    @Param(description = "the display name of the GPU card")
+    protected String name;
+
+    @SerializedName("vendorname")
+    @Param(description = "the vendor name of the GPU card")
+    protected String vendorName;
+
+    @SerializedName("vendorid")
+    @Param(description = "the vendor ID of the GPU card")
+    protected String vendorId;
+
+    public GpuCardResponse(GpuCard gpuCard) {
+        super("gpucard");
+        id = gpuCard.getUuid();
+        deviceId = gpuCard.getDeviceId();
+        deviceName = gpuCard.getDeviceName();
+        name = gpuCard.getName();
+        vendorName = gpuCard.getVendorName();
+        vendorId = gpuCard.getVendorId();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/GpuDeviceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GpuDeviceResponse.java
new file mode 100644
index 00000000000..09e98b54eaa
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/GpuDeviceResponse.java
@@ -0,0 +1,227 @@
+// 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.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.cloud.vm.VirtualMachine;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.gpu.GpuDevice;
+
+@EntityReference(value = GpuDevice.class)
+public class GpuDeviceResponse extends BaseResponse {
+
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the ID of the GPU device")
+    private String id;
+
+    @SerializedName(ApiConstants.BUS_ADDRESS)
+    @Param(description = "bus address of the GPU device or MDEV UUID for vGPU devices")
+    private String bussAddress;
+
+    @SerializedName(ApiConstants.GPU_DEVICE_TYPE)
+    @Param(description = "bus address of the GPU device")
+    private GpuDevice.DeviceType type;
+
+    @SerializedName(ApiConstants.HOST_ID)
+    @Param(description = "the host ID where the GPU device is attached")
+    private String hostId;
+
+    @SerializedName(ApiConstants.HOST_NAME)
+    @Param(description = "the host name where the GPU device is attached")
+    private String hostName;
+
+    @SerializedName(ApiConstants.GPU_CARD_ID)
+    @Param(description = "the GPU card ID associated with this GPU device")
+    private String gpuCardId;
+
+    @SerializedName(ApiConstants.GPU_CARD_NAME)
+    @Param(description = "the GPU card name associated with this GPU device")
+    private String gpuCardName;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_ID)
+    @Param(description = "the vGPU profile ID assigned to this GPU device")
+    private String vgpuProfileId;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_NAME)
+    @Param(description = "the vGPU profile name assigned to this GPU device")
+    private String vgpuProfileName;
+
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
+    @Param(description = "the vGPU profile ID assigned to this GPU device")
+    private String vmId;
+
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
+    @Param(description = "the vGPU profile name assigned to this GPU device")
+    private String vmName;
+
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_STATE)
+    @Param(description = "the state of the virtual machine to which this GPU device is allocated")
+    private VirtualMachine.State vmState;
+
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "the vGPU profile name assigned to this GPU device")
+    private GpuDevice.State state;
+
+    @SerializedName(ApiConstants.MANAGED_STATE)
+    @Param(description = "the managed state of the GPU device (Enabled/Disabled)")
+    private GpuDevice.ManagedState managedState;
+
+    @SerializedName(ApiConstants.PARENT_GPU_DEVICE_ID)
+    @Param(description = "the ID of the parent GPU device, if this is a vGPU")
+    private String parentGpuDeviceId;
+
+    @SerializedName(ApiConstants.NUMA_NODE)
+    @Param(description = "the NUMA node where the GPU device is located")
+    private String numaNode;
+
+
+    public GpuDeviceResponse() {
+        // Empty constructor for serialization
+        super("gpudevice");
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBussAddress() {
+        return bussAddress;
+    }
+
+    public void setBussAddress(String bussAddress) {
+        this.bussAddress = bussAddress;
+    }
+
+    public GpuDevice.DeviceType getType() {
+        return type;
+    }
+
+    public void setType(GpuDevice.DeviceType type) {
+        this.type = type;
+    }
+
+    public String getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(String hostId) {
+        this.hostId = hostId;
+    }
+
+    public String getHostName() {
+        return hostName;
+    }
+
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public String getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public void setGpuCardId(String gpuCardId) {
+        this.gpuCardId = gpuCardId;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public void setGpuCardName(String gpuCardName) {
+        this.gpuCardName = gpuCardName;
+    }
+
+    public String getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public void setVgpuProfileId(String vgpuProfileId) {
+        this.vgpuProfileId = vgpuProfileId;
+    }
+
+    public String getVgpuProfileName() {
+        return vgpuProfileName;
+    }
+
+    public void setVgpuProfileName(String vgpuProfileName) {
+        this.vgpuProfileName = vgpuProfileName;
+    }
+
+    public String getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(String vmId) {
+        this.vmId = vmId;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public VirtualMachine.State getVmState() {
+        return vmState;
+    }
+
+    public void setVmState(VirtualMachine.State vmState) {
+        this.vmState = vmState;
+    }
+
+    public GpuDevice.State getState() {
+        return state;
+    }
+
+    public void setState(GpuDevice.State state) {
+        this.state = state;
+    }
+
+    public GpuDevice.ManagedState getManagedState() {
+        return managedState;
+    }
+
+    public void setManagedState(GpuDevice.ManagedState managedState) {
+        this.managedState = managedState;
+    }
+
+    public String getParentGpuDeviceId() {
+        return parentGpuDeviceId;
+    }
+
+    public void setParentGpuDeviceId(String parentGpuDeviceId) {
+        this.parentGpuDeviceId = parentGpuDeviceId;
+    }
+
+    public String getNumaNode() {
+        return numaNode;
+    }
+
+    public void setNumaNode(String numaNode) {
+        this.numaNode = numaNode;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index 692779b0e30..ca31bd8b155 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -165,6 +165,14 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Param(description = "the amount of the host's memory currently used")
     private Long memoryUsed;
 
+    @SerializedName("gputotal")
+    @Param(description = "Total GPUs on the Host", responseObject = Long.class, since = "4.21")
+    private Long gpuTotal;
+
+    @SerializedName("gpuused")
+    @Param(description = "Used GPUs on the Host", responseObject = Long.class, since = "4.21")
+    private Long gpuUsed;
+
     @SerializedName(ApiConstants.GPUGROUP)
     @Param(description = "GPU cards present in the host", responseObject = GpuResponse.class, since = "4.4")
     private List<GpuResponse> gpuGroup;
@@ -448,6 +456,14 @@ public class HostResponse extends BaseResponseWithAnnotations {
         this.memoryUsed = memoryUsed;
     }
 
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
+    public void setGpuUsed(Long gpuUsed) {
+        this.gpuUsed = gpuUsed;
+    }
+
     public void setGpuGroup(List<GpuResponse> gpuGroup) {
         this.gpuGroup = gpuGroup;
     }
@@ -920,6 +936,14 @@ public class HostResponse extends BaseResponseWithAnnotations {
         return memoryAllocatedBytes;
     }
 
+    public Long getGpuTotal() {
+        return gpuTotal;
+    }
+
+    public Long getGpuUsed() {
+        return gpuUsed;
+    }
+
     public Boolean getTagARule() {
         return isTagARule;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
index 8bdf042add0..e72f6b86036 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
@@ -116,6 +116,18 @@ public class ProjectResponse extends BaseResponse implements ResourceLimitAndCou
     @Param(description = "the total memory (in MB) available to be created for this project", since = "4.2.0")
     private String memoryAvailable;
 
+    @SerializedName("gpulimit")
+    @Param(description = "the total number of gpus the project can own", since = "4.21.0")
+    private String gpuLimit;
+
+    @SerializedName("gputotal")
+    @Param(description = "the total number of gpus owned by project", since = "4.21.0")
+    private Long gpuTotal;
+
+    @SerializedName("gpuavailable")
+    @Param(description = "the total number of gpus available to be created for this project", since = "4.21.0")
+    private String gpuAvailable;
+
     @SerializedName("primarystoragelimit")
     @Param(description = "the total primary storage space (in GiB) the project can own", since = "4.2.0")
     private String primaryStorageLimit;
@@ -483,6 +495,21 @@ public class ProjectResponse extends BaseResponse implements ResourceLimitAndCou
         this.memoryAvailable = memoryAvailable;
     }
 
+    @Override
+    public void setGpuLimit(String gpuLimit) {
+        this.gpuLimit = gpuLimit;
+    }
+
+    @Override
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
+    @Override
+    public void setGpuAvailable(String gpuAvailable) {
+        this.gpuAvailable = gpuAvailable;
+    }
+
     @Override
     public void setPrimaryStorageLimit(String primaryStorageLimit) {
         this.primaryStorageLimit = primaryStorageLimit;
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
index b86723b36c4..66de71dd763 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
@@ -48,6 +48,12 @@ public interface ResourceLimitAndCountResponse {
 
     public void setMemoryAvailable(String memoryAvailable);
 
+    public void setGpuLimit(String gpuLimit);
+
+    public void setGpuTotal(Long gpuTotal);
+
+    public void setGpuAvailable(String gpuAvailable);
+
     public void setPrimaryStorageLimit(String primaryStorageLimit);
 
     public void setPrimaryStorageTotal(Long primaryStorageTotal);
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index ca9358e2e5e..4565a878b34 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -234,6 +234,46 @@ public class ServiceOfferingResponse extends BaseResponseWithAnnotations {
     @Param(description = "true if virtual machine root disk will be encrypted on storage", since = "4.18")
     private Boolean encryptRoot;
 
+    @SerializedName(ApiConstants.GPU_CARD_ID)
+    @Param(description = "the ID of the gpu card to which service offering is linked", since = "4.21")
+    private String gpuCardId;
+
+    @SerializedName(ApiConstants.GPU_CARD_NAME)
+    @Param(description = "the name of the gpu card to which service offering is linked", since = "4.21")
+    private String gpuCardName;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_ID)
+    @Param(description = "the ID of the vgpu profile to which service offering is linked", since = "4.21")
+    private String vgpuProfileId;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_NAME)
+    @Param(description = "the name of the vgpu profile to which service offering is linked", since = "4.21")
+    private String vgpuProfileName;
+
+    @SerializedName(ApiConstants.VIDEORAM)
+    @Param(description = "the video RAM size in MB")
+    private Long videoRam;
+
+    @SerializedName(ApiConstants.MAXHEADS)
+    @Param(description = "the maximum number of display heads")
+    private Long maxHeads;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONX)
+    @Param(description = "the maximum X resolution")
+    private Long maxResolutionX;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONY)
+    @Param(description = "the maximum Y resolution")
+    private Long maxResolutionY;
+
+    @SerializedName(ApiConstants.GPU_COUNT)
+    @Param(description = "the count of GPUs to attach ", since = "4.21")
+    private Integer gpuCount;
+
+    @SerializedName(ApiConstants.GPU_DISPLAY)
+    @Param(description = "whether GPU device is used for display or not ", since = "4.21")
+    private Boolean gpuDisplay;
+
     @SerializedName(ApiConstants.PURGE_RESOURCES)
     @Param(description = "Whether to cleanup VM and its associated resource upon expunge", since = "4.20")
     private Boolean purgeResources;
@@ -584,6 +624,86 @@ public class ServiceOfferingResponse extends BaseResponseWithAnnotations {
 
     public void setEncryptRoot(Boolean encrypt) { this.encryptRoot = encrypt; }
 
+    public String getVgpuProfileName() {
+        return vgpuProfileName;
+    }
+
+    public void setVgpuProfileName(String vgpuProfileName) {
+        this.vgpuProfileName = vgpuProfileName;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+
+    public String getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public void setVgpuProfileId(String vgpuProfileId) {
+        this.vgpuProfileId = vgpuProfileId;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public void setGpuCardName(String gpuCardName) {
+        this.gpuCardName = gpuCardName;
+    }
+
+    public String getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public void setGpuCardId(String gpuCardId) {
+        this.gpuCardId = gpuCardId;
+    }
+
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
+    public void setGpuCount(Integer gpuCount) {
+        this.gpuCount = gpuCount;
+    }
+
+    public Boolean getGpuDisplay() {
+        return gpuDisplay;
+    }
+
+    public void setGpuDisplay(Boolean gpuDisplay) {
+        this.gpuDisplay = gpuDisplay;
+    }
+
     public void setPurgeResources(Boolean purgeResources) {
         this.purgeResources = purgeResources;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
index d873bc65709..ca5bd09a9aa 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -182,6 +182,42 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "the name of the disk offering of the virtual machine. This parameter should not be used for retrieving disk offering details of DATA volumes. Use listVolumes API instead", since = "4.4")
     private String diskOfferingName;
 
+    @SerializedName(ApiConstants.GPU_CARD_ID)
+    @Param(description = "the ID of the gpu card to which service offering is linked", since = "4.21")
+    private String gpuCardId;
+
+    @SerializedName(ApiConstants.GPU_CARD_NAME)
+    @Param(description = "the name of the gpu card to which service offering is linked", since = "4.21")
+    private String gpuCardName;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_ID)
+    @Param(description = "the ID of the vgpu profile to which service offering is linked", since = "4.21")
+    private String vgpuProfileId;
+
+    @SerializedName(ApiConstants.VGPU_PROFILE_NAME)
+    @Param(description = "the name of the vgpu profile to which service offering is linked", since = "4.21")
+    private String vgpuProfileName;
+
+    @SerializedName(ApiConstants.VIDEORAM)
+    @Param(description = "the video RAM size in MB")
+    private Long videoRam;
+
+    @SerializedName(ApiConstants.MAXHEADS)
+    @Param(description = "the maximum number of display heads")
+    private Long maxHeads;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONX)
+    @Param(description = "the maximum X resolution")
+    private Long maxResolutionX;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONY)
+    @Param(description = "the maximum Y resolution")
+    private Long maxResolutionY;
+
+    @SerializedName(ApiConstants.GPU_COUNT)
+    @Param(description = "the count of GPUs on the virtual machine", since = "4.21")
+    private Integer gpuCount;
+
     @SerializedName(ApiConstants.BACKUP_OFFERING_ID)
     @Param(description = "the ID of the backup offering of the virtual machine", since = "4.14")
     private String backupOfferingId;
@@ -565,6 +601,42 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
         return diskOfferingName;
     }
 
+    public String getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public String getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public String getVgpuProfileName() {
+        return vgpuProfileName;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
     public String getBackupOfferingId() {
         return backupOfferingId;
     }
@@ -847,6 +919,42 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
         this.diskOfferingName = diskOfferingName;
     }
 
+    public void setGpuCardId(String gpuCardId) {
+        this.gpuCardId = gpuCardId;
+    }
+
+    public void setGpuCardName(String gpuCardName) {
+        this.gpuCardName = gpuCardName;
+    }
+
+    public void setVgpuProfileId(String vgpuProfileId) {
+        this.vgpuProfileId = vgpuProfileId;
+    }
+
+    public void setVgpuProfileName(String vgpuProfileName) {
+        this.vgpuProfileName = vgpuProfileName;
+    }
+
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+
+    public void setGpuCount(Integer gpuCount) {
+        this.gpuCount = gpuCount;
+    }
+
     public void setBackupOfferingId(String backupOfferingId) {
         this.backupOfferingId = backupOfferingId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VgpuProfileResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VgpuProfileResponse.java
new file mode 100644
index 00000000000..382b391ef59
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/VgpuProfileResponse.java
@@ -0,0 +1,135 @@
+// 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.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.gpu.GpuCard;
+import org.apache.cloudstack.gpu.VgpuProfile;
+
+@EntityReference(value = VgpuProfile.class)
+public class VgpuProfileResponse extends GpuCardResponse {
+
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "the description of the vGPU profile")
+    private String description;
+
+    @SerializedName(ApiConstants.GPU_CARD_ID)
+    @Param(description = "the ID of the GPU card associated with this vGPU profile")
+    private String gpuCardId;
+
+    @SerializedName(ApiConstants.GPU_CARD_NAME)
+    @Param(description = "the name of the vGPU profile")
+    private String gpuCardName;
+
+    @SerializedName(ApiConstants.MAX_VGPU_PER_PHYSICAL_GPU)
+    @Param(description = "the maximum number of vGPUs per physical GPU")
+    private Long maxVgpuPerPgpu;
+
+    @SerializedName(ApiConstants.VIDEORAM)
+    @Param(description = "the video RAM size in MB")
+    private Long videoRam;
+
+    @SerializedName(ApiConstants.MAXHEADS)
+    @Param(description = "the maximum number of display heads")
+    private Long maxHeads;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONX)
+    @Param(description = "the maximum X resolution")
+    private Long maxResolutionX;
+
+    @SerializedName(ApiConstants.MAXRESOLUTIONY)
+    @Param(description = "the maximum Y resolution")
+    private Long maxResolutionY;
+
+    public VgpuProfileResponse(VgpuProfile vgpuProfile, GpuCard gpuCard) {
+        super(gpuCard);
+        id = vgpuProfile.getUuid();
+        name = vgpuProfile.getName();
+        description = vgpuProfile.getDescription();
+        gpuCardId = gpuCard.getUuid();
+        gpuCardName = gpuCard.getName();
+        maxVgpuPerPgpu = vgpuProfile.getMaxVgpuPerPgpu();
+        videoRam = vgpuProfile.getVideoRam();
+        maxHeads = vgpuProfile.getMaxHeads();
+        maxResolutionX = vgpuProfile.getMaxResolutionX();
+        maxResolutionY = vgpuProfile.getMaxResolutionY();
+        setObjectName("vgpuprofile");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public Long getMaxVgpuPerPgpu() {
+        return maxVgpuPerPgpu;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
index 975d9edcca1..09e53dbb146 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -97,6 +97,14 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
     @Param(description = "true if security groups support is enabled, false otherwise")
     private Boolean securityGroupsEnabled;
 
+    @SerializedName("gputotal")
+    @Param(description = "Total GPUs in the Zone", responseObject = Long.class, since = "4.21")
+    private Long gpuTotal;
+
+    @SerializedName("gpuused")
+    @Param(description = "Used GPUs in the Zone", responseObject = Long.class, since = "4.21")
+    private Long gpuUsed;
+
     @SerializedName("allocationstate")
     @Param(description = "the allocation state of the cluster")
     private String allocationState;
@@ -231,6 +239,14 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
         this.securityGroupsEnabled = securityGroupsEnabled;
     }
 
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
+    public void setGpuUsed(Long gpuUsed) {
+        this.gpuUsed = gpuUsed;
+    }
+
     public void setAllocationState(String allocationState) {
         this.allocationState = allocationState;
     }
@@ -366,6 +382,14 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
         return securityGroupsEnabled;
     }
 
+    public Long getGpuUsed() {
+        return gpuUsed;
+    }
+
+    public Long getGpuTotal() {
+        return gpuTotal;
+    }
+
     public boolean isLocalStorageEnabled() {
         return localStorageEnabled;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java b/api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java
new file mode 100644
index 00000000000..2c02a0e30c2
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java
@@ -0,0 +1,69 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import java.util.Date;
+
+/**
+ * GPU card interface representing a physical GPU card model
+ */
+public interface GpuCard extends InternalIdentity, Identity {
+    /**
+     * @return the UUID of the GPU card
+     */
+    String getUuid();
+
+    /**
+     * @return the device ID of the GPU card
+     */
+    String getDeviceId();
+
+    /**
+     * @return the device name of the GPU card
+     */
+    String getDeviceName();
+
+    /**
+     * @return the name of the GPU card
+     */
+    String getName();
+
+    /**
+     * @return the vendor name of the GPU card
+     */
+    String getVendorName();
+
+    /**
+     * @return the vendor ID of the GPU card
+     */
+    String getVendorId();
+
+    /**
+     * @return the date when the GPU card was created
+     */
+    Date getCreated();
+
+
+    /**
+     * @return the group name of the GPU card based on how the XenServer expects it.
+     */
+    String getGroupName();
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gpu/GpuDevice.java b/api/src/main/java/org/apache/cloudstack/gpu/GpuDevice.java
new file mode 100644
index 00000000000..22adda46477
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gpu/GpuDevice.java
@@ -0,0 +1,42 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+/**
+ * GPU device interface representing a physical GPU device
+ */
+public interface GpuDevice extends InternalIdentity, Identity {
+
+    enum State {
+        Allocated, Free, Error, PartiallyAllocated,
+    }
+
+    enum ManagedState {
+        Managed, Unmanaged,
+    }
+
+    enum DeviceType {
+        PCI, MDEV, VGPUOnly,
+    }
+
+    long getHostId();
+
+    State getState();
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gpu/GpuService.java b/api/src/main/java/org/apache/cloudstack/gpu/GpuService.java
new file mode 100644
index 00000000000..1e7928a319f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gpu/GpuService.java
@@ -0,0 +1,157 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.GPUDeviceTO;
+import com.cloud.host.Host;
+import com.cloud.utils.component.Manager;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UnmanageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DiscoverGpuDevicesCmd;
+import org.apache.cloudstack.api.command.admin.gpu.ManageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuDevicesCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuCardsCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListVgpuProfilesCmd;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+import java.util.HashMap;
+import java.util.List;
+
+public interface GpuService extends Manager {
+
+    ConfigKey<Boolean> GpuDetachOnStop = new ConfigKey<>(Boolean.class, "gpu.detach.on.stop", "Advanced", "false",
+            "Whether to detach GPU devices from VM on stop or keep them allocated", true, ConfigKey.Scope.Domain, null);
+
+    GpuCard createGpuCard(CreateGpuCardCmd cmd);
+
+    GpuCard updateGpuCard(UpdateGpuCardCmd cmd);
+
+    boolean deleteGpuCard(DeleteGpuCardCmd cmd);
+
+    VgpuProfileResponse createVgpuProfile(CreateVgpuProfileCmd cmd);
+
+    VgpuProfileResponse updateVgpuProfile(UpdateVgpuProfileCmd cmd);
+
+    boolean deleteVgpuProfile(DeleteVgpuProfileCmd cmd);
+
+    ListResponse<GpuCardResponse> listGpuCards(ListGpuCardsCmd cmd);
+
+    ListResponse<VgpuProfileResponse> listVgpuProfiles(ListVgpuProfilesCmd cmd);
+
+    GpuDeviceResponse createGpuDevice(CreateGpuDeviceCmd cmd);
+
+    GpuDeviceResponse updateGpuDevice(UpdateGpuDeviceCmd cmd);
+
+    ListResponse<GpuDeviceResponse> listGpuDevices(ListGpuDevicesCmd cmd);
+
+    boolean disableGpuDevice(UnmanageGpuDeviceCmd cmd);
+
+    boolean enableGpuDevice(ManageGpuDeviceCmd cmd);
+
+    /**
+     * Deallocate GPU devices for a VM on a host.
+     *
+     * @param vmId The ID of the VM to deallocate GPU devices for.
+     */
+    void deallocateAllGpuDevicesForVm(long vmId);
+
+
+    /**
+     * Deallocate GPU devices for a VM on a host.
+     *
+     * @param vmId The ID of the VM to deallocate GPU devices for.
+     */
+    void deallocateGpuDevicesForVmOnHost(long vmId, long hostId);
+
+    /**
+     * Deallocate existing GPU devices for a VM on a host and allocate new GPU devices to the VM.
+     *
+     * @param vmId       The ID of the VM to allocate GPU devices to.
+     * @param hostId     The ID of the host to allocate GPU devices to.
+     * @param gpuDevices The list of GPU devices to allocate to the VM.
+     */
+    void allocateGpuDevicesToVmOnHost(long vmId, long hostId, List<VgpuTypesInfo> gpuDevices);
+
+    /**
+     * Discover GPU devices on a host by using the getGPUStatistics command and updating the GPU details for the host.
+     *
+     * @param cmd The command to discover GPU devices.
+     * @return The list of GPU devices.
+     */
+    ListResponse<GpuDeviceResponse> discoverGpuDevices(DiscoverGpuDevicesCmd cmd);
+
+    /**
+     * Check if GPU devices are available for a VM on a host by checking the number of available GPU devices for the
+     * vGPU profile.
+     *
+     * @param host        The host to check GPU devices for.
+     * @param vmId        The ID of the VM to check GPU devices for.
+     * @param vgpuProfile The vGPU profile to check GPU devices for.
+     * @param gpuCount    The number of GPU devices to check for.
+     * @return True if GPU devices are available, false otherwise.
+     */
+    boolean isGPUDeviceAvailable(Host host, Long vmId, VgpuProfile vgpuProfile, int gpuCount);
+
+    /**
+     * Get GPU devices for a VM on a host by checking the number of available GPU devices for the vGPU profile.
+     * If the VM already has GPU devices assigned, deallocate them and allocate new GPU devices to the VM.
+     * The new GPU devices are allocated optimally to the VM.
+     *
+     * @param vm          The VM to get GPU devices for.
+     * @param vgpuProfile The vGPU profile to get GPU devices for.
+     * @param gpuCount    The number of GPU devices to get.
+     * @return The GPU devices.
+     */
+    GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfile vgpuProfile, int gpuCount);
+
+    /**
+     * Gets the GPU group details from the GPU devices on a host.
+     * This fetches the GPU devices from the host and prepares the GPU group details for the host.
+     * The GPU group details are a map of GPU group name (Card's device name) to a map of vGPU profile name to
+     * VgpuTypesInfo.
+     * The VgpuTypesInfo contains the information about the GPU device.
+     *
+     * @param hostId The host ID to get GPU group details for.
+     * @return The GPU group details.
+     */
+    HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetailsFromGpuDevicesOnHost(long hostId);
+
+    /**
+     * This method is used to add the GPU devices to the host when the host is discovered or when the GPU devices are
+     * updated.
+     *
+     * @param host              The host to add the GPU devices to.
+     * @param newGpuDevicesInfo The list of GPU devices to add to the host.
+     */
+    void addGpuDevicesToHost(Host host, List<VgpuTypesInfo> newGpuDevicesInfo);
+
+    boolean deleteGpuDevices(DeleteGpuDeviceCmd deleteGpuDeviceCmd);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/gpu/VgpuProfile.java b/api/src/main/java/org/apache/cloudstack/gpu/VgpuProfile.java
new file mode 100644
index 00000000000..8cfac2a20de
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/gpu/VgpuProfile.java
@@ -0,0 +1,74 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import java.util.Date;
+
+/**
+ * vGPU profile interface representing a virtualized GPU profile
+ */
+public interface VgpuProfile extends InternalIdentity, Identity {
+    /**
+     * @return the UUID of the vGPU profile
+     */
+    String getUuid();
+
+    /**
+     * @return the name of the vGPU profile
+     */
+    String getName();
+
+    /**
+     * @return the description of the vGPU profile
+     */
+    String getDescription();
+
+    /**
+     * @return the date when the vGPU profile was created
+     */
+    Date getCreated();
+
+    Long getCardId();
+
+    /**
+     * @return the maximum number of vGPUs per physical GPU
+     */
+    Long getMaxVgpuPerPgpu();
+
+    /**
+     * @return the video RAM size in MB
+     */
+    Long getVideoRam();
+
+    /**
+     * @return the maximum number of display heads
+     */
+    Long getMaxHeads();
+
+    /**
+     * @return the maximum X resolution
+     */
+    Long getMaxResolutionX();
+
+    /**
+     * @return the maximum Y resolution
+     */
+    Long getMaxResolutionY();
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmdTest.java
new file mode 100644
index 00000000000..be21384109c
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmdTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CreateGpuCardCmdTest {
+
+    @Test
+    public void getDeviceId() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getDeviceId());
+        String deviceId = "0000:00:1f.6";
+        ReflectionTestUtils.setField(cmd, "deviceId", deviceId);
+        assertEquals(deviceId, cmd.getDeviceId());
+    }
+
+    @Test
+    public void getDeviceName() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getDeviceName());
+        String deviceName = "NVIDIA GeForce GTX 1080";
+        ReflectionTestUtils.setField(cmd, "deviceName", deviceName);
+        assertEquals(deviceName, cmd.getDeviceName());
+    }
+
+    @Test
+    public void getName() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getName());
+        String name = "Test GPU Card";
+        ReflectionTestUtils.setField(cmd, "name", name);
+        assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void getVendorName() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getVendorName());
+        String vendorName = "NVIDIA";
+        ReflectionTestUtils.setField(cmd, "vendorName", vendorName);
+        assertEquals(vendorName, cmd.getVendorName());
+    }
+
+    @Test
+    public void getVendorId() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getVendorId());
+        String vendorId = "10de"; // NVIDIA vendor ID
+        ReflectionTestUtils.setField(cmd, "vendorId", vendorId);
+        assertEquals(vendorId, cmd.getVendorId());
+    }
+
+    @Test
+    public void getVideoRam() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertNull(cmd.getVideoRam());
+        Long videoRam = 8192L; // 8 GB
+        ReflectionTestUtils.setField(cmd, "videoRam", videoRam);
+        assertEquals(videoRam, cmd.getVideoRam());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        CreateGpuCardCmd cmd = new CreateGpuCardCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmdTest.java
new file mode 100644
index 00000000000..fd5c568d5bc
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmdTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CreateGpuDeviceCmdTest {
+
+    @Test
+    public void getHostId() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertNull(cmd.getHostId());
+        Long hostId = 1L;
+        ReflectionTestUtils.setField(cmd, "hostId", hostId);
+        assertEquals(hostId, cmd.getHostId());
+    }
+
+    @Test
+    public void getBusAddress() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertNull(cmd.getBusAddress());
+        String busAddress = "0000:00:1f.6";
+        ReflectionTestUtils.setField(cmd, "busAddress", busAddress);
+        assertEquals(busAddress, cmd.getBusAddress());
+    }
+
+    @Test
+    public void getGpuCardId() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertNull(cmd.getGpuCardId());
+        Long gpuCardId = 1L;
+        ReflectionTestUtils.setField(cmd, "gpuCardId", gpuCardId);
+        assertEquals(gpuCardId, cmd.getGpuCardId());
+    }
+
+    @Test
+    public void getVgpuProfileId() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertNull(cmd.getVgpuProfileId());
+        Long vgpuProfileId = 1L;
+        ReflectionTestUtils.setField(cmd, "vgpuProfileId", vgpuProfileId);
+        assertEquals(vgpuProfileId, cmd.getVgpuProfileId());
+    }
+
+    @Test
+    public void getType() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertEquals(GpuDevice.DeviceType.PCI, cmd.getType());
+        String type = "MDEV";
+        ReflectionTestUtils.setField(cmd, "type", type);
+        assertEquals(GpuDevice.DeviceType.MDEV, cmd.getType());
+    }
+
+    @Test
+    public void getParentGpuDeviceId() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertNull(cmd.getParentGpuDeviceId());
+        Long parentGpuDeviceId = 1L;
+        ReflectionTestUtils.setField(cmd, "parentGpuDeviceId", parentGpuDeviceId);
+        assertEquals(parentGpuDeviceId, cmd.getParentGpuDeviceId());
+    }
+
+    @Test
+    public void getNumaNode() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertEquals("-1", cmd.getNumaNode());
+        String numaNode = "0";
+        ReflectionTestUtils.setField(cmd, "numaNode", numaNode);
+        assertEquals(numaNode, cmd.getNumaNode());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        CreateGpuDeviceCmd cmd = new CreateGpuDeviceCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmdTest.java
new file mode 100644
index 00000000000..c71286bda65
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmdTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class CreateVgpuProfileCmdTest {
+
+    @Test
+    public void getName() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getName());
+        String name = "Test VGPU Profile";
+        ReflectionTestUtils.setField(cmd, "name", name);
+        assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void getDescription() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getDescription());
+        String description = "Test VGPU Profile Description";
+        ReflectionTestUtils.setField(cmd, "description", description);
+        assertEquals(description, cmd.getDescription());
+    }
+
+    @Test
+    public void getCardId() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getCardId());
+        Long cardId = 1L;
+        ReflectionTestUtils.setField(cmd, "cardId", cardId);
+        assertEquals(cardId, cmd.getCardId());
+    }
+
+    @Test
+    public void getMaxVgpuPerPgpu() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getMaxVgpuPerPgpu());
+        Long maxVgpuPerPgpu = 8L;
+        ReflectionTestUtils.setField(cmd, "maxVgpuPerPgpu", maxVgpuPerPgpu);
+        assertEquals(maxVgpuPerPgpu, cmd.getMaxVgpuPerPgpu());
+    }
+
+    @Test
+    public void getVideoRam() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getVideoRam());
+        Long videoRam = 8192L; // 8 GB
+        ReflectionTestUtils.setField(cmd, "videoRam", videoRam);
+        assertEquals(videoRam, cmd.getVideoRam());
+    }
+
+    @Test
+    public void getMaxHeads() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getMaxHeads());
+        Long maxHeads = 2L;
+        ReflectionTestUtils.setField(cmd, "maxHeads", maxHeads);
+        assertEquals(maxHeads, cmd.getMaxHeads());
+    }
+
+    @Test
+    public void getMaxResolutionX() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getMaxResolutionX());
+        Long maxResolutionX = 1920L; // 1920 pixels
+        ReflectionTestUtils.setField(cmd, "maxResolutionX", maxResolutionX);
+        assertEquals(maxResolutionX, cmd.getMaxResolutionX());
+    }
+
+    @Test
+    public void getMaxResolutionY() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertNull(cmd.getMaxResolutionY());
+        Long maxResolutionY = 1080L; // 1080 pixels
+        ReflectionTestUtils.setField(cmd, "maxResolutionY", maxResolutionY);
+        assertEquals(maxResolutionY, cmd.getMaxResolutionY());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmdTest.java
new file mode 100644
index 00000000000..21df915b420
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmdTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class DeleteGpuCardCmdTest {
+
+    @Test
+    public void getId() {
+        DeleteGpuCardCmd cmd = new DeleteGpuCardCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        CreateVgpuProfileCmd cmd = new CreateVgpuProfileCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmdTest.java
new file mode 100644
index 00000000000..02b04dd307a
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmdTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class DeleteGpuDeviceCmdTest {
+
+    @Test
+    public void getIds() {
+        DeleteGpuDeviceCmd cmd = new DeleteGpuDeviceCmd();
+        assertNull(cmd.getIds());
+        List<Long> ids = List.of(1L, 2L, 3L);
+        ReflectionTestUtils.setField(cmd, "ids", ids);
+        assertEquals(ids, cmd.getIds());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        DeleteGpuDeviceCmd cmd = new DeleteGpuDeviceCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmdTest.java
new file mode 100644
index 00000000000..ecd43810e65
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmdTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class DeleteVgpuProfileCmdTest {
+
+    @Test
+    public void getId() {
+        DeleteVgpuProfileCmd cmd = new DeleteVgpuProfileCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        DeleteVgpuProfileCmd cmd = new DeleteVgpuProfileCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmdTest.java
new file mode 100644
index 00000000000..8295e06e0d5
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmdTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class DiscoverGpuDevicesCmdTest {
+
+    @Test
+    public void getId() {
+        DiscoverGpuDevicesCmd cmd = new DiscoverGpuDevicesCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdminTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdminTest.java
new file mode 100644
index 00000000000..200bce76933
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdminTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ListGpuDevicesCmdByAdminTest {
+
+    @Test
+    public void getId() {
+        ListGpuDevicesCmdByAdmin cmd = new ListGpuDevicesCmdByAdmin();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getHostId() {
+        ListGpuDevicesCmdByAdmin cmd = new ListGpuDevicesCmdByAdmin();
+        assertNull(cmd.getHostId());
+        Long hostId = 1L;
+        ReflectionTestUtils.setField(cmd, "hostId", hostId);
+        assertEquals(hostId, cmd.getHostId());
+    }
+
+    @Test
+    public void getGpuCardId() {
+        ListGpuDevicesCmdByAdmin cmd = new ListGpuDevicesCmdByAdmin();
+        assertNull(cmd.getGpuCardId());
+        Long gpuCardId = 1L;
+        ReflectionTestUtils.setField(cmd, "gpuCardId", gpuCardId);
+        assertEquals(gpuCardId, cmd.getGpuCardId());
+    }
+
+    @Test
+    public void getVgpuProfileId() {
+        ListGpuDevicesCmdByAdmin cmd = new ListGpuDevicesCmdByAdmin();
+        assertNull(cmd.getVgpuProfileId());
+        Long vgpuProfileId = 1L;
+        ReflectionTestUtils.setField(cmd, "vgpuProfileId", vgpuProfileId);
+        assertEquals(vgpuProfileId, cmd.getVgpuProfileId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmdTest.java
new file mode 100644
index 00000000000..ee862409a93
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmdTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ManageGpuDeviceCmdTest {
+
+    @Test
+    public void getIds() {
+        ManageGpuDeviceCmd cmd = new ManageGpuDeviceCmd();
+        assertNull(cmd.getIds());
+        List<Long> ids = List.of(1L, 2L, 3L);
+        ReflectionTestUtils.setField(cmd, "ids", ids);
+        assertEquals(ids, cmd.getIds());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        ManageGpuDeviceCmd cmd = new ManageGpuDeviceCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmdTest.java
new file mode 100644
index 00000000000..63700d9e908
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmdTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UnmanageGpuDeviceCmdTest {
+
+    @Test
+    public void getIds() {
+        UnmanageGpuDeviceCmd cmd = new UnmanageGpuDeviceCmd();
+        assertNull(cmd.getIds());
+        List<Long> ids = List.of(1L, 2L, 3L);
+        ReflectionTestUtils.setField(cmd, "ids", ids);
+        assertEquals(ids, cmd.getIds());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        UnmanageGpuDeviceCmd cmd = new UnmanageGpuDeviceCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmdTest.java
new file mode 100644
index 00000000000..ead7ab9d3d3
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmdTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UpdateGpuCardCmdTest {
+
+    @Test
+    public void getId() {
+        UpdateGpuCardCmd cmd = new UpdateGpuCardCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getDeviceName() {
+        UpdateGpuCardCmd cmd = new UpdateGpuCardCmd();
+        assertNull(cmd.getDeviceName());
+        String deviceName = "GPU-1234";
+        ReflectionTestUtils.setField(cmd, "deviceName", deviceName);
+        assertEquals(deviceName, cmd.getDeviceName());
+    }
+
+    @Test
+    public void getName() {
+        UpdateGpuCardCmd cmd = new UpdateGpuCardCmd();
+        assertNull(cmd.getName());
+        String name = "Test GPU Card";
+        ReflectionTestUtils.setField(cmd, "name", name);
+        assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void getVendorName() {
+        UpdateGpuCardCmd cmd = new UpdateGpuCardCmd();
+        assertNull(cmd.getVendorName());
+        String vendorName = "NVIDIA";
+        ReflectionTestUtils.setField(cmd, "vendorName", vendorName);
+        assertEquals(vendorName, cmd.getVendorName());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        UpdateGpuCardCmd cmd = new UpdateGpuCardCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmdTest.java
new file mode 100644
index 00000000000..6ebec48aa00
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmdTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UpdateGpuDeviceCmdTest {
+
+    @Test
+    public void getId() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getGpuCardId() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getGpuCardId());
+        Long gpuCardId = 1L;
+        ReflectionTestUtils.setField(cmd, "gpuCardId", gpuCardId);
+        assertEquals(gpuCardId, cmd.getGpuCardId());
+    }
+
+    @Test
+    public void getVgpuProfileId() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getVgpuProfileId());
+        Long vgpuProfileId = 1L;
+        ReflectionTestUtils.setField(cmd, "vgpuProfileId", vgpuProfileId);
+        assertEquals(vgpuProfileId, cmd.getVgpuProfileId());
+    }
+
+    @Test
+    public void getType() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getType());
+        String type = "MDEV";
+        ReflectionTestUtils.setField(cmd, "type", type);
+        assertEquals(GpuDevice.DeviceType.MDEV, cmd.getType());
+    }
+
+    @Test
+    public void getParentGpuDeviceId() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getParentGpuDeviceId());
+        Long parentGpuDeviceId = 1L;
+        ReflectionTestUtils.setField(cmd, "parentGpuDeviceId", parentGpuDeviceId);
+        assertEquals(parentGpuDeviceId, cmd.getParentGpuDeviceId());
+    }
+
+    @Test
+    public void getNumaNode() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertNull(cmd.getNumaNode());
+        String numaNode = "0";
+        ReflectionTestUtils.setField(cmd, "numaNode", numaNode);
+        assertEquals(numaNode, cmd.getNumaNode());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        UpdateGpuDeviceCmd cmd = new UpdateGpuDeviceCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmdTest.java
new file mode 100644
index 00000000000..95acd71096e
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmdTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.admin.gpu;
+
+import com.cloud.user.Account;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class UpdateVgpuProfileCmdTest {
+
+    @Test
+    public void getId() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getProfileName() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getProfileName());
+        String profileName = "Test VGPU Profile";
+        ReflectionTestUtils.setField(cmd, "profileName", profileName);
+        assertEquals(profileName, cmd.getProfileName());
+    }
+
+    @Test
+    public void getDescription() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getDescription());
+        String description = "Test VGPU Profile Description";
+        ReflectionTestUtils.setField(cmd, "description", description);
+        assertEquals(description, cmd.getDescription());
+    }
+
+    @Test
+    public void getMaxVgpuPerPgpu() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getMaxVgpuPerPgpu());
+        Long maxVgpuPerPgpu = 8L;
+        ReflectionTestUtils.setField(cmd, "maxVgpuPerPgpu", maxVgpuPerPgpu);
+        assertEquals(maxVgpuPerPgpu, cmd.getMaxVgpuPerPgpu());
+    }
+
+    @Test
+    public void getVideoRam() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getVideoRam());
+        Long videoRam = 8192L; // 8 GB
+        ReflectionTestUtils.setField(cmd, "videoRam", videoRam);
+        assertEquals(videoRam, cmd.getVideoRam());
+    }
+
+    @Test
+    public void getMaxHeads() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getMaxHeads());
+        Long maxHeads = 2L;
+        ReflectionTestUtils.setField(cmd, "maxHeads", maxHeads);
+        assertEquals(maxHeads, cmd.getMaxHeads());
+    }
+
+    @Test
+    public void getMaxResolutionX() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getMaxResolutionX());
+        Long maxResolutionX = 1920L; // Example resolution
+        ReflectionTestUtils.setField(cmd, "maxResolutionX", maxResolutionX);
+        assertEquals(maxResolutionX, cmd.getMaxResolutionX());
+    }
+
+    @Test
+    public void getMaxResolutionY() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertNull(cmd.getMaxResolutionY());
+        Long maxResolutionY = 1080L; // Example resolution
+        ReflectionTestUtils.setField(cmd, "maxResolutionY", maxResolutionY);
+        assertEquals(maxResolutionY, cmd.getMaxResolutionY());
+    }
+
+    @Test
+    public void getEntityOwnerId() {
+        UpdateVgpuProfileCmd cmd = new UpdateVgpuProfileCmd();
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmdTest.java
index d6f9d9b6937..bc7f65b0756 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmdTest.java
@@ -78,4 +78,23 @@ public class CreateServiceOfferingCmdTest {
         ReflectionTestUtils.setField(createServiceOfferingCmd, "leaseExpiryAction", "Unknown");
         Assert.assertEquals(null, createServiceOfferingCmd.getLeaseExpiryAction());
     }
+
+    @Test
+    public void testGetVgpuProfileId() {
+        ReflectionTestUtils.setField(createServiceOfferingCmd, "vgpuProfileId", 10L);
+        Assert.assertEquals(10L, createServiceOfferingCmd.getVgpuProfileId().longValue());
+    }
+
+    @Test
+    public void testGetGpuCount() {
+        ReflectionTestUtils.setField(createServiceOfferingCmd, "gpuCount", 2);
+        Assert.assertEquals(2, createServiceOfferingCmd.getGpuCount().intValue());
+    }
+
+    @Test
+    public void testGetGpuDisplay() {
+        ReflectionTestUtils.setField(createServiceOfferingCmd, "gpuDisplay", true);
+        Assert.assertTrue(createServiceOfferingCmd.getGpuDisplay());
+    }
+
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmdTest.java
new file mode 100644
index 00000000000..54e726eadbe
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmdTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+
+public class ListGpuCardsCmdTest {
+
+    @Test
+    public void getId() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        Assert.assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getVendorName() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertNull(cmd.getVendorName());
+        String vendorName = "vendor name";
+        ReflectionTestUtils.setField(cmd, "vendorName", vendorName);
+        Assert.assertEquals(vendorName, cmd.getVendorName());
+    }
+
+    @Test
+    public void getVendorId() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertNull(cmd.getVendorId());
+        String vendorId = "vendor id";
+        ReflectionTestUtils.setField(cmd, "vendorId", vendorId);
+        Assert.assertEquals(vendorId, cmd.getVendorId());
+    }
+
+    @Test
+    public void getDeviceId() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertNull(cmd.getDeviceId());
+        String deviceId = "device id";
+        ReflectionTestUtils.setField(cmd, "deviceId", deviceId);
+        Assert.assertEquals(deviceId, cmd.getDeviceId());
+    }
+
+    @Test
+    public void getDeviceName() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertNull(cmd.getDeviceName());
+        String deviceName = "device name";
+        ReflectionTestUtils.setField(cmd, "deviceName", deviceName);
+        Assert.assertEquals(deviceName, cmd.getDeviceName());
+    }
+
+    @Test
+    public void getActiveOnly() {
+        ListGpuCardsCmd cmd = new ListGpuCardsCmd();
+        Assert.assertFalse(cmd.getActiveOnly());
+        Boolean activeOnly = true;
+        ReflectionTestUtils.setField(cmd, "activeOnly", activeOnly);
+        Assert.assertEquals(activeOnly, cmd.getActiveOnly());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmdTest.java
new file mode 100644
index 00000000000..e1a65ee0ece
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmdTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class ListGpuDevicesCmdTest {
+
+    @Test
+    public void getVmId() {
+        ListGpuDevicesCmd cmd = new ListGpuDevicesCmd();
+        Assert.assertNull(cmd.getVmId());
+        Long vmId = 1L;
+        ReflectionTestUtils.setField(cmd, "vmId", vmId);
+        Assert.assertEquals(vmId, cmd.getVmId());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmdTest.java
new file mode 100644
index 00000000000..7616abd1f8d
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmdTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package org.apache.cloudstack.api.command.user.gpu;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class ListVgpuProfilesCmdTest {
+
+    @Test
+    public void getId() {
+        ListVgpuProfilesCmd cmd = new ListVgpuProfilesCmd();
+        Assert.assertNull(cmd.getId());
+        Long id = 1L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        Assert.assertEquals(id, cmd.getId());
+    }
+
+    @Test
+    public void getName() {
+        ListVgpuProfilesCmd cmd = new ListVgpuProfilesCmd();
+        Assert.assertNull(cmd.getName());
+        String name = "Test VGPU Profile";
+        ReflectionTestUtils.setField(cmd, "name", name);
+        Assert.assertEquals(name, cmd.getName());
+    }
+
+    @Test
+    public void getCardId() {
+        ListVgpuProfilesCmd cmd = new ListVgpuProfilesCmd();
+        Assert.assertNull(cmd.getCardId());
+        Long cardId = 1L;
+        ReflectionTestUtils.setField(cmd, "cardId", cardId);
+        Assert.assertEquals(cardId, cmd.getCardId());
+    }
+
+    @Test
+    public void getActiveOnly() {
+        ListVgpuProfilesCmd cmd = new ListVgpuProfilesCmd();
+        Assert.assertFalse(cmd.getActiveOnly());
+        Boolean activeOnly = true;
+        ReflectionTestUtils.setField(cmd, "activeOnly", activeOnly);
+        Assert.assertEquals(activeOnly, cmd.getActiveOnly());
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java
index 8b3cd44e207..5bf70ed086f 100644
--- a/core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/GetGPUStatsAnswer.java
@@ -19,7 +19,9 @@
 
 package com.cloud.agent.api;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;
 
@@ -27,6 +29,7 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
 public class GetGPUStatsAnswer extends Answer {
 
     private HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails;
+    private List<VgpuTypesInfo> gpuDevices = new ArrayList<>();
 
     public GetGPUStatsAnswer(final GetGPUStatsCommand cmd, final HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails) {
         super(cmd);
@@ -37,7 +40,21 @@ public class GetGPUStatsAnswer extends Answer {
         super(cmd, success, details);
     }
 
+    public GetGPUStatsAnswer(final GetGPUStatsCommand cmd, final List<VgpuTypesInfo> gpuDevices) {
+        super(cmd);
+        this.gpuDevices = gpuDevices;
+    }
+
+
     public HashMap<String, HashMap<String, VgpuTypesInfo>> getGroupDetails() {
         return groupDetails;
     }
+
+    public List<VgpuTypesInfo> getGpuDevices() {
+        return gpuDevices;
+    }
+
+    public void setGpuDevices(List<VgpuTypesInfo> gpuDevices) {
+        this.gpuDevices = gpuDevices;
+    }
 }
diff --git a/core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java
index 286fced0c58..068196aabe5 100644
--- a/core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/StartupRoutingCommand.java
@@ -45,6 +45,7 @@ public class StartupRoutingCommand extends StartupCommand {
     List<String> hostTags = new ArrayList<String>();
     String hypervisorVersion;
     HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails = new HashMap<String, HashMap<String, VgpuTypesInfo>>();
+    List<VgpuTypesInfo> gpuDevices = new ArrayList<>();
     private Boolean hostHealthCheckResult;
 
     public StartupRoutingCommand() {
@@ -179,7 +180,7 @@ public class StartupRoutingCommand extends StartupCommand {
         this.hostTags = hostTags;
     }
 
-    public  HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetails() {
+    public HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetails() {
         return groupDetails;
     }
 
@@ -187,6 +188,14 @@ public class StartupRoutingCommand extends StartupCommand {
         this.groupDetails = groupDetails;
     }
 
+    public List<VgpuTypesInfo> getGpuDevices() {
+        return gpuDevices;
+    }
+
+    public void setGpuDevices(List<VgpuTypesInfo> gpuDevices) {
+        this.gpuDevices = gpuDevices;
+    }
+
     public boolean getSupportsClonedVolumes() {
         return supportsClonedVolumes;
     }
diff --git a/engine/components-api/src/main/java/com/cloud/resource/Discoverer.java b/engine/components-api/src/main/java/com/cloud/resource/Discoverer.java
index a2bb5945a9d..60b0167758c 100644
--- a/engine/components-api/src/main/java/com/cloud/resource/Discoverer.java
+++ b/engine/components-api/src/main/java/com/cloud/resource/Discoverer.java
@@ -50,5 +50,4 @@ public interface Discoverer extends Adapter {
     public void putParam(Map<String, String> params);
 
     ServerResource reloadResource(HostVO host);
-
 }
diff --git a/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
index 83f9768a62a..8550dfdd906 100755
--- a/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
+++ b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
@@ -21,8 +21,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
+import com.cloud.offering.ServiceOffering;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 
@@ -194,29 +198,34 @@ public interface ResourceManager extends ResourceService, Configurable {
      */
     boolean isHostGpuEnabled(long hostId);
 
-    /**
-     * Check if host has GPU devices available
-     * @param hostId the host to be checked
-     * @param groupName: gpuCard name
-     * @param vgpuType the VGPU type
-     * @return true when the host has the capacity with given VGPU type
-     */
-    boolean isGPUDeviceAvailable(Host host, String groupName, String vgpuType);
+    boolean isGPUDeviceAvailable(ServiceOffering offering, Host host, Long vmId);
 
     /**
      * Get available GPU device
-     * @param hostId the host to be checked
-     * @param groupName: gpuCard name
-     * @param vgpuType the VGPU type
+     *
+     * @param vm          the vm for which GPU device is requested
+     * @param vgpuProfile the VGPU profile
+     * @param gpuCount
+     * @return GPUDeviceTO[]
+     */
+    GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfileVO vgpuProfile, int gpuCount);
+
+    /**
+     * Get available GPU device
+     *
+     * @param hostId    the host to be checked
+     * @param groupName gpuCard name
+     * @param vgpuType  the VGPU type
      * @return GPUDeviceTO[]
      */
     GPUDeviceTO getGPUDevice(long hostId, String groupName, String vgpuType);
 
     /**
      * Return listof available GPU devices
-     * @param hostId, the host to be checked
-     * @param groupName: gpuCard name
-     * @param vgpuType the VGPU type
+     *
+     * @param hostId    the host to be checked
+     * @param groupName gpuCard name
+     * @param vgpuType  the VGPU type
      * @return List of HostGpuGroupsVO.
      */
     List<HostGpuGroupsVO> listAvailableGPUDevice(long hostId, String groupName, String vgpuType);
@@ -228,6 +237,16 @@ public interface ResourceManager extends ResourceService, Configurable {
      */
     void updateGPUDetails(long hostId, HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails);
 
+    /**
+     * Update GPU device details (post VM deployment)
+     *
+     * @param vm          the VirtualMachine object
+     * @param gpuDeviceTO GPU device details
+     */
+    void updateGPUDetailsForVmStop(VirtualMachine vm, GPUDeviceTO gpuDeviceTO);
+
+    void updateGPUDetailsForVmStart(long hostId, long vmId, GPUDeviceTO gpuDevice);
+
     /**
      * Get GPU details for a host
      * @param host, the Host object
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index b57643323dc..3cd8ec0aae3 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -87,6 +87,7 @@ import org.apache.cloudstack.framework.jobs.impl.VmWorkJobVO;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.MessageDispatcher;
 import org.apache.cloudstack.framework.messagebus.MessageHandler;
+import org.apache.cloudstack.gpu.GpuService;
 import org.apache.cloudstack.jobs.JobInfo;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.reservation.dao.ReservationDao;
@@ -395,6 +396,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     private VolumeOrchestrationService volumeMgr;
     @Inject
+    private GpuService gpuService;
+    @Inject
     private DeploymentPlanningManager _dpMgr;
     @Inject
     private MessageBus _messageBus;
@@ -1530,7 +1533,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
                             final GPUDeviceTO gpuDevice = startAnswer.getVirtualMachine().getGpuDevice();
                             if (gpuDevice != null) {
-                                _resourceMgr.updateGPUDetails(destHostId, gpuDevice.getGroupDetails());
+                                _resourceMgr.updateGPUDetailsForVmStart(destHostId, vm.getId(), gpuDevice);
                             }
 
                             if (vmInstanceDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) {
@@ -2123,9 +2126,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 }
 
                 final GPUDeviceTO gpuDevice = stop.getGpuDevice();
-                if (gpuDevice != null) {
-                    _resourceMgr.updateGPUDetails(vm.getHostId(), gpuDevice.getGroupDetails());
-                }
+                _resourceMgr.updateGPUDetailsForVmStop(vm, gpuDevice);
                 if (!answer.getResult()) {
                     final String details = answer.getDetails();
                     logger.debug("Unable to stop VM due to {}", details);
@@ -2454,9 +2455,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 }
                 vmGuru.finalizeStop(profile, answer);
                 final GPUDeviceTO gpuDevice = stop.getGpuDevice();
-                if (gpuDevice != null) {
-                    _resourceMgr.updateGPUDetails(vm.getHostId(), gpuDevice.getGroupDetails());
-                }
+                _resourceMgr.updateGPUDetailsForVmStop(vm, gpuDevice);
             } else {
                 throw new CloudRuntimeException("Invalid answer received in response to a StopCommand on " + vm.instanceName);
             }
@@ -2559,6 +2558,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             _reservationDao.setResourceId(Resource.ResourceType.user_vm, null);
             _reservationDao.setResourceId(Resource.ResourceType.cpu, null);
             _reservationDao.setResourceId(Resource.ResourceType.memory, null);
+            _reservationDao.setResourceId(Resource.ResourceType.gpu, null);
         }
         return _stateMachine.transitTo(vm, e, new Pair<>(vm.getHostId(), hostId), _vmDao);
     }
@@ -2577,6 +2577,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
 
         deleteVMSnapshots(vm, expunge);
 
+        gpuService.deallocateAllGpuDevicesForVm(vm.getId());
+
         Transaction.execute(new TransactionCallbackWithExceptionNoReturn<CloudRuntimeException>() {
             @Override
             public void doInTransactionWithoutResult(final TransactionStatus status) throws CloudRuntimeException {
@@ -3147,6 +3149,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 logger.info("Migration was unsuccessful.  Cleaning up: {}", vm);
                 _networkMgr.rollbackNicForMigration(vmSrc, profile);
                 volumeMgr.release(vm.getId(), dstHostId);
+                // deallocate GPU devices for the VM on the destination host
+                gpuService.deallocateGpuDevicesForVmOnHost(vm.getId(), dstHostId);
 
                 _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), fromHost.getPodId(),
                         "Unable to migrate vm " + vm.getInstanceName() + " from host " + fromHost.getName() + " in zone " + dest.getDataCenter().getName() + " and pod " +
@@ -3165,6 +3169,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             } else {
                 _networkMgr.commitNicForMigration(vmSrc, profile);
                 volumeMgr.release(vm.getId(), srcHostId);
+                // deallocate GPU devices for the VM on the src host after migration is complete
+                gpuService.deallocateGpuDevicesForVmOnHost(vm.getId(), srcHostId);
                 _networkMgr.setHypervisorHostname(profile, dest, true);
                 recreateCheckpointsKvmOnVmAfterMigration(vm, dstHostId);
 
@@ -3963,6 +3969,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                     affectedVms.add(vm.getId());
                     _securityGroupManager.scheduleRulesetUpdateToHosts(affectedVms, true, null);
                 }
+                if (vmTo.getGpuDevice() != null) {
+                    _resourceMgr.updateGPUDetailsForVmStart(host.getId(), vm.getId(), vmTo.getGpuDevice());
+                }
                 return;
             }
 
diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index a570251cb68..4f6329f81cb 100644
--- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -43,6 +43,7 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import com.cloud.resource.ResourceManager;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
@@ -230,6 +231,8 @@ public class VirtualMachineManagerImplTest {
     @Mock
     private EntityManager _entityMgr;
     @Mock
+    private ResourceManager _resourceMgr;
+    @Mock
     private DeploymentPlanningManager _dpMgr;
     @Mock
     private HypervisorGuruManager _hvGuruMgr;
diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
index b978cc04bfa..ebacbd8b3e5 100644
--- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
+++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
@@ -62,20 +62,6 @@ public interface ResourceCountDao extends GenericDao<ResourceCountVO, Long> {
 
     long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType);
 
-    /**
-     * Counts the number of CPU cores allocated for the given account.
-     *
-     * Side note: This method is not using the "resource_count" table. It is executing the actual count instead.
-     */
-    long countCpuNumberAllocatedToAccount(long accountId);
-
-    /**
-     * Counts the amount of memory allocated for the given account.
-     *
-     * Side note: This method is not using the "resource_count" table. It is executing the actual count instead.
-     */
-    long countMemoryAllocatedToAccount(long accountId);
-
     void removeResourceCountsForNonMatchingTags(Long ownerId, ResourceOwnerType ownerType, List<ResourceType> types, List<String> tags);
 
     List<ResourceCountVO> lockRows(Set<Long> ids);
diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index 0ab83442337..2083fb422d2 100644
--- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
@@ -339,19 +339,6 @@ public class ResourceCountDaoImpl extends GenericDaoBase<ResourceCountVO, Long>
             + " left join vm_instance_details vmd on vmd.vm_id = vm.id and vmd.name = '%s' "
             + " where vm.type = 'User' and state not in ('Destroyed', 'Error', 'Expunging') and display_vm = true and account_id = ? ";
 
-    @Override
-    public long countCpuNumberAllocatedToAccount(long accountId) {
-        String sqlCountCpuNumberAllocatedToAccount = String.format(baseSqlCountComputingResourceAllocatedToAccount, ResourceType.cpu, ResourceType.cpu, "cpuNumber");
-        return executeSqlCountComputingResourcesForAccount(accountId, sqlCountCpuNumberAllocatedToAccount);
-    }
-
-    @Override
-    public long countMemoryAllocatedToAccount(long accountId) {
-        String serviceOfferingRamSizeField = "ram_size";
-        String sqlCountCpuNumberAllocatedToAccount = String.format(baseSqlCountComputingResourceAllocatedToAccount, serviceOfferingRamSizeField, serviceOfferingRamSizeField, "memory");
-        return executeSqlCountComputingResourcesForAccount(accountId, sqlCountCpuNumberAllocatedToAccount);
-    }
-
     private long executeSqlCountComputingResourcesForAccount(long accountId, String sqlCountComputingResourcesAllocatedToAccount) {
         TransactionLegacy tx = TransactionLegacy.currentTxn();
         try {
diff --git a/engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java b/engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java
new file mode 100644
index 00000000000..2410077c84a
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java
@@ -0,0 +1,147 @@
+// 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.
+
+package com.cloud.gpu;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gpu.GpuCard;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.UUID;
+
+@Entity
+@Table(name = "gpu_card")
+public class GpuCardVO implements GpuCard {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "device_id")
+    private String deviceId;
+
+    @Column(name = "device_name")
+    private String deviceName;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "vendor_name")
+    private String vendorName;
+
+    @Column(name = "vendor_id")
+    private String vendorId;
+
+    @Column(name = GenericDao.CREATED_COLUMN)
+    private Date created;
+
+    public GpuCardVO() {
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    public GpuCardVO(String deviceId, String deviceName, String name, String vendorName, String vendorId) {
+        this.uuid = UUID.randomUUID().toString();
+        this.deviceId = deviceId;
+        this.deviceName = deviceName;
+        this.name = name;
+        this.vendorName = vendorName;
+        this.vendorId = vendorId;
+        this.created = new Date();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("GPUCard %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                this, "id", "uuid", "name", "deviceId", "deviceName", "vendorId", "vendorName"));
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    @Override
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    @Override
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    @Override
+    public String getGroupName() {
+        return "Group of " + getVendorName() + " " + getDeviceName() + " GPUs";
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/GpuDeviceVO.java b/engine/schema/src/main/java/com/cloud/gpu/GpuDeviceVO.java
new file mode 100644
index 00000000000..ac20e74c360
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/GpuDeviceVO.java
@@ -0,0 +1,200 @@
+// 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.
+package com.cloud.gpu;
+
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.UUID;
+
+@Entity
+@Table(name = "gpu_device")
+public class GpuDeviceVO implements GpuDevice {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "card_id")
+    private long cardId;
+
+    @Column(name = "vgpu_profile_id")
+    private long vgpuProfileId;
+
+    @Column(name = "bus_address")
+    private String busAddress;
+
+    @Column(name = "host_id")
+    private long hostId;
+
+    @Column(name = "vm_id")
+    private Long vmId;
+
+    @Column(name = "type")
+    @Enumerated(value = EnumType.STRING)
+    private DeviceType type = DeviceType.PCI;
+
+    @Column(name = "state")
+    @Enumerated(value = EnumType.STRING)
+    private State state = State.Free;
+
+    @Column(name = "managed_state")
+    @Enumerated(value = EnumType.STRING)
+    private ManagedState managedState = ManagedState.Managed;
+
+    @Column(name = "parent_gpu_device_id")
+    private Long parentGpuDeviceId;
+
+    @Column(name = "numa_node")
+    private String numaNode;
+
+    @Column(name = "pci_root")
+    private String pciRoot;
+
+    public GpuDeviceVO() {
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    public GpuDeviceVO(long cardId, long vgpuProfileId, String busAddress, long hostId, Long parentGpuDeviceId,
+            String numaNode, String pciRoot) {
+        this.uuid = UUID.randomUUID().toString();
+        this.cardId = cardId;
+        this.vgpuProfileId = vgpuProfileId;
+        this.busAddress = busAddress;
+        this.hostId = hostId;
+        this.parentGpuDeviceId = parentGpuDeviceId;
+        this.numaNode = numaNode;
+        this.pciRoot = pciRoot;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("GpuDevice %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                this, "id", "uuid", "cardId", "vgpuProfileId", "busAddress", "hostId", "vmId",
+                "parentGpuDeviceId", "numaNode", "pciRoot", "state", "resourceState"));
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(long cardId) {
+        this.cardId = cardId;
+    }
+
+    public long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public void setVgpuProfileId(long vgpuProfileId) {
+        this.vgpuProfileId = vgpuProfileId;
+    }
+
+    public String getBusAddress() {
+        return busAddress;
+    }
+
+    public void setBusAddress(String busAddress) {
+        this.busAddress = busAddress;
+    }
+
+    public long getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(long hostId) {
+        this.hostId = hostId;
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
+    public DeviceType getType() {
+        return type;
+    }
+
+    public void setType(DeviceType type) {
+        this.type = type;
+    }
+
+    public ManagedState getManagedState() {
+        return managedState;
+    }
+
+    public void setManagedState(ManagedState managedState) {
+        this.managedState = managedState;
+    }
+
+    public Long getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(Long vmId) {
+        this.vmId = vmId;
+    }
+
+    public Long getParentGpuDeviceId() {
+        return parentGpuDeviceId;
+    }
+
+    public void setParentGpuDeviceId(Long parentGpuDeviceId) {
+        this.parentGpuDeviceId = parentGpuDeviceId;
+    }
+
+    public String getNumaNode() {
+        return numaNode;
+    }
+
+    public void setNumaNode(String numaNode) {
+        this.numaNode = numaNode;
+    }
+
+    public String getPciRoot() {
+        return pciRoot;
+    }
+
+    public void setPciRoot(String pciRoot) {
+        this.pciRoot = pciRoot;
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java b/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java
index 5bbf90854ee..4944d51f1b4 100644
--- a/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java
+++ b/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java
@@ -40,19 +40,19 @@ public class VGPUTypesVO implements InternalIdentity {
     private String vgpuType;
 
     @Column(name="video_ram")
-    private long videoRam;
+    private Long videoRam;
 
     @Column(name="max_heads")
-    private long maxHeads;
+    private Long maxHeads;
 
     @Column(name="max_resolution_x")
-    private long maxResolutionX;
+    private Long maxResolutionX;
 
     @Column(name="max_resolution_y")
-    private long maxResolutionY;
+    private Long maxResolutionY;
 
     @Column(name="max_vgpu_per_pgpu")
-    private long maxVgpuPerPgpu;
+    private Long maxVgpuPerPgpu;
 
     @Column(name="remaining_capacity")
     private long remainingCapacity;
@@ -63,7 +63,7 @@ public class VGPUTypesVO implements InternalIdentity {
     protected VGPUTypesVO() {
     }
 
-    public VGPUTypesVO(long gpuGroupId, String vgpuType, long videoRam, long maxHeads, long maxResolutionX, long maxResolutionY, long maxVgpuPerPgpu,
+    public VGPUTypesVO(long gpuGroupId, String vgpuType, Long videoRam, Long maxHeads, Long maxResolutionX, Long maxResolutionY, Long maxVgpuPerPgpu,
             long remainingCapacity, long maxCapacity) {
         this.gpuGroupId = gpuGroupId;
         this.vgpuType = vgpuType;
@@ -92,43 +92,43 @@ public class VGPUTypesVO implements InternalIdentity {
         this.vgpuType = vgpuType;
     }
 
-    public long getVideoRam() {
+    public Long getVideoRam() {
         return videoRam;
     }
 
-    public void setVideoRam(long videoRam) {
+    public void setVideoRam(Long videoRam) {
         this.videoRam = videoRam;
     }
 
-    public long getMaxHeads() {
+    public Long getMaxHeads() {
         return maxHeads;
     }
 
-    public void setMaxHeads(long maxHeads) {
+    public void setMaxHeads(Long maxHeads) {
         this.maxHeads = maxHeads;
     }
 
-    public long getMaxResolutionX() {
+    public Long getMaxResolutionX() {
         return maxResolutionX;
     }
 
-    public void setMaxResolutionX(long maxResolutionX) {
+    public void setMaxResolutionX(Long maxResolutionX) {
         this.maxResolutionX = maxResolutionX;
     }
 
-    public long getMaxResolutionY() {
+    public Long getMaxResolutionY() {
         return maxResolutionY;
     }
 
-    public void setMaxResolutionY(long maxResolutionY) {
+    public void setMaxResolutionY(Long maxResolutionY) {
         this.maxResolutionY = maxResolutionY;
     }
 
-    public long getMaxVgpuPerPgpu() {
+    public Long getMaxVgpuPerPgpu() {
         return maxVgpuPerPgpu;
     }
 
-    public void setMaxVgpuPerPgpu(long maxVgpuPerPgpu) {
+    public void setMaxVgpuPerPgpu(Long maxVgpuPerPgpu) {
         this.maxVgpuPerPgpu = maxVgpuPerPgpu;
     }
 
diff --git a/engine/schema/src/main/java/com/cloud/gpu/VgpuProfileVO.java b/engine/schema/src/main/java/com/cloud/gpu/VgpuProfileVO.java
new file mode 100644
index 00000000000..86f5eb94415
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/VgpuProfileVO.java
@@ -0,0 +1,191 @@
+// 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.
+
+package com.cloud.gpu;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.gpu.VgpuProfile;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+import java.util.UUID;
+
+@Entity
+@Table(name = "vgpu_profile")
+public class VgpuProfileVO implements VgpuProfile {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "card_id")
+    private Long cardId;
+
+    @Column(name = "max_vgpu_per_pgpu")
+    private Long maxVgpuPerPgpu;
+
+    @Column(name = "video_ram")
+    private Long videoRam;
+
+    @Column(name = "max_heads")
+    private Long maxHeads;
+
+    @Column(name = "max_resolution_x")
+    private Long maxResolutionX;
+
+    @Column(name = "max_resolution_y")
+    private Long maxResolutionY;
+
+    @Column(name = GenericDao.CREATED_COLUMN)
+    private Date created;
+
+    public VgpuProfileVO() {
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    public VgpuProfileVO(String name, String description, Long gpuCardId, Long maxVgpuPerPgpu) {
+        this.uuid = UUID.randomUUID().toString();
+        this.name = name;
+        this.description = description;
+        this.cardId = gpuCardId;
+        this.maxVgpuPerPgpu = maxVgpuPerPgpu;
+        this.created = new Date();
+    }
+
+
+    public VgpuProfileVO(String name, String description, Long gpuCardId, Long maxVgpuPerPgpu, Long videoRam, Long maxHeads, Long maxResolutionX, Long maxResolutionY) {
+        this.uuid = UUID.randomUUID().toString();
+        this.name = name;
+        this.description = description;
+        this.cardId = gpuCardId;
+        this.maxVgpuPerPgpu = maxVgpuPerPgpu;
+        this.videoRam = videoRam;
+        this.maxHeads = maxHeads;
+        this.maxResolutionX = maxResolutionX;
+        this.maxResolutionY = maxResolutionY;
+        this.created = new Date();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("VgpuProfile %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                this, "id", "uuid", "name", "cardId"));
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public Date getCreated() {
+        return created;
+    }
+
+    @Override
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
+
+    @Override
+    public Long getMaxVgpuPerPgpu() {
+        return maxVgpuPerPgpu;
+    }
+
+    public void setMaxVgpuPerPgpu(Long maxVgpuPerPgpu) {
+        this.maxVgpuPerPgpu = maxVgpuPerPgpu;
+    }
+
+    @Override
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
+    @Override
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
+    @Override
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
+    @Override
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDao.java
new file mode 100644
index 00000000000..4463a690ae9
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDao.java
@@ -0,0 +1,39 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+
+import java.util.List;
+
+public interface GpuCardDao extends GenericDao<GpuCardVO, Long> {
+
+    /**
+     * Find GPU card by vendor and device id
+     *
+     * @param vendorId the vendor id
+     * @param deviceId the device id
+     * @return GpuCardVO
+     */
+    GpuCardVO findByVendorIdAndDeviceId(String vendorId, String deviceId);
+
+    Pair<List<GpuCardVO>, Integer> searchAndCountGpuCards(
+            Long id, String keyword, String vendorId, String vendorName,
+            String deviceId, String deviceName, boolean activeOnly, Long startIndex, Long pageSize);
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDaoImpl.java
new file mode 100644
index 00000000000..8aad85d4508
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDaoImpl.java
@@ -0,0 +1,122 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@Component
+public class GpuCardDaoImpl extends GenericDaoBase<GpuCardVO, Long> implements GpuCardDao {
+
+    private final SearchBuilder<GpuCardVO> allFieldSearch;
+
+    @Inject
+    private GpuDeviceDao gpuDeviceDao;
+
+    public GpuCardDaoImpl() {
+        allFieldSearch = createSearchBuilder();
+        allFieldSearch.and("name", allFieldSearch.entity().getName(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("vendorId", allFieldSearch.entity().getVendorId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("vendorName", allFieldSearch.entity().getVendorName(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("deviceId", allFieldSearch.entity().getDeviceId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("deviceName", allFieldSearch.entity().getDeviceName(), SearchCriteria.Op.EQ);
+        allFieldSearch.done();
+    }
+
+    @Override
+    public GpuCardVO findByVendorIdAndDeviceId(String vendorId, String deviceId) {
+        SearchCriteria<GpuCardVO> sc = allFieldSearch.create();
+        sc.setParameters("vendorId", vendorId);
+        sc.setParameters("deviceId", deviceId);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public Pair<List<GpuCardVO>, Integer> searchAndCountGpuCards(Long id, String keyword, String vendorId,
+            String vendorName, String deviceId, String deviceName, boolean activeOnly, Long startIndex, Long pageSize
+    ) {
+
+        Filter searchFilter = new Filter(GpuCardVO.class, "id", true, startIndex, pageSize);
+        SearchBuilder<GpuCardVO> sb = createSearchBuilder();
+
+        if (id != null) {
+            sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        }
+        if (keyword != null) {
+            sb.op("nameKeyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
+            sb.and("deviceNameKeyword", sb.entity().getDeviceName(), SearchCriteria.Op.LIKE);
+            sb.and("vendorNameKeyword", sb.entity().getVendorName(), SearchCriteria.Op.LIKE);
+            sb.cp();
+        }
+        if (vendorId != null) {
+            sb.and("vendorId", sb.entity().getVendorId(), SearchCriteria.Op.EQ);
+        }
+        if (vendorName != null) {
+            sb.and("vendorName", sb.entity().getVendorName(), SearchCriteria.Op.EQ);
+        }
+        if (deviceId != null) {
+            sb.and("deviceId", sb.entity().getDeviceId(), SearchCriteria.Op.EQ);
+        }
+        if (deviceName != null) {
+            sb.and("deviceName", sb.entity().getDeviceName(), SearchCriteria.Op.EQ);
+        }
+        if (activeOnly) {
+            sb.and("ids", sb.entity().getId(), SearchCriteria.Op.IN);
+        }
+        sb.done();
+
+        // Build search criteria
+        SearchCriteria<GpuCardVO> sc = sb.create();
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+        if (keyword != null) {
+            sc.setParameters("nameKeyword", "%" + keyword + "%");
+            sc.setParameters("deviceNameKeyword", "%" + keyword + "%");
+            sc.setParameters("vendorNameKeyword", "%" + keyword + "%");
+        }
+        if (vendorId != null) {
+            sc.setParameters("vendorId", vendorId);
+        }
+        if (vendorName != null) {
+            sc.setParameters("vendorName", vendorName);
+        }
+        if (deviceId != null) {
+            sc.setParameters("deviceId", deviceId);
+        }
+        if (deviceName != null) {
+            sc.setParameters("deviceName", deviceName);
+        }
+        if (activeOnly) {
+            List<Long> cardIds = gpuDeviceDao.getDistinctGpuCardIds();
+            if (cardIds.isEmpty()) {
+                return new Pair<>(List.of(), 0);
+            }
+            sc.setParameters("ids", cardIds.toArray());
+        }
+
+        return searchAndCount(sc, searchFilter);
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDao.java
new file mode 100644
index 00000000000..e362f23888d
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDao.java
@@ -0,0 +1,71 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuDeviceVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+
+import java.util.List;
+
+public interface GpuDeviceDao extends GenericDao<GpuDeviceVO, Long> {
+
+    List<GpuDeviceVO> listByIds(List<Long> ids);
+
+    /**
+     * Find GPU device by host ID and bus address
+     *
+     * @param hostId     the host ID
+     * @param busAddress the PCI bus address
+     * @return GpuDeviceVO
+     */
+    GpuDeviceVO findByHostIdAndBusAddress(long hostId, String busAddress);
+
+    /**
+     * List GPU devices by host ID
+     *
+     * @param hostId the ID of the host
+     * @return a list of GPU devices for the host
+     */
+    List<GpuDeviceVO> listByHostId(long hostId);
+
+    /**
+     * List GPU devices by VM ID
+     *
+     * @param vmId the VM ID
+     * @return list of GpuDeviceVO
+     */
+    List<GpuDeviceVO> listByVmId(long vmId);
+
+    boolean isVgpuProfileInUse(long vgpuProfileId);
+
+    boolean isGpuCardInUse(long cardId);
+
+    List<GpuDeviceVO> listByHostAndVm(Long hostId, long vmId);
+
+    List<GpuDeviceVO> listDevicesForAllocation(Long hostId, Long vgpuProfileId);
+
+    Pair<List<GpuDeviceVO>, Integer> searchAndCountGpuDevices(
+            Long id, String keyword, Long hostId, Long vmId, Long gpuCardId, Long vgpuProfileId,
+            Long startIndex, Long pageSize);
+
+    List<Long> getDistinctGpuCardIds();
+
+    List<Long> getDistinctVgpuProfileIds();
+
+    List<GpuDeviceVO> listByParentGpuDeviceId(Long parentGpuDeviceId);
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java
new file mode 100644
index 00000000000..bd7032aff27
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java
@@ -0,0 +1,260 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.gpu.GpuDeviceVO;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+public class GpuDeviceDaoImpl extends GenericDaoBase<GpuDeviceVO, Long> implements GpuDeviceDao {
+
+    private static final String IDS = "ids";
+    private static final String HOST_ID = "hostId";
+    private static final String VM_ID = "vmId";
+    private static final String BUS_ADDRESS = "busAddress";
+    private static final String CARD_ID = "cardId";
+    private static final String VGPU_PROFILE_ID = "vgpuProfileId";
+    private static final String PARENT_GPU_DEVICE_ID = "parentGpuDeviceId";
+    private static final String STATE = "state";
+    private static final String MANAGED_STATE = "managedState";
+    private static final String TYPE = "type";
+    private final SearchBuilder<GpuDeviceVO> allFieldSearch;
+    private SearchBuilder<GpuDeviceVO> devicesForAllocationSearch;
+    @Inject
+    private GpuCardDao gpuCardDao;
+    @Inject
+    private VgpuProfileDao vgpuProfileDao;
+
+    public GpuDeviceDaoImpl() {
+        allFieldSearch = createSearchBuilder();
+        allFieldSearch.and(IDS, allFieldSearch.entity().getId(), SearchCriteria.Op.IN);
+        allFieldSearch.and(HOST_ID, allFieldSearch.entity().getHostId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(CARD_ID, allFieldSearch.entity().getCardId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(BUS_ADDRESS, allFieldSearch.entity().getBusAddress(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(STATE, allFieldSearch.entity().getState(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(VGPU_PROFILE_ID, allFieldSearch.entity().getVgpuProfileId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(PARENT_GPU_DEVICE_ID, allFieldSearch.entity().getParentGpuDeviceId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and(VM_ID, allFieldSearch.entity().getVmId(), SearchCriteria.Op.EQ);
+        allFieldSearch.done();
+
+        devicesForAllocationSearch = createSearchBuilder();
+        devicesForAllocationSearch.and(HOST_ID, devicesForAllocationSearch.entity().getHostId(), SearchCriteria.Op.EQ);
+        devicesForAllocationSearch.and(VGPU_PROFILE_ID, devicesForAllocationSearch.entity().getVgpuProfileId(), SearchCriteria.Op.IN);
+        devicesForAllocationSearch.and(STATE, devicesForAllocationSearch.entity().getState(), SearchCriteria.Op.EQ);
+        devicesForAllocationSearch.and(MANAGED_STATE, devicesForAllocationSearch.entity().getManagedState(), SearchCriteria.Op.EQ);
+        devicesForAllocationSearch.and(TYPE, devicesForAllocationSearch.entity().getType(), SearchCriteria.Op.NEQ);
+        devicesForAllocationSearch.done();
+    }
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        return super.configure(name, params);
+    }
+
+    @Override
+    public List<GpuDeviceVO> listByIds(List<Long> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(IDS, ids.toArray());
+        return listBy(sc);
+    }
+
+    @Override
+    public GpuDeviceVO findByHostIdAndBusAddress(long hostId, String busAddress) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(HOST_ID, hostId);
+        sc.setParameters(BUS_ADDRESS, busAddress);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public List<GpuDeviceVO> listByHostId(long hostId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(HOST_ID, hostId);
+        return listBy(sc);
+    }
+
+    @Override
+    public List<GpuDeviceVO> listByVmId(long vmId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(VM_ID, vmId);
+        return listBy(sc);
+    }
+
+    @Override
+    public boolean isVgpuProfileInUse(long vgpuProfileId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(VGPU_PROFILE_ID, vgpuProfileId);
+        return getCount(sc) > 0;
+    }
+
+    @Override
+    public boolean isGpuCardInUse(long cardId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(CARD_ID, cardId);
+        return getCount(sc) > 0;
+    }
+
+    @Override
+    public List<GpuDeviceVO> listByHostAndVm(Long hostId, long vmId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(HOST_ID, hostId);
+        sc.setParameters(VM_ID, vmId);
+        return search(sc, null);
+    }
+
+    @Override
+    public List<GpuDeviceVO> listDevicesForAllocation(Long hostId, Long vgpuProfileId) {
+        SearchCriteria<GpuDeviceVO> sc = devicesForAllocationSearch.create();
+        sc.setParameters(HOST_ID, hostId);
+        sc.setParameters(VGPU_PROFILE_ID, vgpuProfileId);
+        sc.setParameters(STATE, GpuDevice.State.Free);
+        sc.setParameters(MANAGED_STATE, GpuDevice.ManagedState.Managed);
+        sc.setParameters(TYPE, GpuDevice.DeviceType.VGPUOnly);
+        return search(sc, null);
+    }
+
+    @Override
+    public Pair<List<GpuDeviceVO>, Integer> searchAndCountGpuDevices(Long id, String keyword, Long hostId, Long vmId,
+            Long gpuCardId, Long vgpuProfileId, Long startIndex, Long pageSize) {
+        Filter searchFilter = new Filter(GpuDeviceVO.class, "id", true, startIndex, pageSize);
+        SearchBuilder<GpuDeviceVO> sb = createSearchBuilder();
+
+        if (id != null) {
+            sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        }
+        if (hostId != null) {
+            sb.and("hostId", sb.entity().getHostId(), SearchCriteria.Op.EQ);
+        }
+        if (vmId != null) {
+            sb.and("vmId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
+        }
+        if (gpuCardId != null) {
+            sb.and("cardId", sb.entity().getCardId(), SearchCriteria.Op.EQ);
+        }
+        if (vgpuProfileId != null) {
+            sb.and("vgpuProfileId", sb.entity().getVgpuProfileId(), SearchCriteria.Op.EQ);
+        }
+        if (keyword != null) {
+            SearchBuilder<GpuCardVO> cardSb = gpuCardDao.createSearchBuilder();
+            SearchBuilder<VgpuProfileVO> profileSb = vgpuProfileDao.createSearchBuilder();
+            sb.join("cardJoin", cardSb, sb.entity().getCardId(), cardSb.entity().getId(), JoinBuilder.JoinType.INNER);
+            sb.join("profileJoin", profileSb, sb.entity().getCardId(), profileSb.entity().getId(),
+                    JoinBuilder.JoinType.INNER);
+
+            sb.op("cardNameKeyword", cardSb.entity().getName(), SearchCriteria.Op.LIKE);
+            sb.or("cardNameKeyword", cardSb.entity().getVendorName(), SearchCriteria.Op.LIKE);
+            sb.or("cardNameKeyword", cardSb.entity().getDeviceName(), SearchCriteria.Op.LIKE);
+
+            sb.op("profileNameKeyword", profileSb.entity().getName(), SearchCriteria.Op.LIKE);
+            sb.op("profileDescriptionKeyword", profileSb.entity().getDescription(), SearchCriteria.Op.LIKE);
+            sb.cp();
+        }
+
+        sb.done();
+
+        // Build search criteria
+        SearchCriteria<GpuDeviceVO> sc = sb.create();
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+        if (hostId != null) {
+            sc.setParameters("hostId", hostId);
+        }
+        if (vmId != null) {
+            sc.setParameters("vmId", vmId);
+        }
+        if (gpuCardId != null) {
+            sc.setParameters("cardId", gpuCardId);
+        }
+        if (vgpuProfileId != null) {
+            sc.setParameters("vgpuProfileId", vgpuProfileId);
+        }
+
+        if (keyword != null) {
+            sc.setJoinParameters("cardJoin", "cardNameKeyword", "%" + keyword + "%");
+            sc.setJoinParameters("cardJoin", "cardNameKeyword", "%" + keyword + "%");
+            sc.setJoinParameters("cardJoin", "cardNameKeyword", "%" + keyword + "%");
+            sc.setJoinParameters("profileJoin", "profileNameKeyword", "%" + keyword + "%");
+            sc.setJoinParameters("profileJoin", "profileDescriptionKeyword", "%" + keyword + "%");
+        }
+
+        return searchAndCount(sc, searchFilter);
+    }
+
+    @Override
+    public List<Long> getDistinctGpuCardIds() {
+        SearchBuilder<GpuDeviceVO> sb = createSearchBuilder();
+        sb.select(null, SearchCriteria.Func.DISTINCT, sb.entity().getCardId());
+        sb.done();
+        SearchCriteria<GpuDeviceVO> sc = sb.create();
+
+        List<GpuDeviceVO> gpuDevices = listBy(sc);
+        if (CollectionUtils.isEmpty(gpuDevices)) {
+            return Collections.emptyList();
+        }
+
+        return gpuDevices.stream()
+                .map(GpuDeviceVO::getCardId)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Long> getDistinctVgpuProfileIds() {
+        SearchBuilder<GpuDeviceVO> sb = createSearchBuilder();
+        sb.select(null, SearchCriteria.Func.DISTINCT, sb.entity().getVgpuProfileId());
+        sb.done();
+        SearchCriteria<GpuDeviceVO> sc = sb.create();
+
+        List<GpuDeviceVO> gpuDevices = listBy(sc);
+        if (CollectionUtils.isEmpty(gpuDevices)) {
+            return Collections.emptyList();
+        }
+
+        return gpuDevices.stream()
+                .map(GpuDeviceVO::getVgpuProfileId)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<GpuDeviceVO> listByParentGpuDeviceId(Long parentGpuDeviceId) {
+        SearchCriteria<GpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters(PARENT_GPU_DEVICE_ID, parentGpuDeviceId);
+        return listBy(sc);
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java
index 8e4f2f742ac..99e33617539 100644
--- a/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDao.java
@@ -19,6 +19,7 @@ package com.cloud.gpu.dao;
 import java.util.List;
 
 import com.cloud.gpu.HostGpuGroupsVO;
+import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
 
 public interface HostGpuGroupsDao extends GenericDao<HostGpuGroupsVO, Long> {
@@ -57,4 +58,15 @@ public interface HostGpuGroupsDao extends GenericDao<HostGpuGroupsVO, Long> {
      */
     void persist(long hostId, List<String> gpuGroups);
 
+
+    /**
+     * Returns max and remaining GPU capacity
+     *
+     * @param dcId
+     * @param podId
+     * @param clusterId
+     * @param hostId
+     * @return Pair containing max GPU capacity and remaining GPU capacity
+     */
+    Pair<Long, Long> getGpuStats(Long dcId, Long podId, Long clusterId, Long hostId);
 }
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
index 30535c7e27d..343b144597c 100644
--- a/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
@@ -16,9 +16,16 @@
 // under the License.
 package com.cloud.gpu.dao;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
 
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
 import org.springframework.stereotype.Component;
 
 import com.cloud.gpu.HostGpuGroupsVO;
@@ -87,4 +94,75 @@ public class HostGpuGroupsDaoImpl extends GenericDaoBase<HostGpuGroupsVO, Long>
         sc.setParameters("hostId", hostId);
         remove(sc);
     }
+
+    @Override
+    public Pair<Long, Long> getGpuStats(Long dcId, Long podId, Long clusterId, Long hostId) {
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
+        Pair<Long, Long> result = null;
+        List<Long> resourceIdList = new ArrayList<>();
+        String query = getStatsQuery(resourceIdList, dcId, podId, clusterId, hostId);
+
+        try {
+            PreparedStatement pstmt = txn.prepareAutoCloseStatement(query);
+            for (int i = 0; i < resourceIdList.size(); i++) {
+                pstmt.setLong(1 + i, resourceIdList.get(i));
+            }
+
+            ResultSet rs = pstmt.executeQuery();
+            while (rs.next()) {
+                result = new Pair<>(rs.getLong(1), rs.getLong(2));
+            }
+            return result;
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Error while fetching GPU stats: " + e.getMessage(), e);
+        } catch (Throwable e) {
+            throw new CloudRuntimeException("Caught: " + query, e);
+        }
+    }
+
+    private String getStatsQuery(List<Long> resourceIdList, Long dcId, Long podId, Long clusterId, Long hostId) {
+        StringBuilder query = new StringBuilder("SELECT SUM(max_capacity), SUM(remaining_capacity)" +
+                                                "FROM vgpu_types " +
+                                                "WHERE" +
+                                                "    gpu_group_id IN (" +
+                                                "        SELECT" +
+                                                "            host_gpu_groups.id" +
+                                                "        FROM" +
+                                                "            host_gpu_groups" +
+                                                "            INNER JOIN host ON host.id = host_gpu_groups.host_id ");
+        if (dcId != null) {
+            query.append("WHERE host.data_center_id = ? ");
+            resourceIdList.add(dcId);
+        }
+
+        if (podId != null) {
+            if (resourceIdList.isEmpty()) {
+                query.append("WHERE ");
+            } else {
+                query.append("AND ");
+            }
+            query.append(" host.pod_id = ? ");
+            resourceIdList.add(podId);
+        }
+        if (clusterId != null) {
+            if (resourceIdList.isEmpty()) {
+                query.append("WHERE ");
+            } else {
+                query.append("AND ");
+            }
+            query.append(" host.cluster_id = ? ");
+            resourceIdList.add(clusterId);
+        }
+        if (hostId != null) {
+            if (resourceIdList.isEmpty()) {
+                query.append("WHERE ");
+            } else {
+                query.append("AND ");
+            }
+            query.append(" host.id = ? ");
+            resourceIdList.add(hostId);
+        }
+        query.append("    )");
+        return query.toString();
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
index edc5e1f67c8..524feed2467 100644
--- a/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
@@ -16,6 +16,17 @@
 //under the License.
 package com.cloud.gpu.dao;
 
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.gpu.HostGpuGroupsVO;
+import com.cloud.gpu.VGPUTypesVO;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,42 +36,30 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
-import org.springframework.stereotype.Component;
-
-import com.cloud.agent.api.VgpuTypesInfo;
-import com.cloud.gpu.HostGpuGroupsVO;
-import com.cloud.gpu.VGPUTypesVO;
-import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.TransactionLegacy;
-import com.cloud.utils.exception.CloudRuntimeException;
-
 @Component
 public class VGPUTypesDaoImpl extends GenericDaoBase<VGPUTypesVO, Long> implements VGPUTypesDao {
 
-    private final SearchBuilder<VGPUTypesVO> _searchByGroupId;
-    private final SearchBuilder<VGPUTypesVO> _searchByGroupIdVGPUType;
-
-    @Inject protected HostGpuGroupsDao _hostGpuGroupsDao;
+    @Inject
+    protected HostGpuGroupsDao hostGpuGroupsDao;
 
     private static final String LIST_ZONE_POD_CLUSTER_WIDE_GPU_CAPACITIES =
             "SELECT host_gpu_groups.group_name, vgpu_type, max_vgpu_per_pgpu, SUM(remaining_capacity) AS remaining_capacity, SUM(max_capacity) AS total_capacity FROM" +
-            " `cloud`.`vgpu_types` INNER JOIN `cloud`.`host_gpu_groups` ON vgpu_types.gpu_group_id = host_gpu_groups.id INNER JOIN `cloud`.`host`" +
-            " ON host_gpu_groups.host_id = host.id WHERE host.type =  'Routing' AND host.data_center_id = ?";
+                    " `cloud`.`vgpu_types` INNER JOIN `cloud`.`host_gpu_groups` ON vgpu_types.gpu_group_id = host_gpu_groups.id INNER JOIN `cloud`.`host`" +
+                    " ON host_gpu_groups.host_id = host.id WHERE host.type =  'Routing' AND vgpu_types.max_capacity > 0 AND host.data_center_id = ?";
+
+    private final SearchBuilder<VGPUTypesVO> searchByGroupId;
+    private final SearchBuilder<VGPUTypesVO> searchByGroupIdVGPUType;
 
     public VGPUTypesDaoImpl() {
 
-        _searchByGroupId = createSearchBuilder();
-        _searchByGroupId.and("groupId", _searchByGroupId.entity().getGpuGroupId(), SearchCriteria.Op.EQ);
-        _searchByGroupId.done();
+        searchByGroupId = createSearchBuilder();
+        searchByGroupId.and("groupId", searchByGroupId.entity().getGpuGroupId(), SearchCriteria.Op.EQ);
+        searchByGroupId.done();
 
-        _searchByGroupIdVGPUType = createSearchBuilder();
-        _searchByGroupIdVGPUType.and("groupId", _searchByGroupIdVGPUType.entity().getGpuGroupId(), SearchCriteria.Op.EQ);
-        _searchByGroupIdVGPUType.and("vgpuType", _searchByGroupIdVGPUType.entity().getVgpuType(), SearchCriteria.Op.EQ);
-        _searchByGroupIdVGPUType.done();
+        searchByGroupIdVGPUType = createSearchBuilder();
+        searchByGroupIdVGPUType.and("groupId", searchByGroupIdVGPUType.entity().getGpuGroupId(), SearchCriteria.Op.EQ);
+        searchByGroupIdVGPUType.and("vgpuType", searchByGroupIdVGPUType.entity().getVgpuType(), SearchCriteria.Op.EQ);
+        searchByGroupIdVGPUType.done();
     }
 
     @Override
@@ -83,7 +82,7 @@ public class VGPUTypesDaoImpl extends GenericDaoBase<VGPUTypesVO, Long> implemen
             finalQuery.append(" AND host.cluster_id = ?");
             resourceIdList.add(clusterId);
         }
-        finalQuery.append(" GROUP BY host_gpu_groups.group_name, vgpu_type");
+        finalQuery.append(" GROUP BY host_gpu_groups.group_name, vgpu_type, max_vgpu_per_pgpu");
 
         try {
             pstmt = txn.prepareAutoCloseStatement(finalQuery.toString());
@@ -106,14 +105,14 @@ public class VGPUTypesDaoImpl extends GenericDaoBase<VGPUTypesVO, Long> implemen
 
     @Override
     public List<VGPUTypesVO> listByGroupId(long groupId) {
-        SearchCriteria<VGPUTypesVO> sc = _searchByGroupId.create();
+        SearchCriteria<VGPUTypesVO> sc = searchByGroupId.create();
         sc.setParameters("groupId", groupId);
         return listBy(sc);
     }
 
     @Override
     public VGPUTypesVO findByGroupIdVGPUType(long groupId, String vgpuType) {
-        SearchCriteria<VGPUTypesVO> sc = _searchByGroupIdVGPUType.create();
+        SearchCriteria<VGPUTypesVO> sc = searchByGroupIdVGPUType.create();
         sc.setParameters("groupId", groupId);
         sc.setParameters("vgpuType", vgpuType);
         return findOneBy(sc);
@@ -124,7 +123,7 @@ public class VGPUTypesDaoImpl extends GenericDaoBase<VGPUTypesVO, Long> implemen
         Iterator<Entry<String, HashMap<String, VgpuTypesInfo>>> it1 = groupDetails.entrySet().iterator();
         while (it1.hasNext()) {
             Entry<String, HashMap<String, VgpuTypesInfo>> entry = it1.next();
-            HostGpuGroupsVO gpuGroup = _hostGpuGroupsDao.findByHostIdGroupName(hostId, entry.getKey());
+            HostGpuGroupsVO gpuGroup = hostGpuGroupsDao.findByHostIdGroupName(hostId, entry.getKey());
             HashMap<String, VgpuTypesInfo> values = entry.getValue();
             Iterator<Entry<String, VgpuTypesInfo>> it2 = values.entrySet().iterator();
             while (it2.hasNext()) {
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDao.java b/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDao.java
new file mode 100644
index 00000000000..2628f1851f2
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDao.java
@@ -0,0 +1,33 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+
+import java.util.List;
+
+public interface VgpuProfileDao extends GenericDao<VgpuProfileVO, Long> {
+
+    VgpuProfileVO findByNameAndCardId(String name, long cardId);
+
+    int removeByCardId(long cardId);
+
+    Pair<List<VgpuProfileVO>, Integer> searchAndCountVgpuProfiles(Long id, String name, String keyword, Long gpuCardId,
+            boolean activeOnly, Long startIndex, Long pageSize);
+}
diff --git a/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java b/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java
new file mode 100644
index 00000000000..11dd7edb30d
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java
@@ -0,0 +1,110 @@
+// 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.
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@Component
+public class VgpuProfileDaoImpl extends GenericDaoBase<VgpuProfileVO, Long> implements VgpuProfileDao {
+
+    private final SearchBuilder<VgpuProfileVO> allFieldSearch;
+
+    @Inject
+    private GpuDeviceDao gpuDeviceDao;
+
+    public VgpuProfileDaoImpl() {
+        allFieldSearch = createSearchBuilder();
+        allFieldSearch.and("name", allFieldSearch.entity().getName(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("cardId", allFieldSearch.entity().getCardId(), SearchCriteria.Op.IN);
+        allFieldSearch.done();
+    }
+
+    @Override
+    public VgpuProfileVO findByNameAndCardId(String name, long cardId) {
+        SearchCriteria<VgpuProfileVO> sc = allFieldSearch.create();
+        sc.setParameters("name", name);
+        sc.setParameters("cardId", cardId);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public int removeByCardId(long cardId) {
+        SearchCriteria<VgpuProfileVO> sc = allFieldSearch.create();
+        sc.setParameters("cardId", cardId);
+        return remove(sc);
+    }
+
+    @Override
+    public Pair<List<VgpuProfileVO>, Integer> searchAndCountVgpuProfiles(Long id, String name, String keyword,
+            Long gpuCardId, boolean activeOnly, Long startIndex, Long pageSize) {
+        Filter searchFilter = new Filter(VgpuProfileVO.class, "id", true, startIndex, pageSize);
+        SearchBuilder<VgpuProfileVO> sb = createSearchBuilder();
+
+        if (id != null) {
+            sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        }
+        if (name != null) {
+            sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
+        }
+        if (keyword != null) {
+            sb.and("keywordName", sb.entity().getName(), SearchCriteria.Op.LIKE);
+            sb.and("keywordDescription", sb.entity().getDescription(), SearchCriteria.Op.LIKE);
+        }
+        if (gpuCardId != null) {
+            sb.and("cardId", sb.entity().getCardId(), SearchCriteria.Op.EQ);
+        }
+        if (activeOnly) {
+            sb.and("ids", sb.entity().getId(), SearchCriteria.Op.IN);
+        }
+        sb.done();
+
+        // Build search criteria
+        SearchCriteria<VgpuProfileVO> sc = sb.create();
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+        if (name != null) {
+            sc.setParameters("name", name);
+        }
+        if (keyword != null) {
+            sc.setParameters("keywordName", "%" + keyword + "%");
+            sc.setParameters("keywordDescription", "%" + keyword + "%");
+        }
+        if (gpuCardId != null) {
+            sc.setParameters("cardId", gpuCardId);
+        }
+
+        if (activeOnly) {
+            List<Long> vgpuProfileIds = gpuDeviceDao.getDistinctVgpuProfileIds();
+            if (vgpuProfileIds.isEmpty()) {
+                return new Pair<>(List.of(), 0);
+            }
+            sc.setParameters("ids", vgpuProfileIds.toArray());
+        }
+
+        return searchAndCount(sc, searchFilter);
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java
index 7f5c1a7afa1..cfe8049f5b2 100644
--- a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java
@@ -124,6 +124,15 @@ public class ServiceOfferingVO implements ServiceOffering {
     @Column(name = "dynamic_scaling_enabled")
     private boolean dynamicScalingEnabled = true;
 
+    @Column(name = "vgpu_profile_id")
+    private Long vgpuProfileId;
+
+    @Column(name = "gpu_count")
+    private Integer gpuCount;
+
+    @Column(name = "gpu_display")
+    private Boolean gpuDisplay;
+
     // This is a delayed load value.  If the value is null,
     // then this field has not been loaded yet.
     // Call service offering dao to load it.
@@ -198,6 +207,8 @@ public class ServiceOfferingVO implements ServiceOffering {
         systemUse = offering.isSystemUse();
         dynamicScalingEnabled = offering.isDynamicScalingEnabled();
         diskOfferingStrictness = offering.diskOfferingStrictness;
+        vgpuProfileId = offering.vgpuProfileId;
+        gpuCount = offering.gpuCount;
     }
 
     @Override
@@ -445,4 +456,30 @@ public class ServiceOfferingVO implements ServiceOffering {
     public void setDiskOfferingStrictness(boolean diskOfferingStrictness) {
         this.diskOfferingStrictness = diskOfferingStrictness;
     }
+
+    @Override
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public void setVgpuProfileId(Long vgpuProfileId) {
+        this.vgpuProfileId = vgpuProfileId;
+    }
+
+    @Override
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
+    public void setGpuCount(Integer gpuCount) {
+        this.gpuCount = gpuCount;
+    }
+
+    public Boolean getGpuDisplay() {
+        return gpuDisplay;
+    }
+
+    public void setGpuDisplay(Boolean gpuDisplay) {
+        this.gpuDisplay = gpuDisplay;
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
index ceb5b0a4fc1..d3bab4fcbe2 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.storage.Storage.ProvisioningType;
 import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.db.SearchBuilder;
 import com.cloud.vm.VirtualMachine;
 
 /*
@@ -57,4 +58,6 @@ public interface ServiceOfferingDao extends GenericDao<ServiceOfferingVO, Long>
     ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long diskOfferingId, boolean includingRemoved);
 
     List<Long> listIdsByHostTag(String tag);
+
+    void addCheckForGpuEnabled(SearchBuilder<ServiceOfferingVO> serviceOfferingSearch, Boolean gpuEnabled);
 }
diff --git a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 2710aea3b9d..f360770ad68 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -312,4 +312,13 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
         sc.setParameters("tagEndLike",   "%," + tag);
         return customSearch(sc, null);
     }
+
+    @Override
+    public void addCheckForGpuEnabled(SearchBuilder<ServiceOfferingVO> serviceOfferingSearch, Boolean gpuEnabled) {
+        if (gpuEnabled) {
+            serviceOfferingSearch.and("gpuEnabled", serviceOfferingSearch.entity().getVgpuProfileId(), SearchCriteria.Op.NNULL);
+        } else {
+            serviceOfferingSearch.and("gpuDisabled", serviceOfferingSearch.entity().getVgpuProfileId(), SearchCriteria.Op.NULL);
+        }
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
index fc0322c25e7..41bcb3155e5 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -821,6 +821,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
                 reservationDao.setResourceId(Resource.ResourceType.user_vm, userVM.getId());
                 reservationDao.setResourceId(Resource.ResourceType.cpu, userVM.getId());
                 reservationDao.setResourceId(Resource.ResourceType.memory, userVM.getId());
+                reservationDao.setResourceId(Resource.ResourceType.gpu, userVM.getId());
                 return userVM;
             });
         }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
index ef10af63bae..dc0391f71fd 100755
--- a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -131,12 +131,22 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
 
     private static final String ORDER_HOSTS_NUMBER_OF_VMS_FOR_ACCOUNT_PART2 = " GROUP BY host.id ORDER BY 2 ASC ";
 
-    private static final String COUNT_VMS_BASED_ON_VGPU_TYPES1 =
+    private static final String COUNT_VMS_BASED_ON_VGPU_TYPES1_LEGACY =
             "SELECT pci, type, SUM(vmcount) FROM (SELECT MAX(IF(offering.name = 'pciDevice',value,'')) AS pci, MAX(IF(offering.name = 'vgpuType', value,'')) " +
             "AS type, COUNT(DISTINCT vm.id) AS vmcount FROM service_offering_details offering INNER JOIN vm_instance vm ON offering.service_offering_id = vm.service_offering_id " +
             "INNER JOIN `cloud`.`host` ON vm.host_id = host.id WHERE vm.state = 'Running' AND host.data_center_id = ? ";
+    private static final String COUNT_VMS_BASED_ON_VGPU_TYPES2_LEGACY =
+            "GROUP BY vm.service_offering_id) results GROUP BY pci, type";
+
+    private static final String COUNT_VMS_BASED_ON_VGPU_TYPES1 =
+            "SELECT CONCAT(gpu_card.vendor_name,  ' ',  gpu_card.device_name), vgpu_profile.name, COUNT(gpu_device.vm_id) "
+            + "FROM `cloud`.`gpu_device` "
+            + "INNER JOIN `cloud`.`host` ON gpu_device.host_id = host.id "
+            + "INNER JOIN `cloud`.`gpu_card` ON gpu_device.card_id = gpu_card.id "
+            + "INNER JOIN `cloud`.`vgpu_profile` ON vgpu_profile.id = gpu_device.vgpu_profile_id "
+            + "WHERE vm_id IS NOT NULL AND host.data_center_id = ? ";
     private static final String COUNT_VMS_BASED_ON_VGPU_TYPES2 =
-            "GROUP BY offering.service_offering_id) results GROUP BY pci, type";
+            "GROUP BY gpu_card.name, vgpu_profile.name";
 
     private static final String UPDATE_SYSTEM_VM_TEMPLATE_ID_FOR_HYPERVISOR = "UPDATE `cloud`.`vm_instance` SET vm_template_id = ? WHERE type <> 'User' AND hypervisor_type = ? AND removed is NULL";
 
@@ -794,40 +804,52 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
 
     @Override
     public HashMap<String, Long> countVgpuVMs(Long dcId, Long podId, Long clusterId) {
+        StringBuilder finalQueryLegacy = new StringBuilder();
         StringBuilder finalQuery = new StringBuilder();
         TransactionLegacy txn = TransactionLegacy.currentTxn();
+        PreparedStatement pstmtLegacy = null;
         PreparedStatement pstmt = null;
         List<Long> resourceIdList = new ArrayList<Long>();
         HashMap<String, Long> result = new HashMap<String, Long>();
 
         resourceIdList.add(dcId);
+        finalQueryLegacy.append(COUNT_VMS_BASED_ON_VGPU_TYPES1_LEGACY);
         finalQuery.append(COUNT_VMS_BASED_ON_VGPU_TYPES1);
 
         if (podId != null) {
+            finalQueryLegacy.append("AND host.pod_id = ? ");
             finalQuery.append("AND host.pod_id = ? ");
             resourceIdList.add(podId);
         }
 
         if (clusterId != null) {
+            finalQueryLegacy.append("AND host.cluster_id = ? ");
             finalQuery.append("AND host.cluster_id = ? ");
             resourceIdList.add(clusterId);
         }
+        finalQueryLegacy.append(COUNT_VMS_BASED_ON_VGPU_TYPES2_LEGACY);
         finalQuery.append(COUNT_VMS_BASED_ON_VGPU_TYPES2);
 
         try {
+            pstmtLegacy = txn.prepareAutoCloseStatement(finalQueryLegacy.toString());
             pstmt = txn.prepareAutoCloseStatement(finalQuery.toString());
             for (int i = 0; i < resourceIdList.size(); i++) {
+                pstmtLegacy.setLong(1 + i, resourceIdList.get(i));
                 pstmt.setLong(1 + i, resourceIdList.get(i));
             }
-            ResultSet rs = pstmt.executeQuery();
+            ResultSet rs = pstmtLegacy.executeQuery();
+            while (rs.next()) {
+                result.put(rs.getString(1).concat(rs.getString(2)), rs.getLong(3));
+            }
+            rs = pstmt.executeQuery();
             while (rs.next()) {
                 result.put(rs.getString(1).concat(rs.getString(2)), rs.getLong(3));
             }
             return result;
         } catch (SQLException e) {
-            throw new CloudRuntimeException("DB Exception on: " + finalQuery, e);
+            throw new CloudRuntimeException("DB Exception on: " + finalQueryLegacy, e);
         } catch (Throwable e) {
-            throw new CloudRuntimeException("Caught: " + finalQuery, e);
+            throw new CloudRuntimeException("Caught: " + finalQueryLegacy, e);
         }
     }
 
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 1e144dde8f1..4d75c35c933 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -305,4 +305,7 @@
   <bean id="guiThemeDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeDaoImpl" />
   <bean id="guiThemeDetailsDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeDetailsDaoImpl" />
   <bean id="guiThemeJoinDaoImpl" class="org.apache.cloudstack.gui.theme.dao.GuiThemeJoinDaoImpl" />
+  <bean id="gpuCardDaoImpl" class="com.cloud.gpu.dao.GpuCardDaoImpl" />
+  <bean id="gpuDeviceDaoImpl" class="com.cloud.gpu.dao.GpuDeviceDaoImpl" />
+  <bean id="vgpuProfileDaoImpl" class="com.cloud.gpu.dao.VgpuProfileDaoImpl" />
 </beans>
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 275549e5eee..103b9363d6c 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -238,6 +238,68 @@ CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
     CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
 );
 
+-- Create the GPU card table to hold the GPU card information
+CREATE TABLE IF NOT EXISTS `cloud`.`gpu_card` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `uuid` varchar(40) NOT NULL UNIQUE,
+  `device_id` varchar(4) NOT NULL COMMENT 'device id of the GPU card',
+  `device_name` varchar(255) NOT NULL COMMENT 'device name of the GPU card',
+  `name` varchar(255) NOT NULL COMMENT 'name of the GPU card',
+  `vendor_name` varchar(255) NOT NULL COMMENT 'vendor name of the GPU card',
+  `vendor_id` varchar(4) NOT NULL COMMENT 'vendor id of the GPU card',
+  `created` datetime NOT NULL COMMENT 'date created',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY (`vendor_id`, `device_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='GPU cards supported by CloudStack';
+
+-- Create the vGPU profile table to hold the vGPU profile information.
+CREATE TABLE IF NOT EXISTS `cloud`.`vgpu_profile` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `uuid` varchar(40) NOT NULL UNIQUE,
+  `name` varchar(255) NOT NULL COMMENT 'name of the vGPU profile',
+  `description` varchar(255) DEFAULT NULL COMMENT 'description of the vGPU profile',
+  `card_id` bigint unsigned NOT NULL COMMENT 'id of the GPU card',
+  `video_ram` bigint unsigned DEFAULT NULL COMMENT 'video RAM of the vGPU profile',
+  `max_heads` bigint unsigned DEFAULT NULL COMMENT 'maximum number of heads of the vGPU profile',
+  `max_resolution_x` bigint unsigned DEFAULT NULL COMMENT 'maximum resolution x of the vGPU profile',
+  `max_resolution_y` bigint unsigned DEFAULT NULL COMMENT 'maximum resolution y of the vGPU profile',
+  `max_vgpu_per_pgpu` bigint unsigned DEFAULT NULL COMMENT 'Maximum number of vGPUs per physical GPU',
+  `created` datetime NOT NULL COMMENT 'date created',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY (`name`, `card_id`),
+  CONSTRAINT `fk_vgpu_profile_card_id` FOREIGN KEY (`card_id`) REFERENCES `gpu_card`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='vGPU profiles supported by CloudStack';
+
+-- Create the GPU device table to hold the GPU device information on different hosts
+CREATE TABLE IF NOT EXISTS `cloud`.`gpu_device` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `uuid` varchar(40) NOT NULL UNIQUE,
+  `card_id` bigint unsigned NOT NULL COMMENT 'id of the GPU card',
+  `vgpu_profile_id` bigint unsigned DEFAULT NULL COMMENT 'id of the vGPU profile.',
+  `bus_address` varchar(255) NOT NULL COMMENT 'PCI bus address of the GPU device',
+  `type` varchar(32) NOT NULL COMMENT 'type of the GPU device. PCI or MDEV',
+  `host_id` bigint unsigned NOT NULL COMMENT 'id of the host where GPU is installed',
+  `vm_id` bigint unsigned DEFAULT NULL COMMENT 'id of the VM using this GPU device',
+  `numa_node` varchar(255) DEFAULT NULL COMMENT 'NUMA node of the GPU device',
+  `pci_root` varchar(255) DEFAULT NULL COMMENT 'PCI root of the GPU device',
+  `parent_gpu_device_id` bigint unsigned DEFAULT NULL COMMENT 'id of the parent GPU device. null if it is a physical GPU device and for vGPUs points to the actual GPU',
+  `state` varchar(32) NOT NULL COMMENT 'state of the GPU device',
+  `managed_state` varchar(32) NOT NULL COMMENT 'resource state of the GPU device',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY (`bus_address`, `host_id`),
+  CONSTRAINT `fk_gpu_devices__card_id` FOREIGN KEY (`card_id`) REFERENCES `gpu_card` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_gpu_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_gpu_devices__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE SET NULL,
+  CONSTRAINT `fk_gpu_devices__parent_gpu_device_id` FOREIGN KEY (`parent_gpu_device_id`) REFERENCES `gpu_device` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='GPU devices installed on hosts';
+
+-- Add references to GPU tables
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.service_offering', 'vgpu_profile_id', 'bigint unsigned DEFAULT NULL COMMENT "vgpu profile ID"');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.service_offering', 'gpu_count', 'int unsigned DEFAULT NULL COMMENT "number of GPUs"');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.service_offering', 'gpu_display', 'boolean DEFAULT false COMMENT "enable GPU display"');
+CALL `cloud`.`IDEMPOTENT_DROP_FOREIGN_KEY`('cloud.service_offering','fk_service_offering__vgpu_profile_id');
+CALL `cloud`.`IDEMPOTENT_ADD_FOREIGN_KEY`('cloud.service_offering', 'fk_service_offering__vgpu_profile_id', '(vgpu_profile_id)', '`vgpu_profile`(`id`)');
+
 -- Netris Plugin
 CREATE TABLE `cloud`.`netris_providers` (
                                             `id` bigint unsigned NOT NULL auto_increment COMMENT '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 6092fe8e845..edc164c40cb 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
@@ -64,6 +64,8 @@ select
     `cpucount`.`count` AS `cpuTotal`,
     `memorylimit`.`max` AS `memoryLimit`,
     `memorycount`.`count` AS `memoryTotal`,
+    `gpulimit`.`max` AS `gpuLimit`,
+    `gpucount`.`count` AS `gpuTotal`,
     `primary_storage_limit`.`max` AS `primaryStorageLimit`,
     `primary_storage_count`.`count` AS `primaryStorageTotal`,
     `secondary_storage_limit`.`max` AS `secondaryStorageLimit`,
@@ -156,6 +158,12 @@ from
     `cloud`.`resource_count` memorycount ON account.id = memorycount.account_id
         and memorycount.type = 'memory' and memorycount.tag IS NULL
         left join
+    `cloud`.`resource_limit` gpulimit ON account.id = gpulimit.account_id
+        and gpulimit.type = 'gpu' and gpulimit.tag IS NULL
+        left join
+    `cloud`.`resource_count` gpucount ON account.id = gpucount.account_id
+        and gpucount.type = 'gpu' and gpucount.tag IS NULL
+        left join
     `cloud`.`resource_limit` primary_storage_limit ON account.id = primary_storage_limit.account_id
         and primary_storage_limit.type = 'primary_storage' and primary_storage_limit.tag IS NULL
         left join
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
index c9f7bfc51e4..14fd87536aa 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
@@ -55,6 +55,8 @@ select
     `cpucount`.`count` AS `cpuTotal`,
     `memorylimit`.`max` AS `memoryLimit`,
     `memorycount`.`count` AS `memoryTotal`,
+    `gpulimit`.`max` AS `gpuLimit`,
+    `gpucount`.`count` AS `gpuTotal`,
     `primary_storage_limit`.`max` AS `primaryStorageLimit`,
     `primary_storage_count`.`count` AS `primaryStorageTotal`,
     `secondary_storage_limit`.`max` AS `secondaryStorageLimit`,
@@ -130,6 +132,12 @@ from
     `cloud`.`resource_count` memorycount ON domain.id = memorycount.domain_id
         and memorycount.type = 'memory' and memorycount.tag IS NULL
         left join
+    `cloud`.`resource_limit` gpulimit ON domain.id = gpulimit.domain_id
+        and gpulimit.type = 'gpu' and gpulimit.tag IS NULL
+        left join
+    `cloud`.`resource_count` gpucount ON domain.id = gpucount.domain_id
+        and gpucount.type = 'gpu' and gpucount.tag IS NULL
+        left join
     `cloud`.`resource_limit` primary_storage_limit ON domain.id = primary_storage_limit.domain_id
         and primary_storage_limit.type = 'primary_storage' and primary_storage_limit.tag IS NULL
         left join
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql
index 18e6231ef89..eb987af3ffb 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql
@@ -73,6 +73,18 @@ SELECT
     `vsphere_storage_policy`.`value` AS `vsphere_storage_policy`,
     `lease_duration_details`.`value` AS `lease_duration`,
     `lease_expiry_action_details`.`value` AS `lease_expiry_action`,
+    `gpu_card`.`id` AS `gpu_card_id`,
+    `gpu_card`.`uuid` AS `gpu_card_uuid`,
+    `gpu_card`.`name` AS `gpu_card_name`,
+    `vgpu_profile`.`id` AS `vgpu_profile_id`,
+    `vgpu_profile`.`uuid` AS `vgpu_profile_uuid`,
+    `vgpu_profile`.`name` AS `vgpu_profile_name`,
+    `vgpu_profile`.`video_ram` AS `vgpu_profile_video_ram`,
+    `vgpu_profile`.`max_heads` AS `vgpu_profile_max_heads`,
+    `vgpu_profile`.`max_resolution_x` AS `vgpu_profile_max_resolution_x`,
+    `vgpu_profile`.`max_resolution_y` AS `vgpu_profile_max_resolution_y`,
+    `service_offering`.`gpu_count` AS `gpu_count`,
+    `service_offering`.`gpu_display` AS `gpu_display`,
     GROUP_CONCAT(DISTINCT(domain.id)) AS domain_id,
     GROUP_CONCAT(DISTINCT(domain.uuid)) AS domain_uuid,
     GROUP_CONCAT(DISTINCT(domain.name)) AS domain_name,
@@ -89,6 +101,10 @@ FROM
         INNER JOIN
     `cloud`.`disk_offering` ON service_offering.disk_offering_id = disk_offering.id
         LEFT JOIN
+    `cloud`.`vgpu_profile` ON service_offering.vgpu_profile_id = vgpu_profile.id
+        LEFT JOIN
+    `cloud`.`gpu_card` ON vgpu_profile.card_id = gpu_card.id
+        LEFT JOIN
     `cloud`.`service_offering_details` AS `domain_details` ON `domain_details`.`service_offering_id` = `service_offering`.`id` AND `domain_details`.`name`='domainid'
         LEFT JOIN
     `cloud`.`domain` AS `domain` ON FIND_IN_SET(`domain`.`id`, `domain_details`.`value`)
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
index 534579779c4..94bc8640fd5 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql
@@ -103,6 +103,17 @@ SELECT
     `backup_offering`.`uuid` AS `backup_offering_uuid`,
     `backup_offering`.`id` AS `backup_offering_id`,
     `service_offering`.`name` AS `service_offering_name`,
+    `service_offering`.`vgpu_profile_id` AS `vgpu_profile_id`,
+    `vgpu_profile`.`uuid` AS `vgpu_profile_uuid`,
+    `vgpu_profile`.`name` AS `vgpu_profile_name`,
+    `vgpu_profile`.`video_ram` AS `vgpu_profile_video_ram`,
+    `vgpu_profile`.`max_heads` AS `vgpu_profile_max_heads`,
+    `vgpu_profile`.`max_resolution_x` AS `vgpu_profile_max_resolution_x`,
+    `vgpu_profile`.`max_resolution_y` AS `vgpu_profile_max_resolution_y`,
+    `gpu_card`.`id` AS `gpu_card_id`,
+    `gpu_card`.`uuid` AS `gpu_card_uuid`,
+    `gpu_card`.`name` AS `gpu_card_name`,
+    `service_offering`.`gpu_count` AS `gpu_count`,
     `disk_offering`.`name` AS `disk_offering_name`,
     `backup_offering`.`name` AS `backup_offering_name`,
     `storage_pool`.`id` AS `pool_id`,
@@ -174,7 +185,7 @@ SELECT
     `lease_expiry_action`.`value` AS `lease_expiry_action`,
     `lease_action_execution`.`value` AS `lease_action_execution`
 FROM
-    (((((((((((((((((((((((((((((((((((`user_vm`
+    (((((((((((((((((((((((((((((((((((((`user_vm`
         JOIN `vm_instance` ON (((`vm_instance`.`id` = `user_vm`.`id`)
             AND ISNULL(`vm_instance`.`removed`))))
         JOIN `account` ON ((`vm_instance`.`account_id` = `account`.`id`)))
@@ -192,6 +203,8 @@ FROM
         LEFT JOIN `service_offering` ON ((`vm_instance`.`service_offering_id` = `service_offering`.`id`)))
         LEFT JOIN `disk_offering` `svc_disk_offering` ON ((`volumes`.`disk_offering_id` = `svc_disk_offering`.`id`)))
         LEFT JOIN `disk_offering` ON ((`volumes`.`disk_offering_id` = `disk_offering`.`id`)))
+        LEFT JOIN `vgpu_profile` ON ((`service_offering`.`vgpu_profile_id` = `vgpu_profile`.`id`)))
+        LEFT JOIN `gpu_card` ON ((`vgpu_profile`.`card_id` = `gpu_card`.`id`)))
         LEFT JOIN `backup_offering` ON ((`vm_instance`.`backup_offering_id` = `backup_offering`.`id`)))
         LEFT JOIN `storage_pool` ON ((`volumes`.`pool_id` = `storage_pool`.`id`)))
         LEFT JOIN `security_group_vm_map` ON ((`vm_instance`.`id` = `security_group_vm_map`.`instance_id`)))
diff --git a/engine/schema/src/test/java/com/cloud/gpu/dao/GpuCardDaoImplTest.java b/engine/schema/src/test/java/com/cloud/gpu/dao/GpuCardDaoImplTest.java
new file mode 100644
index 00000000000..e0a283add99
--- /dev/null
+++ b/engine/schema/src/test/java/com/cloud/gpu/dao/GpuCardDaoImplTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.utils.db.SearchCriteria;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GpuCardDaoImplTest {
+
+    @Spy
+    @InjectMocks
+    GpuCardDaoImpl gpuCardDaoImpl = new GpuCardDaoImpl();
+
+    @Test
+    public void findByVendorIdAndDeviceId() {
+        doReturn(mock(GpuCardVO.class)).when(gpuCardDaoImpl).findOneBy(any(SearchCriteria.class));
+
+        GpuCardVO gpuCard = gpuCardDaoImpl.findByVendorIdAndDeviceId("0d1a", "1a3b");
+        Assert.assertNotNull("Expected non-null gpu card", gpuCard);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuCardDaoImpl).findOneBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause",
+                "gpu_card.vendor_id = ?  AND gpu_card.device_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+}
diff --git a/engine/schema/src/test/java/com/cloud/gpu/dao/GpuDeviceDaoImplTest.java b/engine/schema/src/test/java/com/cloud/gpu/dao/GpuDeviceDaoImplTest.java
new file mode 100644
index 00000000000..1780fbd3df3
--- /dev/null
+++ b/engine/schema/src/test/java/com/cloud/gpu/dao/GpuDeviceDaoImplTest.java
@@ -0,0 +1,277 @@
+/*
+ * 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.
+ */
+
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.GpuDeviceVO;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.SearchCriteria;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GpuDeviceDaoImplTest {
+
+    @Spy
+    @InjectMocks
+    GpuDeviceDaoImpl gpuDeviceDao = new GpuDeviceDaoImpl();
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void listByIds_emptyList() {
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByIds(null);
+        Assert.assertTrue("Expected empty list", devices.isEmpty());
+        devices = gpuDeviceDao.listByIds(Collections.emptyList());
+        Assert.assertTrue("Expected empty list", devices.isEmpty());
+    }
+
+    @Test
+    public void listByIds() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByIds(List.of(1L, 2L, 3L));
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        SearchCriteria<GpuDeviceVO> sc = scCaptor.getValue();
+        Assert.assertEquals("Expected correct where clause", "gpu_device.id IN (?,?,?)", sc.getWhereClause().trim());
+    }
+
+    @Test
+    public void findByHostIdAndBusAddress() {
+        doReturn(mock(GpuDeviceVO.class)).when(gpuDeviceDao).findOneBy(any(SearchCriteria.class));
+
+        GpuDeviceVO device = gpuDeviceDao.findByHostIdAndBusAddress(1L, "0000:00:1f.6");
+
+        Assert.assertNotNull("Expected non-null device", device);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).findOneBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.host_id = ?  AND gpu_device.bus_address = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void listByHostId() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByHostId(1L);
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.host_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void listByVmId() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByVmId(1L);
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+
+        Assert.assertEquals("Expected correct where clause", "gpu_device.vm_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void isVgpuProfileInUse() {
+        doReturn(1).when(gpuDeviceDao).getCount(any(SearchCriteria.class));
+
+        boolean vgpuProfileInUse = gpuDeviceDao.isVgpuProfileInUse(1L);
+
+        Assert.assertTrue("Expected vGPU profile to be in use", vgpuProfileInUse);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).getCount(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.vgpu_profile_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void isGpuCardInUse() {
+        doReturn(1).when(gpuDeviceDao).getCount(any(SearchCriteria.class));
+
+        boolean vgpuProfileInUse = gpuDeviceDao.isGpuCardInUse(1L);
+
+        Assert.assertTrue("Expected GPU Card to be in use", vgpuProfileInUse);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).getCount(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.card_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void listByHostAndVm() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).search(any(SearchCriteria.class), any());
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByHostAndVm(1L, 2L);
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        ArgumentCaptor<Filter> filterCaptor = ArgumentCaptor.forClass(Filter.class);
+        verify(gpuDeviceDao).search(scCaptor.capture(), filterCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.host_id = ?  AND gpu_device.vm_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+        Assert.assertNull("Expected no filter", filterCaptor.getValue());
+    }
+
+    @Test
+    public void listDevicesForAllocation() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).search(any(SearchCriteria.class), any());
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listDevicesForAllocation(1L, 2L);
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        ArgumentCaptor<Filter> filterCaptor = ArgumentCaptor.forClass(Filter.class);
+        verify(gpuDeviceDao).search(scCaptor.capture(), filterCaptor.capture());
+        Assert.assertEquals("Expected correct where clause",
+                "gpu_device.host_id = ?  AND gpu_device.vgpu_profile_id=? AND gpu_device.state = ?  AND gpu_device"
+                + ".managed_state = ?  AND gpu_device.type != ?",
+                scCaptor.getValue().getWhereClause().trim());
+        Assert.assertNull("Expected no filter", filterCaptor.getValue());
+    }
+
+    @Test
+    public void searchAndCountGpuDevices() {
+    }
+
+    @Test
+    public void getDistinctGpuCardIds_no_devices() {
+        doReturn(null).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<Long> cardIds = gpuDeviceDao.getDistinctGpuCardIds();
+
+        Assert.assertTrue("Expected empty list", cardIds.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "", scCaptor.getValue().getWhereClause().trim());
+    }
+
+
+    @Test
+    public void getDistinctGpuCardIds() {
+        GpuDeviceVO device1 = mock(GpuDeviceVO.class);
+        GpuDeviceVO device2 = mock(GpuDeviceVO.class);
+        GpuDeviceVO device3 = mock(GpuDeviceVO.class);
+        when(device1.getCardId()).thenReturn(1L);
+        when(device2.getCardId()).thenReturn(2L);
+        when(device3.getCardId()).thenReturn(1L);
+
+        doReturn(List.of(device1, device2, device3)).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<Long> cardIds = gpuDeviceDao.getDistinctGpuCardIds();
+
+        Assert.assertEquals("Expected 2 card IDs", 2, cardIds.size());
+
+        Assert.assertTrue("Expected card ID 1 in list", cardIds.contains(1L));
+        Assert.assertTrue("Expected card ID 2 in list", cardIds.contains(2L));
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "", scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void getDistinctVgpuProfileIds_no_devices() {
+        doReturn(null).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<Long> cardIds = gpuDeviceDao.getDistinctVgpuProfileIds();
+
+        Assert.assertTrue("Expected empty list", cardIds.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "", scCaptor.getValue().getWhereClause().trim());
+    }
+
+
+    @Test
+    public void getDistinctVgpuProfileIds() {
+        GpuDeviceVO device1 = mock(GpuDeviceVO.class);
+        GpuDeviceVO device2 = mock(GpuDeviceVO.class);
+        GpuDeviceVO device3 = mock(GpuDeviceVO.class);
+        when(device1.getVgpuProfileId()).thenReturn(1L);
+        when(device2.getVgpuProfileId()).thenReturn(2L);
+        when(device3.getVgpuProfileId()).thenReturn(1L);
+
+        doReturn(List.of(device1, device2, device3)).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<Long> cardIds = gpuDeviceDao.getDistinctVgpuProfileIds();
+
+        Assert.assertEquals("Expected 2 VgpuProfile IDs", 2, cardIds.size());
+
+        Assert.assertTrue("Expected VgpuProfile ID 1 in list", cardIds.contains(1L));
+        Assert.assertTrue("Expected VgpuProfile ID 2 in list", cardIds.contains(2L));
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "", scCaptor.getValue().getWhereClause().trim());
+    }
+
+
+    @Test
+    public void listByParentGpuDeviceId() {
+        doReturn(List.of(mock(GpuDeviceVO.class))).when(gpuDeviceDao).listBy(any(SearchCriteria.class));
+
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByParentGpuDeviceId(1L);
+
+        Assert.assertFalse("Expected non empty list", devices.isEmpty());
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(gpuDeviceDao).listBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "gpu_device.parent_gpu_device_id = ?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+}
diff --git a/engine/schema/src/test/java/com/cloud/gpu/dao/VgpuProfileDaoImplTest.java b/engine/schema/src/test/java/com/cloud/gpu/dao/VgpuProfileDaoImplTest.java
new file mode 100644
index 00000000000..cd7199d020f
--- /dev/null
+++ b/engine/schema/src/test/java/com/cloud/gpu/dao/VgpuProfileDaoImplTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package com.cloud.gpu.dao;
+
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.utils.db.SearchCriteria;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class VgpuProfileDaoImplTest {
+
+    @Spy
+    @InjectMocks
+    VgpuProfileDaoImpl vgpuProfileDaoImpl = new VgpuProfileDaoImpl();
+
+    @Test
+    public void findByNameAndCardId() {
+        doReturn(mock(VgpuProfileVO.class)).when(vgpuProfileDaoImpl).findOneBy(any(SearchCriteria.class));
+
+        VgpuProfileVO vgpuProfile = vgpuProfileDaoImpl.findByNameAndCardId("test-profile", 1L);
+        Assert.assertNotNull("Expected non-null vgpu profile", vgpuProfile);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(vgpuProfileDaoImpl).findOneBy(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause",
+                "vgpu_profile.name = ?  AND vgpu_profile.card_id=?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+
+    @Test
+    public void removeByCardId() {
+        doReturn(1).when(vgpuProfileDaoImpl).remove(any(SearchCriteria.class));
+
+        int removed = vgpuProfileDaoImpl.removeByCardId(123L);
+        Assert.assertEquals("Expected one vgpu profile removed", 1, removed);
+
+        ArgumentCaptor<SearchCriteria> scCaptor = ArgumentCaptor.forClass(SearchCriteria.class);
+        verify(vgpuProfileDaoImpl).remove(scCaptor.capture());
+        Assert.assertEquals("Expected correct where clause", "vgpu_profile.card_id=?",
+                scCaptor.getValue().getWhereClause().trim());
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index d96290a86ac..3a6512cd01c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -74,6 +74,7 @@ import org.apache.cloudstack.command.CommandInfo;
 import org.apache.cloudstack.command.ReconcileCommandService;
 import org.apache.cloudstack.command.ReconcileCommandUtils;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.gpu.GpuDevice;
 import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsCommand;
 import org.apache.cloudstack.storage.configdrive.ConfigDrive;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
@@ -103,9 +104,9 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.Logger;
 import org.apache.xerces.impl.xpath.regex.Match;
 import org.joda.time.Duration;
 import org.libvirt.Connect;
@@ -130,7 +131,6 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.HostVmStateReportEntry;
@@ -143,6 +143,7 @@ import com.cloud.agent.api.SetupGuestNetworkCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
 import com.cloud.agent.api.StartupStorageCommand;
+import com.cloud.agent.api.VgpuTypesInfo;
 import com.cloud.agent.api.VmDiskStatsEntry;
 import com.cloud.agent.api.VmNetworkStatsEntry;
 import com.cloud.agent.api.VmStatsEntry;
@@ -213,8 +214,8 @@ import com.cloud.network.Networks.IsolationType;
 import com.cloud.network.Networks.RouterPrivateIpStrategy;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.resource.AgentStatusUpdater;
-import com.cloud.resource.ResourceStatusUpdater;
 import com.cloud.resource.RequestWrapper;
+import com.cloud.resource.ResourceStatusUpdater;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.ServerResourceBase;
 import com.cloud.storage.JavaStorageLayer;
@@ -241,6 +242,10 @@ import com.cloud.vm.VirtualMachine.PowerState;
 import com.cloud.vm.VmDetailConstants;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 
 /**
  * LibvirtComputingResource execute requests on the computing/routing host using
@@ -379,6 +384,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     private String modifyVlanPath;
     private String versionStringPath;
+    private String gpuDiscoveryPath;
     private String patchScriptPath;
     private String createVmPath;
     private String manageSnapshotPath;
@@ -487,12 +493,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     protected String agentHooksBasedir = "/etc/cloudstack/agent/hooks";
 
     protected String agentHooksLibvirtXmlScript = "libvirt-vm-xml-transformer.groovy";
+    protected String agentHooksLibvirtXmlShellScript = "libvirt-vm-xml-transformer.sh";
     protected String agentHooksLibvirtXmlMethod = "transform";
 
     protected String agentHooksVmOnStartScript = "libvirt-vm-state-change.groovy";
+    protected String agentHooksVmOnStartShellScript = "libvirt-vm-state-change.sh";
     protected String agentHooksVmOnStartMethod = "onStart";
 
     protected String agentHooksVmOnStopScript = "libvirt-vm-state-change.groovy";
+    protected String agentHooksVmOnStopShellScript = "libvirt-vm-state-change.sh";
     protected String agentHooksVmOnStopMethod = "onStop";
 
     protected static final String LOCAL_STORAGE_PATH = "local.storage.path";
@@ -686,15 +695,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     }
 
     public LibvirtKvmAgentHook getTransformer() throws IOException {
-        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksLibvirtXmlScript, agentHooksLibvirtXmlMethod);
+        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksLibvirtXmlScript, agentHooksLibvirtXmlShellScript, agentHooksLibvirtXmlMethod);
     }
 
     public LibvirtKvmAgentHook getStartHook() throws IOException {
-        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksVmOnStartScript, agentHooksVmOnStartMethod);
+        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksVmOnStartScript, agentHooksVmOnStartShellScript, agentHooksVmOnStartMethod);
     }
 
     public LibvirtKvmAgentHook getStopHook() throws IOException {
-        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksVmOnStopScript, agentHooksVmOnStopMethod);
+        return new LibvirtKvmAgentHook(agentHooksBasedir, agentHooksVmOnStopScript, agentHooksVmOnStopShellScript, agentHooksVmOnStopMethod);
     }
 
     public LibvirtUtilitiesHelper getLibvirtUtilitiesHelper() {
@@ -1039,6 +1048,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             throw new ConfigurationException("Unable to find versions.sh");
         }
 
+        gpuDiscoveryPath = Script.findScript(kvmScriptsDir, "gpudiscovery.sh");
+        if (gpuDiscoveryPath == null) {
+            throw new ConfigurationException("Unable to find gpudiscovery.sh");
+        }
+
         patchScriptPath = Script.findScript(kvmScriptsDir, "patch.sh");
         if (patchScriptPath == null) {
             throw new ConfigurationException("Unable to find patch.sh");
@@ -1593,18 +1607,27 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         agentHooksLibvirtXmlScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_XML_TRANSFORMER_SCRIPT);
         LOGGER.debug("agent.hooks.libvirt_vm_xml_transformer.script is " + agentHooksLibvirtXmlScript);
 
+        agentHooksLibvirtXmlShellScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_XML_TRANSFORMER_SHELL_SCRIPT);
+        LOGGER.debug("agent.hooks.libvirt_vm_xml_transformer.shell_script is " + agentHooksLibvirtXmlShellScript);
+
         agentHooksLibvirtXmlMethod = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_XML_TRANSFORMER_METHOD);
         LOGGER.debug("agent.hooks.libvirt_vm_xml_transformer.method is " + agentHooksLibvirtXmlMethod);
 
         agentHooksVmOnStartScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_START_SCRIPT);
         LOGGER.debug("agent.hooks.libvirt_vm_on_start.script is " + agentHooksVmOnStartScript);
 
+        agentHooksVmOnStartShellScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_START_SHELL_SCRIPT);
+        LOGGER.debug("agent.hooks.libvirt_vm_on_start.shell_script is " + agentHooksVmOnStartShellScript);
+
         agentHooksVmOnStartMethod = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_START_METHOD);
         LOGGER.debug("agent.hooks.libvirt_vm_on_start.method is " + agentHooksVmOnStartMethod);
 
         agentHooksVmOnStopScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_STOP_SCRIPT);
         LOGGER.debug("agent.hooks.libvirt_vm_on_stop.script is " + agentHooksVmOnStopScript);
 
+        agentHooksVmOnStopShellScript = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_STOP_SHELL_SCRIPT);
+        LOGGER.debug("agent.hooks.libvirt_vm_on_stop.shell_script is " + agentHooksVmOnStopShellScript);
+
         agentHooksVmOnStopMethod = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_LIBVIRT_VM_ON_STOP_METHOD);
         LOGGER.debug("agent.hooks.libvirt_vm_on_stop.method is " + agentHooksVmOnStopMethod);
     }
@@ -1955,6 +1978,173 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         return true;
     }
 
+    public List<VgpuTypesInfo> getGpuDevices() {
+        LOGGER.debug("Executing GPU discovery script at: {}", gpuDiscoveryPath);
+        final Script command = new Script(gpuDiscoveryPath, Duration.standardSeconds(30), LOGGER);
+
+        OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+        String result = command.execute(parser);
+        if (result == null) {
+            LOGGER.debug("GPU discovery command executed successfully");
+            result = parser.getLines();
+        }
+
+        if (result == null || result.trim().isEmpty()) {
+            LOGGER.error("GPU discovery failed: command returned null or empty result. Script path: {}, Exit code: {}",
+                    gpuDiscoveryPath, command.getExitValue());
+            return Collections.emptyList();
+        }
+
+        LOGGER.debug("GPU discovery result: {}", result);
+
+        // This will be used to update the GPU device list when agent on a host is unavailable or the VM is imported.
+        return parseGpuDevicesFromResult(result);
+    }
+
+    protected List<VgpuTypesInfo> parseGpuDevicesFromResult(String result) {
+        List<VgpuTypesInfo> gpuDevices = new ArrayList<>();
+        try {
+            JsonParser jsonParser = new JsonParser();
+            JsonArray jsonArray = jsonParser.parse(result).getAsJsonObject().get("gpus").getAsJsonArray();
+
+            for (JsonElement jsonElement : jsonArray) {
+                JsonObject jsonObject = jsonElement.getAsJsonObject();
+                String busAddress = jsonObject.get("pci_address").getAsString();
+                String vendorId = jsonObject.get("vendor_id").getAsString();
+                String vendorName = jsonObject.get("vendor").getAsString();
+                String deviceId = jsonObject.get("device_id").getAsString();
+                String deviceName = jsonObject.get("device").getAsString();
+
+                // vgpu instances uses mdev uuid
+                // vf instances uses vf_pci_address
+
+                JsonArray vgpuInstances = jsonObject.get("vgpu_instances").getAsJsonArray();
+                JsonArray vfInstances = jsonObject.get("vf_instances").getAsJsonArray();
+
+                JsonObject fullPassthrough = jsonObject.get("full_passthrough").getAsJsonObject();
+                boolean fullPassthroughEnabled = fullPassthrough.get("enabled").getAsInt() == 1;
+
+                String numaNode = getJsonStringValueOrNull(jsonObject, "numa_node");
+                String pciRoot = getJsonStringValueOrNull(jsonObject, "pci_root");
+
+                Long maxInstances = getJsonLongValueOrNull(jsonObject, "max_instances");
+                Long videoRam = getJsonLongValueOrNull(jsonObject, "video_ram");
+                Long maxHeads = getJsonLongValueOrNull(jsonObject, "max_heads");
+                Long maxResolutionX = getJsonLongValueOrNull(jsonObject, "max_resolution_x");
+                Long maxResolutionY = getJsonLongValueOrNull(jsonObject, "max_resolution_y");
+
+                VgpuTypesInfo vgpuType = new VgpuTypesInfo(GpuDevice.DeviceType.PCI, vendorName + " " + deviceName,
+                        "passthrough", busAddress, vendorId, vendorName, deviceId, deviceName, numaNode, pciRoot);
+
+                vgpuType.setMaxVgpuPerGpu(maxInstances);
+                vgpuType.setVideoRam(videoRam);
+                vgpuType.setMaxHeads(maxHeads);
+                vgpuType.setMaxResolutionX(maxResolutionX);
+                vgpuType.setMaxResolutionY(maxResolutionY);
+
+                if (fullPassthroughEnabled) {
+                    vgpuType.setPassthroughEnabled(true);
+                } else {
+                    vgpuType.setPassthroughEnabled(false);
+                }
+                vgpuType.setVmName(getJsonStringValueOrNull(fullPassthrough, "used_by_vm"));
+
+                gpuDevices.add(vgpuType);
+
+                for (JsonElement vgpuInstance : vgpuInstances) {
+                    VgpuTypesInfo vgpu = getGpuDeviceFromVgpuInstance(vgpuInstance, busAddress, vendorId, vendorName,
+                            deviceId, deviceName, numaNode, pciRoot);
+                    if (vgpu != null) {
+                        gpuDevices.add(vgpu);
+                    }
+                }
+
+                for (JsonElement vfInstance : vfInstances) {
+                    VgpuTypesInfo vf = getGpuDeviceFromVfInstance(vfInstance, busAddress, vendorId, vendorName,
+                            deviceId, deviceName, numaNode, pciRoot);
+                    if (vf != null) {
+                        gpuDevices.add(vf);
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.error("Failed to parse GPU discovery result: {}", e.getMessage(), e);
+        }
+        return gpuDevices;
+    }
+
+    protected VgpuTypesInfo getGpuDeviceFromVgpuInstance(JsonElement vgpuInstance, String busAddress, String vendorId,
+            String vendorName, String deviceId, String deviceName, String numaNode, String pciRoot) {
+        JsonObject vgpuInstanceJsonObject = vgpuInstance.getAsJsonObject();
+        String mdevUuid = getJsonStringValueOrNull(vgpuInstanceJsonObject, "mdev_uuid");
+        String profileName = getJsonStringValueOrNull(vgpuInstanceJsonObject, "profile_name");
+        if (profileName == null || profileName.isEmpty()) {
+            return null; // Skip if profile name is not provided
+        }
+        Long maxInstances = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_instances");
+        Long videoRam = getJsonLongValueOrNull(vgpuInstanceJsonObject, "video_ram");
+        Long maxHeads = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_heads");
+        Long maxResolutionX = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_resolution_x");
+        Long maxResolutionY = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_resolution_y");
+        VgpuTypesInfo device = new VgpuTypesInfo(GpuDevice.DeviceType.MDEV, vendorName + " " + deviceName, profileName, mdevUuid, vendorId, vendorName, deviceId, deviceName, numaNode, pciRoot);
+        device.setParentBusAddress(busAddress);
+        device.setMaxVgpuPerGpu(maxInstances);
+        device.setVideoRam(videoRam);
+        device.setMaxHeads(maxHeads);
+        device.setMaxResolutionX(maxResolutionX);
+        device.setMaxResolutionY(maxResolutionY);
+        device.setVmName(getJsonStringValueOrNull(vgpuInstance.getAsJsonObject(), "used_by_vm"));
+        return device;
+    }
+
+    protected VgpuTypesInfo getGpuDeviceFromVfInstance(JsonElement vfInstance, String busAddress, String vendorId,
+            String vendorName, String deviceId, String deviceName, String numaNode, String pciRoot) {
+        JsonObject vfInstanceJsonObject = vfInstance.getAsJsonObject();
+        String vfPciAddress = vfInstanceJsonObject.get("vf_pci_address").getAsString();
+        String vfProfile = vfInstanceJsonObject.get("vf_profile").getAsString();
+        if (vfProfile == null || vfProfile.isEmpty()) {
+            return null; // Skip if profile name is not provided
+        }
+        Long maxInstances = getJsonLongValueOrNull(vfInstanceJsonObject, "max_instances");
+        Long videoRam = getJsonLongValueOrNull(vfInstanceJsonObject, "video_ram");
+        Long maxHeads = getJsonLongValueOrNull(vfInstanceJsonObject, "max_heads");
+        Long maxResolutionX = getJsonLongValueOrNull(vfInstanceJsonObject, "max_resolution_x");
+        Long maxResolutionY = getJsonLongValueOrNull(vfInstanceJsonObject, "max_resolution_y");
+        VgpuTypesInfo device = new VgpuTypesInfo(GpuDevice.DeviceType.PCI, vendorName + " " + deviceName, vfProfile, vfPciAddress, vendorId, vendorName, deviceId, deviceName, numaNode, pciRoot);
+        device.setParentBusAddress(busAddress);
+        device.setMaxVgpuPerGpu(maxInstances);
+        device.setVideoRam(videoRam);
+        device.setMaxHeads(maxHeads);
+        device.setMaxResolutionX(maxResolutionX);
+        device.setMaxResolutionY(maxResolutionY);
+        device.setVmName(getJsonStringValueOrNull(vfInstanceJsonObject, "used_by_vm"));
+        return device;
+    }
+
+    /**
+     * Safely extracts a string value from a JSON object, returning null if the field is missing or null.
+     *
+     * @param jsonObject the JSON object to extract from
+     * @param fieldName the name of the field to extract
+     * @return the string value of the field, or null if the field is missing or null
+     */
+    protected String getJsonStringValueOrNull(JsonObject jsonObject, String fieldName) {
+        JsonElement element = jsonObject.get(fieldName);
+        if (element == null || element.isJsonNull()) {
+            return null;
+        }
+        return element.getAsString();
+    }
+
+    protected Long getJsonLongValueOrNull(JsonObject jsonObject, String fieldName) {
+        JsonElement element = jsonObject.get(fieldName);
+        if (element == null || element.isJsonNull()) {
+            return null;
+        }
+        return element.getAsLong();
+    }
+
     boolean isDirectAttachedNetwork(final String type) {
         if ("untagged".equalsIgnoreCase(type)) {
             return true;
@@ -2807,6 +2997,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         devices.addDevice(createConsoleDef());
         devices.addDevice(createGraphicDef(vmTO));
 
+        if (vmTO.getGpuDevice() != null && CollectionUtils.isNotEmpty(vmTO.getGpuDevice().getGpuDevices())) {
+            attachGpuDevices(vmTO, devices);
+        }
+
         if (!isGuestS390x()) {
             devices.addDevice(createTabletInputDef());
         }
@@ -2834,6 +3028,19 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         return devices;
     }
 
+    protected void attachGpuDevices(final VirtualMachineTO vmTO, final DevicesDef devicesDef) {
+        // GPU device is not set for the VM
+        List<VgpuTypesInfo> gpuDevices = vmTO.getGpuDevice().getGpuDevices();
+        for (VgpuTypesInfo gpuDevice : gpuDevices) {
+            LibvirtGpuDef gpu = new LibvirtGpuDef();
+
+            gpu.defGpu(gpuDevice);
+
+            devicesDef.addDevice(gpu);
+            LOGGER.info("Attached GPU device " + gpuDevice.getDeviceName() + " to VM " + vmTO.getName());
+        }
+    }
+
     protected WatchDogDef createWatchDogDef() {
         return new WatchDogDef(watchDogAction, watchDogModel);
     }
@@ -3947,6 +4154,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             hostDistro = cmd.getHostDetails().get("Host.OS");
         }
 
+        cmd.setGpuDevices(getGpuDevices());
+
         List<StartupCommand> startupCommands = new ArrayList<>();
         startupCommands.add(cmd);
         for (int i = 0; i < localStoragePaths.size(); i++) {
@@ -6214,5 +6423,4 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     public String getGuestCpuArch() {
         return guestCpuArch;
     }
-
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDef.java
new file mode 100644
index 00000000000..80a34b33b59
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDef.java
@@ -0,0 +1,102 @@
+// 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.
+package com.cloud.hypervisor.kvm.resource;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import org.apache.cloudstack.gpu.GpuDevice;
+
+public class LibvirtGpuDef {
+
+    private VgpuTypesInfo vgpuType;
+
+    public LibvirtGpuDef() {}
+
+    public void defGpu(VgpuTypesInfo vgpuType) {
+        this.vgpuType = vgpuType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder gpuBuilder = new StringBuilder();
+        GpuDevice.DeviceType deviceType = vgpuType.getDeviceType();
+
+        if (deviceType == GpuDevice.DeviceType.MDEV) {
+            // Generate XML for MDEV device (vGPU, including MIG instances)
+            generateMdevXml(gpuBuilder);
+        } else {
+            // Generate XML for PCI device (passthrough GPU or VF)
+            generatePciXml(gpuBuilder);
+        }
+
+        return gpuBuilder.toString();
+    }
+
+    private void generateMdevXml(StringBuilder gpuBuilder) {
+        String mdevUuid = vgpuType.getBusAddress(); // For MDEV devices, busAddress contains the UUID
+        String displayAttribute = vgpuType.isDisplay() ? "on" : "off";
+
+        gpuBuilder.append("<hostdev mode='subsystem' type='mdev' managed='no' display='").append(displayAttribute).append("'>\n");
+        gpuBuilder.append("  <source>\n");
+        gpuBuilder.append("    <address uuid='").append(mdevUuid).append("'/>\n");
+        gpuBuilder.append("  </source>\n");
+        gpuBuilder.append("</hostdev>\n");
+    }
+
+    private void generatePciXml(StringBuilder gpuBuilder) {
+        String busAddress = vgpuType.getBusAddress();
+
+        // For VDI use cases with display=on, ramfb provides early boot framebuffer
+        // before GPU driver loads. This is critical for:
+        // - Windows VDI guests (require framebuffer during boot)
+        // - UEFI/OVMF firmware environments
+        // - ARM64 hosts (cache coherency issues with traditional VGA)
+        // - Multi-monitor VDI setups (primary display)
+        if (vgpuType.isDisplay()) {
+            gpuBuilder.append("<hostdev mode='subsystem' type='pci' managed='yes' display='on' ramfb='on'>\n");
+        } else {
+            // Compute-only workloads don't need display or ramfb
+            gpuBuilder.append("<hostdev mode='subsystem' type='pci' managed='yes' display='off'>\n");
+        }
+        gpuBuilder.append("  <driver name='vfio'/>\n");
+        gpuBuilder.append("  <source>\n");
+
+        // Parse the bus address (e.g., 00:02.0) into domain, bus, slot, function
+        String domain = "0x0000";
+        String bus = "0x00";
+        String slot = "0x00";
+        String function = "0x0";
+
+        if (busAddress != null && !busAddress.isEmpty()) {
+            String[] parts = busAddress.split(":");
+            if (parts.length > 1) {
+                bus = "0x" + parts[0];
+                String[] slotFunctionParts = parts[1].split("\\.");
+                if (slotFunctionParts.length > 0) {
+                    slot = "0x" + slotFunctionParts[0];
+                    if (slotFunctionParts.length > 1) {
+                        function = "0x" + slotFunctionParts[1].trim();
+                    }
+                }
+            }
+        }
+
+        gpuBuilder.append("    <address domain='").append(domain).append("' bus='").append(bus).append("' slot='")
+                .append(slot).append("' function='").append(function.trim()).append("'/>\n");
+        gpuBuilder.append("  </source>\n");
+        gpuBuilder.append("</hostdev>\n");
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
index edcc5a05326..5d4ca37e457 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
@@ -17,6 +17,8 @@
 
 package com.cloud.hypervisor.kvm.resource;
 
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
 import groovy.lang.Binding;
 import groovy.lang.GroovyObject;
 import groovy.util.GroovyScriptEngine;
@@ -25,18 +27,39 @@ import groovy.util.ScriptException;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack;
+import org.joda.time.Duration;
 
 import java.io.File;
 import java.io.IOException;
 
 public class LibvirtKvmAgentHook {
     private final String script;
+    private final String shellScript;
     private final String method;
     private final GroovyScriptEngine gse;
     private final Binding binding = new Binding();
 
     protected Logger logger = LogManager.getLogger(getClass());
 
+    public LibvirtKvmAgentHook(String path, String script, String shellScript, String method) throws IOException {
+        this.script = script;
+        this.method = method;
+        File full_path = new File(path, script);
+        if (!full_path.canRead()) {
+            logger.warn("Groovy script '" + full_path.toString() + "' is not available. Transformations will not be applied.");
+            this.gse = null;
+        } else {
+            this.gse = new GroovyScriptEngine(path);
+        }
+        full_path = new File(path, shellScript);
+        if (!full_path.canRead()) {
+            logger.warn("Shell script '" + full_path.toString() + "' is not available. Transformations will not be applied.");
+            this.shellScript = null;
+        } else {
+            this.shellScript = full_path.getAbsolutePath();
+        }
+    }
+
     public LibvirtKvmAgentHook(String path, String script, String method) throws IOException {
         this.script = script;
         this.method = method;
@@ -47,31 +70,69 @@ public class LibvirtKvmAgentHook {
         } else {
             this.gse = new GroovyScriptEngine(path);
         }
+        this.shellScript = null;
     }
 
     public boolean isInitialized() {
         return this.gse != null;
     }
 
+    /**
+     * Sanitizes a string for safe use as a bash command argument by escaping special characters.
+     * This prevents shell injection and parsing issues when passing multiline content like XML.
+     */
+    String sanitizeBashCommandArgument(String input) {
+        if (input == null) {
+            return "";
+        }
+        StringBuilder sanitized = new StringBuilder();
+        for (char c : input.toCharArray()) {
+            if ("\\\"'`$|&;()<>*?![]{}~".indexOf(c) != -1) {
+                sanitized.append('\\');
+            }
+            sanitized.append(c);
+        }
+        return sanitized.toString();
+    }
+
     public Object handle(Object arg) throws ResourceException, ScriptException {
-        if (!isInitialized()) {
+        Object res = arg;
+        if (isInitialized()) {
+            GroovyObject cls = (GroovyObject) this.gse.run(this.script, binding);
+            if (null == cls) {
+                logger.warn("Groovy object is not received from script '" + this.script + "'.");
+                return arg;
+            } else {
+                Object[] params = {logger, arg};
+                try {
+                    res = cls.invokeMethod(this.method, params);
+                } catch (MissingMethodExceptionNoStack e) {
+                    logger.error("Error occurred when calling method from groovy script, {}", e);
+                    res = arg;
+                }
+            }
+        } else {
             logger.warn("Groovy scripting engine is not initialized. Data transformation skipped.");
-            return arg;
         }
 
-        GroovyObject cls = (GroovyObject) this.gse.run(this.script, binding);
-        if (null == cls) {
-            logger.warn("Groovy object is not received from script '" + this.script + "'.");
-            return arg;
-        } else {
-            Object[] params = {logger, arg};
-            try {
-                Object res = cls.invokeMethod(this.method, params);
-                return res;
-            } catch (MissingMethodExceptionNoStack e) {
-                logger.error("Error occurred when calling method from groovy script, {}", e);
-                return arg;
+        // Shell script
+        if (this.shellScript != null) {
+            logger.debug("Executing Shell script for transformation at: {}", this.shellScript);
+            final Script command = new Script(this.shellScript, Duration.standardSeconds(30), logger);
+            command.add(String.valueOf(this.method));
+            command.add(String.valueOf(res));
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = command.execute(parser);
+            if (result == null) {
+                logger.debug("GPU discovery command executed successfully");
+                res = parser.getLines();
+            } else {
+                logger.warn("Error occurred when calling script for transformation: {}", result);
             }
+        } else {
+            logger.debug("No shell script provided for transformation. Data transformation skipped.");
         }
+        return res;
     }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetGPUStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetGPUStatsCommandWrapper.java
new file mode 100644
index 00000000000..9d4da0224d6
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetGPUStatsCommandWrapper.java
@@ -0,0 +1,37 @@
+//
+// 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.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.GetGPUStatsAnswer;
+import com.cloud.agent.api.GetGPUStatsCommand;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+
+@ResourceWrapper(handles = GetGPUStatsCommand.class)
+public final class LibvirtGetGPUStatsCommandWrapper extends CommandWrapper<GetGPUStatsCommand, Answer,
+        LibvirtComputingResource> {
+
+    @Override
+    public Answer execute(final GetGPUStatsCommand command, final LibvirtComputingResource libvirtComputingResource) {
+        return new GetGPUStatsAnswer(command, libvirtComputingResource.getGpuDevices());
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
index 0d0dcd96ffa..94e60327253 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -40,9 +41,13 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.GPUDeviceTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtGpuDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtXMLParser;
 import org.apache.cloudstack.utils.security.ParserUtils;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -226,6 +231,8 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
 
             xmlDesc = updateVmSharesIfNeeded(command, xmlDesc, libvirtComputingResource);
 
+            xmlDesc = updateGpuDevicesIfNeeded(command, xmlDesc, libvirtComputingResource);
+
             dconn = libvirtUtilitiesHelper.retrieveQemuConnection(destinationUri);
 
             if (to.getType() == VirtualMachine.Type.User) {
@@ -417,6 +424,116 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
         return setOfLabels;
     }
 
+        String updateGpuDevicesIfNeeded(MigrateCommand migrateCommand, String xmlDesc, LibvirtComputingResource libvirtComputingResource)
+            throws ParserConfigurationException, IOException, SAXException, TransformerException {
+        GPUDeviceTO gpuDevice = migrateCommand.getVirtualMachine().getGpuDevice();
+        if (gpuDevice == null || CollectionUtils.isEmpty(gpuDevice.getGpuDevices())) {
+            logger.debug("No GPU device to update for VM [{}].", migrateCommand.getVmName());
+            return xmlDesc;
+        }
+
+        List<VgpuTypesInfo> devices = gpuDevice.getGpuDevices();
+        logger.info("Updating GPU devices for VM [{}] during migration. Number of devices: {}",
+                    migrateCommand.getVmName(), devices.size());
+
+        // Parse XML and find devices element
+        DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
+        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+        Document document;
+        try (InputStream inputStream = IOUtils.toInputStream(xmlDesc, StandardCharsets.UTF_8)) {
+            document = docBuilder.parse(inputStream);
+        }
+
+        NodeList devicesList = document.getElementsByTagName("devices");
+        if (devicesList.getLength() == 0) {
+            logger.warn("No devices section found in XML for VM [{}]", migrateCommand.getVmName());
+            return xmlDesc;
+        }
+
+        Element devicesElement = (Element) devicesList.item(0);
+
+        // Remove existing GPU hostdev elements and add new ones
+        removeExistingGpuHostdevElements(devicesElement);
+        addNewGpuHostdevElements(document, devicesElement, devices);
+
+        String newXmlDesc = LibvirtXMLParser.getXml(document);
+        logger.debug("Updated XML configuration for VM [{}] with new GPU devices", migrateCommand.getVmName());
+
+        return newXmlDesc;
+    }
+
+    /**
+     * Removes existing GPU hostdev elements from the devices section.
+     * GPU devices are identified as hostdev elements with type='pci' or type='mdev'.
+     */
+    private void removeExistingGpuHostdevElements(Element devicesElement) {
+        NodeList hostdevNodes = devicesElement.getElementsByTagName("hostdev");
+        List<Node> nodesToRemove = new ArrayList<>();
+
+        for (int i = 0; i < hostdevNodes.getLength(); i++) {
+            Node hostdevNode = hostdevNodes.item(i);
+            if (hostdevNode.getNodeType() == Node.ELEMENT_NODE) {
+                Element hostdevElement = (Element) hostdevNode;
+                String hostdevType = hostdevElement.getAttribute("type");
+
+                // Remove hostdev elements that represent GPU devices (type='pci' or type='mdev')
+                if ("pci".equals(hostdevType) || "mdev".equals(hostdevType)) {
+                    // Additional check: ensure this is actually a GPU device by checking mode='subsystem'
+                    String mode = hostdevElement.getAttribute("mode");
+                    if ("subsystem".equals(mode)) {
+                        nodesToRemove.add(hostdevNode);
+                    }
+                }
+            }
+        }
+
+        // Remove the nodes
+        for (Node node : nodesToRemove) {
+            devicesElement.removeChild(node);
+        }
+
+        logger.debug("Removed {} existing GPU hostdev elements", nodesToRemove.size());
+    }
+
+    /**
+     * Adds new GPU hostdev elements to the devices section based on the GPU devices
+     * allocated on the destination host.
+     */
+    private void addNewGpuHostdevElements(Document document, Element devicesElement, List<VgpuTypesInfo> devices)
+            throws ParserConfigurationException, IOException, SAXException {
+        if (devices.isEmpty()) {
+            return;
+        }
+
+        // Reuse parser for efficiency
+        DocumentBuilderFactory factory = ParserUtils.getSaferDocumentBuilderFactory();
+        DocumentBuilder builder = factory.newDocumentBuilder();
+
+        for (VgpuTypesInfo deviceInfo : devices) {
+            Element hostdevElement = createGpuHostdevElement(document, deviceInfo, builder);
+            devicesElement.appendChild(hostdevElement);
+            logger.debug("Added new GPU hostdev element for device: {} (type: {}, busAddress: {})",
+                         deviceInfo.getDeviceName(), deviceInfo.getDeviceType(), deviceInfo.getBusAddress());
+        }
+    }
+
+    /**
+     * Creates a hostdev element for a GPU device using LibvirtGpuDef.
+     */
+    private Element createGpuHostdevElement(Document document, VgpuTypesInfo deviceInfo, DocumentBuilder builder)
+            throws IOException, SAXException {
+        // Generate GPU XML using LibvirtGpuDef
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        gpuDef.defGpu(deviceInfo);
+        String gpuXml = gpuDef.toString();
+
+        // Parse and import into target document
+        try (InputStream xmlStream = IOUtils.toInputStream(gpuXml, StandardCharsets.UTF_8)) {
+            Document gpuDocument = builder.parse(xmlStream);
+            Element hostdevElement = gpuDocument.getDocumentElement();
+            return (Element) document.importNode(hostdevElement, true);
+        }
+    }
 
     /**
      * Checks if the CPU shares are equal in the source host and destination host.
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index ea380f1a8a7..fc4ec048d49 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,6 +64,8 @@ import javax.xml.xpath.XPathFactory;
 import com.cloud.utils.net.NetUtils;
 
 import com.cloud.vm.VmDetailConstants;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import org.apache.cloudstack.api.ApiConstants.IoDriverPolicy;
 import org.apache.cloudstack.storage.command.AttachAnswer;
 import org.apache.cloudstack.storage.command.AttachCommand;
@@ -163,6 +166,7 @@ import com.cloud.agent.api.UnPlugNicCommand;
 import com.cloud.agent.api.UnsupportedAnswer;
 import com.cloud.agent.api.UpdateHostPasswordCommand;
 import com.cloud.agent.api.UpgradeSnapshotCommand;
+import com.cloud.agent.api.VgpuTypesInfo;
 import com.cloud.agent.api.VmStatsEntry;
 import com.cloud.agent.api.check.CheckSshCommand;
 import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
@@ -6624,11 +6628,13 @@ public class LibvirtComputingResourceTest {
 
         Mockito.doReturn(List.of("path")).when(volumeObjectToMock).getCheckpointPaths();
 
-        Mockito.doNothing().when(libvirtComputingResourceSpy).recreateCheckpointsOfDisk(Mockito.any(), Mockito.any(), Mockito.any());
+        Mockito.doNothing().when(libvirtComputingResourceSpy)
+                .recreateCheckpointsOfDisk(Mockito.any(), Mockito.any(), Mockito.any());
 
         boolean result = libvirtComputingResourceSpy.recreateCheckpointsOnVm(List.of(volumeObjectToMock), null, null);
 
-        Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1)).recreateCheckpointsOfDisk(Mockito.any(), Mockito.any(), Mockito.any());
+        Mockito.verify(libvirtComputingResourceSpy, Mockito.times(1))
+                .recreateCheckpointsOfDisk(Mockito.any(), Mockito.any(), Mockito.any());
         Assert.assertTrue(result);
     }
 
@@ -6779,4 +6785,345 @@ public class LibvirtComputingResourceTest {
         libvirtComputingResourceSpy.manuallyDeleteUnusedSnapshotFile(true, "");
         Mockito.verify(libvirtComputingResourceSpy, Mockito.never()).deleteIfExists("");
     }
+
+    @Test
+    public void testGetJsonStringValueOrNullWithValidStringValue() {
+        // Test case: field exists and has a string value
+        String jsonString = "{\"testField\": \"testValue\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "testField");
+
+        assertEquals("testValue", result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withEmptyStringValue() {
+        // Test case: field exists and has an empty string value
+        String jsonString = "{\"testField\": \"\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "testField");
+
+        assertEquals("", result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withNullValue() {
+        // Test case: field exists but is null
+        String jsonString = "{\"testField\": null}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "testField");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withMissingField() {
+        // Test case: field doesn't exist in the JSON object
+        String jsonString = "{\"otherField\": \"otherValue\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "missingField");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withEmptyJsonObject() {
+        // Test case: empty JSON object
+        String jsonString = "{}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "anyField");
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withNumericValue() {
+        // Test case: field exists but contains a numeric value (should still work as it gets converted to string)
+        String jsonString = "{\"numericField\": 123}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "numericField");
+
+        assertEquals("123", result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withBooleanValue() {
+        // Test case: field exists but contains a boolean value (should still work as it gets converted to string)
+        String jsonString = "{\"booleanField\": true}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "booleanField");
+
+        assertEquals("true", result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withNullFieldName() {
+        // Test case: null field name should return null
+        String jsonString = "{\"testField\": \"testValue\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, null);
+
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withLongStringValue() {
+        // Test case: field exists and has a long string value
+        String longValue = "This is a very long string value that contains multiple words and special characters like @#$%^&*()";
+        String jsonString = "{\"longField\": \"" + longValue + "\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "longField");
+
+        assertEquals(longValue, result);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testGetJsonStringValueOrNull_withNullJsonObject() {
+        // Test case: null JSON object should throw NullPointerException
+        // This tests that the method doesn't handle null objects gracefully, which is expected behavior
+        libvirtComputingResourceSpy.getJsonStringValueOrNull(null, "testField");
+    }
+
+    @Test
+    public void testGetJsonStringValueOrNull_withSpecialCharacters() {
+        // Test case: field contains JSON special characters and unicode
+        String jsonString = "{\"specialField\": \"Value with \\\"quotes\\\", \\n newlines, and unicode: \\u00E9\"}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject jsonObject = jsonParser.parse(jsonString).getAsJsonObject();
+
+        String result = libvirtComputingResourceSpy.getJsonStringValueOrNull(jsonObject, "specialField");
+
+        assertEquals("Value with \"quotes\", \n newlines, and unicode: é", result);
+    }
+
+    @Test
+    public void testParseGpuDevicesFromResult_withSuccess() {
+        String result = "{\"gpus\": ["
+                        + "    {"
+                        + "      \"pci_address\": \"00:03.0\","
+                        + "      \"vendor_id\": \"10de\","
+                        + "      \"device_id\": \"2484\","
+                        + "      \"vendor\": \"NVIDIA Corporation\","
+                        + "      \"device\": \"GeForce RTX 3070\","
+                        + "      \"driver\": \"nvidia\","
+                        + "      \"pci_class\": \"VGA compatible controller\","
+                        + "      \"iommu_group\": \"8\","
+                        + "      \"sriov_totalvfs\": 0,"
+                        + "      \"sriov_numvfs\": 0,"
+                        + "      \"full_passthrough\": {"
+                        + "        \"enabled\": 1,"
+                        + "        \"libvirt_address\": {"
+                        + "          \"domain\": \"0x0000\","
+                        + "          \"bus\": \"0x00\","
+                        + "          \"slot\": \"0x03\","
+                        + "          \"function\": \"0x0\""
+                        + "        },"
+                        + "        \"used_by_vm\": \"win10\""
+                        + "      },"
+                        + "      \"vgpu_instances\": [],"
+                        + "      \"vf_instances\": []"
+                        + "    },"
+                        + "    {"
+                        + "      \"pci_address\": \"00:AF.0\","
+                        + "      \"vendor_id\": \"10de\","
+                        + "      \"device_id\": \"1EB8\","
+                        + "      \"vendor\": \"NVIDIA Corporation\","
+                        + "      \"device\": \"Tesla T4\","
+                        + "      \"driver\": \"nvidia\","
+                        + "      \"pci_class\": \"3D controller\","
+                        + "      \"iommu_group\": \"12\","
+                        + "      \"sriov_totalvfs\": 0,"
+                        + "      \"sriov_numvfs\": 0,"
+                        + "      \"full_passthrough\": {"
+                        + "        \"enabled\": 0,"
+                        + "        \"libvirt_address\": {"
+                        + "          \"domain\": \"0x0000\","
+                        + "          \"bus\": \"0x00\","
+                        + "          \"slot\": \"0xAF\","
+                        + "          \"function\": \"0x0\""
+                        + "        },"
+                        + "        \"used_by_vm\": null"
+                        + "      },"
+                        + "      \"vgpu_instances\": ["
+                        + "        {"
+                        + "          \"mdev_uuid\": \"a1b2c3d4-5678-4e9a-8b0c-d1e2f3a4b5c6\","
+                        + "          \"profile_name\": \"grid_t4-16c\","
+                        + "          \"max_instances\": 4,"
+                        + "          \"libvirt_address\": {"
+                        + "            \"domain\": \"0x0000\","
+                        + "            \"bus\": \"0x00\","
+                        + "            \"slot\": \"0xAF\","
+                        + "            \"function\": \"0x0\""
+                        + "          },"
+                        + "          \"used_by_vm\": \"vm1\""
+                        + "        },"
+                        + "        {"
+                        + "          \"mdev_uuid\": \"b2c3d4e5-6789-4f0a-9c1d-e2f3a4b5c6d7\","
+                        + "          \"profile_name\": \"grid_t4-8c\","
+                        + "          \"max_instances\": 8,"
+                        + "          \"libvirt_address\": {"
+                        + "            \"domain\": \"0x0000\","
+                        + "            \"bus\": \"0x00\","
+                        + "            \"slot\": \"0xAF\","
+                        + "            \"function\": \"0x1\""
+                        + "          },"
+                        + "          \"used_by_vm\": \"vm2\""
+                        + "        }"
+                        + "      ],"
+                        + "      \"vf_instances\": []"
+                        + "    },"
+                        + "    {"
+                        + "      \"pci_address\": \"00:65.0\","
+                        + "      \"vendor_id\": \"10de\","
+                        + "      \"device_id\": \"20B0\","
+                        + "      \"vendor\": \"NVIDIA Corporation\","
+                        + "      \"device\": \"A100-SXM4-40GB\","
+                        + "      \"driver\": \"nvidia\","
+                        + "      \"pci_class\": \"VGA compatible controller\","
+                        + "      \"iommu_group\": \"15\","
+                        + "      \"sriov_totalvfs\": 7,"
+                        + "      \"sriov_numvfs\": 7,"
+                        + "      \"full_passthrough\": {"
+                        + "        \"enabled\": 0,"
+                        + "        \"libvirt_address\": {"
+                        + "          \"domain\": \"0x0000\","
+                        + "          \"bus\": \"0x00\","
+                        + "          \"slot\": \"0x65\","
+                        + "          \"function\": \"0x0\""
+                        + "        },"
+                        + "        \"used_by_vm\": null"
+                        + "      },"
+                        + "      \"vgpu_instances\": [],"
+                        + "      \"vf_instances\": ["
+                        + "        {"
+                        + "          \"vf_pci_address\": \"00:65.2\","
+                        + "          \"vf_profile\": \"1g.5gb\","
+                        + "          \"libvirt_address\": {"
+                        + "            \"domain\": \"0x0000\","
+                        + "            \"bus\": \"0x00\","
+                        + "            \"slot\": \"0x65\","
+                        + "            \"function\": \"0x2\""
+                        + "          },"
+                        + "          \"used_by_vm\": \"ml\""
+                        + "        },"
+                        + "        {"
+                        + "          \"vf_pci_address\": \"00:65.3\","
+                        + "          \"vf_profile\": \"2g.10gb\","
+                        + "          \"libvirt_address\": {"
+                        + "            \"domain\": \"0x0000\","
+                        + "            \"bus\": \"0x00\","
+                        + "            \"slot\": \"0x65\","
+                        + "            \"function\": \"0x3\""
+                        + "          },"
+                        + "          \"used_by_vm\": null"
+                        + "        }"
+                        + "      ]"
+                        + "    }"
+                        + "  ]"
+                        + "}";
+        List<VgpuTypesInfo> gpuDevices = libvirtComputingResourceSpy.parseGpuDevicesFromResult(result);
+        assertEquals(7, gpuDevices.size());
+        // Verify first GPU device (RTX 3070)
+        VgpuTypesInfo firstGpu = gpuDevices.get(0);
+        assertEquals("00:03.0", firstGpu.getBusAddress());
+        assertEquals("10de", firstGpu.getVendorId());
+        assertEquals("2484", firstGpu.getDeviceId());
+        assertEquals("NVIDIA Corporation", firstGpu.getVendorName());
+        assertEquals("GeForce RTX 3070", firstGpu.getDeviceName());
+        assertEquals("passthrough", firstGpu.getModelName());
+        assertEquals("NVIDIA Corporation GeForce RTX 3070", firstGpu.getGroupName());
+        assertTrue(firstGpu.isPassthroughEnabled());
+        assertEquals("win10", firstGpu.getVmName());
+
+        // Verify second GPU device (Tesla T4)
+        VgpuTypesInfo secondGpu = gpuDevices.get(1);
+        assertEquals("00:AF.0", secondGpu.getBusAddress());
+        assertEquals("10de", secondGpu.getVendorId());
+        assertEquals("1EB8", secondGpu.getDeviceId());
+        assertEquals("NVIDIA Corporation", secondGpu.getVendorName());
+        assertEquals("Tesla T4", secondGpu.getDeviceName());
+        assertEquals("passthrough", secondGpu.getModelName());
+        assertEquals("NVIDIA Corporation Tesla T4", secondGpu.getGroupName());
+        assertFalse(secondGpu.isPassthroughEnabled());
+        assertNull(secondGpu.getVmName());
+
+        // Verify third GPU device (A100-SXM4-40GB)
+        VgpuTypesInfo thirdGpu = gpuDevices.get(4);
+        assertEquals("00:65.0", thirdGpu.getBusAddress());
+        assertEquals("10de", thirdGpu.getVendorId());
+        assertEquals("20B0", thirdGpu.getDeviceId());
+        assertEquals("NVIDIA Corporation", thirdGpu.getVendorName());
+        assertEquals("A100-SXM4-40GB", thirdGpu.getDeviceName());
+        assertEquals("NVIDIA Corporation A100-SXM4-40GB", thirdGpu.getGroupName());
+        assertEquals("passthrough", thirdGpu.getModelName());
+        assertEquals("NVIDIA Corporation A100-SXM4-40GB", thirdGpu.getGroupName());
+        assertFalse(thirdGpu.isPassthroughEnabled());
+        assertNull(thirdGpu.getVmName());
+
+        // Verify vGPU instances from Tesla T4
+        VgpuTypesInfo vgpuInstance1 = gpuDevices.get(2);
+        assertEquals("a1b2c3d4-5678-4e9a-8b0c-d1e2f3a4b5c6", vgpuInstance1.getBusAddress());
+        assertEquals("00:AF.0", vgpuInstance1.getParentBusAddress());
+        assertEquals("10de", vgpuInstance1.getVendorId());
+        assertEquals("1EB8", vgpuInstance1.getDeviceId());
+        assertEquals("NVIDIA Corporation", vgpuInstance1.getVendorName());
+        assertEquals("Tesla T4", vgpuInstance1.getDeviceName());
+        assertEquals("NVIDIA Corporation Tesla T4", vgpuInstance1.getGroupName());
+        assertEquals("grid_t4-16c", vgpuInstance1.getModelName());
+        assertEquals(Long.valueOf(4), vgpuInstance1.getMaxVpuPerGpu());
+        assertEquals("vm1", vgpuInstance1.getVmName());
+
+        VgpuTypesInfo vgpuInstance2 = gpuDevices.get(3);
+        assertEquals("b2c3d4e5-6789-4f0a-9c1d-e2f3a4b5c6d7", vgpuInstance2.getBusAddress());
+        assertEquals("00:AF.0", vgpuInstance2.getParentBusAddress());
+        assertEquals("10de", vgpuInstance2.getVendorId());
+        assertEquals("1EB8", vgpuInstance2.getDeviceId());
+        assertEquals("NVIDIA Corporation", vgpuInstance2.getVendorName());
+        assertEquals("Tesla T4", vgpuInstance2.getDeviceName());
+        assertEquals("NVIDIA Corporation Tesla T4", vgpuInstance2.getGroupName());
+        assertEquals("grid_t4-8c", vgpuInstance2.getModelName());
+        assertEquals(Long.valueOf(8), vgpuInstance2.getMaxVpuPerGpu());
+        assertEquals("vm2", vgpuInstance2.getVmName());
+
+        // Verify VF instances from NVIDIA Corporation A100-SXM4-40GB
+        VgpuTypesInfo vfInstance1 = gpuDevices.get(5);
+        assertEquals("00:65.0", vfInstance1.getParentBusAddress());
+        assertEquals("00:65.2", vfInstance1.getBusAddress());
+        assertEquals("10de", vfInstance1.getVendorId());
+        assertEquals("20B0", vfInstance1.getDeviceId());
+        assertEquals("NVIDIA Corporation", vfInstance1.getVendorName());
+        assertEquals("A100-SXM4-40GB", vfInstance1.getDeviceName());
+        assertEquals("NVIDIA Corporation A100-SXM4-40GB", vfInstance1.getGroupName());
+        assertEquals("1g.5gb", vfInstance1.getModelName());
+        assertEquals("ml", vfInstance1.getVmName());
+
+        VgpuTypesInfo vfInstance2 = gpuDevices.get(6);
+        assertEquals("00:65.0", vfInstance2.getParentBusAddress());
+        assertEquals("00:65.3", vfInstance2.getBusAddress());
+        assertEquals("10de", vfInstance2.getVendorId());
+        assertEquals("20B0", vfInstance2.getDeviceId());
+        assertEquals("NVIDIA Corporation", vfInstance2.getVendorName());
+        assertEquals("A100-SXM4-40GB", vfInstance2.getDeviceName());
+        assertEquals("NVIDIA Corporation A100-SXM4-40GB", vfInstance1.getGroupName());
+        assertEquals("2g.10gb", vfInstance2.getModelName());
+        assertNull(vfInstance2.getVmName());
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java
new file mode 100644
index 00000000000..5dbea4fabf9
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java
@@ -0,0 +1,142 @@
+// 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.
+
+package com.cloud.hypervisor.kvm.resource;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import junit.framework.TestCase;
+import org.apache.cloudstack.gpu.GpuDevice;
+import org.junit.Test;
+
+public class LibvirtGpuDefTest extends TestCase {
+
+    @Test
+    public void testGpuDef_withPciPassthrough() {
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        VgpuTypesInfo pciGpuInfo = new VgpuTypesInfo(
+                GpuDevice.DeviceType.PCI,
+                "passthrough",
+                "passthrough",
+                "00:02.0",
+                "10de",
+                "NVIDIA Corporation",
+                "1b38",
+                "Tesla T4"
+        );
+        gpuDef.defGpu(pciGpuInfo);
+
+        String gpuXml = gpuDef.toString();
+
+        assertTrue(gpuXml.contains("<hostdev mode='subsystem' type='pci' managed='yes' display='off'>"));
+        assertTrue(gpuXml.contains("<driver name='vfio'/>"));
+        assertTrue(gpuXml.contains("<address domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>"));
+        assertTrue(gpuXml.contains("</hostdev>"));
+    }
+
+    @Test
+    public void testGpuDef_withMdevDevice() {
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        VgpuTypesInfo mdevGpuInfo = new VgpuTypesInfo(
+                GpuDevice.DeviceType.MDEV,
+                "nvidia-63",
+                "GRID T4-2Q",
+                "4b20d080-1b54-4048-85b3-a6a62d165c01",
+                "10de",
+                "NVIDIA Corporation",
+                "1eb8",
+                "Tesla T4"
+        );
+        gpuDef.defGpu(mdevGpuInfo);
+
+        String gpuXml = gpuDef.toString();
+
+        assertTrue(gpuXml.contains("<hostdev mode='subsystem' type='mdev' managed='no' display='off'>"));
+        assertTrue(gpuXml.contains("<address uuid='4b20d080-1b54-4048-85b3-a6a62d165c01'/>"));
+        assertTrue(gpuXml.contains("</hostdev>"));
+        assertFalse(gpuXml.contains("vfio")); // MDEV should not contain vfio driver element
+    }
+
+    @Test
+    public void testGpuDef_withSriovVirtualFunction() {
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        VgpuTypesInfo vfGpuInfo = new VgpuTypesInfo(
+                GpuDevice.DeviceType.PCI,
+                "VF-Profile",
+                "VF-Profile",
+                "00:10.1",
+                "8086",
+                "Intel Corporation",
+                "1515",
+                "X710 Virtual Function"
+        );
+        gpuDef.defGpu(vfGpuInfo);
+
+        String gpuXml = gpuDef.toString();
+
+        assertTrue(gpuXml.contains("<hostdev mode='subsystem' type='pci' managed='yes' display='off'>"));
+        assertTrue(gpuXml.contains("<driver name='vfio'/>"));
+        assertTrue(gpuXml.contains("<address domain='0x0000' bus='0x00' slot='0x10' function='0x1'/>"));
+        assertTrue(gpuXml.contains("</hostdev>"));
+    }
+
+    @Test
+    public void testGpuDef_withComplexPciAddress() {
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        VgpuTypesInfo complexPciGpuInfo = new VgpuTypesInfo(
+                GpuDevice.DeviceType.PCI,
+                "passthrough",
+                "passthrough",
+                "81:00.0",
+                "1002",
+                "Advanced Micro Devices",
+                "73a3",
+                "Navi 21"
+        );
+        gpuDef.defGpu(complexPciGpuInfo);
+
+        String gpuXml = gpuDef.toString();
+
+        assertTrue(gpuXml.contains("<hostdev mode='subsystem' type='pci' managed='yes' display='off'>"));
+        assertTrue(gpuXml.contains("<driver name='vfio'/>"));
+        assertTrue(gpuXml.contains("<address domain='0x0000' bus='0x81' slot='0x00' function='0x0'/>"));
+        assertTrue(gpuXml.contains("</hostdev>"));
+    }
+
+    @Test
+    public void testGpuDef_withNullDeviceType() {
+        LibvirtGpuDef gpuDef = new LibvirtGpuDef();
+        VgpuTypesInfo nullTypeGpuInfo = new VgpuTypesInfo(
+                null, // null device type should default to PCI behavior
+                "passthrough",
+                "passthrough",
+                "00:05.0",
+                "10de",
+                "NVIDIA Corporation",
+                "1db4",
+                "V100"
+        );
+        gpuDef.defGpu(nullTypeGpuInfo);
+
+        String gpuXml = gpuDef.toString();
+
+        // Should default to PCI behavior when device type is null
+        assertTrue(gpuXml.contains("<hostdev mode='subsystem' type='pci' managed='yes' display='off'>"));
+        assertTrue(gpuXml.contains("<driver name='vfio'/>"));
+        assertTrue(gpuXml.contains("<address domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>"));
+        assertTrue(gpuXml.contains("</hostdev>"));
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java
index 9cf9ca31e0f..80a04aaff09 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java
@@ -102,4 +102,47 @@ public class LibvirtKvmAgentHookTest extends TestCase {
         assertEquals(t.isInitialized(), false);
         assertEquals(t.handle(source), source);
     }
+
+    @Test
+    public void testSanitizeBashCommandArgument() throws IOException {
+        LibvirtKvmAgentHook hook = new LibvirtKvmAgentHook(dir, script, method);
+
+        // Test case map: input -> expected output
+        java.util.Map<String, String> testCases = new java.util.LinkedHashMap<>();
+
+        // Edge cases
+        testCases.put("", ""); // Empty string
+        testCases.put("normalString123", "normalString123"); // Normal string without special chars
+
+        // Special character escaping
+        testCases.put("test\"string'with`special$chars", "test\\\"string\\'with\\`special\\$chars");
+        testCases.put("\\\"'`$|&;()<>*?![]{}~", "\\\\\\\"\\'\\`\\$\\|\\&\\;\\(\\)\\<\\>\\*\\?\\!\\[\\]\\{\\}\\~");
+
+        // XML content scenarios
+        testCases.put("<domain type='kvm'>\n  <name>test-vm</name>\n  <memory>1048576</memory>\n</domain>",
+                "\\<domain type=\\'kvm\\'\\>\n  \\<name\\>test-vm\\</name\\>\n  "
+                + "\\<memory\\>1048576\\</memory\\>\n\\</domain\\>");
+        testCases.put("<device path='/dev/disk' value=\"$HOME\" command=`ls -la`>&amp;</device>",
+                "\\<device path=\\'/dev/disk\\' value=\\\"\\$HOME\\\" command=\\`ls -la\\`\\>\\&amp\\;\\</device\\>");
+
+        // Multiline content (newlines should not be escaped)
+        testCases.put("line1\nline2\rline3\r\nline4", "line1\nline2\rline3\r\nline4");
+
+        // Security test cases
+        testCases.put("normal; rm -rf /; echo 'gotcha'", "normal\\; rm -rf /\\; echo \\'gotcha\\'");
+        testCases.put("data | grep pattern > output.txt", "data \\| grep pattern \\> output.txt");
+        testCases.put("$(whoami) and `date`", "\\$\\(whoami\\) and \\`date\\`");
+
+        // Test each case
+        for (java.util.Map.Entry<String, String> testCase : testCases.entrySet()) {
+            String input = testCase.getKey();
+            String expected = testCase.getValue();
+            String actual = hook.sanitizeBashCommandArgument(input);
+            assertEquals("Failed for input: " + input, expected, actual);
+        }
+
+        // Test null input separately since it can't be a map key
+        String nullResult = hook.sanitizeBashCommandArgument(null);
+        assertEquals("Null input should return empty string", "", nullResult);
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
index b62fce5c105..0407ed8bbfd 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
@@ -63,12 +63,15 @@ import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.DiskType;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.DriverType;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.Source;
+import com.cloud.agent.api.VgpuTypesInfo;
 import com.cloud.agent.api.to.DpdkTO;
+import com.cloud.agent.api.to.GPUDeviceTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
 import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
 import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.gpu.GpuDevice;
 
 @RunWith(MockitoJUnitRunner.class)
 public class LibvirtMigrateCommandWrapperTest {
@@ -578,6 +581,72 @@ public class LibvirtMigrateCommandWrapperTest {
             "  </devices>\n" +
             "</domain>\n";
 
+    private String xmlWithGpuDevices =
+            "<domain type='kvm' id='3'>\n" +
+            "  <name>i-2-3-VM</name>\n" +
+            "  <uuid>91860126-7dda-4876-ac1e-48d06cd4b2eb</uuid>\n" +
+            "  <memory unit='KiB'>524288</memory>\n" +
+            "  <currentMemory unit='KiB'>524288</currentMemory>\n" +
+            "  <vcpu placement='static'>1</vcpu>\n" +
+            "  <devices>\n" +
+            "    <emulator>/usr/libexec/qemu-kvm</emulator>\n" +
+            "    <disk type='file' device='disk'>\n" +
+            "      <driver name='qemu' type='qcow2' cache='none'/>\n" +
+            "      <source file='/mnt/storage/disk.qcow2'/>\n" +
+            "      <target dev='vda' bus='virtio'/>\n" +
+            "    </disk>\n" +
+            "    <hostdev mode='subsystem' type='pci' managed='yes' display='off'>\n" +
+            "      <driver name='vfio'/>\n" +
+            "      <source>\n" +
+            "        <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>\n" +
+            "      </source>\n" +
+            "    </hostdev>\n" +
+            "    <hostdev mode='subsystem' type='mdev' managed='no' display='on'>\n" +
+            "      <source>\n" +
+            "        <address uuid='4b20d080-1b54-4048-85b3-a6a62d165c01'/>\n" +
+            "      </source>\n" +
+            "    </hostdev>\n" +
+            "    <interface type='bridge'>\n" +
+            "      <mac address='02:00:4c:5f:00:01'/>\n" +
+            "      <source bridge='breth1-511'/>\n" +
+            "      <target dev='vnet6'/>\n" +
+            "      <model type='e1000'/>\n" +
+            "    </interface>\n" +
+            "  </devices>\n" +
+            "</domain>";
+
+    private String xmlWithoutGpuDevices =
+            "<domain type='kvm' id='3'>\n" +
+            "  <name>i-2-3-VM</name>\n" +
+            "  <uuid>91860126-7dda-4876-ac1e-48d06cd4b2eb</uuid>\n" +
+            "  <memory unit='KiB'>524288</memory>\n" +
+            "  <currentMemory unit='KiB'>524288</currentMemory>\n" +
+            "  <vcpu placement='static'>1</vcpu>\n" +
+            "  <devices>\n" +
+            "    <emulator>/usr/libexec/qemu-kvm</emulator>\n" +
+            "    <disk type='file' device='disk'>\n" +
+            "      <driver name='qemu' type='qcow2' cache='none'/>\n" +
+            "      <source file='/mnt/storage/disk.qcow2'/>\n" +
+            "      <target dev='vda' bus='virtio'/>\n" +
+            "    </disk>\n" +
+            "    <interface type='bridge'>\n" +
+            "      <mac address='02:00:4c:5f:00:01'/>\n" +
+            "      <source bridge='breth1-511'/>\n" +
+            "      <target dev='vnet6'/>\n" +
+            "      <model type='e1000'/>\n" +
+            "    </interface>\n" +
+            "  </devices>\n" +
+            "</domain>";
+
+    private String xmlNoDevicesSection =
+            "<domain type='kvm' id='3'>\n" +
+            "  <name>i-2-3-VM</name>\n" +
+            "  <uuid>91860126-7dda-4876-ac1e-48d06cd4b2eb</uuid>\n" +
+            "  <memory unit='KiB'>524288</memory>\n" +
+            "  <currentMemory unit='KiB'>524288</currentMemory>\n" +
+            "  <vcpu placement='static'>1</vcpu>\n" +
+            "</domain>";
+
     private Map<String, MigrateDiskInfo> createMapMigrateStorage(String sourceText, String path) {
         Map<String, MigrateDiskInfo> mapMigrateStorage = new HashMap<String, MigrateDiskInfo>();
 
@@ -1019,4 +1088,154 @@ public class LibvirtMigrateCommandWrapperTest {
 
         Assert.assertTrue(finalXml.contains(newIsoVolumePath));
     }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestNoGpuDevice() throws Exception {
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(null).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlWithoutGpuDevices, libvirtComputingResourceMock);
+
+        Assert.assertEquals("XML should remain unchanged when no GPU device is present", xmlWithoutGpuDevices, result);
+    }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestNoDevicesSection() throws Exception {
+        List<VgpuTypesInfo> gpuDevices = createTestMixedGpuDevices();
+        GPUDeviceTO gpuDeviceTO = Mockito.mock(GPUDeviceTO.class);
+        Mockito.doReturn(gpuDevices).when(gpuDeviceTO).getGpuDevices();
+
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(gpuDeviceTO).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlNoDevicesSection, libvirtComputingResourceMock);
+
+        Assert.assertEquals("XML should remain unchanged when no devices section is found", xmlNoDevicesSection, result);
+    }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestWithPciDevice() throws Exception {
+        List<VgpuTypesInfo> gpuDevices = createTestPciGpuDevice();
+        GPUDeviceTO gpuDeviceTO = Mockito.mock(GPUDeviceTO.class);
+        Mockito.doReturn(gpuDevices).when(gpuDeviceTO).getGpuDevices();
+
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(gpuDeviceTO).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlWithGpuDevices, libvirtComputingResourceMock);
+
+        // Verify that old GPU devices are removed and new ones are added
+        Assert.assertFalse("Old PCI device should be removed", result.contains("bus='0x01' slot='0x00'"));
+        Assert.assertFalse("Old MDEV device should be removed", result.contains("4b20d080-1b54-4048-85b3-a6a62d165c01"));
+        Assert.assertTrue("New PCI device should be added", result.contains("bus=\"0x02\""));
+        Assert.assertTrue("New PCI device should be added", result.contains("slot=\"0x00\""));
+        Assert.assertTrue("PCI device should have vfio driver", result.contains("name=\"vfio\""));
+    }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestWithMdevDevice() throws Exception {
+        List<VgpuTypesInfo> gpuDevices = createTestMdevGpuDevice();
+        GPUDeviceTO gpuDeviceTO = Mockito.mock(GPUDeviceTO.class);
+        Mockito.doReturn(gpuDevices).when(gpuDeviceTO).getGpuDevices();
+
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(gpuDeviceTO).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlWithGpuDevices, libvirtComputingResourceMock);
+
+        // Verify that old GPU devices are removed and new ones are added
+        Assert.assertFalse("Old PCI device should be removed", result.contains("bus='0x01' slot='0x00'"));
+        Assert.assertFalse("Old MDEV device should be removed", result.contains("4b20d080-1b54-4048-85b3-a6a62d165c01"));
+        Assert.assertTrue("New MDEV device should be added", result.contains("6f20d080-1b54-4048-85b3-a6a62d165c01"));
+        Assert.assertTrue("MDEV device should have display=off", result.contains("display=\"off\""));
+    }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestWithMixedDevices() throws Exception {
+        List<VgpuTypesInfo> gpuDevices = createTestMixedGpuDevices();
+        GPUDeviceTO gpuDeviceTO = Mockito.mock(GPUDeviceTO.class);
+        Mockito.doReturn(gpuDevices).when(gpuDeviceTO).getGpuDevices();
+
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(gpuDeviceTO).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlWithGpuDevices, libvirtComputingResourceMock);
+
+        // Verify both PCI and MDEV devices are added
+        Assert.assertTrue("PCI device should be added", result.contains("bus=\"0x02\""));
+        Assert.assertTrue("PCI device should be added", result.contains("slot=\"0x00\""));
+        Assert.assertTrue("MDEV device should be added", result.contains("6f20d080-1b54-4048-85b3-a6a62d165c01"));
+
+        // Count hostdev elements to ensure we have both
+        long hostdevCount = result.lines().filter(line -> line.contains("<hostdev")).count();
+        Assert.assertEquals("Should have 2 hostdev elements", 2, hostdevCount);
+    }
+
+    @Test
+    public void updateGpuDevicesIfNeededTestRemoveAllGpuDevices() throws Exception {
+        List<VgpuTypesInfo> gpuDevices = new ArrayList<>(); // Empty list
+        GPUDeviceTO gpuDeviceTO = Mockito.mock(GPUDeviceTO.class);
+        Mockito.doReturn(gpuDevices).when(gpuDeviceTO).getGpuDevices();
+
+        Mockito.doReturn(virtualMachineTOMock).when(migrateCommandMock).getVirtualMachine();
+        Mockito.doReturn(gpuDeviceTO).when(virtualMachineTOMock).getGpuDevice();
+
+        String result = libvirtMigrateCmdWrapper.updateGpuDevicesIfNeeded(migrateCommandMock, xmlWithoutGpuDevices, libvirtComputingResourceMock);
+
+        // Verify all GPU devices are removed
+        Assert.assertFalse("Old PCI device should be removed", result.contains("bus=\"0x01\""));
+        Assert.assertFalse("Old PCI device should be removed", result.contains("slot=\"0x00\""));
+        Assert.assertFalse("Old MDEV device should be removed", result.contains("4b20d080-1b54-4048-85b3-a6a62d165c01"));
+
+        // Verify no hostdev elements remain
+        long hostdevCount = result.lines().filter(line -> line.contains("<hostdev")).count();
+        Assert.assertEquals("Should have no hostdev elements", 0, hostdevCount);
+    }
+
+    // Helper methods for creating test GPU devices
+    private List<VgpuTypesInfo> createTestPciGpuDevice() {
+        List<VgpuTypesInfo> devices = new ArrayList<>();
+        VgpuTypesInfo pciDevice = new VgpuTypesInfo(
+                GpuDevice.DeviceType.PCI,
+                "NVIDIA Corporation Tesla T4",
+                "passthrough",
+                "02:00.0", // New bus address for destination host
+                "10de",
+                "NVIDIA Corporation",
+                "1eb8",
+                "Tesla T4"
+        );
+        pciDevice.setDisplay(false);
+        devices.add(pciDevice);
+        return devices;
+    }
+
+    private List<VgpuTypesInfo> createTestMdevGpuDevice() {
+        List<VgpuTypesInfo> devices = new ArrayList<>();
+        VgpuTypesInfo mdevDevice = new VgpuTypesInfo(
+                GpuDevice.DeviceType.MDEV,
+                "nvidia-63",
+                "GRID T4-2Q",
+                "6f20d080-1b54-4048-85b3-a6a62d165c01", // New UUID for destination host
+                "10de",
+                "NVIDIA Corporation",
+                "1eb8",
+                "Tesla T4"
+        );
+        mdevDevice.setDisplay(false);
+        devices.add(mdevDevice);
+        return devices;
+    }
+
+    private List<VgpuTypesInfo> createTestMixedGpuDevices() {
+        List<VgpuTypesInfo> devices = new ArrayList<>();
+
+        // Add PCI device
+        devices.addAll(createTestPciGpuDevice());
+
+        // Add MDEV device
+        devices.addAll(createTestMdevGpuDevice());
+
+        return devices;
+    }
 }
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java
index 260ffe594f3..2c3ebcbd1eb 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManager.java
@@ -16,10 +16,13 @@
 // under the License.
 package com.cloud.agent.manager;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.GetGPUStatsCommand;
+import com.cloud.agent.api.VgpuTypesInfo;
 import org.apache.cloudstack.ca.SetupCertificateCommand;
 import org.apache.cloudstack.ca.SetupKeyStoreCommand;
 
@@ -55,6 +58,10 @@ public interface MockAgentManager extends Manager {
 
     Answer checkHealth(CheckHealthCommand cmd);
 
+    Answer getGpuStats(GetGPUStatsCommand cmd, long hostId);
+
+    List<VgpuTypesInfo> getGPUDevices(long hostId);
+
     Answer pingTest(PingTestCommand cmd);
 
     Answer setupKeyStore(SetupKeyStoreCommand cmd);
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java
index d3d6f646a7e..1a4d6add968 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockAgentManagerImpl.java
@@ -21,11 +21,14 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckHealthCommand;
 import com.cloud.agent.api.CheckNetworkAnswer;
 import com.cloud.agent.api.CheckNetworkCommand;
+import com.cloud.agent.api.GetGPUStatsAnswer;
+import com.cloud.agent.api.GetGPUStatsCommand;
 import com.cloud.agent.api.GetHostStatsAnswer;
 import com.cloud.agent.api.GetHostStatsCommand;
 import com.cloud.agent.api.HostStatsEntry;
 import com.cloud.agent.api.MaintainAnswer;
 import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.api.VgpuTypesInfo;
 import com.cloud.agent.api.routing.NetworkElementCommand;
 import com.cloud.api.commands.SimulatorAddSecondaryAgent;
 import com.cloud.dc.DataCenter;
@@ -40,10 +43,14 @@ import com.cloud.resource.AgentRoutingResource;
 import com.cloud.resource.AgentStorageResource;
 import com.cloud.resource.Discoverer;
 import com.cloud.resource.ResourceManager;
+import com.cloud.resource.SimulatorDiscoverer;
 import com.cloud.resource.SimulatorSecondaryDiscoverer;
+import com.cloud.simulator.MockGpuDevice;
+import com.cloud.simulator.MockGpuDeviceVO;
 import com.cloud.simulator.MockHost;
 import com.cloud.simulator.MockHostVO;
 import com.cloud.simulator.MockVMVO;
+import com.cloud.simulator.dao.MockGpuDeviceDao;
 import com.cloud.simulator.dao.MockHostDao;
 import com.cloud.simulator.dao.MockVMDao;
 import com.cloud.user.AccountManager;
@@ -61,12 +68,14 @@ import org.apache.cloudstack.ca.SetupKeystoreAnswer;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.diagnostics.DiagnosticsAnswer;
 import org.apache.cloudstack.diagnostics.DiagnosticsCommand;
+import org.apache.cloudstack.gpu.GpuDevice;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,6 +97,8 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
     @Inject
     MockVMDao _mockVmDao = null;
     @Inject
+    MockGpuDeviceDao _mockGpuDeviceDao = null;
+    @Inject
     SimulatorManager _simulatorMgr = null;
     @Inject
     AgentManager _agentMgr = null;
@@ -97,7 +108,8 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
     ResourceManager _resourceMgr;
     @Inject private AccountManager _accountMgr;
 
-    SimulatorSecondaryDiscoverer discoverer;
+    SimulatorDiscoverer discoverer;
+    SimulatorSecondaryDiscoverer ssDiscoverer;
     @Inject
     HostDao hostDao;
 
@@ -184,10 +196,19 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
             mockHost.setVersion(this.getClass().getPackage().getImplementationVersion());
             mockHost.setResource("com.cloud.agent.AgentRoutingResource");
 
+            // Create different types of GPU devices to simulate KVM-like behavior
+            // 1. Physical GPUs (passthrough only)
+            // 2. Physical GPUs that support VF (Virtual Functions)
+            // 3. Physical GPUs that support MDEV (Mediated Devices)
+
             TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.SIMULATOR_DB);
             try {
                 txn.start();
                 mockHost = _mockHostDao.persist(mockHost);
+
+                // Create physical GPU devices
+                createPhysicalGpuDevices(mockHost.getId());
+
                 txn.commit();
             } catch (Exception ex) {
                 txn.rollback();
@@ -217,6 +238,101 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
         return newResources;
     }
 
+    /**
+     * Creates different types of GPU devices to simulate KVM-like behavior
+     *
+     * @param hostId The host ID to associate the GPU devices with
+     */
+    private void createPhysicalGpuDevices(long hostId) {
+        // 1. Create passthrough-only GPU devices across different NUMA nodes and PCI roots
+        createPassthroughGpu(hostId, "00:01.0", "1234", "5678", "Simulator",
+                "Graphics Card Basic", true, 0, "pci0000:00", 8192L, 4096L, 2160L, 1L);
+        createPassthroughGpu(hostId, "00:02.0", "1234", "5678", "Simulator",
+                "Graphics Card Basic", true, 0, "pci0000:00", 8192L, 4096L, 2160L, 1L);
+        // Additional passthrough GPUs on different PCI roots
+        createPassthroughGpu(hostId, "00:03.0", "1234", "5678", "Simulator",
+                "Graphics Card Basic", true, 1, "pci0000:17", 8192L, 4096L, 2160L, 1L);
+        createPassthroughGpu(hostId, "00:04.0", "1234", "5678", "Simulator",
+                "Graphics Card Basic", true, 1, "pci0000:5d", 8192L, 4096L, 2160L, 1L);
+
+        // 3. Create GPUs with MDEV support across different NUMA nodes
+        MockGpuDeviceVO mdevParentDevice1 = createPassthroughGpu(hostId, "00:05.0", "1234", "89ab", "Simulator",
+                "Graphics Card Pro", false, 0, "pci0000:00", 16384L, 4096L, 2160L, 1L);
+        createMdevDevices(hostId, mdevParentDevice1);
+
+        MockGpuDeviceVO mdevParentDevice2 = createPassthroughGpu(hostId, "00:06.0", "1234", "89ab", "Simulator",
+                "Graphics Card Pro", false, 0, "pci0000:00", 16384L, 4096L, 2160L, 1L);
+        createMdevDevices(hostId, mdevParentDevice2);
+
+        MockGpuDeviceVO mdevParentDevice3 = createPassthroughGpu(hostId, "00:07.0", "1234", "89ab", "Simulator",
+                "Graphics Card Pro", false, 1, "pci0000:17", 16384L, 4096L, 2160L, 1L);
+        createMdevDevices(hostId, mdevParentDevice3);
+
+        MockGpuDeviceVO mdevParentDevice4 = createPassthroughGpu(hostId, "00:08.0", "1234", "89ab", "Simulator",
+                "Graphics Card Pro", false, 1, "pci0000:3a", 16384L, 4096L, 2160L, 1L);
+        createMdevDevices(hostId, mdevParentDevice4);
+    }
+
+    /**
+     * Creates a basic passthrough-only GPU device
+     *
+     * @return
+     */
+    private MockGpuDeviceVO createPassthroughGpu(long hostId, String busAddress, String vendorId, String deviceId,
+                                      String vendorName, String deviceName, boolean passthroughEnabled, Integer numaNode, String pciRoot, Long videoRam, Long resolutionX, Long resolutionY, Long maxHeads) {
+        MockGpuDeviceVO device = new MockGpuDeviceVO();
+        device.setBusAddress(busAddress);
+        device.setVendorId(vendorId);
+        device.setDeviceId(deviceId);
+        device.setVendorName(vendorName);
+        device.setDeviceName(deviceName);
+        device.setHostId(hostId);
+        device.setState(MockGpuDevice.State.Available);
+        device.setDeviceType(GpuDevice.DeviceType.PCI);
+        device.setProfileName("passthrough");
+        device.setPassthroughEnabled(passthroughEnabled);
+        device.setNumaNode(numaNode);
+        device.setPciRoot(pciRoot);
+        device.setVideoRam(videoRam);
+        device.setMaxResolutionX(resolutionX);
+        device.setMaxResolutionY(resolutionY);
+        device.setMaxHeads(maxHeads);
+        return _mockGpuDeviceDao.persist(device);
+    }
+
+    /**
+     * Creates MDEV devices with different profiles
+     */
+    private void createMdevDevices(long hostId, MockGpuDeviceVO parentDevice) {
+        // Create MDEV devices with different profiles (similar to NVIDIA/Intel naming)
+        String[] mdevProfiles = { "sim-8q", "sim-4q", "sim-2q", "sim-2q"};
+        String[] mdevUuids = {UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString(),
+                              UUID.randomUUID().toString()};
+        Long[] videoRam = {8192L, 4096L, 2048L, 2048L};
+        Long[] resoultionX = {4096L, 1920L, 1920L, 1920L};
+        Long[] resoultionY = {2160L, 1080L, 1080L, 1080L};
+        Long[] maxVgpuPerGpu = {2L, 4L, 8L, 8L};
+        Long[] maxHeads = {4L, 2L, 1L, 1L};
+
+        for (int i = 0; i < mdevProfiles.length; i++) {
+            MockGpuDeviceVO mdevDevice = new MockGpuDeviceVO(mdevUuids[i], parentDevice.getVendorId(), parentDevice.getDeviceId(), parentDevice.getVendorName(), parentDevice.getDeviceName(), hostId );
+            mdevDevice.setState(MockGpuDevice.State.Available);
+            mdevDevice.setDeviceType(GpuDevice.DeviceType.MDEV);
+            mdevDevice.setParentDeviceId(parentDevice.getId());
+            mdevDevice.setProfileName(mdevProfiles[i]);
+            mdevDevice.setPassthroughEnabled(true); // MDEV devices don't use passthrough
+            mdevDevice.setMaxVgpuPerPgpu(maxVgpuPerGpu[i]);
+            mdevDevice.setVideoRam(videoRam[i]);
+            mdevDevice.setMaxResolutionX(resoultionX[i]);
+            mdevDevice.setMaxResolutionY(resoultionY[i]);
+            mdevDevice.setMaxHeads(maxHeads[i]);
+            // MDEV devices inherit NUMA node and PCI root from parent
+            mdevDevice.setNumaNode(parentDevice.getNumaNode());
+            mdevDevice.setPciRoot(parentDevice.getPciRoot());
+            _mockGpuDeviceDao.persist(mdevDevice);
+        }
+    }
+
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         try {
@@ -371,7 +487,7 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
                     storageResource.configure("secondaryStorage", params);
                     storageResource.start();
                     _resources.put(this.guid, storageResource);
-                    discoverer.setResource(storageResource);
+                    ssDiscoverer.setResource(storageResource);
                     SimulatorAddSecondaryAgent cmd = new SimulatorAddSecondaryAgent("sim://" + this.guid, this.dcId);
                     try {
                         _resourceMgr.discoverHosts(cmd);
@@ -469,6 +585,72 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
         return new Answer(cmd);
     }
 
+    @Override
+    public Answer getGpuStats(GetGPUStatsCommand cmd, long hostId) {
+        return new GetGPUStatsAnswer(cmd, getGPUDevices(hostId));
+    }
+
+    @Override
+    public List<VgpuTypesInfo> getGPUDevices(long hostId) {
+        List<VgpuTypesInfo> gpuDevices = new ArrayList<>();
+        List<MockGpuDeviceVO> mockGpuDevices;
+        // List all mock GPU devices from database
+        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.SIMULATOR_DB);
+        try {
+            txn.start();
+            mockGpuDevices = _mockGpuDeviceDao.listByHostId(hostId);
+
+            if (mockGpuDevices != null && !mockGpuDevices.isEmpty()) {
+                logger.debug("Found {} mock GPU devices in the database", mockGpuDevices.size());
+
+                for (MockGpuDeviceVO mockGpuDevice : mockGpuDevices) {
+                    String busAddress = mockGpuDevice.getBusAddress();
+                    String vendorId = mockGpuDevice.getVendorId();
+                    String deviceId = mockGpuDevice.getDeviceId();
+                    String vendorName = mockGpuDevice.getVendorName();
+                    String deviceName = mockGpuDevice.getDeviceName();
+                    String modelName = mockGpuDevice.getProfileName();
+                    boolean isPassthrough = mockGpuDevice.isPassthroughEnabled();
+                    Long maxVgpuPerGpu = mockGpuDevice.getMaxVgpuPerPgpu();
+                    Integer numaNode = mockGpuDevice.getNumaNode();
+                    String pciRoot = mockGpuDevice.getPciRoot();
+
+                    VgpuTypesInfo vgpuTypesInfo = new VgpuTypesInfo(mockGpuDevice.getDeviceType(),
+                            vendorName + " " + deviceName, modelName, busAddress, vendorId, vendorName,
+                            deviceId, deviceName, numaNode.toString(), pciRoot);
+                    vgpuTypesInfo.setPassthroughEnabled(isPassthrough);
+                    vgpuTypesInfo.setMaxVgpuPerGpu(maxVgpuPerGpu);
+                    vgpuTypesInfo.setVideoRam(mockGpuDevice.getVideoRam());
+                    vgpuTypesInfo.setMaxResolutionX(mockGpuDevice.getMaxResolutionX());
+                    vgpuTypesInfo.setMaxResolutionY(mockGpuDevice.getMaxResolutionY());
+                    vgpuTypesInfo.setMaxHeads(mockGpuDevice.getMaxHeads());
+
+                    if (mockGpuDevice.getVmId() != null) {
+                        MockVMVO mockVm = _mockVmDao.findById(mockGpuDevice.getVmId());
+                        vgpuTypesInfo.setVmName(mockVm.getName());
+                    }
+
+                    if (mockGpuDevice.getParentDeviceId() != null) {
+                        MockGpuDeviceVO parentDevice = _mockGpuDeviceDao.findById(mockGpuDevice.getParentDeviceId());
+                        if (parentDevice != null) {
+                            vgpuTypesInfo.setParentBusAddress(parentDevice.getBusAddress());
+                        }
+                    }
+                    gpuDevices.add(vgpuTypesInfo);
+                }
+            }
+            txn.commit();
+        } catch (Exception ex) {
+            txn.rollback();
+            throw new CloudRuntimeException("Unable to get GPU devices on hostId " + hostId + " due to " + ex.getMessage(), ex);
+        } finally {
+            txn.close();
+            txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
+            txn.close();
+        }
+        return gpuDevices;
+    }
+
     @Override
     public Answer pingTest(PingTestCommand cmd) {
         return new Answer(cmd);
@@ -497,12 +679,14 @@ public class MockAgentManagerImpl extends ManagerBase implements MockAgentManage
     public boolean start() {
         for (Discoverer discoverer : discoverers) {
             if (discoverer instanceof SimulatorSecondaryDiscoverer) {
-                this.discoverer = (SimulatorSecondaryDiscoverer)discoverer;
-                break;
+                this.ssDiscoverer = (SimulatorSecondaryDiscoverer)discoverer;
+            }
+            if (discoverer instanceof SimulatorDiscoverer) {
+                this.discoverer = (SimulatorDiscoverer)discoverer;
             }
         }
 
-        if (this.discoverer == null) {
+        if (this.ssDiscoverer == null) {
             throw new IllegalStateException("Failed to find SimulatorSecondaryDiscoverer");
         }
 
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java
index 953c5792a50..6a088bce4b9 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -25,7 +25,13 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.GPUDeviceTO;
+import com.cloud.simulator.MockGpuDevice;
+import com.cloud.simulator.MockGpuDeviceVO;
+import com.cloud.simulator.dao.MockGpuDeviceDao;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.agent.api.Answer;
@@ -99,6 +105,8 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
     @Inject
     MockHostDao _mockHostDao = null;
     @Inject
+    MockGpuDeviceDao _mockGpuDeviceDao = null;
+    @Inject
     MockSecurityRulesDao _mockSecurityDao = null;
     private final Map<String, Map<String, Ternary<String, Long, Long>>> _securityRules = new ConcurrentHashMap<String, Map<String, Ternary<String, Long, Long>>>();
 
@@ -111,7 +119,7 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
         return true;
     }
 
-    public String startVM(final String vmName, final NicTO[] nics, final int cpuHz, final long ramSize, final String bootArgs, final String hostGuid) {
+    public String startVM(final String vmName, final NicTO[] nics, GPUDeviceTO gpuDeviceTO, final int cpuHz, final long ramSize, final String bootArgs, final String hostGuid) {
 
         TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.SIMULATOR_DB);
         MockHost host = null;
@@ -157,6 +165,22 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
         try {
             txn.start();
             vm = _mockVmDao.persist((MockVMVO)vm);
+            if (gpuDeviceTO != null) {
+                List<VgpuTypesInfo> gpuDevices = gpuDeviceTO.getGpuDevices();
+                for (VgpuTypesInfo gpuDevice : gpuDevices) {
+                    MockGpuDeviceVO mockGpuDevice = _mockGpuDeviceDao.listByHostIdAndBusAddress(host.getId(), gpuDevice.getBusAddress());
+                    mockGpuDevice.setVmId(vm.getId());
+                    mockGpuDevice.setState(MockGpuDevice.State.Allocated);
+                    _mockGpuDeviceDao.persist(mockGpuDevice);
+                }
+            } else {
+                List<MockGpuDeviceVO> mockGpuDevices = _mockGpuDeviceDao.listByVmId(vm.getId());
+                for (MockGpuDeviceVO mockGpuDevice : mockGpuDevices) {
+                    mockGpuDevice.setVmId(null);
+                    mockGpuDevice.setState(MockGpuDevice.State.Available);
+                    _mockGpuDeviceDao.persist(mockGpuDevice);
+                }
+            }
             txn.commit();
         } catch (final Exception ex) {
             txn.rollback();
@@ -331,7 +355,7 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
     @Override
     public StartAnswer startVM(final StartCommand cmd, final SimulatorInfo info) {
         final VirtualMachineTO vm = cmd.getVirtualMachine();
-        final String result = startVM(vm.getName(), vm.getNics(), vm.getCpus() * vm.getMaxSpeed(), vm.getMaxRam(), vm.getBootArgs(), info.getHostUuid());
+        final String result = startVM(vm.getName(), vm.getNics(), vm.getGpuDevice(), vm.getCpus() * vm.getMaxSpeed(), vm.getMaxRam(), vm.getBootArgs(), info.getHostUuid());
         if (result != null) {
             return new StartAnswer(cmd, result);
         } else {
@@ -362,6 +386,33 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
             }
             vm.setHostId(destHost.getId());
             _mockVmDao.update(vm.getId(), vm);
+
+            // Unassign existing GPU Devices
+            List<MockGpuDeviceVO> devices = _mockGpuDeviceDao.listByVmId(vm.getId());
+            for (MockGpuDeviceVO mockGpuDevice : devices) {
+                mockGpuDevice.setVmId(null);
+                mockGpuDevice.setState(MockGpuDevice.State.Available);
+                _mockGpuDeviceDao.persist(mockGpuDevice);
+            }
+
+            // Assign GPU Devices to the new host
+            GPUDeviceTO gpuDeviceTO = cmd.getVirtualMachine().getGpuDevice();
+            if (gpuDeviceTO != null) {
+                List<VgpuTypesInfo> gpuDevices = gpuDeviceTO.getGpuDevices();
+                if (CollectionUtils.isNotEmpty(gpuDevices)) {
+                    for (VgpuTypesInfo gpuDevice : gpuDevices) {
+                        MockGpuDeviceVO mockGpuDevice = _mockGpuDeviceDao.listByHostIdAndBusAddress(destHost.getId(), gpuDevice.getBusAddress());
+                        if (mockGpuDevice != null) {
+                            mockGpuDevice.setVmId(vm.getId());
+                            mockGpuDevice.setState(MockGpuDevice.State.Allocated);
+                            _mockGpuDeviceDao.persist(mockGpuDevice);
+                        } else {
+                            return new MigrateAnswer(cmd, false, "No GPU device found on destination host for bus address: " + gpuDevice.getBusAddress(), null);
+                        }
+                    }
+                }
+            }
+
             txn.commit();
             return new MigrateAnswer(cmd, true, null, 0);
         } catch (final Exception ex) {
@@ -496,6 +547,11 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
             final MockVm vm = _mockVmDao.findByVmName(vmName);
             if (vm != null) {
                 vm.setPowerState(PowerState.PowerOff);
+                _mockGpuDeviceDao.listByVmId(vm.getId()).forEach(mockGpuDevice -> {
+                    mockGpuDevice.setVmId(null);
+                    mockGpuDevice.setState(MockGpuDevice.State.Available);
+                    _mockGpuDeviceDao.persist(mockGpuDevice);
+                });
                 _mockVmDao.update(vm.getId(), (MockVMVO)vm);
             }
 
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java
index cb8d71985e3..39e504d7f95 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.GetGPUStatsCommand;
 import org.apache.cloudstack.ca.SetupCertificateCommand;
 import org.apache.cloudstack.ca.SetupKeyStoreCommand;
 import org.apache.cloudstack.diagnostics.DiagnosticsCommand;
@@ -287,8 +288,10 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage
             if (answer == null) {
                 if (cmd instanceof GetHostStatsCommand) {
                     answer = _mockAgentMgr.getHostStatistic((GetHostStatsCommand)cmd);
+                } else if (cmd instanceof GetGPUStatsCommand) {
+                    answer = _mockAgentMgr.getGpuStats((GetGPUStatsCommand) cmd, host.getId());
                 } else if (cmd instanceof CheckHealthCommand) {
-                    answer = _mockAgentMgr.checkHealth((CheckHealthCommand)cmd);
+                    answer = _mockAgentMgr.checkHealth((CheckHealthCommand) cmd);
                 } else if (cmd instanceof PingTestCommand) {
                     answer = _mockAgentMgr.pingTest((PingTestCommand)cmd);
                 } else if (cmd instanceof SetupKeyStoreCommand) {
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java
index 332ac609803..12489334ab0 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java
@@ -300,6 +300,8 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
             return null;
         }
 
+        ssCmd.setGpuDevices(_mockAgentMgr.getGPUDevices(host.getId()));
+
         return _resourceMgr.fillRoutingHostVO(host, ssCmd, HypervisorType.Simulator, details, hostTags);
     }
 
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDevice.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDevice.java
new file mode 100644
index 00000000000..66ed29cdb25
--- /dev/null
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDevice.java
@@ -0,0 +1,42 @@
+// 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.
+package com.cloud.simulator;
+
+public interface MockGpuDevice {
+
+    enum State {
+        Allocated, Available
+    }
+
+    long getId();
+
+    String getBusAddress();
+
+    String getVendorId();
+
+    String getDeviceId();
+
+    String getVendorName();
+
+    String getDeviceName();
+
+    Long getHostId();
+
+    Long getVmId();
+
+    State getState();
+}
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDeviceVO.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDeviceVO.java
new file mode 100644
index 00000000000..9def4cd8f2c
--- /dev/null
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDeviceVO.java
@@ -0,0 +1,313 @@
+// 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.
+package com.cloud.simulator;
+
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.gpu.GpuDevice;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "mockgpudevice")
+public class MockGpuDeviceVO implements MockGpuDevice, InternalIdentity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    // PCI address for parent devices, MDEV UUID for MDEV devices, VF PCI address for VF devices
+    @Column(name = "bus_address", nullable = false)
+    private String busAddress;
+
+    @Column(name = "vendor_id", nullable = false)
+    private String vendorId;
+
+    @Column(name = "device_id", nullable = false)
+    private String deviceId;
+
+    @Column(name = "vendor_name", nullable = false)
+    private String vendorName;
+
+    @Column(name = "device_name", nullable = false)
+    private String deviceName;
+
+    @Column(name = "host_id")
+    private Long hostId;
+
+    @Column(name = "vm_id")
+    private Long vmId;
+
+    @Column(name = "max_vgpu_per_pgpu", nullable = false)
+    private Long maxVgpuPerPgpu = 1L;
+
+    @Column(name = "video_ram", nullable = false)
+    private Long videoRam = 0L;
+
+    @Column(name = "max_resolution_x", nullable = false)
+    private Long maxResolutionX = 0L;
+
+    @Column(name = "max_resolution_y", nullable = false)
+    private Long maxResolutionY = 0L;
+
+    @Column(name = "max_heads", nullable = false)
+    private Long maxHeads = 1L;
+
+    @Column(name = "state")
+    @Enumerated(EnumType.STRING)
+    private State state;
+
+    @Column(name = "device_type")
+    @Enumerated(EnumType.STRING)
+    private GpuDevice.DeviceType deviceType = GpuDevice.DeviceType.PCI;
+
+    @Column(name = "parent_device_id")
+    private Long parentDeviceId;
+
+    @Column(name = "profile_name")
+    private String profileName;
+
+    @Column(name = "passthrough_enabled")
+    private boolean passthroughEnabled = true;
+
+    @Column(name = "numa_node")
+    private Integer numaNode;
+
+    @Column(name = "pci_root")
+    private String pciRoot;
+
+    public MockGpuDeviceVO() {
+    }
+
+    public MockGpuDeviceVO(String busAddress, String vendorId, String deviceId, String vendorName, String deviceName,
+            Long hostId) {
+        this.busAddress = busAddress;
+        this.vendorId = vendorId;
+        this.deviceId = deviceId;
+        this.vendorName = vendorName;
+        this.deviceName = deviceName;
+        this.hostId = hostId;
+        this.state = State.Available;
+        this.deviceType = GpuDevice.DeviceType.PCI;
+        this.profileName = "passthrough";
+        this.passthroughEnabled = true;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getBusAddress() {
+        return busAddress;
+    }
+
+    public void setBusAddress(String busAddress) {
+        this.busAddress = busAddress;
+    }
+
+    @Override
+    public String getVendorId() {
+        return vendorId;
+    }
+
+    public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+    @Override
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    @Override
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    @Override
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    @Override
+    public Long getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(Long hostId) {
+        this.hostId = hostId;
+    }
+
+    @Override
+    public Long getVmId() {
+        return vmId;
+    }
+
+    public void setVmId(Long vmId) {
+        this.vmId = vmId;
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
+    public Long getMaxVgpuPerPgpu() {
+        return maxVgpuPerPgpu;
+    }
+
+    public void setMaxVgpuPerPgpu(Long maxVgpuPerGpu) {
+        this.maxVgpuPerPgpu = maxVgpuPerGpu;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public void setVideoRam(Long videoRam) {
+        this.videoRam = videoRam;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public void setMaxResolutionX(Long maxResolutionX) {
+        this.maxResolutionX = maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public void setMaxResolutionY(Long maxResolutionY) {
+        this.maxResolutionY = maxResolutionY;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public void setMaxHeads(Long maxHeads) {
+        this.maxHeads = maxHeads;
+    }
+
+    public GpuDevice.DeviceType getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(GpuDevice.DeviceType deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public Long getParentDeviceId() {
+        return parentDeviceId;
+    }
+
+    public void setParentDeviceId(Long parentDeviceId) {
+        this.parentDeviceId = parentDeviceId;
+    }
+
+    public String getProfileName() {
+        return profileName;
+    }
+
+    public void setProfileName(String profileName) {
+        this.profileName = profileName;
+    }
+
+    public boolean isPassthroughEnabled() {
+        return passthroughEnabled;
+    }
+
+    public void setPassthroughEnabled(boolean passthroughEnabled) {
+        this.passthroughEnabled = passthroughEnabled;
+    }
+
+    public Integer getNumaNode() {
+        return numaNode;
+    }
+
+    public void setNumaNode(Integer numaNode) {
+        this.numaNode = numaNode;
+    }
+
+    public String getPciRoot() {
+        return pciRoot;
+    }
+
+    public void setPciRoot(String pciRoot) {
+        this.pciRoot = pciRoot;
+    }
+
+    /**
+     * Helper method to get the MDEV UUID (when device_type is MDEV)
+     *
+     * @return MDEV UUID or null if not an MDEV device
+     */
+    public String getMdevUuid() {
+        return GpuDevice.DeviceType.MDEV.equals(this.deviceType) ? this.busAddress : null;
+    }
+
+    /**
+     * Helper method to get the VF PCI address (when device_type is PCI and has
+     * parent)
+     *
+     * @return VF PCI address or null if not a VF device
+     */
+    public String getVfPciAddress() {
+        return GpuDevice.DeviceType.PCI.equals(this.deviceType) && this.parentDeviceId != null ? this.busAddress : null;
+    }
+
+    /**
+     * Helper method to get the parent PCI bus address (when device_type is PCI and
+     * no parent)
+     *
+     * @return Parent PCI bus address or null if not a parent device
+     */
+    public String getParentPciBusAddress() {
+        return GpuDevice.DeviceType.PCI.equals(this.deviceType) && this.parentDeviceId == null ? this.busAddress : null;
+    }
+}
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDao.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDao.java
new file mode 100644
index 00000000000..cb952535d19
--- /dev/null
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDao.java
@@ -0,0 +1,43 @@
+// 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.
+package com.cloud.simulator.dao;
+
+import com.cloud.simulator.MockGpuDeviceVO;
+import com.cloud.utils.db.GenericDao;
+
+import java.util.List;
+
+public interface MockGpuDeviceDao extends GenericDao<MockGpuDeviceVO, Long> {
+
+    /**
+     * Find GPU device by bus address
+     *
+     * @param busAddress the bus address
+     * @return the GPU device or null if not found
+     */
+    MockGpuDeviceVO listByHostIdAndBusAddress(long hostId, String busAddress);
+
+    /**
+     * List GPU devices by host ID
+     *
+     * @param hostId the host ID
+     * @return list of GPU devices
+     */
+    List<MockGpuDeviceVO> listByHostId(Long hostId);
+
+    List<MockGpuDeviceVO> listByVmId(Long vmId);
+}
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDaoImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDaoImpl.java
new file mode 100644
index 00000000000..90f6a1d0edb
--- /dev/null
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDaoImpl.java
@@ -0,0 +1,67 @@
+// 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.
+package com.cloud.simulator.dao;
+
+import com.cloud.simulator.MockGpuDeviceVO;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class MockGpuDeviceDaoImpl extends GenericDaoBase<MockGpuDeviceVO, Long> implements MockGpuDeviceDao {
+
+    private final SearchBuilder<MockGpuDeviceVO> allFieldSearch;
+
+    public MockGpuDeviceDaoImpl() {
+        allFieldSearch = createSearchBuilder();
+        allFieldSearch.and("busAddress", allFieldSearch.entity().getBusAddress(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("hostId", allFieldSearch.entity().getHostId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("vendorName", allFieldSearch.entity().getVendorName(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("vendorId", allFieldSearch.entity().getVendorId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("deviceId", allFieldSearch.entity().getDeviceId(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("deviceName", allFieldSearch.entity().getDeviceName(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("state", allFieldSearch.entity().getState(), SearchCriteria.Op.EQ);
+        allFieldSearch.and("vmId", allFieldSearch.entity().getVmId(), SearchCriteria.Op.EQ);
+        allFieldSearch.done();
+    }
+
+    @Override
+    public MockGpuDeviceVO listByHostIdAndBusAddress(long hostId, String busAddress) {
+        SearchCriteria<MockGpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters("hostId", hostId);
+        sc.setParameters("busAddress", busAddress);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public List<MockGpuDeviceVO> listByHostId(Long hostId) {
+        SearchCriteria<MockGpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters("hostId", hostId);
+        return search(sc, new Filter(MockGpuDeviceVO.class, "id", true));
+    }
+
+    @Override
+    public List<MockGpuDeviceVO> listByVmId(Long vmId) {
+        SearchCriteria<MockGpuDeviceVO> sc = allFieldSearch.create();
+        sc.setParameters("vmId", vmId);
+        return search(sc, null);
+    }
+}
diff --git a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml
index e0ed6066bc5..c085e309aac 100644
--- a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml
+++ b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/core/spring-simulator-core-context.xml
@@ -29,6 +29,7 @@
 
     <bean id="mockConfigurationDaoImpl" class="com.cloud.simulator.dao.MockConfigurationDaoImpl" />
     <bean id="mockHostDaoImpl" class="com.cloud.simulator.dao.MockHostDaoImpl" />
+    <bean id="mockGpuDeviceDaoImpl" class="com.cloud.simulator.dao.MockGpuDeviceDaoImpl" />
     <bean id="mockSecStorageDaoImpl" class="com.cloud.simulator.dao.MockSecStorageDaoImpl" />
     <bean id="mockSecurityRulesDaoImpl" class="com.cloud.simulator.dao.MockSecurityRulesDaoImpl" />
     <bean id="mockStoragePoolDaoImpl" class="com.cloud.simulator.dao.MockStoragePoolDaoImpl" />
diff --git a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
index 32ec2f53211..8908bfa000f 100644
--- a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
+++ b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
@@ -394,6 +394,7 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
     private void addDomainLimits(final List<Item> metricsList) {
         Long totalCpuLimit = 0L;
         Long totalMemoryLimit = 0L;
+        Long totalGpuLimit = 0L;
 
         for (final DomainJoinVO domain: domainDao.listAll()) {
             if (domain == null || domain.getLevel() != 1) {
@@ -411,6 +412,12 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
                 totalMemoryLimit += memoryLimit;
             }
 
+            long gpuLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getGpuLimit(), false,
+                    Resource.ResourceType.gpu, domain.getId());
+            if (gpuLimit > 0) {
+                totalGpuLimit += gpuLimit;
+            }
+
             long primaryStorageLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getPrimaryStorageLimit(), false,
                     Resource.ResourceType.primary_storage, domain.getId());
             long secondaryStorageLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getSecondaryStorageLimit(), false,
@@ -419,6 +426,7 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
             // Add per domain cpu, memory and storage count
             metricsList.add(new ItemPerDomainResourceLimit(cpuLimit, domain.getPath(), Resource.ResourceType.cpu.getName()));
             metricsList.add(new ItemPerDomainResourceLimit(memoryLimit, domain.getPath(), Resource.ResourceType.memory.getName()));
+            metricsList.add(new ItemPerDomainResourceLimit(gpuLimit, domain.getPath(), Resource.ResourceType.gpu.getName()));
             metricsList.add(new ItemPerDomainResourceLimit(primaryStorageLimit, domain.getPath(), Resource.ResourceType.primary_storage.getName()));
             metricsList.add(new ItemPerDomainResourceLimit(secondaryStorageLimit, domain.getPath(), Resource.ResourceType.secondary_storage.getName()));
         }
@@ -442,6 +450,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
                     Resource.ResourceType.memory, null);
             long cpuUsed = _resourceCountDao.getResourceCount(domain.getId(), Resource.ResourceOwnerType.Domain,
                     Resource.ResourceType.cpu, null);
+            long gpuUsed = _resourceCountDao.getResourceCount(domain.getId(), Resource.ResourceOwnerType.Domain,
+                    Resource.ResourceType.gpu, null);
             long primaryStorageUsed = _resourceCountDao.getResourceCount(domain.getId(), Resource.ResourceOwnerType.Domain,
                     Resource.ResourceType.primary_storage, null);
             long secondaryStorageUsed = _resourceCountDao.getResourceCount(domain.getId(), Resource.ResourceOwnerType.Domain,
@@ -449,6 +459,7 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
 
             metricsList.add(new ItemPerDomainResourceCount(memoryUsed, domain.getPath(), Resource.ResourceType.memory.getName()));
             metricsList.add(new ItemPerDomainResourceCount(cpuUsed, domain.getPath(), Resource.ResourceType.cpu.getName()));
+            metricsList.add(new ItemPerDomainResourceCount(gpuUsed, domain.getPath(), Resource.ResourceType.gpu.getName()));
             metricsList.add(new ItemPerDomainResourceCount(primaryStorageUsed, domain.getPath(),
                     Resource.ResourceType.primary_storage.getName()));
             metricsList.add(new ItemPerDomainResourceCount(secondaryStorageUsed, domain.getPath(),
diff --git a/scripts/vm/hypervisor/kvm/gpudiscovery.sh b/scripts/vm/hypervisor/kvm/gpudiscovery.sh
new file mode 100755
index 00000000000..67627deef57
--- /dev/null
+++ b/scripts/vm/hypervisor/kvm/gpudiscovery.sh
@@ -0,0 +1,734 @@
+#!/bin/bash
+# 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.
+
+#
+# Enumerate GPUs (NVIDIA, Intel, AMD) and output JSON for libvirt,
+# including:
+#   - PCI metadata (address, vendor/device IDs, driver, pci_class)
+#   - IOMMU group
+#   - PCI root (for PCIe topology grouping)
+#   - NUMA node
+#   - SR-IOV VF counts
+#   - full_passthrough block (with VM usage)
+#   - vGPU (MDEV) instances (fetching profile “name” and “max_instance” from description)
+#   - VF (SR-IOV / MIG) instances (with VM usage)
+#
+# Uses `lspci -nnm` for GPU discovery and `virsh` to detect VM attachments.
+# Compatible with Ubuntu (20.04+, 22.04+) and RHEL/CentOS (7/8), Bash ≥4.
+#
+#
+# Sample JSON:
+# {
+#   "gpus": [
+#     {
+#       "pci_address": "00:03.0",
+#       "vendor_id": "10de",
+#       "device_id": "2484",
+#       "vendor": "NVIDIA Corporation",
+#       "device": "GeForce RTX 3070",
+#       "driver": "nvidia",
+#       "pci_class": "VGA compatible controller",
+#       "iommu_group": "8",
+#       "sriov_totalvfs": 0,
+#       "sriov_numvfs": 0,
+
+#       "full_passthrough": {
+#         "enabled": true,
+#         "libvirt_address": {
+#           "domain": "0x0000",
+#           "bus": "0x00",
+#           "slot": "0x03",
+#           "function": "0x0"
+#         },
+#         "used_by_vm": "win10"
+#       },
+
+#       "vgpu_instances": [],
+
+#       "vf_instances": []
+#     },
+#     {
+#       "pci_address": "00:AF.0",
+#       "vendor_id": "10de",
+#       "device_id": "1EB8",
+#       "vendor": "NVIDIA Corporation",
+#       "device": "Tesla T4",
+#       "driver": "nvidia",
+#       "pci_class": "3D controller",
+#       "iommu_group": "12",
+#       "sriov_totalvfs": 0,
+#       "sriov_numvfs": 0,
+
+#       "full_passthrough": {
+#         "enabled": false,
+#         "libvirt_address": {
+#           "domain": "0x0000",
+#           "bus": "0x00",
+#           "slot": "0xAF",
+#           "function": "0x0"
+#         },
+#         "used_by_vm": null
+#       },
+
+#       "vgpu_instances": [
+#         {
+#           "mdev_uuid": "a1b2c3d4-5678-4e9a-8b0c-d1e2f3a4b5c6",
+#           "profile_name": "grid_t4-16c",
+#           "max_instances": 4,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0xAF",
+#             "function": "0x0"
+#           },
+#           "used_by_vm": "vm1"
+#         },
+#         {
+#           "mdev_uuid": "b2c3d4e5-6789-4f0a-9c1d-e2f3a4b5c6d7",
+#           "profile_name": "grid_t4-8c",
+#           "max_instances": 8,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0xAF",
+#             "function": "0x1"
+#           },
+#           "used_by_vm": "vm2"
+#         }
+#       ],
+
+#       "vf_instances": []
+#     },
+#     {
+#       "pci_address": "00:65.0",
+#       "vendor_id": "10de",
+#       "device_id": "20B0",
+#       "vendor": "NVIDIA Corporation",
+#       "device": "A100-SXM4-40GB",
+#       "driver": "nvidia",
+#       "pci_class": "VGA compatible controller",
+#       "iommu_group": "15",
+#       "sriov_totalvfs": 7,
+#       "sriov_numvfs": 7,
+
+#       "full_passthrough": {
+#         "enabled": false,
+#         "libvirt_address": {
+#           "domain": "0x0000",
+#           "bus": "0x00",
+#           "slot": "0x65",
+#           "function": "0x0"
+#         },
+#         "used_by_vm": null
+#       },
+
+#       "vgpu_instances": [
+#         {
+#           "mdev_uuid": "f4a2c8de-1234-4b3a-8c9d-0a1b2c3d4e5f",
+#           "profile_name": "grid_a100-8c",
+#           "max_instances": 8,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x65",
+#             "function": "0x0"
+#           },
+#           "used_by_vm": null
+#         },
+#         {
+#           "mdev_uuid": "e5b3d9ef-5678-4c2b-9d0e-1b2c3d4e5f6a",
+#           "profile_name": "grid_a100-5c",
+#           "max_instances": 5,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x65",
+#             "function": "0x1"
+#           },
+#           "used_by_vm": null
+#         }
+#       ],
+
+#       "vf_instances": [
+#         {
+#           "vf_pci_address": "65:00.2",
+#           "vf_profile": "1g.5gb",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x65",
+#             "function": "0x2"
+#           },
+#           "used_by_vm": "ml"
+#         },
+#         {
+#           "vf_pci_address": "65:00.3",
+#           "vf_profile": "2g.10gb",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x65",
+#             "function": "0x3"
+#           },
+#           "used_by_vm": null
+#         }
+#       ]
+#     },
+#     {
+#       "pci_address": "00:02.0",
+#       "vendor_id": "8086",
+#       "device_id": "46A6",
+#       "vendor": "Intel Corporation",
+#       "device": "Alder Lake-P GT2 [Iris Xe Graphics]",
+#       "driver": "i915",
+#       "pci_class": "VGA compatible controller",
+#       "iommu_group": "0",
+#       "sriov_totalvfs": 4,
+#       "sriov_numvfs": 4,
+
+#       "full_passthrough": {
+#         "enabled": false,
+#         "libvirt_address": {
+#           "domain": "0x0000",
+#           "bus": "0x00",
+#           "slot": "0x02",
+#           "function": "0x0"
+#         },
+#         "used_by_vm": null
+#       },
+
+#       "vgpu_instances": [
+#         {
+#           "mdev_uuid": "b7c8d9fe-1111-2222-3333-444455556666",
+#           "profile_name": "i915-GVTg_V5_4",
+#           "max_instances": 4,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x02",
+#             "function": "0x0"
+#           },
+#           "used_by_vm": null
+#         },
+#         {
+#           "mdev_uuid": "c8d9e0af-7777-8888-9999-000011112222",
+#           "profile_name": "i915-GVTg_V5_8",
+#           "max_instances": 8,
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x02",
+#             "function": "0x1"
+#           },
+#           "used_by_vm": null
+#         }
+#       ],
+
+#       "vf_instances": [
+#         {
+#           "vf_pci_address": "00:02.1",
+#           "vf_profile": "Intel SR-IOV VF 1",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x02",
+#             "function": "0x1"
+#           },
+#           "used_by_vm": "linux01"
+#         },
+#         {
+#           "vf_pci_address": "00:02.2",
+#           "vf_profile": "Intel SR-IOV VF 2",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x02",
+#             "function": "0x2"
+#           },
+#           "used_by_vm": null
+#         }
+#       ]
+#     },
+#     {
+#       "pci_address": "00:03.0",
+#       "vendor_id": "1002",
+#       "device_id": "7340",
+#       "vendor": "AMD",
+#       "device": "Instinct MI210",
+#       "driver": "amdgpu",
+#       "pci_class": "3D controller",
+#       "iommu_group": "8",
+#       "sriov_totalvfs": 8,
+#       "sriov_numvfs": 8,
+
+#       "full_passthrough": {
+#         "enabled": false,
+#         "libvirt_address": {
+#           "domain": "0x0000",
+#           "bus": "0x00",
+#           "slot": "0x03",
+#           "function": "0x0"
+#         },
+#         "used_by_vm": null
+#       },
+
+#       "vgpu_instances": [],
+
+#       "vf_instances": [
+#         {
+#           "vf_pci_address": "03:00.1",
+#           "vf_profile": "mi210-4c",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x03",
+#             "function": "0x1"
+#           },
+#           "used_by_vm": null
+#         },
+#         {
+#           "vf_pci_address": "03:00.2",
+#           "vf_profile": "mi210-2c",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x03",
+#             "function": "0x2"
+#           },
+#           "used_by_vm": null
+#         },
+#         {
+#           "vf_pci_address": "03:00.3",
+#           "vf_profile": "mi210-1c",
+#           "libvirt_address": {
+#             "domain": "0x0000",
+#             "bus": "0x00",
+#             "slot": "0x03",
+#             "function": "0x3"
+#           },
+#           "used_by_vm": null
+#         }
+#       ]
+#     }
+#   ]
+# }
+#
+
+set -euo pipefail
+
+# === Utility Functions ===
+
+# Escape a string for JSON
+json_escape() {
+	local str="$1"
+	str=${str//\\/\\\\}
+	str=${str//\"/\\\"}
+	str=${str//
+/\\n}
+	str=${str//
+/\\r}
+	str=${str//	/\\t}
+	printf '"%s"' "$str"
+}
+
+# Cache for nodedev XML data to avoid repeated virsh calls
+declare -A nodedev_cache
+
+# Get nodedev name for a PCI address (e.g. "00:02.0" -> "pci_0000_00_02_0")
+get_nodedev_name() {
+	local addr="$1"
+	echo "pci_$(echo "$addr" | sed 's/[:.]/\_/g' | sed 's/^/0000_/')"
+}
+
+# Get cached nodedev XML for a PCI address
+get_nodedev_xml() {
+	local addr="$1"
+	local nodedev_name
+	nodedev_name=$(get_nodedev_name "$addr")
+
+	if [[ -z "${nodedev_cache[$nodedev_name]:-}" ]]; then
+		if nodedev_cache[$nodedev_name]=$(virsh nodedev-dumpxml "$nodedev_name" 2>/dev/null); then
+			true # Cache populated successfully
+		else
+			nodedev_cache[$nodedev_name]="" # Cache empty result to avoid retries
+		fi
+	fi
+
+	echo "${nodedev_cache[$nodedev_name]}"
+}
+
+# Given a PCI address (e.g. "00:02.0"), return its IOMMU group or "null"
+get_iommu_group() {
+	local addr="$1"
+	local xml
+	xml=$(get_nodedev_xml "$addr")
+	local group
+	group=$(echo "$xml" | xmlstarlet sel -t -v "//iommuGroup/@number" 2>/dev/null || true)
+	echo "${group:-null}"
+}
+
+# Given a PCI address, output "TOTALVFS NUMVFS"
+get_sriov_counts() {
+	local addr="$1"
+	local xml
+	xml=$(get_nodedev_xml "$addr")
+
+	local totalvfs=0
+	local numvfs=0
+
+	if [[ -n "$xml" ]]; then
+		# Check for SR-IOV capability before parsing
+		local cap_xml
+		cap_xml=$(echo "$xml" | xmlstarlet sel -t -c "//capability[@type='virt_functions']" 2>/dev/null || true)
+
+		if [[ -n "$cap_xml" ]]; then
+			totalvfs=$(echo "$cap_xml" | xmlstarlet sel -t -v "/capability/@maxCount" 2>/dev/null || true)
+			numvfs=$(echo "$cap_xml" | xmlstarlet sel -t -v "count(/capability/address)" 2>/dev/null || true)
+		fi
+	fi
+
+	echo "${totalvfs:-0} ${numvfs:-0}"
+}
+
+# Given a PCI address, return its NUMA node (or -1 if none)
+get_numa_node() {
+	local addr="$1"
+	local xml
+	xml=$(get_nodedev_xml "$addr")
+	local node
+	node=$(echo "$xml" | xmlstarlet sel -t -v "//numa/@node" 2>/dev/null || true)
+	echo "${node:--1}"
+}
+
+# Given a PCI address, return its PCI root (the top‐level bridge ID, e.g. "0000:00:03")
+get_pci_root() {
+	local addr="$1"
+	local xml
+	xml=$(get_nodedev_xml "$addr")
+
+	if [[ -n "$xml" ]]; then
+		# Extract the parent device from XML
+		local parent
+		parent=$(echo "$xml" | xmlstarlet sel -t -v "/device/parent" 2>/dev/null || true)
+		if [[ -n "$parent" ]]; then
+			# If parent is a PCI device, recursively find its root
+			if [[ $parent =~ ^pci_0000_([0-9A-Fa-f]{2})_([0-9A-Fa-f]{2})_([0-9A-Fa-f])$ ]]; then
+				local parent_addr="${BASH_REMATCH[1]}:${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
+				get_pci_root "$parent_addr"
+				return
+			else
+				# Parent is not PCI device, so current device is the root
+				echo "0000:$addr"
+				return
+			fi
+		fi
+	fi
+
+	# fallback
+	echo "0000:$addr"
+}
+
+# Build VM → hostdev maps:
+#   pci_to_vm[BDF] = VM name that attaches that BDF
+#   mdev_to_vm[UUID] = VM name that attaches that MDEV UUID
+declare -A pci_to_vm mdev_to_vm
+
+# Gather all VM names (including inactive)
+mapfile -t VMS < <(virsh list --all --name | grep -v '^$')
+for VM in "${VMS[@]}"; do
+	# Skip if dumpxml fails
+	if ! xml=$(virsh dumpxml "$VM" 2>/dev/null); then
+		continue
+	fi
+
+	# -- PCI hostdevs: use xmlstarlet to extract BDF for all PCI host devices --
+	while read -r bus slot func; do
+		[[ -n "$bus" && -n "$slot" && -n "$func" ]] || continue
+		# Format to match lspci output (e.g., 01:00.0) by padding with zeros
+		bus_fmt=$(printf "%02x" "0x$bus")
+		slot_fmt=$(printf "%02x" "0x$slot")
+		func_fmt=$(printf "%x" "0x$func")
+		BDF="$bus_fmt:$slot_fmt.$func_fmt"
+		pci_to_vm["$BDF"]="$VM"
+	done < <(echo "$xml" | xmlstarlet sel -T -t -m "//hostdev[@type='pci']/source/address" \
+		-v "substring-after(@bus, '0x')" -o " " \
+		-v "substring-after(@slot, '0x')" -o " " \
+		-v "substring-after(@function, '0x')" -n 2>/dev/null || true)
+
+	# -- MDEV hostdevs: use xmlstarlet to extract UUIDs --
+	while IFS= read -r UUID; do
+		[[ -n "$UUID" ]] && mdev_to_vm["$UUID"]="$VM"
+	done < <(echo "$xml" | xmlstarlet sel -T -t -m "//hostdev[@type='mdev']" -v "@uuid" -n 2>/dev/null || true)
+done
+
+# Helper: convert a VM name to JSON value (quoted string or null)
+to_json_vm() {
+	local vm="$1"
+	if [[ -z "$vm" ]]; then
+		echo "null"
+	else
+		json_escape "$vm"
+	fi
+}
+
+# Parse a "description" file for GPU properties and set global variables
+# Expects one argument: the path to the description file
+parse_and_add_gpu_properties() {
+    local desc_file="$1"
+    # Reset properties to null defaults
+    MAX_INSTANCES="null"
+    VIDEO_RAM="null"
+    MAX_HEADS="null"
+    MAX_RESOLUTION_X="null"
+    MAX_RESOLUTION_Y="null"
+
+    if [[ -f "$desc_file" ]]; then
+        local desc
+        desc=$(<"$desc_file")
+        if [[ $desc =~ max_instance=([0-9]+) ]]; then
+            MAX_INSTANCES="${BASH_REMATCH[1]}"
+        fi
+        if [[ $desc =~ framebuffer=([0-9]+)M? ]]; then # Support with or without 'M' suffix
+            VIDEO_RAM="${BASH_REMATCH[1]}"
+        fi
+        if [[ $desc =~ num_heads=([0-9]+) ]]; then
+            MAX_HEADS="${BASH_REMATCH[1]}"
+        fi
+        if [[ $desc =~ max_resolution=([0-9]+)x([0-9]+) ]]; then
+            MAX_RESOLUTION_X="${BASH_REMATCH[1]}"
+            MAX_RESOLUTION_Y="${BASH_REMATCH[2]}"
+        fi
+    fi
+}
+
+# === GPU Discovery ===
+
+mapfile -t LINES < <(lspci -nnm)
+
+echo '{ "gpus": ['
+
+first_gpu=true
+for LINE in "${LINES[@]}"; do
+	# Parse lspci -nnm fields: SLOT "CLASS [CODE]" "VENDOR [VID]" "DEVICE [DID]" ...
+	if [[ $LINE =~ ^([^[:space:]]+)[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\" ]]; then
+		PCI_ADDR="${BASH_REMATCH[1]}"
+		PCI_CLASS="${BASH_REMATCH[2]}"
+		VENDOR_FIELD="${BASH_REMATCH[3]}"
+		DEVICE_FIELD="${BASH_REMATCH[4]}"
+	else
+		continue
+	fi
+
+	# If this is a VF, skip it. It will be processed under its PF.
+	if [[ -e "/sys/bus/pci/devices/0000:$PCI_ADDR/physfn" ]]; then
+		continue
+	fi
+
+	# Only process GPU classes (3D controller)
+	if [[ ! "$PCI_CLASS" =~ (3D\ controller) ]]; then
+		continue
+	fi
+
+	# Extract vendor name and ID
+	VENDOR=$(sed -E 's/ \[[0-9A-Fa-f]{4}\]$//' <<<"$VENDOR_FIELD")
+	VENDOR_ID=$(sed -E 's/.*\[([0-9A-Fa-f]{4})\]$/\1/' <<<"$VENDOR_FIELD")
+	# Extract device name and ID
+	DEVICE=$(sed -E 's/ \[[0-9A-Fa-f]{4}\]$//' <<<"$DEVICE_FIELD")
+	DEVICE_ID=$(sed -E 's/.*\[([0-9A-Fa-f]{4})\]$/\1/' <<<"$DEVICE_FIELD")
+
+	# Kernel driver
+	DRV_PATH="/sys/bus/pci/devices/0000:$PCI_ADDR/driver"
+	if [[ -L $DRV_PATH ]]; then
+		DRIVER=$(basename "$(readlink "$DRV_PATH")")
+	else
+		DRIVER="unknown"
+	fi
+
+	# IOMMU group
+	IOMMU=$(get_iommu_group "$PCI_ADDR")
+
+	# PCI root (to group GPUs under same PCIe switch/root complex)
+	PCI_ROOT=$(get_pci_root "$PCI_ADDR")
+
+	# NUMA node
+	NUMA_NODE=$(get_numa_node "$PCI_ADDR")
+
+	# SR-IOV counts
+	read -r TOTALVFS NUMVFS < <(get_sriov_counts "$PCI_ADDR")
+
+	# Get Physical GPU properties from its own description file, if available
+	PF_DESC_PATH="/sys/bus/pci/devices/0000:$PCI_ADDR/description"
+	parse_and_add_gpu_properties "$PF_DESC_PATH"
+	# Save physical function's properties before they are overwritten by vGPU/VF processing
+	PF_MAX_INSTANCES=$MAX_INSTANCES
+	PF_VIDEO_RAM=$VIDEO_RAM
+	PF_MAX_HEADS=$MAX_HEADS
+	PF_MAX_RESOLUTION_X=$MAX_RESOLUTION_X
+	PF_MAX_RESOLUTION_Y=$MAX_RESOLUTION_Y
+
+	# === full_passthrough usage ===
+	raw="${pci_to_vm[$PCI_ADDR]:-}"
+	FULL_USED_JSON=$(to_json_vm "$raw")
+
+	# === vGPU (MDEV) instances ===
+	VGPU_ARRAY="[]"
+	declare -a vlist=()
+	MDEV_BASE="/sys/bus/pci/devices/0000:$PCI_ADDR/mdev_supported_types"
+	if [[ -d "$MDEV_BASE" ]]; then
+		for PROF_DIR in "$MDEV_BASE"/*; do
+			[[ -d "$PROF_DIR" ]] || continue
+
+			# Read the human-readable profile name from the 'name' file
+			if [[ -f "$PROF_DIR/name" ]]; then
+				PROFILE_NAME=$(<"$PROF_DIR/name")
+			else
+				PROFILE_NAME=$(basename "$PROF_DIR")
+			fi
+
+			# Fetch max_instance from the description file, if present
+			parse_and_add_gpu_properties "$PROF_DIR/description"
+
+			# Under each profile, existing UUIDs appear in:
+			#    /sys/bus/pci/devices/0000:$PCI_ADDR/mdev_supported_types/<PROFILE>/devices/*
+			DEVICE_DIR="$PROF_DIR/devices"
+			if [[ -d "$DEVICE_DIR" ]]; then
+				for UDIR in "$DEVICE_DIR"/*; do
+					[[ -d $UDIR ]] || continue
+					MDEV_UUID=$(basename "$UDIR")
+
+					# libvirt_address uses PF BDF
+					DOMAIN="0x0000"
+					BUS="0x${PCI_ADDR:0:2}"
+					SLOT="0x${PCI_ADDR:3:2}"
+					FUNC="0x${PCI_ADDR:6:1}"
+
+					# Determine which VM uses this UUID
+					raw="${mdev_to_vm[$MDEV_UUID]:-}"
+					USED_JSON=$(to_json_vm "$raw")
+
+					vlist+=(
+						"{\"mdev_uuid\":\"$MDEV_UUID\",\"profile_name\":$(json_escape "$PROFILE_NAME"),\"max_instances\":$MAX_INSTANCES,\"video_ram\":$VIDEO_RAM,\"max_heads\":$MAX_HEADS,\"max_resolution_x\":$MAX_RESOLUTION_X,\"max_resolution_y\":$MAX_RESOLUTION_Y,\"libvirt_address\":{\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
+				done
+			fi
+		done
+		if [ ${#vlist[@]} -gt 0 ]; then
+			VGPU_ARRAY="[$(
+				IFS=,
+				echo "${vlist[*]}"
+			)]"
+		fi
+	fi
+
+	# === VF instances (SR-IOV / MIG) ===
+	VF_ARRAY="[]"
+	declare -a flist=()
+	if ((TOTALVFS > 0)); then
+		for VF_LINK in /sys/bus/pci/devices/0000:"$PCI_ADDR"/virtfn*; do
+			[[ -L $VF_LINK ]] || continue
+			VF_PATH=$(readlink -f "$VF_LINK")
+			VF_ADDR=${VF_PATH##*/} # e.g. "0000:65:00.2"
+			VF_BDF="${VF_ADDR:5}"  # "65:00.2"
+
+			DOMAIN="0x0000"
+			BUS="0x${VF_BDF:0:2}"
+			SLOT="0x${VF_BDF:3:2}"
+			FUNC="0x${VF_BDF:6:1}"
+
+			# Determine vf_profile
+			VF_PROFILE=""
+			if VF_LINE=$(lspci -nnm -s "$VF_BDF" 2>/dev/null); then
+				if [[ $VF_LINE =~ \"([^\"]+)\"[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\" ]]; then
+					VF_DEVICE_FIELD="${BASH_REMATCH[4]}"
+					VF_PROFILE=$(sed -E 's/ \[[0-9A-Fa-f]{4}\]$//' <<<"$VF_DEVICE_FIELD")
+				fi
+			fi
+			VF_PROFILE_JSON=$(json_escape "$VF_PROFILE")
+
+			# Determine which VM uses this VF_BDF
+			raw="${pci_to_vm[$VF_BDF]:-}"
+			USED_JSON=$(to_json_vm "$raw")
+
+			flist+=(
+				"{\"vf_pci_address\":\"$VF_BDF\",\"vf_profile\":$VF_PROFILE_JSON,\"libvirt_address\":{\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
+		done
+		if [ ${#flist[@]} -gt 0 ]; then
+			VF_ARRAY="[$(
+				IFS=,
+				echo "${flist[*]}"
+			)]"
+		fi
+	fi
+
+	# === full_passthrough block ===
+	# If vgpu_instances and vf_instances are empty, we can assume full passthrough
+	FP_ENABLED=0
+	if [[ ${#vlist[@]} -eq 0 && ${#flist[@]} -eq 0 ]]; then
+		FP_ENABLED=1
+	fi
+	DOMAIN="0x0000"
+	BUS="0x${PCI_ADDR:0:2}"
+	SLOT="0x${PCI_ADDR:3:2}"
+	FUNC="0x${PCI_ADDR:6:1}"
+
+	# Emit JSON
+	if $first_gpu; then
+		first_gpu=false
+	else
+		echo ","
+	fi
+
+	cat <<JSON
+    {
+      "pci_address":$(json_escape "$PCI_ADDR"),
+      "vendor_id":$(json_escape "$VENDOR_ID"),
+      "device_id":$(json_escape "$DEVICE_ID"),
+      "vendor":$(json_escape "$VENDOR"),
+      "device":$(json_escape "$DEVICE"),
+      "driver":$(json_escape "$DRIVER"),
+      "pci_class":$(json_escape "$PCI_CLASS"),
+      "iommu_group":$(json_escape "$IOMMU"),
+      "pci_root":$(json_escape "$PCI_ROOT"),
+      "numa_node":$NUMA_NODE,
+      "sriov_totalvfs":$TOTALVFS,
+      "sriov_numvfs":$NUMVFS,
+      "max_instances":$PF_MAX_INSTANCES,
+      "video_ram":$PF_VIDEO_RAM,
+      "max_heads":$PF_MAX_HEADS,
+      "max_resolution_x":$PF_MAX_RESOLUTION_X,
+      "max_resolution_y":$PF_MAX_RESOLUTION_Y,
+
+      "full_passthrough": {
+        "enabled":$FP_ENABLED,
+        "libvirt_address": {
+          "domain":$(json_escape "$DOMAIN"),
+          "bus":$(json_escape "$BUS"),
+          "slot":$(json_escape "$SLOT"),
+          "function":$(json_escape "$FUNC")
+        },
+        "used_by_vm":$FULL_USED_JSON
+      },
+
+      "vgpu_instances":$VGPU_ARRAY,
+      "vf_instances":$VF_ARRAY
+    }
+JSON
+
+done
+
+echo ""
+echo "]}"
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 5f82bc1656c..85baf1b580b 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -29,6 +29,12 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.gpu.dao.VgpuProfileDao;
+
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+import org.springframework.stereotype.Component;
+
 import com.cloud.agent.manager.allocator.HostAllocator;
 import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityManager;
@@ -67,11 +73,7 @@ import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.VMInstanceDetailsDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
-
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
 
 /**
  * An allocator that tries to find a fit on a computing host.  This allocator does not care whether or not the host supports routing.
@@ -104,6 +106,8 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
     CapacityDao _capacityDao;
     @Inject
     VMInstanceDetailsDao _vmInstanceDetailsDao;
+    @Inject
+    private VgpuProfileDao vgpuProfileDao;
 
     boolean _checkHvm = true;
     static DecimalFormat decimalFormat = new DecimalFormat("#.##");
@@ -224,7 +228,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
             avoid.addHost(host.getId());
         }
 
-        return allocateTo(plan, offering, template, avoid, clusterHosts, returnUpTo, considerReservedCapacity, account);
+        return allocateTo(vmProfile, plan, offering, template, avoid, clusterHosts, returnUpTo, considerReservedCapacity, account);
     }
 
     @Override
@@ -285,13 +289,13 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
         hostsCopy.addAll(_hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(hostTagOnOffering));
 
         if (!hostsCopy.isEmpty()) {
-            suitableHosts = allocateTo(plan, offering, template, avoid, hostsCopy, returnUpTo, considerReservedCapacity, account);
+            suitableHosts = allocateTo(vmProfile, plan, offering, template, avoid, hostsCopy, returnUpTo, considerReservedCapacity, account);
         }
 
         return suitableHosts;
     }
 
-    protected List<Host> allocateTo(DeploymentPlan plan, ServiceOffering offering, VMTemplateVO template, ExcludeList avoid, List<? extends Host> hosts, int returnUpTo,
+    protected List<Host> allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, ServiceOffering offering, VMTemplateVO template, ExcludeList avoid, List<? extends Host> hosts, int returnUpTo,
         boolean considerReservedCapacity, Account account) {
         String vmAllocationAlgorithm = DeploymentClusterPlanner.VmAllocationAlgorithm.value();
         if (vmAllocationAlgorithm.equals("random") || vmAllocationAlgorithm.equals("userconcentratedpod_random")) {
@@ -342,14 +346,15 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
             }
 
             // Check if GPU device is required by offering and host has the availability
-            if ((offeringDetails   = _serviceOfferingDetailsDao.findDetail(serviceOfferingId, GPU.Keys.vgpuType.toString())) != null) {
-                ServiceOfferingDetailsVO groupName = _serviceOfferingDetailsDao.findDetail(serviceOfferingId, GPU.Keys.pciDevice.toString());
-                if(!_resourceMgr.isGPUDeviceAvailable(host, groupName.getValue(), offeringDetails.getValue())){
-                    logger.debug("Adding host [{}] to avoid set, because this host does not have required GPU devices available.", host);
-                    avoid.addHost(host.getId());
-                    continue;
-                }
+            if (_resourceMgr.isGPUDeviceAvailable(offering, host, vmProfile.getId())) {
+                logger.debug("Host [{}] has required GPU devices available.", host);
+            } else {
+                // If GPU is not available, skip this host
+                logger.debug("Adding host [{}] to avoid set, because this host does not have required GPU devices available.", host);
+                avoid.addHost(host.getId());
+                continue;
             }
+
             Pair<Boolean, Boolean> cpuCapabilityAndCapacity = _capacityMgr.checkIfHostHasCpuCapabilityAndCapacity(host, offering, considerReservedCapacity);
             if (cpuCapabilityAndCapacity.first() && cpuCapabilityAndCapacity.second()) {
                 if (logger.isDebugEnabled()) {
@@ -537,7 +542,7 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
         prioritizedHosts.addAll(lowPriorityHosts);
 
         // if service offering is not GPU enabled then move all the GPU enabled hosts to the end of priority list.
-        if (_serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null) {
+        if (_serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null && offering.getVgpuProfileId() == null) {
 
             List<Host> gpuEnabledHosts = new ArrayList<>();
             // Check for GPU enabled hosts.
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 5bce31b9fc6..a4dafd60562 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -300,7 +300,6 @@ import com.cloud.domain.DomainVO;
 import com.cloud.event.Event;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
-import com.cloud.gpu.GPU;
 import com.cloud.host.ControlState;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
@@ -2195,15 +2194,13 @@ public class ApiResponseHelper implements ResponseGenerator {
                         result.get(0).getPodId(), result.get(0).getClusterId())) != null) {
             HashMap<String, Long> vgpuVMs = ApiDBUtils.getVgpuVmsCount(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId());
 
-            float capacityUsed = 0;
+            long capacityUsed = 0;
             long capacityMax = 0;
             for (VgpuTypesInfo capacity : gpuCapacities) {
                 if (vgpuVMs.containsKey(capacity.getGroupName().concat(capacity.getModelName()))) {
-                    capacityUsed += (float)vgpuVMs.get(capacity.getGroupName().concat(capacity.getModelName())) / capacity.getMaxVpuPerGpu();
-                }
-                if (capacity.getModelName().equals(GPU.GPUType.passthrough.toString())) {
-                    capacityMax += capacity.getMaxCapacity();
+                    capacityUsed += vgpuVMs.get(capacity.getGroupName().concat(capacity.getModelName()));
                 }
+                capacityMax += capacity.getMaxCapacity();
             }
 
             DataCenter zone = ApiDBUtils.findZoneById(result.get(0).getDataCenterId());
@@ -2224,10 +2221,11 @@ public class ApiResponseHelper implements ResponseGenerator {
             }
             capacityResponse.setCapacityType(Capacity.CAPACITY_TYPE_GPU);
             capacityResponse.setCapacityName(CapacityVO.getCapacityName(Capacity.CAPACITY_TYPE_GPU));
-            capacityResponse.setCapacityUsed((long)Math.ceil(capacityUsed));
+            capacityResponse.setCapacityUsed(capacityUsed);
+            capacityResponse.setCapacityAllocated(capacityUsed);
             capacityResponse.setCapacityTotal(capacityMax);
             if (capacityMax > 0) {
-                capacityResponse.setPercentUsed(format.format(capacityUsed / capacityMax * 100f));
+                capacityResponse.setPercentUsed(format.format((float)capacityUsed / capacityMax * 100f));
             } else {
                 capacityResponse.setPercentUsed(format.format(0));
             }
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index e91c76adc79..1643c1962ce 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -1535,6 +1535,13 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
                     userVmSearchBuilder.entity().getId(), JoinBuilder.JoinType.INNER);
         }
 
+        if (cmd.getGpuEnabled() != null) {
+            SearchBuilder<ServiceOfferingVO> serviceOfferingSearch = _srvOfferingDao.createSearchBuilder();
+            _srvOfferingDao.addCheckForGpuEnabled(serviceOfferingSearch, cmd.getGpuEnabled());
+
+            userVmSearchBuilder.join("serviceOffering", serviceOfferingSearch, serviceOfferingSearch.entity().getId(), userVmSearchBuilder.entity().getServiceOfferingId(), JoinBuilder.JoinType.INNER);
+        }
+
         if (keyPairName != null) {
             SearchBuilder<VMInstanceDetailVO> vmDetailSearchKeys = vmInstanceDetailsDao.createSearchBuilder();
             SearchBuilder<VMInstanceDetailVO> vmDetailSearchVmIds = vmInstanceDetailsDao.createSearchBuilder();
@@ -4043,6 +4050,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
         String storageType = cmd.getStorageType();
         ServiceOffering.State state = cmd.getState();
         final Long templateId = cmd.getTemplateId();
+        final Long vgpuProfileId = cmd.getVgpuProfileId();
+        final Boolean gpuEnabled = cmd.getGpuEnabled();
 
         final Account owner = accountMgr.finalizeOwner(caller, accountName, domainId, projectId);
 
@@ -4082,6 +4091,14 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             serviceOfferingSearch.and("state", serviceOfferingSearch.entity().getState(), Op.EQ);
         }
 
+        if (vgpuProfileId != null) {
+            serviceOfferingSearch.and("vgpuProfileId", serviceOfferingSearch.entity().getVgpuProfileId(), Op.EQ);
+        }
+
+        if (gpuEnabled != null) {
+            _srvOfferingDao.addCheckForGpuEnabled(serviceOfferingSearch, gpuEnabled);
+        }
+
         if (vmId != null) {
             currentVmOffering = _srvOfferingDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
             diskOffering = _diskOfferingDao.findByIdIncludingRemoved(currentVmOffering.getDiskOfferingId());
@@ -4368,6 +4385,10 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
             sc.setParameters("state", state);
         }
 
+        if (vgpuProfileId != null) {
+            sc.setParameters("vgpuProfileId", vgpuProfileId);
+        }
+
         if (vmId != null) {
             if (!currentVmOffering.isDynamic()) {
                 sc.setParameters("idNEQ", currentVmOffering.getId());
diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
index 2779e3a22e6..76db6fd66b5 100644
--- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
@@ -471,6 +471,7 @@ public class ViewResponseHelper {
         resourceLimitMap.put(Resource.ResourceType.vpc, domainJoinVO.getVpcLimit());
         resourceLimitMap.put(Resource.ResourceType.cpu, domainJoinVO.getCpuLimit());
         resourceLimitMap.put(Resource.ResourceType.memory, domainJoinVO.getMemoryLimit());
+        resourceLimitMap.put(Resource.ResourceType.gpu, domainJoinVO.getGpuLimit());
         resourceLimitMap.put(Resource.ResourceType.primary_storage, domainJoinVO.getPrimaryStorageLimit());
         resourceLimitMap.put(Resource.ResourceType.secondary_storage, domainJoinVO.getSecondaryStorageLimit());
         resourceLimitMap.put(Resource.ResourceType.project, domainJoinVO.getProjectLimit());
@@ -490,6 +491,7 @@ public class ViewResponseHelper {
         domainJoinVO.setVpcLimit(resourceLimitMap.get(Resource.ResourceType.vpc));
         domainJoinVO.setCpuLimit(resourceLimitMap.get(Resource.ResourceType.cpu));
         domainJoinVO.setMemoryLimit(resourceLimitMap.get(Resource.ResourceType.memory));
+        domainJoinVO.setGpuLimit(resourceLimitMap.get(Resource.ResourceType.gpu));
         domainJoinVO.setPrimaryStorageLimit(resourceLimitMap.get(Resource.ResourceType.primary_storage));
         domainJoinVO.setSecondaryStorageLimit(resourceLimitMap.get(Resource.ResourceType.secondary_storage));
         domainJoinVO.setProjectLimit(resourceLimitMap.get(Resource.ResourceType.project));
@@ -512,6 +514,7 @@ public class ViewResponseHelper {
             Long vpcLimit = resourceLimitMap.get(Resource.ResourceType.vpc);
             Long cpuLimit = resourceLimitMap.get(Resource.ResourceType.cpu);
             Long memoryLimit = resourceLimitMap.get(Resource.ResourceType.memory);
+            Long gpuLimit = resourceLimitMap.get(Resource.ResourceType.gpu);
             Long primaryStorageLimit = resourceLimitMap.get(Resource.ResourceType.primary_storage);
             Long secondaryStorageLimit = resourceLimitMap.get(Resource.ResourceType.secondary_storage);
             Long projectLimit = resourceLimitMap.get(Resource.ResourceType.project);
@@ -556,6 +559,10 @@ public class ViewResponseHelper {
                 memoryLimit = parentDomainJoinVO.getMemoryLimit();
                 resourceLimitMap.put(Resource.ResourceType.memory, memoryLimit);
             }
+            if (gpuLimit == null) {
+                gpuLimit = parentDomainJoinVO.getGpuLimit();
+                resourceLimitMap.put(Resource.ResourceType.gpu, gpuLimit);
+            }
             if (primaryStorageLimit == null) {
                 primaryStorageLimit = parentDomainJoinVO.getPrimaryStorageLimit();
                 resourceLimitMap.put(Resource.ResourceType.primary_storage, primaryStorageLimit);
diff --git a/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java
index c81481dec74..9a301d440a9 100644
--- a/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java
@@ -220,6 +220,9 @@ public class AccountJoinDaoImpl extends GenericDaoBase<AccountJoinVO, Long> impl
         response.setMemoryTotal(memoryTotal);
         response.setMemoryAvailable(memoryAvail);
 
+        //get resource limits for gpus
+        setGpuResourceLimits(account, fullView,response);
+
         //get resource limits for primary storage space and convert it from Bytes to GiB
         long primaryStorageLimit = ApiDBUtils.findCorrectResourceLimit(account.getPrimaryStorageLimit(), account.getId(), ResourceType.primary_storage);
         String primaryStorageLimitDisplay = (fullView || primaryStorageLimit == -1) ? Resource.UNLIMITED : String.valueOf(primaryStorageLimit / ResourceType.bytesToGiB);
@@ -278,6 +281,16 @@ public class AccountJoinDaoImpl extends GenericDaoBase<AccountJoinVO, Long> impl
         response.setObjectStorageAvailable(objectStorageAvail);
     }
 
+    private void setGpuResourceLimits(AccountJoinVO account, boolean fullView, ResourceLimitAndCountResponse response) {
+        long gpuLimit = ApiDBUtils.findCorrectResourceLimit(account.getGpuLimit(), account.getId(), ResourceType.gpu);
+        String gpuLimitDisplay = (fullView || gpuLimit == -1) ? Resource.UNLIMITED : String.valueOf(gpuLimit);
+        long gpuTotal = (account.getGpuTotal() == null) ? 0 : account.getGpuTotal();
+        String gpuAvail = (fullView || gpuLimit == -1) ? Resource.UNLIMITED : String.valueOf(gpuLimit - gpuTotal);
+        response.setGpuLimit(gpuLimitDisplay);
+        response.setGpuTotal(gpuTotal);
+        response.setGpuAvailable(gpuAvail);
+    }
+
     @Override
     public List<AccountJoinVO> searchByIds(Long... accountIds) {
         // set detail batch query size
diff --git a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
index a3177594e7f..f2d061c7bb0 100644
--- a/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
@@ -25,11 +25,13 @@ import javax.inject.Inject;
 import com.cloud.cpu.CPU;
 import com.cloud.dc.ASNumberRangeVO;
 import com.cloud.dc.dao.ASNumberRangeDao;
+import com.cloud.gpu.dao.HostGpuGroupsDao;
 import com.cloud.network.Network;
 import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
+import com.cloud.utils.Pair;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
@@ -69,6 +71,8 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
     private NetrisProviderDao netrisProviderDao;
     @Inject
     private ASNumberRangeDao asNumberRangeDao;
+    @Inject
+    private HostGpuGroupsDao hostGpuGroupsDao;
 
     protected DataCenterJoinDaoImpl() {
 
@@ -97,6 +101,13 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
         zoneResponse.setLocalStorageEnabled(dataCenter.isLocalStorageEnabled());
         zoneResponse.setType(ObjectUtils.defaultIfNull(dataCenter.getType(), DataCenter.Type.Core).toString());
         zoneResponse.setStorageAccessGroups(dataCenter.getStorageAccessGroups());
+        Pair<Long, Long> gpuStats = hostGpuGroupsDao.getGpuStats(dataCenter.getId(), null, null, null);
+        if (gpuStats != null) {
+            Long totalGpuDevices = gpuStats.first();
+            Long usedGpuDevices = totalGpuDevices - gpuStats.second();
+            zoneResponse.setGpuTotal(totalGpuDevices);
+            zoneResponse.setGpuUsed(usedGpuDevices);
+        }
 
         if ((dataCenter.getDescription() != null) && !dataCenter.getDescription().equalsIgnoreCase("null")) {
             zoneResponse.setDescription(dataCenter.getDescription());
diff --git a/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java
index 79376a37b97..4a0929744cf 100644
--- a/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/DomainJoinDaoImpl.java
@@ -195,6 +195,9 @@ public class DomainJoinDaoImpl extends GenericDaoBase<DomainJoinVO, Long> implem
         response.setMemoryTotal(memoryTotal);
         response.setMemoryAvailable(memoryAvail);
 
+        //get resource limits for gpus
+        setGpuResourceLimits(domain, fullView, response);
+
       //get resource limits for primary storage space and convert it from Bytes to GiB
         long primaryStorageLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getPrimaryStorageLimit(), ResourceType.primary_storage, domain.getId());
         String primaryStorageLimitDisplay = (fullView || primaryStorageLimit == -1) ? Resource.UNLIMITED : String.valueOf(primaryStorageLimit / ResourceType.bytesToGiB);
@@ -250,6 +253,16 @@ public class DomainJoinDaoImpl extends GenericDaoBase<DomainJoinVO, Long> implem
         response.setObjectStorageAvailable(objectStorageAvail);
     }
 
+    private void setGpuResourceLimits(DomainJoinVO domain, boolean fullView, ResourceLimitAndCountResponse response) {
+        long gpuLimit = ApiDBUtils.findCorrectResourceLimitForDomain(domain.getGpuLimit(), ResourceType.gpu, domain.getId());
+        String gpuLimitDisplay = (fullView || gpuLimit == -1) ? Resource.UNLIMITED : String.valueOf(gpuLimit);
+        long gpuTotal = (domain.getGpuTotal() == null) ? 0 : domain.getGpuTotal();
+        String gpuAvail = (fullView || gpuLimit == -1) ? Resource.UNLIMITED : String.valueOf(gpuLimit - gpuTotal);
+        response.setGpuLimit(gpuLimitDisplay);
+        response.setGpuTotal(gpuTotal);
+        response.setGpuAvailable(gpuAvail);
+    }
+
     @Override
     public List<DomainJoinVO> searchByIds(Long... domainIds) {
         // set detail batch query size
diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
index 66472597f97..e7265a7e3b9 100644
--- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -158,6 +158,8 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
         List<HostGpuGroupsVO> gpuGroups = ApiDBUtils.getGpuGroups(host.getId());
         if (gpuGroups != null && !gpuGroups.isEmpty()) {
             List<GpuResponse> gpus = new ArrayList<GpuResponse>();
+            long gpuRemaining = 0;
+            long gpuTotal = 0;
             for (HostGpuGroupsVO entry : gpuGroups) {
                 GpuResponse gpuResponse = new GpuResponse();
                 gpuResponse.setGpuGroupName(entry.getGroupName());
@@ -175,11 +177,15 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                         vgpuResponse.setRemainingCapacity(vgpuType.getRemainingCapacity());
                         vgpuResponse.setmaxCapacity(vgpuType.getMaxCapacity());
                         vgpus.add(vgpuResponse);
+                        gpuRemaining += vgpuType.getRemainingCapacity();
+                        gpuTotal += vgpuType.getMaxCapacity();
                     }
                     gpuResponse.setVgpu(vgpus);
                 }
                 gpus.add(gpuResponse);
             }
+            hostResponse.setGpuTotal(gpuTotal);
+            hostResponse.setGpuUsed(gpuTotal - gpuRemaining);
             hostResponse.setGpuGroup(gpus);
         }
         if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity) || details.contains(HostDetails.stats) || details.contains(HostDetails.events)) {
diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
index 4ae5074c511..579425a68c1 100644
--- a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
@@ -137,6 +137,16 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
         offeringResponse.setDomainId(offering.getDomainUuid());
         offeringResponse.setZone(offering.getZoneName());
         offeringResponse.setZoneId(offering.getZoneUuid());
+        offeringResponse.setGpuCardId(offering.getGpuCardUuid());
+        offeringResponse.setGpuCardName(offering.getGpuCardName());
+        offeringResponse.setVgpuProfileId(offering.getVgpuProfileUuid());
+        offeringResponse.setVgpuProfileName(offering.getVgpuProfileName());
+        offeringResponse.setVideoRam(offering.getVideoRam());
+        offeringResponse.setMaxHeads(offering.getMaxHeads());
+        offeringResponse.setMaxResolutionX(offering.getMaxResolutionX());
+        offeringResponse.setMaxResolutionY(offering.getMaxResolutionY());
+        offeringResponse.setGpuCount(offering.getGpuCount());
+        offeringResponse.setGpuDisplay(offering.getGpuDisplay());
         offeringResponse.setNetworkRate(offering.getRateMbps());
         offeringResponse.setHostTag(offering.getHostTag());
         offeringResponse.setDeploymentPlanner(offering.getDeploymentPlanner());
diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index c174da2993a..8092c63c6fd 100644
--- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -17,13 +17,14 @@
 package com.cloud.api.query.dao;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
+
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
@@ -33,6 +34,8 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import com.cloud.gpu.dao.VgpuProfileDao;
+import com.cloud.service.dao.ServiceOfferingDao;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -89,6 +92,7 @@ import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VmStats;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpVO;
+
 import com.cloud.vm.dao.VMInstanceDetailsDao;
 
 @Component
@@ -116,6 +120,10 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     VnfTemplateNicDao vnfTemplateNicDao;
     @Inject
     ConfigurationDao configurationDao;
+    @Inject
+    private ServiceOfferingDao serviceOfferingDao;
+    @Inject
+    private VgpuProfileDao vgpuProfileDao;
 
     private final SearchBuilder<UserVmJoinVO> VmDetailSearch;
     private final SearchBuilder<UserVmJoinVO> activeVmByIsoSearch;
@@ -251,6 +259,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
                 userVmResponse.setDiskOfferingName(userVm.getDiskOfferingName());
             }
         }
+
         if (details.contains(VMDetails.all) || details.contains(VMDetails.backoff)) {
             userVmResponse.setBackupOfferingId(userVm.getBackupOfferingUuid());
             userVmResponse.setBackupOfferingName(userVm.getBackupOfferingName());
@@ -259,6 +268,19 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
             userVmResponse.setCpuNumber(userVm.getCpu());
             userVmResponse.setCpuSpeed(userVm.getSpeed());
             userVmResponse.setMemory(userVm.getRamSize());
+            userVmResponse.setGpuCount(userVm.getGpuCount());
+            userVmResponse.setGpuCardName(userVm.getGpuCardName());
+            if (caller.getType() == Account.Type.ADMIN) {
+                userVmResponse.setGpuCardId(userVm.getGpuCardUuid());
+                userVmResponse.setVgpuProfileId(userVm.getVgpuProfileUuid());
+            }
+            userVmResponse.setVgpuProfileName(userVm.getVgpuProfileName());
+            userVmResponse.setVideoRam(userVm.getVideoRam());
+            userVmResponse.setMaxHeads(userVm.getMaxHeads());
+            userVmResponse.setMaxResolutionX(userVm.getMaxResolutionX());
+            userVmResponse.setMaxResolutionY(userVm.getMaxResolutionY());
+            userVmResponse.setVgpu(userVm.getVgpuProfileName());
+
             ServiceOfferingDetailsVO serviceOfferingDetail = ApiDBUtils.findServiceOfferingDetail(userVm.getServiceOfferingId(), GPU.Keys.vgpuType.toString());
             if (serviceOfferingDetail != null) {
                 userVmResponse.setVgpu(serviceOfferingDetail.getValue());
@@ -743,8 +765,10 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     public List<UserVmJoinVO> listByAccountServiceOfferingTemplateAndNotInState(long accountId, List<State> states,
             List<Long> offeringIds, List<Long> templateIds) {
         SearchBuilder<UserVmJoinVO> userVmSearch = createSearchBuilder();
+
         userVmSearch.selectFields(userVmSearch.entity().getId(), userVmSearch.entity().getCpu(),
-                userVmSearch.entity().getRamSize());
+                userVmSearch.entity().getRamSize(), userVmSearch.entity().getGpuCount());
+
         userVmSearch.and("accountId", userVmSearch.entity().getAccountId(), Op.EQ);
         userVmSearch.and("serviceOfferingId", userVmSearch.entity().getServiceOfferingId(), Op.IN);
         userVmSearch.and("templateId", userVmSearch.entity().getTemplateId(), Op.IN);
diff --git a/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java
index 2e39816ed41..91abd235ae8 100644
--- a/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java
@@ -177,6 +177,12 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name = "memoryTotal")
     private Long memoryTotal;
 
+    @Column(name = "gpuLimit")
+    private Long gpuLimit;
+
+    @Column(name = "gpuTotal")
+    private Long gpuTotal;
+
     @Column(name = "primaryStorageLimit")
     private Long primaryStorageLimit;
 
@@ -357,6 +363,10 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
         return memoryTotal;
     }
 
+    public Long getGpuTotal() {
+        return gpuTotal;
+    }
+
     public Long getPrimaryStorageTotal() {
         return primaryStorageTotal;
     }
@@ -421,6 +431,10 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
         return memoryLimit;
     }
 
+    public Long getGpuLimit() {
+        return gpuLimit;
+    }
+
     public Long getPrimaryStorageLimit() {
         return primaryStorageLimit;
     }
diff --git a/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java
index 3e623690f10..83461d470d8 100644
--- a/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java
@@ -152,6 +152,11 @@ public class DomainJoinVO extends BaseViewVO implements InternalIdentity, Identi
     @Column(name="memoryTotal")
     private Long memoryTotal;
 
+    @Column(name = "gpuLimit")
+    private Long gpuLimit;
+
+    @Column(name = "gpuTotal")
+    private Long gpuTotal;
 
     @Column(name="primaryStorageLimit")
     private Long primaryStorageLimit;
@@ -404,6 +409,14 @@ public class DomainJoinVO extends BaseViewVO implements InternalIdentity, Identi
     }
 
 
+    public Long getGpuTotal() {
+        return gpuTotal;
+    }
+
+    public void setGpuTotal(Long gpuTotal) {
+        this.gpuTotal = gpuTotal;
+    }
+
     public Long getPrimaryStorageTotal() {
         return primaryStorageTotal;
     }
@@ -545,6 +558,14 @@ public class DomainJoinVO extends BaseViewVO implements InternalIdentity, Identi
     }
 
 
+    public Long getGpuLimit() {
+        return gpuLimit;
+    }
+
+    public void setGpuLimit(Long gpuLimit) {
+        this.gpuLimit = gpuLimit;
+    }
+
     public Long getPrimaryStorageLimit() {
         return primaryStorageLimit;
     }
diff --git a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
index 5b75c572933..1d86d14cf63 100644
--- a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
@@ -227,6 +227,42 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
     @Enumerated(value = EnumType.STRING)
     private VMLeaseManager.ExpiryAction leaseExpiryAction;
 
+    @Column(name = "gpu_card_id")
+    private Long gpuCardId;
+
+    @Column(name = "gpu_card_uuid")
+    private String gpuCardUuid;
+
+    @Column(name = "gpu_card_name")
+    private String gpuCardName;
+
+    @Column(name = "vgpu_profile_id")
+    private Long vgpuProfileId;
+
+    @Column(name = "vgpu_profile_uuid")
+    private String vgpuProfileUuid;
+
+    @Column(name = "vgpu_profile_name")
+    private String vgpuProfileName;
+
+    @Column(name = "vgpu_profile_video_ram")
+    private Long videoRam;
+
+    @Column(name = "vgpu_profile_max_heads")
+    private Long maxHeads;
+
+    @Column(name = "vgpu_profile_max_resolution_x")
+    private Long maxResolutionX;
+
+    @Column(name = "vgpu_profile_max_resolution_y")
+    private Long maxResolutionY;
+
+    @Column(name = "gpu_count")
+    private Integer gpuCount;
+
+    @Column(name = "gpu_display")
+    private Boolean gpuDisplay;
+
     public ServiceOfferingJoinVO() {
     }
 
@@ -473,4 +509,52 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
     public VMLeaseManager.ExpiryAction getLeaseExpiryAction() {
         return leaseExpiryAction;
     }
+
+    public Long getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public String getGpuCardUuid() {
+        return gpuCardUuid;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public String getVgpuProfileUuid() {
+        return vgpuProfileUuid;
+    }
+
+    public String getVgpuProfileName() {
+        return vgpuProfileName;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
+    public Boolean getGpuDisplay() {
+        return gpuDisplay;
+    }
 }
diff --git a/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
index a0680f55753..eab34081d51 100644
--- a/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -240,6 +240,40 @@ public class UserVmJoinVO extends BaseViewWithTagInformationVO implements Contro
     @Column(name = "service_offering_name")
     private String serviceOfferingName;
 
+
+    @Column(name = "gpu_card_id")
+    private Long gpuCardId;
+
+    @Column(name = "gpu_card_uuid")
+    private String gpuCardUuid;
+
+    @Column(name = "gpu_card_name")
+    private String gpuCardName;
+
+    @Column(name = "vgpu_profile_id")
+    private Long vgpuProfileId;
+
+    @Column(name = "vgpu_profile_uuid")
+    private String vgpuProfileUuid;
+
+    @Column(name = "vgpu_profile_name")
+    private String vgpuProfileName;
+
+    @Column(name = "vgpu_profile_video_ram")
+    private Long videoRam;
+
+    @Column(name = "vgpu_profile_max_heads")
+    private Long maxHeads;
+
+    @Column(name = "vgpu_profile_max_resolution_x")
+    private Long maxResolutionX;
+
+    @Column(name = "vgpu_profile_max_resolution_y")
+    private Long maxResolutionY;
+
+    @Column(name = "gpu_count")
+    private Integer gpuCount;
+
     @Column(name = "backup_offering_id")
     private Long backupOfferingId;
 
@@ -703,6 +737,50 @@ public class UserVmJoinVO extends BaseViewWithTagInformationVO implements Contro
         return serviceOfferingName;
     }
 
+    public Long getGpuCardId() {
+        return gpuCardId;
+    }
+
+    public String getGpuCardUuid() {
+        return gpuCardUuid;
+    }
+
+    public String getGpuCardName() {
+        return gpuCardName;
+    }
+
+    public Long getVgpuProfileId() {
+        return vgpuProfileId;
+    }
+
+    public String getVgpuProfileUuid() {
+        return vgpuProfileUuid;
+    }
+
+    public String getVgpuProfileName() {
+        return vgpuProfileName;
+    }
+
+    public Long getVideoRam() {
+        return videoRam;
+    }
+
+    public Long getMaxHeads() {
+        return maxHeads;
+    }
+
+    public Long getMaxResolutionX() {
+        return maxResolutionX;
+    }
+
+    public Long getMaxResolutionY() {
+        return maxResolutionY;
+    }
+
+    public Integer getGpuCount() {
+        return gpuCount;
+    }
+
     public String getBackupOfferingUuid() {
         return backupOfferingUuid;
     }
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index dd204d41141..a60b84bf2b6 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -54,6 +54,8 @@ import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.netris.NetrisService;
 import org.apache.cloudstack.acl.RoleType;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.VgpuProfileDao;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroup;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -360,6 +362,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     @Inject
     DiskOfferingDetailsDao diskOfferingDetailsDao;
     @Inject
+    VgpuProfileDao vgpuProfileDao;
+    @Inject
     NetworkOfferingDao _networkOfferingDao;
     @Inject
     NetworkOfferingJoinDao networkOfferingJoinDao;
@@ -3450,6 +3454,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         Integer leaseDuration = cmd.getLeaseDuration();
         VMLeaseManager.ExpiryAction leaseExpiryAction = validateAndGetLeaseExpiryAction(leaseDuration, cmd.getLeaseExpiryAction());
 
+        final Long vgpuProfileId = cmd.getVgpuProfileId();
+        Integer gpuCount = validateVgpuProfileAndGetGpuCount(vgpuProfileId, cmd.getGpuCount());
+
         return createServiceOffering(userId, cmd.isSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(),
                 cmd.getProvisioningType(), localStorageRequired, offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainIds(), cmd.getZoneIds(), cmd.getHostTag(),
                 cmd.getNetworkRate(), cmd.getDeploymentPlanner(), details, cmd.getRootDiskSize(), isCustomizedIops, cmd.getMinIops(), cmd.getMaxIops(),
@@ -3458,7 +3465,24 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                 cmd.getIopsReadRate(), cmd.getIopsReadRateMax(), cmd.getIopsReadRateMaxLength(),
                 cmd.getIopsWriteRate(), cmd.getIopsWriteRateMax(), cmd.getIopsWriteRateMaxLength(),
                 cmd.getHypervisorSnapshotReserve(), cmd.getCacheMode(), storagePolicyId, cmd.getDynamicScalingEnabled(), diskOfferingId,
-                cmd.getDiskOfferingStrictness(), cmd.isCustomized(), cmd.getEncryptRoot(), cmd.isPurgeResources(), leaseDuration, leaseExpiryAction);
+                cmd.getDiskOfferingStrictness(), cmd.isCustomized(), cmd.getEncryptRoot(), vgpuProfileId, gpuCount, cmd.getGpuDisplay(), cmd.isPurgeResources(), leaseDuration, leaseExpiryAction);
+    }
+
+    private Integer validateVgpuProfileAndGetGpuCount(final Long vgpuProfileId, Integer gpuCount) {
+        Integer finalGpuCount = gpuCount;
+        if (vgpuProfileId != null) {
+            VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(vgpuProfileId);
+            if (vgpuProfile == null) {
+                throw new InvalidParameterValueException("Please specify a valid vgpu profile.");
+            }
+            if (gpuCount != null && gpuCount < 1) {
+                throw new InvalidParameterValueException("GPU count must be greater than 0.");
+            }
+            if (gpuCount == null) {
+                finalGpuCount = 1;
+            }
+        }
+        return finalGpuCount;
     }
 
     protected ServiceOfferingVO createServiceOffering(final long userId, final boolean isSystem, final VirtualMachine.Type vmType,
@@ -3471,7 +3495,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                                                       Long iopsWriteRate, Long iopsWriteRateMax, Long iopsWriteRateMaxLength,
                                                       final Integer hypervisorSnapshotReserve, String cacheMode, final Long storagePolicyID,
                                                       final boolean dynamicScalingEnabled, final Long diskOfferingId, final boolean diskOfferingStrictness,
-                                                      final boolean isCustomized, final boolean encryptRoot, final boolean purgeResources, Integer leaseDuration, VMLeaseManager.ExpiryAction leaseExpiryAction) {
+                                                      final boolean isCustomized, final boolean encryptRoot, Long vgpuProfileId, Integer gpuCount, Boolean gpuDisplay, final boolean purgeResources, Integer leaseDuration, VMLeaseManager.ExpiryAction leaseExpiryAction) {
 
         // Filter child domains when both parent and child domains are present
         List<Long> filteredDomainIds = filterChildSubDomains(domainIds);
@@ -3553,6 +3577,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         }
 
         serviceOffering.setDiskOfferingStrictness(diskOfferingStrictness);
+        serviceOffering.setVgpuProfileId(vgpuProfileId);
+        serviceOffering.setGpuCount(gpuCount);
+        serviceOffering.setGpuDisplay(gpuDisplay);
 
         DiskOfferingVO diskOffering = null;
         if (diskOfferingId == null) {
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 9d68c3395d4..daaebb42a34 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.gpu.dao.VgpuProfileDao;
 import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -94,7 +95,6 @@ import com.cloud.exception.AffinityConflictException;
 import com.cloud.exception.ConnectionException;
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.exception.StorageUnavailableException;
-import com.cloud.gpu.GPU;
 import com.cloud.host.DetailVO;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
@@ -106,7 +106,6 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.org.Cluster;
 import com.cloud.org.Grouping;
 import com.cloud.resource.ResourceManager;
-import com.cloud.service.ServiceOfferingDetailsVO;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.GuestOSVO;
@@ -251,6 +250,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
     @Inject
     protected ResourceManager _resourceMgr;
     @Inject
+    protected VgpuProfileDao vgpuProfileDao;
+    @Inject
     protected ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
 
     protected List<DeploymentPlanner> _planners;
@@ -586,10 +587,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
             return false;
         }
 
-        ServiceOfferingDetailsVO offeringDetails = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString());
-        ServiceOfferingDetailsVO groupName = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.pciDevice.toString());
-        if (offeringDetails != null && !_resourceMgr.isGPUDeviceAvailable(host, groupName.getValue(), offeringDetails.getValue())) {
-            logger.debug("Cannot deploy VM [{}] in the last host [{}] because this host does not have the required GPU devices available. Skipping this and trying other available hosts.",
+        if (!_resourceMgr.isGPUDeviceAvailable(offering, host, vm.getId())) {
+            logger.debug("Cannot deploy VM [{}] in the last host [{}] because this host does not have GPU devices available. Skipping this and trying other available hosts.",
                     vm, host);
             return false;
         }
diff --git a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
index 63377a66b6c..3aab852ba7f 100644
--- a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
@@ -203,8 +203,13 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
                 }
 
             }
-            // In case of non-GPU VMs, protect GPU enabled Hosts and prefer VM deployment on non-GPU Hosts.
-            if (((serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null) && !(hostGpuGroupsDao.listHostIds().isEmpty())) || nonUefiVMDeploy) {
+            // In case of non-GPU VMs, protect GPU enabled Hosts and prefer VM deployment on
+            // non-GPU Hosts.
+            if (((offering.getVgpuProfileId() == null &&
+                  serviceOfferingDetailsDao.findDetail(offering.getId(),
+                          GPU.Keys.vgpuType.toString()) == null)
+                 && !(hostGpuGroupsDao.listHostIds().isEmpty())) || nonUefiVMDeploy
+            ) {
                 int requiredCpu = offering.getCpu() * offering.getSpeed();
                 long requiredRam = offering.getRamSize() * 1024L * 1024L;
                 reorderClustersBasedOnImplicitTags(clusterList, requiredCpu, requiredRam);
diff --git a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
index 1be822d673e..1aa9a1af3fa 100644
--- a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -23,10 +23,13 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import com.cloud.agent.api.to.GPUDeviceTO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.dao.DomainDao;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.VgpuProfileDao;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.user.Account;
@@ -110,6 +113,8 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
     @Inject
     protected ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
     @Inject
+    protected VgpuProfileDao vgpuProfileDao;
+    @Inject
     protected ServiceOfferingDao serviceOfferingDao;
     @Inject
     private NetworkDetailsDao networkDetailsDao;
@@ -325,9 +330,8 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
 
         // Set GPU details
         ServiceOfferingDetailsVO offeringDetail = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString());
-        if (offeringDetail != null) {
-            ServiceOfferingDetailsVO groupName = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.pciDevice.toString());
-            to.setGpuDevice(_resourceMgr.getGPUDevice(vm.getHostId(), groupName.getValue(), offeringDetail.getValue()));
+        if (offering.getVgpuProfileId() != null || offeringDetail != null) {
+                to.setGpuDevice(getGpuDevice(offering, offeringDetail, vm, vmProfile.getHostId()));
         }
 
         // Workaround to make sure the TO has the UUID we need for Niciri integration
@@ -345,6 +349,21 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
         return to;
     }
 
+    private GPUDeviceTO getGpuDevice(ServiceOffering offering, ServiceOfferingDetailsVO offeringDetail, VirtualMachine vm, long hostId) {
+        if (offering.getVgpuProfileId() != null) {
+            VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(offering.getVgpuProfileId());
+            if (vgpuProfile != null) {
+                int gpuCount = offering.getGpuCount() != null ? offering.getGpuCount() : 1;
+                return _resourceMgr.getGPUDevice(vm, hostId, vgpuProfile, gpuCount);
+            }
+        } else if (offeringDetail != null) {
+            ServiceOfferingDetailsVO groupName = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.pciDevice.toString());
+            return _resourceMgr.getGPUDevice(vm.getHostId(), groupName.getValue(), offeringDetail.getValue());
+        }
+        return null;
+    }
+
+
     protected Long findClusterOfVm(VirtualMachine vm) {
         HostVO host = hostDao.findById(vm.getHostId());
         if (host != null) {
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 936dfd9cf95..47f23bca4b0 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -18,6 +18,7 @@ package com.cloud.resource;
 
 import static com.cloud.configuration.ConfigurationManagerImpl.MIGRATE_VM_ACROSS_CLUSTERS;
 import static com.cloud.configuration.ConfigurationManagerImpl.SET_HOST_DOWN_TO_MAINTENANCE;
+import static org.apache.cloudstack.gpu.GpuService.GpuDetachOnStop;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -38,6 +39,16 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.gpu.dao.VgpuProfileDao;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.service.ServiceOfferingDetailsVO;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.StoragePoolAndAccessGroupMapVO;
+import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
+import com.cloud.storage.dao.StoragePoolTagsDao;
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.GpuCardDao;
 import org.apache.cloudstack.alert.AlertService;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -66,6 +77,7 @@ import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.cloudstack.framework.extensions.vo.ExtensionResourceMapVO;
 import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
+import org.apache.cloudstack.gpu.GpuService;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
@@ -171,10 +183,8 @@ import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.storage.ScopeType;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
-import com.cloud.storage.StoragePoolAndAccessGroupMapVO;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.StorageService;
@@ -182,9 +192,7 @@ import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.GuestOSCategoryDao;
-import com.cloud.storage.dao.StoragePoolAndAccessGroupMapDao;
 import com.cloud.storage.dao.StoragePoolHostDao;
-import com.cloud.storage.dao.StoragePoolTagsDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.Account;
@@ -266,6 +274,10 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     @Inject
     protected VGPUTypesDao _vgpuTypesDao;
     @Inject
+    protected VgpuProfileDao vgpuProfileDao;
+    @Inject
+    private GpuCardDao gpuCardDao;
+    @Inject
     private PrimaryDataStoreDao _storagePoolDao;
     @Inject
     private StoragePoolTagsDao _storagePoolTagsDao;
@@ -293,6 +305,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
     private ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
     @Inject
     private UserVmManager userVmManager;
+    @Inject
+    private GpuService gpuService;
 
     private List<? extends Discoverer> _discoverers;
 
@@ -1501,8 +1515,11 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             }
 
             for (final VMInstanceVO vm : vms) {
+                ServiceOfferingVO offering = serviceOfferingDao.findById(vm.getServiceOfferingId());
                 if (hosts == null || hosts.isEmpty() || !answer.getMigrate()
-                        || _serviceOfferingDetailsDao.findDetail(vm.getServiceOfferingId(), GPU.Keys.vgpuType.toString()) != null) {
+                    || offering.getVgpuProfileId() != null
+                    || _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) != null
+                ) {
                     handleVmForLastHostOrWithVGpu(host, vm);
                 } else if (HypervisorType.LXC.equals(host.getHypervisorType()) && VirtualMachine.Type.User.equals(vm.getType())){
                     //Migration is not supported for LXC Vms. Schedule restart instead.
@@ -2896,7 +2913,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         _gpuAvailability.and("groupName", _gpuAvailability.entity().getGroupName(), Op.EQ);
         final SearchBuilder<VGPUTypesVO> join1 = _vgpuTypesDao.createSearchBuilder();
         join1.and("vgpuType", join1.entity().getVgpuType(), Op.EQ);
-        join1.and("remainingCapacity", join1.entity().getRemainingCapacity(), Op.GT);
+        join1.and("remainingCapacity", join1.entity().getRemainingCapacity(), Op.GTEQ);
         _gpuAvailability.join("groupId", join1, _gpuAvailability.entity().getId(), join1.entity().getGpuGroupId(), JoinBuilder.JoinType.INNER);
         _gpuAvailability.done();
 
@@ -3224,7 +3241,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         }
 
         if (newHost) {
-            host = _hostDao.persist(host);
+            host = persistNewHost(host, startup);
         } else {
             _hostDao.update(host.getId(), host);
         }
@@ -3253,6 +3270,18 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         return host;
     }
 
+    private HostVO persistNewHost(HostVO host, StartupCommand startup) {
+        HostVO hostVo = _hostDao.persist(host);
+        // Check for GPU devices again because we couldn't persist the GPU devices earlier due to missing host ID
+        if (startup instanceof StartupRoutingCommand &&
+            CollectionUtils.isNotEmpty(((StartupRoutingCommand) startup).getGpuDevices())) {
+            StartupRoutingCommand ssCmd = ((StartupRoutingCommand) startup);
+            host.setGpuGroups(getGroupDetails(host, ssCmd.getGpuDevices(), ssCmd.getGpuGroupDetails()));
+            _hostDao.update(hostVo.getId(), host);
+        }
+        return hostVo;
+    }
+
     private void updateSupportsClonedVolumes(HostVO host, boolean supportsClonedVolumes) {
         final String name = "supportsResign";
 
@@ -3639,7 +3668,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         host.setSpeed(ssCmd.getSpeed());
         host.setHypervisorType(hyType);
         host.setHypervisorVersion(ssCmd.getHypervisorVersion());
-        host.setGpuGroups(ssCmd.getGpuGroupDetails());
+        host.setGpuGroups(getGroupDetails(host, ssCmd.getGpuDevices(), ssCmd.getGpuGroupDetails()));
         return host;
     }
 
@@ -4263,7 +4292,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         sc.setParameters("hostId", hostId);
         sc.setParameters("groupName", groupName);
         sc.setJoinParameters("groupId", "vgpuType", vgpuType);
-        sc.setJoinParameters("groupId", "remainingCapacity", 0);
         return _hostGpuGroupsDao.customSearch(sc, searchFilter);
     }
 
@@ -4287,7 +4315,14 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         return sc.list();
     }
 
-    @Override
+    /**
+     * Check if host has GPU devices available
+     *
+     * @param host      the host to be checked
+     * @param groupName gpuCard name
+     * @param vgpuType  the VGPU type
+     * @return true when the host has the capacity with given VGPU type
+     */
     public boolean isGPUDeviceAvailable(final Host host, final String groupName, final String vgpuType) {
         if(!listAvailableGPUDevice(host.getId(), groupName, vgpuType).isEmpty()) {
             return true;
@@ -4299,6 +4334,65 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         }
     }
 
+    @Override
+    public boolean isGPUDeviceAvailable(ServiceOffering offering, Host host, Long vmId) {
+            // Check if GPU device is required by offering and host has the availability
+            ServiceOfferingDetailsVO offeringDetails = null;
+            if (offering.getVgpuProfileId() != null) {
+                VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(offering.getVgpuProfileId());
+                if (vgpuProfile == null) {
+                    logger.debug("Host {} does not have GPU devices available.", host);
+                    return false;
+                }
+                int gpuCount = offering.getGpuCount() != null ? offering.getGpuCount() : 1;
+
+                if(!isGPUDeviceAvailable(host, vmId, vgpuProfile, gpuCount)) {
+                    logger.debug("Host {} does not have required GPU devices available.", host);
+                    return false;
+                }
+            } else if ((offeringDetails   = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString())) != null) {
+                ServiceOfferingDetailsVO groupName = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.pciDevice.toString());
+                if(!isGPUDeviceAvailable(host, groupName.getValue(), offeringDetails.getValue())){
+                    logger.debug("Host {} does not have required GPU devices available.", host);
+                    return false;
+                }
+            }
+            return true;
+    }
+
+    /**
+     * Check if host has GPU devices available
+     *
+     * @param host        the host to be checked
+     * @param vmId        VM ID
+     * @param vgpuProfile the VGPU profile
+     * @param gpuCount    the number of GPUs requested
+     * @return true when the host has the capacity with given VGPU type
+     */
+    public boolean isGPUDeviceAvailable(Host host, Long vmId, VgpuProfileVO vgpuProfile, int gpuCount) {
+        if (host.getHypervisorType().equals(HypervisorType.XenServer)) {
+            GpuCardVO gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
+            String groupName = gpuCard.getGroupName();
+            String vgpuType = vgpuProfile.getName();
+            return isGPUDeviceAvailable(host, groupName, vgpuType);
+        } else {
+            return gpuService.isGPUDeviceAvailable(host, vmId, vgpuProfile, gpuCount);
+        }
+    }
+
+    @Override
+    public GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfileVO vgpuProfile, int gpuCount) {
+        HostVO host = _hostDao.findById(vm.getHostId());
+        if (host.getHypervisorType().equals(HypervisorType.XenServer)) {
+            GpuCardVO gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
+            String groupName = gpuCard.getGroupName();
+            String vgpuType = vgpuProfile.getName();
+            return getGPUDevice(vm.getHostId(), groupName, vgpuType);
+        } else {
+            return gpuService.getGPUDevice(vm, hostId, vgpuProfile, gpuCount);
+        }
+    }
+
     @Override
     public GPUDeviceTO getGPUDevice(final long hostId, final String groupName, final String vgpuType) {
         final List<HostGpuGroupsVO> gpuDeviceList = listAvailableGPUDevice(hostId, groupName, vgpuType);
@@ -4322,6 +4416,31 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         txn.commit();
     }
 
+    @Override
+    public void updateGPUDetailsForVmStop(final VirtualMachine vm, final GPUDeviceTO gpuDevice) {
+        HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails;
+        if (gpuDevice == null || gpuDevice.getGpuDevices() != null) {
+            HostVO host = _hostDao.findById(vm.getHostId());
+            if (GpuDetachOnStop.valueIn(vm.getDomainId())) {
+                gpuService.deallocateAllGpuDevicesForVm(vm.getId());
+            }
+            groupDetails = gpuService.getGpuGroupDetailsFromGpuDevicesOnHost(host.getId());
+        } else {
+            groupDetails = gpuDevice.getGroupDetails();
+        }
+        updateGPUDetails(vm.getHostId(), groupDetails);
+    }
+
+    @Override
+    public void updateGPUDetailsForVmStart(long hostId, long vmId, GPUDeviceTO gpuDevice) {
+        HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails = gpuDevice.getGroupDetails();
+        if (gpuDevice.getGpuDevices() != null) {
+            gpuService.allocateGpuDevicesToVmOnHost(vmId, hostId, gpuDevice.getGpuDevices());
+            groupDetails = gpuService.getGpuGroupDetailsFromGpuDevicesOnHost(hostId);
+        }
+        updateGPUDetails(hostId, groupDetails);
+    }
+
     @Override
     public HashMap<String, HashMap<String, VgpuTypesInfo>> getGPUStatistics(final HostVO host) {
         final Answer answer = _agentMgr.easySend(host.getId(), new GetGPUStatsCommand(host.getGuid(), host.getName()));
@@ -4332,15 +4451,27 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             final String msg = String.format("Unable to obtain GPU stats for %s", host);
             logger.warn(msg);
             return null;
-        } else {
-            // now construct the result object
-            if (answer instanceof GetGPUStatsAnswer) {
-                return ((GetGPUStatsAnswer)answer).getGroupDetails();
-            }
+        } else if (answer instanceof GetGPUStatsAnswer) {
+            GetGPUStatsAnswer gpuStatsAnswer = (GetGPUStatsAnswer) answer;
+            return getGroupDetails(host, gpuStatsAnswer.getGpuDevices(), gpuStatsAnswer.getGroupDetails());
         }
         return null;
     }
 
+    private HashMap<String, HashMap<String, VgpuTypesInfo>> getGroupDetails(HostVO host, List<VgpuTypesInfo> gpuDevices, HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails) {
+        HashMap<String, HashMap<String, VgpuTypesInfo>> finalGroupDetails;
+        if (host.getId() > 0) {
+            // The below method needs the host to be persisted in the DB to save the GPU devices for the host
+            gpuService.addGpuDevicesToHost(host, gpuDevices);
+        }
+        if (CollectionUtils.isNotEmpty(gpuDevices)) {
+            finalGroupDetails = gpuService.getGpuGroupDetailsFromGpuDevicesOnHost(host.getId());
+        } else {
+            finalGroupDetails = groupDetails;
+        }
+        return finalGroupDetails;
+    }
+
     @Override
     public HostVO findOneRandomRunningHostByHypervisor(final HypervisorType type, final Long dcId) {
         final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 37d74445776..7ada4b7f4cc 100644
--- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -297,6 +297,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             projectResourceLimitMap.put(Resource.ResourceType.vpc.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectVpcs.key())));
             projectResourceLimitMap.put(Resource.ResourceType.cpu.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectCpus.key())));
             projectResourceLimitMap.put(Resource.ResourceType.memory.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectMemory.key())));
+            projectResourceLimitMap.put(Resource.ResourceType.gpu.name(), DefaultMaxProjectGpus.value());
             projectResourceLimitMap.put(Resource.ResourceType.primary_storage.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxProjectPrimaryStorage.key())));
             projectResourceLimitMap.put(Resource.ResourceType.secondary_storage.name(), MaxProjectSecondaryStorage.value());
             projectResourceLimitMap.put(Resource.ResourceType.backup.name(), Long.parseLong(_configDao.getValue(BackupManager.DefaultMaxProjectBackups.key())));
@@ -313,6 +314,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             accountResourceLimitMap.put(Resource.ResourceType.vpc.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountVpcs.key())));
             accountResourceLimitMap.put(Resource.ResourceType.cpu.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountCpus.key())));
             accountResourceLimitMap.put(Resource.ResourceType.memory.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountMemory.key())));
+            accountResourceLimitMap.put(Resource.ResourceType.gpu.name(), DefaultMaxAccountGpus.value());
             accountResourceLimitMap.put(Resource.ResourceType.primary_storage.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxAccountPrimaryStorage.key())));
             accountResourceLimitMap.put(Resource.ResourceType.secondary_storage.name(), MaxAccountSecondaryStorage.value());
             accountResourceLimitMap.put(Resource.ResourceType.project.name(), DefaultMaxAccountProjects.value());
@@ -333,6 +335,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             domainResourceLimitMap.put(Resource.ResourceType.primary_storage.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainPrimaryStorage.key())));
             domainResourceLimitMap.put(Resource.ResourceType.secondary_storage.name(), Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainSecondaryStorage.key())));
             domainResourceLimitMap.put(Resource.ResourceType.project.name(), DefaultMaxDomainProjects.value());
+            domainResourceLimitMap.put(Resource.ResourceType.gpu.name(), DefaultMaxDomainGpus.value());
             domainResourceLimitMap.put(Resource.ResourceType.backup.name(), Long.parseLong(_configDao.getValue(BackupManager.DefaultMaxDomainBackups.key())));
             domainResourceLimitMap.put(Resource.ResourceType.backup_storage.name(), Long.parseLong(_configDao.getValue(BackupManager.DefaultMaxDomainBackupStorage.key())));
             domainResourceLimitMap.put(Resource.ResourceType.bucket.name(), Long.parseLong(_configDao.getValue(BucketApiService.DefaultMaxDomainBuckets.key())));
@@ -1303,6 +1306,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             newCount = calculateVmCpuCountForAccount(accountId, tag);
         } else if (type == Resource.ResourceType.memory) {
             newCount = calculateVmMemoryCountForAccount(accountId, tag);
+        } else if (type == Resource.ResourceType.gpu) {
+            newCount = calculateVmGpuCountForAccount(accountId, tag);
         } else if (type == Resource.ResourceType.primary_storage) {
             newCount = calculatePrimaryStorageForAccount(accountId, tag);
         } else if (type == Resource.ResourceType.secondary_storage) {
@@ -1429,6 +1434,22 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         return memory - reservedMemory;
     }
 
+    protected long calculateVmGpuCountForAccount(long accountId, String tag) {
+        if (StringUtils.isEmpty(tag)) {
+            return calculateGpuForAccount(accountId);
+        }
+        long gputotal = 0;
+        List<UserVmJoinVO> vms = getVmsWithAccountAndTag(accountId, tag);
+
+        for (UserVmJoinVO vm : vms) {
+            if (vm.getGpuCount() != null) {
+                gputotal += vm.getGpuCount();
+            }
+        }
+        long reservedGpus = calculateReservedResources(vms, accountId, ResourceType.gpu, tag);
+        return gputotal - reservedGpus;
+    }
+
     public long countCpusForAccount(long accountId) {
         long cputotal = 0;
         List<UserVmJoinVO> userVms = getVmsWithAccount(accountId);
@@ -1449,6 +1470,18 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         return ramtotal - reservedRamTotal;
     }
 
+    public long calculateGpuForAccount(long accountId) {
+        long gputotal = 0;
+        List<UserVmJoinVO> userVms = getVmsWithAccount(accountId);
+        for (UserVmJoinVO vm : userVms) {
+            if (vm.getGpuCount() != null) {
+                gputotal += vm.getGpuCount();
+            }
+        }
+        long reservedGpuTotal = calculateReservedResources(userVms, accountId, ResourceType.gpu, null);
+        return gputotal - reservedGpuTotal;
+    }
+
     public long calculateSecondaryStorageForAccount(long accountId) {
         long totalVolumesSize = _volumeDao.secondaryStorageUsedForAccount(accountId);
         long totalSnapshotsSize = 0;
@@ -1854,24 +1887,18 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         if (newMemory == null) {
             newMemory = newOffering.getRamSize() != null ? Long.valueOf(newOffering.getRamSize()) : 0L;
         }
+        Long currentGpu = currentOffering.getGpuCount() != null ? Long.valueOf(currentOffering.getGpuCount()) : 0L;
+        Long newGpu = newOffering.getGpuCount() != null ? Long.valueOf(newOffering.getGpuCount()) : 0L;
 
         Set<String> sameTags = updatedResourceLimitHostTags.first();
         Set<String> newTags = updatedResourceLimitHostTags.second();
         Set<String> removedTags = updatedResourceLimitHostTags.third();
 
-        if (!newCpu.equals(currentCpu) || !newMemory.equals(currentMemory)) {
+        if (!newCpu.equals(currentCpu) || !newMemory.equals(currentMemory) || !newGpu.equals(currentGpu)) {
             for (String tag : sameTags) {
-                if (newCpu - currentCpu > 0) {
-                    incrementResourceCountWithTag(accountId, ResourceType.cpu, tag, newCpu - currentCpu);
-                } else if (newCpu - currentCpu < 0) {
-                    decrementResourceCountWithTag(accountId, ResourceType.cpu, tag, currentCpu - newCpu);
-                }
-
-                if (newMemory - currentMemory > 0) {
-                    incrementResourceCountWithTag(accountId, ResourceType.memory, tag, newMemory - currentMemory);
-                } else if (newMemory - currentMemory < 0) {
-                    decrementResourceCountWithTag(accountId, ResourceType.memory, tag, currentMemory - newMemory);
-                }
+                adjustResourceCount(newCpu, currentCpu, ResourceType.cpu, accountId, tag);
+                adjustResourceCount(newMemory, currentMemory, ResourceType.memory, accountId, tag);
+                adjustResourceCount(newGpu, currentGpu, ResourceType.gpu, accountId, tag);
             }
         }
 
@@ -1879,12 +1906,22 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             decrementResourceCountWithTag(accountId, ResourceType.user_vm, tag, 1L);
             decrementResourceCountWithTag(accountId, ResourceType.cpu, tag, currentCpu);
             decrementResourceCountWithTag(accountId, ResourceType.memory, tag, currentMemory);
+            decrementResourceCountWithTag(accountId, ResourceType.gpu, tag, currentGpu);
         }
 
         for (String tag : newTags) {
             incrementResourceCountWithTag(accountId, ResourceType.user_vm, tag, 1L);
             incrementResourceCountWithTag(accountId, ResourceType.cpu, tag, newCpu);
             incrementResourceCountWithTag(accountId, ResourceType.memory, tag, newMemory);
+            incrementResourceCountWithTag(accountId, ResourceType.gpu, tag, newGpu);
+        }
+    }
+
+    private void adjustResourceCount(Long newValue, Long currentValue, Resource.ResourceType type, long accountId, String tag) {
+        if (newValue - currentValue > 0) {
+            incrementResourceCountWithTag(accountId, type, tag, newValue - currentValue);
+        } else if (newValue - currentValue < 0) {
+            decrementResourceCountWithTag(accountId, type, tag, currentValue - newValue);
         }
     }
 
@@ -1986,10 +2023,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         }
         Long cpu = serviceOffering.getCpu() != null ? Long.valueOf(serviceOffering.getCpu()) : 0L;
         Long ram = serviceOffering.getRamSize() != null ? Long.valueOf(serviceOffering.getRamSize()) : 0L;
+        Long gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
         for (String tag : tags) {
             checkResourceLimitWithTag(owner, ResourceType.user_vm, tag);
             checkResourceLimitWithTag(owner, ResourceType.cpu, tag, cpu);
             checkResourceLimitWithTag(owner, ResourceType.memory, tag, ram);
+            checkResourceLimitWithTag(owner, ResourceType.gpu, tag, gpu);
         }
     }
 
@@ -2004,10 +2043,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 }
                 Long cpu = serviceOffering.getCpu() != null ? Long.valueOf(serviceOffering.getCpu()) : 0L;
                 Long ram = serviceOffering.getRamSize() != null ? Long.valueOf(serviceOffering.getRamSize()) : 0L;
+                Long gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
                 for (String tag : tags) {
                     incrementResourceCountWithTag(accountId, ResourceType.user_vm, tag);
                     incrementResourceCountWithTag(accountId, ResourceType.cpu, tag, cpu);
                     incrementResourceCountWithTag(accountId, ResourceType.memory, tag, ram);
+                    incrementResourceCountWithTag(accountId, ResourceType.gpu, tag, gpu);
                 }
             }
         });
@@ -2025,10 +2066,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 }
                 Long cpu = serviceOffering.getCpu() != null ? Long.valueOf(serviceOffering.getCpu()) : 0L;
                 Long ram = serviceOffering.getRamSize() != null ? Long.valueOf(serviceOffering.getRamSize()) : 0L;
+                Long gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
                 for (String tag : tags) {
                     decrementResourceCountWithTag(accountId, ResourceType.user_vm, tag);
                     decrementResourceCountWithTag(accountId, ResourceType.cpu, tag, cpu);
                     decrementResourceCountWithTag(accountId, ResourceType.memory, tag, ram);
+                    decrementResourceCountWithTag(accountId, ResourceType.gpu, tag, gpu);
                 }
             }
         });
@@ -2071,11 +2114,13 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         if (newMemory == null) {
             newMemory = newOffering.getRamSize() != null ? Long.valueOf(newOffering.getRamSize()) : 0L;
         }
+        Long currentGpu = currentOffering.getGpuCount() != null ? Long.valueOf(currentOffering.getGpuCount()) : 0L;
+        Long newGpu = newOffering.getGpuCount() != null ? Long.valueOf(newOffering.getGpuCount()) : 0L;
 
         Set<String> sameTags = updatedResourceLimitHostTags.first();
         Set<String> newTags = updatedResourceLimitHostTags.second();
 
-        if (newCpu - currentCpu > 0 || newMemory - currentMemory > 0) {
+        if (newCpu - currentCpu > 0 || newMemory - currentMemory > 0 || newGpu - currentGpu > 0) {
             for (String tag : sameTags) {
                 if (newCpu - currentCpu > 0) {
                     checkResourceLimitWithTag(owner, ResourceType.cpu, tag, newCpu - currentCpu);
@@ -2084,6 +2129,10 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 if (newMemory - currentMemory > 0) {
                     checkResourceLimitWithTag(owner, ResourceType.memory, tag, newMemory - currentMemory);
                 }
+
+                if (newGpu - currentGpu > 0) {
+                    checkResourceLimitWithTag(owner, ResourceType.gpu, tag, newGpu - currentGpu);
+                }
             }
         }
 
@@ -2091,6 +2140,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
             checkResourceLimitWithTag(owner, ResourceType.user_vm, tag, 1L);
             checkResourceLimitWithTag(owner, ResourceType.cpu, tag, newCpu);
             checkResourceLimitWithTag(owner, ResourceType.memory, tag, newMemory);
+            checkResourceLimitWithTag(owner, ResourceType.gpu, tag, newGpu);
         }
     }
 
@@ -2178,6 +2228,48 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
         }
     }
 
+    @Override
+    public void checkVmGpuResourceLimit(Account owner, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) throws ResourceAllocationException {
+        List<String> tags = getResourceLimitHostTagsForResourceCountOperation(display, serviceOffering, template);
+        if (CollectionUtils.isEmpty(tags)) {
+            return;
+        }
+        if (gpu == null) {
+            gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
+        }
+        for (String tag : tags) {
+            checkResourceLimitWithTag(owner, ResourceType.gpu, tag, gpu);
+        }
+    }
+
+    @Override
+    public void incrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) {
+        List<String> tags = getResourceLimitHostTagsForResourceCountOperation(display, serviceOffering, template);
+        if (CollectionUtils.isEmpty(tags)) {
+            return;
+        }
+        if (gpu == null) {
+            gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
+        }
+        for (String tag : tags) {
+            incrementResourceCountWithTag(accountId, ResourceType.gpu, tag, gpu);
+        }
+    }
+
+    @Override
+    public void decrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) {
+        List<String> tags = getResourceLimitHostTagsForResourceCountOperation(display, serviceOffering, template);
+        if (CollectionUtils.isEmpty(tags)) {
+            return;
+        }
+        if (gpu == null) {
+            gpu = serviceOffering.getGpuCount() != null ? Long.valueOf(serviceOffering.getGpuCount()) : 0L;
+        }
+        for (String tag : tags) {
+            decrementResourceCountWithTag(accountId, ResourceType.gpu, tag, gpu);
+        }
+    }
+
     @Override
     public String getConfigComponentName() {
         return ResourceLimitManagerImpl.class.getName();
@@ -2193,7 +2285,10 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
                 ResourceLimitHostTags,
                 ResourceLimitStorageTags,
                 DefaultMaxAccountProjects,
-                DefaultMaxDomainProjects
+                DefaultMaxDomainProjects,
+                DefaultMaxAccountGpus,
+                DefaultMaxDomainGpus,
+                DefaultMaxProjectGpus
         };
     }
 
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 352783cdcc7..21e8c2eac8b 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -44,6 +44,18 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.cpu.CPU;
+import com.cloud.dc.VlanDetailsVO;
+import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.network.dao.NetrisProviderDao;
+import com.cloud.network.dao.NsxProviderDao;
+
+import com.cloud.utils.security.CertificateHelper;
+import com.cloud.api.query.dao.ManagementServerJoinDao;
+import com.cloud.api.query.vo.ManagementServerJoinVO;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.VgpuProfileDao;
+import com.cloud.offering.ServiceOffering;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@@ -681,9 +693,7 @@ import com.cloud.alert.AlertManager;
 import com.cloud.alert.AlertVO;
 import com.cloud.alert.dao.AlertDao;
 import com.cloud.api.ApiDBUtils;
-import com.cloud.api.query.dao.ManagementServerJoinDao;
 import com.cloud.api.query.dao.StoragePoolJoinDao;
-import com.cloud.api.query.vo.ManagementServerJoinVO;
 import com.cloud.api.query.vo.StoragePoolJoinVO;
 import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityVO;
@@ -694,7 +704,6 @@ import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManagerImpl;
 import com.cloud.consoleproxy.ConsoleProxyManagementState;
 import com.cloud.consoleproxy.ConsoleProxyManager;
-import com.cloud.cpu.CPU;
 import com.cloud.dc.AccountVlanMapVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
@@ -704,7 +713,6 @@ import com.cloud.dc.Pod;
 import com.cloud.dc.PodVlanMapVO;
 import com.cloud.dc.Vlan;
 import com.cloud.dc.Vlan.VlanType;
-import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
 import com.cloud.dc.dao.AccountVlanMapDao;
 import com.cloud.dc.dao.ClusterDao;
@@ -713,7 +721,6 @@ import com.cloud.dc.dao.DomainVlanMapDao;
 import com.cloud.dc.dao.HostPodDao;
 import com.cloud.dc.dao.PodVlanMapDao;
 import com.cloud.dc.dao.VlanDao;
-import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
@@ -761,14 +768,12 @@ import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.LoadBalancerDao;
 import com.cloud.network.dao.LoadBalancerVO;
-import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NetworkAccountDao;
 import com.cloud.network.dao.NetworkAccountVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkDomainDao;
 import com.cloud.network.dao.NetworkDomainVO;
 import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.dao.NsxProviderDao;
 import com.cloud.network.dao.PublicIpQuarantineDao;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.org.Cluster;
@@ -845,7 +850,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.net.MacAddress;
 import com.cloud.utils.net.NetUtils;
-import com.cloud.utils.security.CertificateHelper;
 import com.cloud.utils.ssh.SSHKeysHelper;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.DiskProfile;
@@ -961,6 +965,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     private HostPodDao _hostPodDao;
     @Inject
+    private VgpuProfileDao vgpuProfileDao;
+    @Inject
     private VMInstanceDao _vmInstanceDao;
     @Inject
     private VolumeDao _volumeDao;
@@ -1557,6 +1563,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
             throw new InvalidParameterValueException("Unsupported operation, VM uses Local storage, cannot migrate");
         }
 
+        validateVgpuProfileForVmMigration(vmProfile);
+
         final Type hostType = srcHost.getType();
         Pair<List<HostVO>, Integer> allHostsPair = null;
         List<HostVO> allHosts = null;
@@ -1683,6 +1691,17 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         return new Ternary<>(otherHosts, suitableHosts, requiresStorageMotion);
     }
 
+    private void validateVgpuProfileForVmMigration(final VirtualMachineProfile vmProfile) {
+        // Validate if the VM is using a vGPU profile that supports migration.
+        ServiceOffering serviceOffering = vmProfile.getServiceOffering();
+        if (serviceOffering.getVgpuProfileId() != null) {
+            VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(serviceOffering.getVgpuProfileId());
+            if (vgpuProfile == null || "passthrough".equals(vgpuProfile.getName())) {
+                throw new InvalidParameterValueException("Unsupported operation, VM uses host passthrough, cannot migrate");
+            }
+        }
+    }
+
     /**
      * Add non DPDK enabled hosts to the avoid list
      */
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index f144745fc5c..76be0ed6b56 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -1958,7 +1958,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
         logger.debug("Total over provisioned capacity of the pool {} is {}", storagePool, toHumanReadableSize(totalOverProvCapacity));
         CapacityState capacityState = CapacityState.Enabled;
         if (storagePool.getScope() == ScopeType.ZONE) {
-            DataCenterVO dc = ApiDBUtils.findZoneById(storagePool.getDataCenterId());
+            DataCenterVO dc = _dcDao.findById(storagePool.getDataCenterId());
             AllocationState allocationState = dc.getAllocationState();
             capacityState = (allocationState == AllocationState.Disabled) ? CapacityState.Disabled : CapacityState.Enabled;
         } else {
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 771d3c0c5a7..91897c0977d 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -2805,18 +2805,39 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         long currentCpu = currentServiceOffering.getCpu();
         long currentMemory = currentServiceOffering.getRamSize();
         VMTemplateVO template = _templateDao.findByIdIncludingRemoved(vmInstance.getTemplateId());
+        Long currentGpu = currentServiceOffering.getGpuCount() != null ? Long.valueOf(currentServiceOffering.getGpuCount()) : 0L;
+        Long newGpu = svcOffering.getGpuCount() != null ? Long.valueOf(svcOffering.getGpuCount()) : 0L;
         try {
-            if (newCpu > currentCpu) {
-                _resourceLimitMgr.checkVmCpuResourceLimit(owner, vmInstance.isDisplay(), svcOffering, template, newCpu - currentCpu);
-            }
-            if (newMemory > currentMemory) {
-                _resourceLimitMgr.checkVmMemoryResourceLimit(owner, vmInstance.isDisplay(), svcOffering, template, newMemory - currentMemory);
-            }
+            checkVmLimits(owner, vmInstance, svcOffering, template, newCpu, currentCpu, newMemory, currentMemory, newGpu, currentGpu);
         } catch (ResourceAllocationException e) {
             logger.error(String.format("Failed to updated VM due to: %s", e.getLocalizedMessage()));
             throw new InvalidParameterValueException(e.getLocalizedMessage());
         }
+        adjustVmLimits(owner, vmInstance, svcOffering, template, newCpu, currentCpu, newMemory, currentMemory, newGpu, currentGpu);
+    }
 
+    private void checkVmLimits(Account owner, UserVmVO vmInstance, ServiceOfferingVO svcOffering,
+            VMTemplateVO template, Long newCpu, Long currentCpu, Long newMemory, Long currentMemory,
+            Long newGpu, Long currentGpu
+    ) throws ResourceAllocationException {
+        if (newCpu > currentCpu) {
+            _resourceLimitMgr.checkVmCpuResourceLimit(owner, vmInstance.isDisplay(), svcOffering,
+                    template, newCpu - currentCpu);
+        }
+        if (newMemory > currentMemory) {
+            _resourceLimitMgr.checkVmMemoryResourceLimit(owner, vmInstance.isDisplay(), svcOffering,
+                    template, newMemory - currentMemory);
+        }
+        if (newGpu > currentGpu) {
+            _resourceLimitMgr.checkVmGpuResourceLimit(owner, vmInstance.isDisplay(), svcOffering,
+                    template, newGpu - currentGpu);
+        }
+    }
+
+    private void adjustVmLimits(Account owner, UserVmVO vmInstance, ServiceOfferingVO svcOffering,
+            VMTemplateVO template, Long newCpu, Long currentCpu, Long newMemory, Long currentMemory,
+            Long newGpu, Long currentGpu
+    ) {
         if (newCpu > currentCpu) {
             _resourceLimitMgr.incrementVmCpuResourceCount(owner.getAccountId(), vmInstance.isDisplay(), svcOffering, template, newCpu - currentCpu);
         } else if (newCpu > 0 && currentCpu > newCpu){
@@ -2827,6 +2848,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         } else if (newMemory > 0 && currentMemory > newMemory){
             _resourceLimitMgr.decrementVmMemoryResourceCount(owner.getAccountId(), vmInstance.isDisplay(), svcOffering, template, currentMemory - newMemory);
         }
+        if (newGpu > currentGpu) {
+            _resourceLimitMgr.incrementVmGpuResourceCount(owner.getAccountId(), vmInstance.isDisplay(), svcOffering, template, newGpu - currentGpu);
+        } else if (newGpu > 0 && currentGpu > newGpu){
+            _resourceLimitMgr.decrementVmGpuResourceCount(owner.getAccountId(), vmInstance.isDisplay(), svcOffering, template, currentGpu - newGpu);
+        }
     }
 
     @Override
@@ -4211,6 +4237,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             try (CheckedReservation vmReservation = new CheckedReservation(owner, ResourceType.user_vm, resourceLimitHostTags, 1l, reservationDao, resourceLimitService);
                  CheckedReservation cpuReservation = new CheckedReservation(owner, ResourceType.cpu, resourceLimitHostTags, Long.valueOf(offering.getCpu()), reservationDao, resourceLimitService);
                  CheckedReservation memReservation = new CheckedReservation(owner, ResourceType.memory, resourceLimitHostTags, Long.valueOf(offering.getRamSize()), reservationDao, resourceLimitService);
+                 CheckedReservation gpuReservation = offering.getGpuCount() != null && offering.getGpuCount() > 0 ?
+                         new CheckedReservation(owner, ResourceType.gpu, resourceLimitHostTags, Long.valueOf(offering.getGpuCount()), reservationDao, resourceLimitService) : null;
             ) {
                 return getUncheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize, additionalDiskSize, volume, snapshot);
             } catch (ResourceAllocationException | CloudRuntimeException  e) {
@@ -5841,6 +5869,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         try (CheckedReservation vmReservation = new CheckedReservation(owner, ResourceType.user_vm, vmId, null, -1L, reservationDao, resourceLimitService);
              CheckedReservation cpuReservation = new CheckedReservation(owner, ResourceType.cpu, vmId, null, -1 * Long.valueOf(offering.getCpu()), reservationDao, resourceLimitService);
              CheckedReservation memReservation = new CheckedReservation(owner, ResourceType.memory, vmId, null, -1 * Long.valueOf(offering.getRamSize()), reservationDao, resourceLimitService);
+             CheckedReservation gpuReservation = offering.getGpuCount() != null && offering.getGpuCount() > 0 ?
+                     new CheckedReservation(owner, ResourceType.gpu, vmId, null, -1 * Long.valueOf(offering.getGpuCount()), reservationDao, resourceLimitService) : null;
         ) {
             try {
                 VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid());
diff --git a/server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java b/server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java
new file mode 100644
index 00000000000..5890b176c8e
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java
@@ -0,0 +1,1385 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.GPUDeviceTO;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.gpu.GpuDeviceVO;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.GpuCardDao;
+import com.cloud.gpu.dao.GpuDeviceDao;
+import com.cloud.gpu.dao.VgpuProfileDao;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DiscoverGpuDevicesCmd;
+import org.apache.cloudstack.api.command.admin.gpu.ListGpuDevicesCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.gpu.ManageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UnmanageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuCardsCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuDevicesCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListVgpuProfilesCmd;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Component
+public class GpuServiceImpl extends ManagerBase implements GpuService, PluggableService, Configurable {
+
+    @Inject
+    private GpuCardDao gpuCardDao;
+
+    @Inject
+    private VgpuProfileDao vgpuProfileDao;
+
+    @Inject
+    private GpuDeviceDao gpuDeviceDao;
+
+    @Inject
+    private ServiceOfferingDao serviceOfferingDao;
+
+    @Inject
+    private HostDao hostDao;
+
+    @Inject
+    private UserVmManager userVmManager;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
+    @Inject
+    private ResourceManager resourceManager;
+
+    @Override
+    public boolean configure(String name, java.util.Map<String, Object> params) throws ConfigurationException {
+        logger.info("Configuring GpuServiceImpl: {}", name);
+        return true;
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        List<Class<?>> cmdList = new ArrayList<>();
+        // GPU Card Commands
+        cmdList.add(CreateGpuCardCmd.class);
+        cmdList.add(UpdateGpuCardCmd.class);
+        cmdList.add(DeleteGpuCardCmd.class);
+        cmdList.add(ListGpuCardsCmd.class);
+
+        // vGPU Profile Commands
+        cmdList.add(CreateVgpuProfileCmd.class);
+        cmdList.add(UpdateVgpuProfileCmd.class);
+        cmdList.add(DeleteVgpuProfileCmd.class);
+        cmdList.add(ListVgpuProfilesCmd.class);
+
+        // GPU Device Commands
+        cmdList.add(ListGpuDevicesCmd.class);
+        cmdList.add(ListGpuDevicesCmdByAdmin.class);
+        cmdList.add(UnmanageGpuDeviceCmd.class);
+        cmdList.add(ManageGpuDeviceCmd.class);
+        cmdList.add(DiscoverGpuDevicesCmd.class);
+        cmdList.add(CreateGpuDeviceCmd.class);
+        cmdList.add(UpdateGpuDeviceCmd.class);
+        cmdList.add(DeleteGpuDeviceCmd.class);
+
+        return cmdList;
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return GpuService.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[]{GpuDetachOnStop};
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_GPU_CARD_CREATE, eventDescription = "creating GPU Card")
+    public GpuCardVO createGpuCard(CreateGpuCardCmd cmd) {
+        final String deviceId = cmd.getDeviceId();
+        final String deviceName = cmd.getDeviceName();
+        final String name = cmd.getName();
+        final String vendorName = cmd.getVendorName();
+        final String vendorId = cmd.getVendorId();
+        final Long videoRam = cmd.getVideoRam();
+
+        // Validate inputs
+        validateCreateGpuCardParams(deviceId, deviceName, name, vendorName, vendorId);
+
+        GpuCardVO gpuCard = new GpuCardVO(deviceId, deviceName, name, vendorName, vendorId);
+        gpuCard = gpuCardDao.persist(gpuCard);
+
+        // Create passthrough vGPU profile with optional display parameters
+        VgpuProfileVO passthroughProfile = new VgpuProfileVO("passthrough", "passthrough", gpuCard.getId(), 1L);
+        passthroughProfile.setVideoRam(videoRam);
+        vgpuProfileDao.persist(passthroughProfile);
+
+        return gpuCard;
+    }
+
+    private void validateCreateGpuCardParams(String deviceId, String deviceName, String name, String vendorName, String vendorId) {
+        if (StringUtils.isBlank(deviceId)) {
+            throw new InvalidParameterValueException("Device ID cannot be blank");
+        } else if (!deviceId.matches("^[a-zA-Z0-9]+$")) {
+            throw new InvalidParameterValueException("Device ID must be alphanumeric and in hexadecimal format");
+        }
+        if (StringUtils.isBlank(deviceName)) {
+            throw new InvalidParameterValueException("Device name cannot be blank");
+        }
+        if (StringUtils.isBlank(name)) {
+            throw new InvalidParameterValueException("Display name cannot be blank");
+        }
+        if (StringUtils.isBlank(vendorName)) {
+            throw new InvalidParameterValueException("Vendor name cannot be blank");
+        }
+        if (StringUtils.isBlank(vendorId)) {
+            throw new InvalidParameterValueException("Vendor ID cannot be blank");
+        } else if (!vendorId.matches("^[a-zA-Z0-9]+$")) {
+            throw new InvalidParameterValueException("Vendor ID must be alphanumeric and in hexadecimal format");
+        }
+
+        // Check if a GPU card with the same vendor ID and device ID already exists
+        GpuCardVO existingGpuCard = gpuCardDao.findByVendorIdAndDeviceId(vendorId, deviceId);
+        if (existingGpuCard != null) {
+            throw new InvalidParameterValueException(
+                    String.format("GPU card with vendor ID %s and device ID %s already exists", vendorId, deviceId));
+        }
+    }
+
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_GPU_CARD_EDIT, eventDescription = "Updating GPU Card")
+    public GpuCardVO updateGpuCard(UpdateGpuCardCmd cmd) {
+        final Long id = cmd.getId();
+        final String deviceName = cmd.getDeviceName();
+        final String name = cmd.getName();
+        final String vendorName = cmd.getVendorName();
+
+        // Validate inputs
+        GpuCardVO gpuCard = gpuCardDao.findById(id);
+        if (gpuCard == null) {
+            throw new InvalidParameterValueException("GPU card with ID " + id + " not found");
+        }
+
+        if (deviceName != null) {
+            gpuCard.setDeviceName(deviceName);
+        }
+        if (name != null) {
+            gpuCard.setName(name);
+        }
+        if (vendorName != null) {
+            gpuCard.setVendorName(vendorName);
+        }
+        gpuCardDao.update(id, gpuCard);
+        return gpuCard;
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_GPU_CARD_DELETE, eventDescription = "deleting the GPU Card")
+    public boolean deleteGpuCard(DeleteGpuCardCmd cmd) {
+        final Long id = cmd.getId();
+
+        // Validate inputs
+        GpuCardVO gpuCard = gpuCardDao.findById(id);
+        if (gpuCard == null) {
+            throw new InvalidParameterValueException("GPU card with ID " + id + " not found");
+        }
+
+        // Check if a GPU card is in use
+        if (gpuDeviceDao.isGpuCardInUse(id)) {
+            throw new InvalidParameterValueException(
+                    "Cannot delete GPU card " + gpuCard + " as it is in use by one or more GPU devices");
+        }
+
+        // delete gpu profiles associated with this GPU card
+        int rowsRemoved = vgpuProfileDao.removeByCardId(id);
+        logger.info("Removed {} vGPU profiles associated with GPU card {}", rowsRemoved, gpuCard);
+
+        return gpuCardDao.remove(id);
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_VGPU_PROFILE_CREATE, eventDescription = "creating vGPU profile")
+    public VgpuProfileResponse createVgpuProfile(CreateVgpuProfileCmd cmd) {
+        final String profileName = cmd.getName();
+        final String profileDescription = cmd.getDescription();
+        final Long gpuCardId = cmd.getCardId();
+        final Long maxVgpuPerPgpu = cmd.getMaxVgpuPerPgpu();
+        final Long videoRam = cmd.getVideoRam();
+        final Long maxHeads = cmd.getMaxHeads();
+        final Long maxResolutionX = cmd.getMaxResolutionX();
+        final Long maxResolutionY = cmd.getMaxResolutionY();
+
+        // Validate inputs
+        if (StringUtils.isBlank(profileName)) {
+            throw new InvalidParameterValueException("vGPU profile name cannot be empty");
+        }
+
+        // Check if the GPU card ID is valid
+        GpuCardVO gpuCard = gpuCardDao.findById(gpuCardId);
+        if (gpuCard == null) {
+            throw new InvalidParameterValueException(String.format("GPU card with ID %d not found", gpuCardId));
+        }
+
+        // Check if a vGPU profile with the same name already exists
+        VgpuProfileVO existingProfile = vgpuProfileDao.findByNameAndCardId(profileName, gpuCardId);
+        if (existingProfile != null) {
+            throw new InvalidParameterValueException(
+                    String.format("vGPU profile with name %s already exists", profileName));
+        }
+
+        VgpuProfileVO vgpuProfile = new VgpuProfileVO(profileName, profileDescription, gpuCardId, maxVgpuPerPgpu,
+                videoRam, maxHeads, maxResolutionX, maxResolutionY);
+        vgpuProfile = vgpuProfileDao.persist(vgpuProfile);
+
+        VgpuProfileResponse response = new VgpuProfileResponse(vgpuProfile, gpuCard);
+        response.setResponseName(cmd.getCommandName());
+        return response;
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_VGPU_PROFILE_EDIT, eventDescription = "updating vGPU profile")
+    public VgpuProfileResponse updateVgpuProfile(UpdateVgpuProfileCmd cmd) {
+        final Long id = cmd.getId();
+        final String profileName = cmd.getProfileName();
+        final String profileDescription = cmd.getDescription();
+        final Long maxVgpuPerPgpu = cmd.getMaxVgpuPerPgpu();
+        final Long videoRam = cmd.getVideoRam();
+        final Long maxHeads = cmd.getMaxHeads();
+        final Long maxResolutionX = cmd.getMaxResolutionX();
+        final Long maxResolutionY = cmd.getMaxResolutionY();
+
+        // Validate inputs
+        VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(id);
+        if (vgpuProfile == null) {
+            throw new InvalidParameterValueException(String.format("vGPU profile with ID %d not found", id));
+        }
+
+        // Check if a vGPU profile with the same name already exists (if the name is being updated)
+        if (profileName != null && !profileName.equals(vgpuProfile.getName())) {
+            VgpuProfileVO existingProfile = vgpuProfileDao.findByNameAndCardId(profileName, vgpuProfile.getCardId());
+            if (existingProfile != null) {
+                throw new InvalidParameterValueException(
+                        String.format("vGPU profile with name %s already exists", profileName));
+            }
+        }
+
+        if (profileName != null) {
+            vgpuProfile.setName(profileName);
+        }
+        if (profileDescription != null) {
+            vgpuProfile.setDescription(profileDescription);
+        }
+        if (maxVgpuPerPgpu != null) {
+            vgpuProfile.setMaxVgpuPerPgpu(maxVgpuPerPgpu);
+        }
+        if (videoRam != null) {
+            vgpuProfile.setVideoRam(videoRam);
+        }
+        if (maxHeads != null) {
+            vgpuProfile.setMaxHeads(maxHeads);
+        }
+        if (maxResolutionX != null) {
+            vgpuProfile.setMaxResolutionX(maxResolutionX);
+        }
+        if (maxResolutionY != null) {
+            vgpuProfile.setMaxResolutionY(maxResolutionY);
+        }
+        vgpuProfileDao.update(id, vgpuProfile);
+
+        VgpuProfileResponse response = new VgpuProfileResponse(vgpuProfile,
+                gpuCardDao.findById(vgpuProfile.getCardId()));
+        response.setResponseName(cmd.getCommandName());
+        return response;
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_VGPU_PROFILE_DELETE, eventDescription = "Deleting vGPU profile")
+    public boolean deleteVgpuProfile(DeleteVgpuProfileCmd cmd) {
+        final Long id = cmd.getId();
+
+        // Validate inputs
+        VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(id);
+        if (vgpuProfile == null) {
+            throw new InvalidParameterValueException(String.format("vGPU profile with ID %d not found", id));
+        }
+
+        // Check if vGPU profile is in use
+        if (gpuDeviceDao.isVgpuProfileInUse(id)) {
+            throw new InvalidParameterValueException(String.format(
+                    "Cannot delete vGPU profile with ID %d as it is in use by one or more GPU " + "devices", id));
+        }
+
+        return vgpuProfileDao.remove(id);
+    }
+
+    @Override
+    public ListResponse<GpuCardResponse> listGpuCards(ListGpuCardsCmd cmd) {
+        Long id = cmd.getId();
+        String keyword = cmd.getKeyword();
+        String vendorName = cmd.getVendorName();
+        String vendorId = cmd.getVendorId();
+        String deviceId = cmd.getDeviceId();
+        String deviceName = cmd.getDeviceName();
+        boolean activeOnly = cmd.getActiveOnly();
+
+        Pair<List<GpuCardVO>, Integer> gpuCardsAndCount = gpuCardDao.searchAndCountGpuCards(id, keyword, vendorId,
+                vendorName, deviceId, deviceName, activeOnly, cmd.getStartIndex(), cmd.getPageSizeVal());
+
+        return getGpuCardResponseListResponse(cmd, gpuCardsAndCount.first(), gpuCardsAndCount.second());
+    }
+
+    private static ListResponse<GpuCardResponse> getGpuCardResponseListResponse(ListGpuCardsCmd cmd,
+            List<GpuCardVO> gpuCards, Integer count) {
+        ListResponse<GpuCardResponse> response = new ListResponse<>();
+        List<GpuCardResponse> gpuCardResponses = new ArrayList<>();
+
+        for (GpuCardVO gpuCard : gpuCards) {
+            GpuCardResponse gpuCardResponse = new GpuCardResponse(gpuCard);
+            response.setResponseName(cmd.getCommandName());
+            gpuCardResponses.add(gpuCardResponse);
+        }
+
+        response.setResponses(gpuCardResponses, count);
+        response.setResponseName(cmd.getCommandName());
+        return response;
+    }
+
+    @Override
+    public ListResponse<VgpuProfileResponse> listVgpuProfiles(ListVgpuProfilesCmd cmd) {
+        Long id = cmd.getId();
+        String name = cmd.getName();
+        String keyword = cmd.getKeyword();
+        Long gpuCardId = cmd.getCardId();
+        boolean activeOnly = cmd.getActiveOnly();
+
+        Pair<List<VgpuProfileVO>, Integer> vgpuProfilesAndCount = vgpuProfileDao.searchAndCountVgpuProfiles(id, name,
+                keyword, gpuCardId, activeOnly, cmd.getStartIndex(), cmd.getPageSizeVal());
+
+        return getVgpuProfileResponseListResponse(cmd, vgpuProfilesAndCount.first(), vgpuProfilesAndCount.second());
+    }
+
+    private ListResponse<VgpuProfileResponse> getVgpuProfileResponseListResponse(ListVgpuProfilesCmd cmd,
+            List<VgpuProfileVO> vgpuProfiles, Integer count) {
+        ListResponse<VgpuProfileResponse> response = new ListResponse<>();
+        List<VgpuProfileResponse> vgpuProfileResponses = new ArrayList<>();
+
+        Map<Long, GpuCardVO> cardMap = new HashMap<>();
+        for (VgpuProfileVO vgpuProfile : vgpuProfiles) {
+            GpuCardVO gpuCard = cardMap.get(vgpuProfile.getCardId());
+            if (gpuCard == null) {
+                gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
+                cardMap.put(vgpuProfile.getCardId(), gpuCard);
+            }
+            VgpuProfileResponse vgpuProfileResponse = new VgpuProfileResponse(vgpuProfile, gpuCard);
+            vgpuProfileResponse.setResponseName(cmd.getCommandName());
+            vgpuProfileResponses.add(vgpuProfileResponse);
+        }
+
+        response.setResponses(vgpuProfileResponses, count);
+        response.setResponseName(cmd.getCommandName());
+        return response;
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_GPU_CARD_DELETE, eventDescription = "creating GPU device")
+    public GpuDeviceResponse createGpuDevice(CreateGpuDeviceCmd cmd) {
+        final Long hostId = cmd.getHostId();
+        String busAddress = cmd.getBusAddress();
+        final Long gpuCardId = cmd.getGpuCardId();
+        final Long vgpuProfileId = cmd.getVgpuProfileId();
+        final GpuDevice.DeviceType type = cmd.getType();
+        final Long parentGpuDeviceId = cmd.getParentGpuDeviceId();
+        final String numaNode = cmd.getNumaNode();
+
+        // Validate inputs
+        HostVO host = hostDao.findById(hostId);
+        if (host == null) {
+            throw new InvalidParameterValueException(String.format("Host with ID %d not found", hostId));
+        }
+
+        if (StringUtils.isBlank(busAddress)) {
+            throw new InvalidParameterValueException("Bus address cannot be empty");
+        }
+        busAddress = busAddress.trim();
+
+        // Check if a GPU device with the same bus address already exists on this host
+        GpuDeviceVO existingDevice = gpuDeviceDao.findByHostIdAndBusAddress(hostId, busAddress);
+        if (existingDevice != null) {
+            throw new InvalidParameterValueException(
+                    String.format("GPU device with bus address %s already exists on host %s", busAddress,
+                            host.getName()));
+        }
+
+        // Validate GPU card
+        GpuCardVO gpuCard = gpuCardDao.findById(gpuCardId);
+        if (gpuCard == null) {
+            throw new InvalidParameterValueException(String.format("GPU card with ID %d not found", gpuCardId));
+        }
+
+        // Validate vGPU profile
+        VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(vgpuProfileId);
+        if (vgpuProfile == null) {
+            throw new InvalidParameterValueException(String.format("vGPU profile with ID %d not found", vgpuProfileId));
+        }
+
+        // Validate that the vGPU profile belongs to the specified GPU card
+        if (!vgpuProfile.getCardId().equals(gpuCardId)) {
+            throw new InvalidParameterValueException(
+                    String.format("vGPU profile %s does not belong to GPU card %s", vgpuProfile.getName(),
+                            gpuCard.getName()));
+        }
+
+        // Validate parent GPU device if specified
+        if (parentGpuDeviceId != null) {
+            GpuDeviceVO parentDevice = gpuDeviceDao.findById(parentGpuDeviceId);
+            if (parentDevice == null) {
+                throw new InvalidParameterValueException(
+                        String.format("Parent GPU device with ID %d not found", parentGpuDeviceId));
+            }
+            if (!hostId.equals(parentDevice.getHostId())) {
+                throw new InvalidParameterValueException("Parent GPU device must be on the same host");
+            }
+        }
+
+        // Create the GPU device
+        GpuDeviceVO gpuDevice = new GpuDeviceVO(gpuCardId, vgpuProfileId, busAddress, hostId, parentGpuDeviceId,
+                numaNode, null);
+        gpuDevice.setType(type);
+        gpuDevice.setState(GpuDevice.State.Free);
+        gpuDevice.setManagedState(GpuDevice.ManagedState.Managed);
+
+        gpuDevice = gpuDeviceDao.persist(gpuDevice);
+
+        logger.info("Successfully created GPU device {} on host {}", gpuDevice.getUuid(), host.getName());
+        return createGpuDeviceResponse(gpuDevice, ResponseObject.ResponseView.Full);
+    }
+
+    @Override
+    @DB
+    @ActionEvent(eventType = EventTypes.EVENT_GPU_DEVICE_EDIT, eventDescription = "updating GPU device")
+    public GpuDeviceResponse updateGpuDevice(UpdateGpuDeviceCmd cmd) {
+        final Long id = cmd.getId();
+        final Long gpuCardId = cmd.getGpuCardId();
+        final Long vgpuProfileId = cmd.getVgpuProfileId();
+        final GpuDevice.DeviceType type = cmd.getType();
+        final Long parentGpuDeviceId = cmd.getParentGpuDeviceId();
+        final String numaNode = cmd.getNumaNode();
+
+        // Validate inputs
+        GpuDeviceVO gpuDevice = gpuDeviceDao.findById(id);
+        if (gpuDevice == null) {
+            throw new InvalidParameterValueException(String.format("GPU device with ID %d not found", id));
+        }
+
+        // Check if device is currently allocated to a VM
+        if (gpuDevice.getVmId() != null) {
+            throw new InvalidParameterValueException(
+                    String.format("Cannot update GPU device %s as it is currently allocated to VM %d",
+                            gpuDevice.getUuid(), gpuDevice.getVmId()));
+        }
+
+        // Validate GPU card if specified
+        if (gpuCardId != null) {
+            GpuCardVO gpuCard = gpuCardDao.findById(gpuCardId);
+            if (gpuCard == null) {
+                throw new InvalidParameterValueException(String.format("GPU card with ID %d not found", gpuCardId));
+            }
+        }
+
+        // Validate vGPU profile if specified
+        VgpuProfileVO vgpuProfile = null;
+        if (vgpuProfileId != null) {
+            vgpuProfile = vgpuProfileDao.findById(vgpuProfileId);
+            if (vgpuProfile == null) {
+                throw new InvalidParameterValueException(
+                        String.format("vGPU profile with ID %d not found", vgpuProfileId));
+            }
+
+            // Check if vGPU profile belongs to the GPU card (either current or new)
+            Long targetCardId = gpuCardId != null ? gpuCardId : gpuDevice.getCardId();
+            if (!vgpuProfile.getCardId().equals(targetCardId)) {
+                GpuCardVO targetCard = gpuCardDao.findById(targetCardId);
+                throw new InvalidParameterValueException(
+                        String.format("vGPU profile %s does not belong to GPU card %s", vgpuProfile.getName(),
+                                targetCard.getName()));
+            }
+        }
+
+        // Validate parent GPU device if specified
+        if (parentGpuDeviceId != null) {
+            GpuDeviceVO parentDevice = gpuDeviceDao.findById(parentGpuDeviceId);
+            if (parentDevice == null) {
+                throw new InvalidParameterValueException(
+                        String.format("Parent GPU device with ID %d not found", parentGpuDeviceId));
+            }
+            if (parentDevice.getHostId() != gpuDevice.getHostId()) {
+                throw new InvalidParameterValueException("Parent GPU device must be on the same host");
+            }
+            if (parentDevice.getId() == gpuDevice.getId()) {
+                throw new InvalidParameterValueException("GPU device cannot be its own parent");
+            }
+        }
+
+        // Update the GPU device
+        if (gpuCardId != null) {
+            gpuDevice.setCardId(gpuCardId);
+        }
+        if (vgpuProfileId != null) {
+            gpuDevice.setVgpuProfileId(vgpuProfileId);
+        }
+        if (type != null) {
+            gpuDevice.setType(type);
+        }
+        if (parentGpuDeviceId != null) {
+            gpuDevice.setParentGpuDeviceId(parentGpuDeviceId);
+        }
+        if (numaNode != null) {
+            gpuDevice.setNumaNode(numaNode);
+        }
+        gpuDeviceDao.update(id, gpuDevice);
+
+        logger.info("Successfully updated GPU device {}", gpuDevice.getUuid());
+        return createGpuDeviceResponse(gpuDevice, ResponseObject.ResponseView.Full);
+    }
+
+    @Override
+    public ListResponse<GpuDeviceResponse> listGpuDevices(ListGpuDevicesCmd cmd) {
+        Long id = null;
+        Long hostId = null;
+        Long gpuCardId = null;
+        Long vgpuProfileId = null;
+        if (cmd instanceof ListGpuDevicesCmdByAdmin) {
+            ListGpuDevicesCmdByAdmin adminCmd = (ListGpuDevicesCmdByAdmin) cmd;
+            id = adminCmd.getId();
+            hostId = adminCmd.getHostId();
+            gpuCardId = adminCmd.getGpuCardId();
+            vgpuProfileId = adminCmd.getVgpuProfileId();
+        }
+        String keyword = cmd.getKeyword();
+        Long vmId = cmd.getVmId();
+
+        Pair<List<GpuDeviceVO>, Integer> gpuDevicesAndCount = gpuDeviceDao.searchAndCountGpuDevices(id, keyword, hostId,
+                vmId, gpuCardId, vgpuProfileId, cmd.getStartIndex(), cmd.getPageSizeVal());
+
+        return getGpuDeviceResponseListResponse(cmd, gpuDevicesAndCount.first(), gpuDevicesAndCount.second());
+    }
+
+    @Override
+    public boolean disableGpuDevice(UnmanageGpuDeviceCmd cmd) {
+        return updateGpuDeviceManagedState(cmd.getIds(), GpuDevice.ManagedState.Unmanaged);
+    }
+
+    @Override
+    public boolean enableGpuDevice(ManageGpuDeviceCmd cmd) {
+        return updateGpuDeviceManagedState(cmd.getIds(), GpuDevice.ManagedState.Managed);
+    }
+
+    @Override
+    public void deallocateAllGpuDevicesForVm(long vmId) {
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByVmId(vmId);
+        deallocateGpuDevices(devices);
+    }
+
+    @Override
+    public void deallocateGpuDevicesForVmOnHost(long vmId, long hostId) {
+        List<GpuDeviceVO> devices = gpuDeviceDao.listByHostAndVm(hostId, vmId);
+        deallocateGpuDevices(devices);
+    }
+
+    private void deallocateGpuDevices(List<GpuDeviceVO> devices) {
+        if (CollectionUtils.isNotEmpty(devices)) {
+            for (GpuDeviceVO device : devices) {
+                device.setState(GpuDevice.State.Free);
+                device.setVmId(null);
+                gpuDeviceDao.persist(device);
+                checkAndUpdateParentGpuDeviceState(device.getParentGpuDeviceId());
+            }
+        }
+    }
+
+    protected void checkAndUpdateParentGpuDeviceState(Long parentGpuDeviceId) {
+        if (parentGpuDeviceId != null) {
+            GpuDeviceVO parentGpuDevice = gpuDeviceDao.findById(parentGpuDeviceId);
+            checkAndUpdateParentGpuDeviceState(parentGpuDevice);
+        }
+    }
+
+    protected void checkAndUpdateParentGpuDeviceState(GpuDeviceVO parentDevice) {
+        if (parentDevice != null) {
+            List<GpuDeviceVO> childDevices = gpuDeviceDao.listByParentGpuDeviceId(parentDevice.getId());
+            GpuDevice.State finalState = GpuDevice.State.Free;
+            for (GpuDeviceVO childDevice : childDevices) {
+                if (childDevice.getState().equals(GpuDevice.State.Allocated)) {
+                    finalState = GpuDevice.State.PartiallyAllocated;
+                } else if (childDevice.getState().equals(GpuDevice.State.Error)) {
+                    finalState = GpuDevice.State.Error;
+                    break;
+                }
+            }
+            if (!finalState.equals(parentDevice.getState())) {
+                parentDevice.setState(finalState);
+                gpuDeviceDao.update(parentDevice.getId(), parentDevice);
+            }
+        }
+    }
+
+    @Override
+    public void allocateGpuDevicesToVmOnHost(long vmId, long hostId, List<VgpuTypesInfo> gpuDevices) {
+        Transaction.execute(new TransactionCallbackNoReturn() {
+            @Override
+            public void doInTransactionWithoutResult(TransactionStatus status) {
+                // Deallocate existing GPU devices for the VM on the host
+                deallocateAllGpuDevicesForVm(vmId);
+
+                // Allocate new GPU devices to the VM on the host
+                for (VgpuTypesInfo gpuDevice : gpuDevices) {
+                    GpuDeviceVO device = gpuDeviceDao.findByHostIdAndBusAddress(hostId, gpuDevice.getBusAddress());
+                    if (device != null) {
+                        device.setState(GpuDevice.State.Allocated);
+                        device.setVmId(vmId);
+                        gpuDeviceDao.persist(device);
+                        checkAndUpdateParentGpuDeviceState(device.getParentGpuDeviceId());
+                    } else {
+                        throw new CloudRuntimeException(
+                                String.format("GPU device not found for VM %d on host %d", vmId, hostId));
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public ListResponse<GpuDeviceResponse> discoverGpuDevices(DiscoverGpuDevicesCmd cmd) {
+        final Long hostId = cmd.getId();
+        HostVO host = hostDao.findById(hostId);
+        if (host == null) {
+            throw new InvalidParameterValueException(String.format("Host with ID %d not found", hostId));
+        }
+        if (!Status.Up.equals(host.getStatus())) {
+            throw new InvalidParameterValueException(String.format("Host [%s] is not in Up status", host));
+        }
+
+        // Get GPU stats on the host and update GPU details
+        // getGPUStatistics() fetches the stats
+        HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails = resourceManager.getGPUStatistics(host);
+        if (!MapUtils.isEmpty(groupDetails)) {
+            resourceManager.updateGPUDetails(host.getId(), groupDetails);
+        }
+
+        // Return the list of GPU devices for the host
+        List<GpuDeviceVO> gpuDevices = gpuDeviceDao.listByHostId(hostId);
+        return getGpuDeviceResponseListResponse(cmd, gpuDevices, gpuDevices.size());
+    }
+
+    @Override
+    public boolean isGPUDeviceAvailable(Host host, Long vmId, VgpuProfile vgpuProfile, int gpuCount) {
+        List<GpuDeviceVO> availableGpuDevices = gpuDeviceDao.listDevicesForAllocation(host.getId(),
+                vgpuProfile.getId());
+        if (availableGpuDevices.size() >= gpuCount) {
+            return true;
+        } else {
+            // Check if there are already GPU devices assigned to the VM and belonging to the same vGPU profile
+            List<GpuDeviceVO> existingGpuDevices = gpuDeviceDao.listByHostAndVm(host.getId(), vmId);
+            existingGpuDevices = existingGpuDevices.stream().filter(
+                    device -> device.getVgpuProfileId() == vgpuProfile.getId()).collect(Collectors.toList());
+            return existingGpuDevices.size() + availableGpuDevices.size() >= gpuCount;
+        }
+    }
+
+    @Override
+    @DB
+    public GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfile vgpuProfile, int gpuCount) {
+        return Transaction.execute(new TransactionCallback<GPUDeviceTO>() {
+            @Override
+            public GPUDeviceTO doInTransaction(TransactionStatus status) {
+                if (vm.getHostId() == hostId) {
+                    deallocateAllGpuDevicesForVm(vm.getId());
+                }
+
+                List<GpuDeviceVO> availableGpuDevices = gpuDeviceDao.listDevicesForAllocation(hostId,
+                        vgpuProfile.getId());
+
+                if (availableGpuDevices.size() < gpuCount) {
+                    logger.debug("Not enough GPU devices available for VM {}", vm);
+                    throw new CloudRuntimeException(
+                            String.format("Not enough GPU devices available for VM %s", vm.getUuid()));
+                }
+
+                List<GpuDeviceVO> finalGpuDevices = getGpuDevicesToAllocate(availableGpuDevices, gpuCount);
+
+                GpuCardVO gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
+
+                ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(vm.getServiceOfferingId());
+                List<VgpuTypesInfo> vgpuInfoList = new ArrayList<>();
+                for (GpuDeviceVO gpuDevice : finalGpuDevices) {
+                    gpuDevice.setState(GpuDevice.State.Allocated);
+                    gpuDevice.setVmId(vm.getId());
+                    gpuDeviceDao.persist(gpuDevice);
+
+                    VgpuTypesInfo vgpuInfo = new VgpuTypesInfo(gpuDevice.getType(), gpuCard.getName(),
+                            vgpuProfile.getName(), gpuDevice.getBusAddress(), gpuCard.getVendorId(),
+                            gpuCard.getVendorName(), gpuCard.getDeviceId(), gpuCard.getDeviceName());
+                    vgpuInfo.setDisplay(serviceOffering.getGpuDisplay());
+
+                    if (gpuDevice.getParentGpuDeviceId() != null) {
+                        GpuDeviceVO parentGpuDevice = gpuDeviceDao.findById(gpuDevice.getParentGpuDeviceId());
+                        if (parentGpuDevice != null) {
+                            vgpuInfo.setParentBusAddress(parentGpuDevice.getBusAddress());
+                            checkAndUpdateParentGpuDeviceState(parentGpuDevice);
+                        }
+                    }
+                    vgpuInfoList.add(vgpuInfo);
+                }
+
+                HashMap<String, HashMap<String, VgpuTypesInfo>> groupDetails = getGpuGroupDetailsFromGpuDevicesOnHost(hostId);
+                return new GPUDeviceTO(gpuCard.getName(), vgpuProfile.getName(), gpuCount, groupDetails, vgpuInfoList);
+            }
+        });
+    }
+
+    @Override
+    public HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetailsFromGpuDevicesOnHost(final long hostId) {
+        HashMap<String, HashMap<String, VgpuTypesInfo>> gpuGroupDetails = new HashMap<>();
+        List<GpuDeviceVO> gpuDevices = gpuDeviceDao.listByHostId(hostId);
+        for (final GpuDeviceVO device : gpuDevices) {
+            // Calculate GPU capacity and update gpuGroupDetails
+            GpuCardVO card = gpuCardDao.findById(device.getCardId());
+            String groupName = card.getName();
+            if (!gpuGroupDetails.containsKey(groupName)) {
+                gpuGroupDetails.put(groupName, new HashMap<>());
+            }
+            VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(device.getVgpuProfileId());
+
+            VgpuTypesInfo gpuDeviceInfo = gpuGroupDetails.get(groupName).get(vgpuProfile.getName());
+            long remainingCapacity = 0L;
+            long maxCapacity = 1L;
+            if (GpuDevice.State.Free.equals(device.getState()) && GpuDevice.ManagedState.Managed.equals(
+                    device.getManagedState())) {
+                remainingCapacity = 1L;
+            }
+            if (GpuDevice.DeviceType.VGPUOnly.equals(device.getType()) ||
+                GpuDevice.ManagedState.Unmanaged.equals(device.getManagedState()) ||
+                GpuDevice.State.Error.equals(device.getState())
+            ) {
+                maxCapacity = 0L;
+                remainingCapacity = 0L;
+            }
+            if (gpuDeviceInfo == null) {
+                gpuDeviceInfo = new VgpuTypesInfo(card.getName(), vgpuProfile.getName(), vgpuProfile.getVideoRam(), vgpuProfile.getMaxHeads(),
+                        vgpuProfile.getMaxResolutionX(), vgpuProfile.getMaxResolutionY(),
+                        vgpuProfile.getMaxVgpuPerPgpu(), remainingCapacity, maxCapacity);
+                gpuDeviceInfo.setDeviceName(card.getDeviceName());
+                gpuDeviceInfo.setVendorId(card.getVendorId());
+                gpuDeviceInfo.setVendorName(card.getVendorName());
+                gpuDeviceInfo.setDeviceId(card.getDeviceId());
+                gpuGroupDetails.get(groupName).put(vgpuProfile.getName(), gpuDeviceInfo);
+            } else {
+                // Update the existing VgpuTypesInfo with the new device's information
+                gpuDeviceInfo.setRemainingCapacity(gpuDeviceInfo.getRemainingCapacity() + remainingCapacity);
+                gpuDeviceInfo.setMaxVmCapacity(gpuDeviceInfo.getMaxCapacity() + maxCapacity);
+            }
+        }
+        return gpuGroupDetails;
+    }
+
+    /*
+     * For the devices in newGpuDevicesInfo, create the GPU card and vGPU profile if they don't exist.
+     * For the devices in existingGpuDevices but not in newGpuDevicesInfo, disable the device.
+     * For the devices in newGpuDevicesInfo but not in existingGpuDevices, add them to the host.
+     * For the devices in both, update the device's info.
+     */
+    @Override
+    @DB
+    public void addGpuDevicesToHost(final Host host, final List<VgpuTypesInfo> newGpuDevicesInfo) {
+        List<GpuDeviceVO> existingGpuDevices = gpuDeviceDao.listByHostId(host.getId());
+        Map<String, GpuDeviceVO> existingGpuDevicesMap = new HashMap<>();
+        Map<String, GpuDeviceVO> gpuDevicesToDisableMap = new HashMap<>();
+        for (final GpuDeviceVO device : existingGpuDevices) {
+            existingGpuDevicesMap.put(device.getBusAddress(), device);
+            gpuDevicesToDisableMap.put(device.getBusAddress(), device);
+        }
+
+        GlobalLock lock = GlobalLock.getInternLock("add-gpu-devices-to-host-" + host.getId());
+        try {
+            if (lock.lock(30)) {
+                try {
+                    Map<String, GpuCardVO> cardMap = new HashMap<>();
+                    Map<String, VgpuProfileVO> vgpuProfileMap = new HashMap<>();
+
+                    for (final VgpuTypesInfo deviceInfo : newGpuDevicesInfo) {
+                        GpuCardVO card = getGpuCardAndUpdateMap(deviceInfo, cardMap, vgpuProfileMap);
+                        VgpuProfileVO vgpuProfile = getVgpuProfileAndUpdateMap(deviceInfo, card, vgpuProfileMap);
+
+                        GpuDeviceVO existingDevice = existingGpuDevicesMap.get(deviceInfo.getBusAddress());
+                        if (existingDevice == null) {
+                            createAndAddGpuDeviceToHost(deviceInfo, host, card, vgpuProfile);
+                        } else {
+                            // Update the device's info
+                            GpuDeviceVO parentGpuDevice = null;
+                            if (existingDevice.getParentGpuDeviceId() == null
+                                && deviceInfo.getParentBusAddress() != null) {
+                                parentGpuDevice = gpuDeviceDao.findByHostIdAndBusAddress(host.getId(),
+                                        deviceInfo.getParentBusAddress());
+                                if (parentGpuDevice != null) {
+                                    existingDevice.setParentGpuDeviceId(parentGpuDevice.getId());
+                                }
+                            }
+                            if (existingDevice.getPciRoot() == null) {
+                                existingDevice.setPciRoot(deviceInfo.getPciRoot());
+                            }
+                            setStateAndVmName(deviceInfo, existingDevice, parentGpuDevice);
+                            gpuDeviceDao.update(existingDevice.getId(), existingDevice);
+                            checkAndUpdateParentGpuDeviceState(existingDevice.getParentGpuDeviceId());
+                        }
+                        gpuDevicesToDisableMap.remove(deviceInfo.getBusAddress());
+                    }
+
+                    // Disable the devices that are not in the new list
+                    for (final GpuDeviceVO device : gpuDevicesToDisableMap.values()) {
+                        logger.info("Disabling GPU device {} on host {} due to missing address in the new devices on the host.", device, host);
+                        device.setState(GpuDevice.State.Error);
+                        device.setManagedState(GpuDevice.ManagedState.Unmanaged);
+                        gpuDeviceDao.update(device.getId(), device);
+                        checkAndUpdateParentGpuDeviceState(device.getParentGpuDeviceId());
+                    }
+                } finally {
+                    lock.unlock();
+                }
+            }
+        } finally {
+            lock.releaseRef();
+        }
+    }
+
+    @Override
+    public boolean deleteGpuDevices(DeleteGpuDeviceCmd deleteGpuDeviceCmd) {
+        List<Long> gpuDeviceIds = deleteGpuDeviceCmd.getIds();
+        if (CollectionUtils.isEmpty(gpuDeviceIds)) {
+            throw new InvalidParameterValueException("GPU device IDs cannot be empty");
+        }
+
+        List<GpuDeviceVO> gpuDevices = gpuDeviceDao.listByIds(gpuDeviceIds);
+        if (gpuDevices.isEmpty()) {
+            throw new InvalidParameterValueException("No GPU devices found for the provided IDs");
+        }
+
+        for (GpuDeviceVO gpuDevice : gpuDevices) {
+            if (gpuDevice.getVmId() != null) {
+                throw new InvalidParameterValueException(
+                        String.format("Cannot delete GPU device %s as it is currently allocated to VM %d",
+                                gpuDevice.getUuid(), gpuDevice.getVmId()));
+            }
+            gpuDeviceDao.remove(gpuDevice.getId());
+        }
+        return true;
+    }
+
+    private GpuCardVO getGpuCardAndUpdateMap(VgpuTypesInfo deviceInfo, Map<String, GpuCardVO> cardMap,
+            Map<String, VgpuProfileVO> vgpuProfileMap) {
+        String cardMapKey = deviceInfo.getDeviceId() + " - " + deviceInfo.getVendorId();
+        GpuCardVO card = cardMap.get(cardMapKey);
+        if (card == null) {
+            card = gpuCardDao.findByVendorIdAndDeviceId(deviceInfo.getVendorId(), deviceInfo.getDeviceId());
+            if (card == null) {
+                // Create GPU card if it doesn't exist
+                logger.info("Creating new GPU card for vendor ID: {} and device ID: {}", deviceInfo.getVendorId(),
+                        deviceInfo.getDeviceId());
+
+                String deviceName = StringUtils.isNotBlank(deviceInfo.getDeviceName()) ?
+                        deviceInfo.getDeviceName() :
+                        deviceInfo.getGroupName();
+                String vendorName = StringUtils.isNotBlank(deviceInfo.getVendorName()) ?
+                        deviceInfo.getVendorName() :
+                        "Unknown Vendor";
+                String cardDisplayName = vendorName + " " + deviceName;
+
+                card = new GpuCardVO(deviceInfo.getDeviceId(), deviceName, cardDisplayName, vendorName,
+                        deviceInfo.getVendorId());
+                card = gpuCardDao.persist(card);
+
+                // Create default passthrough profile for the new card
+                VgpuProfileVO passthroughProfile = new VgpuProfileVO("passthrough", "passthrough", card.getId(), 1L);
+                passthroughProfile.setVideoRam(deviceInfo.getVideoRam());
+                passthroughProfile.setMaxResolutionX(deviceInfo.getMaxResolutionX());
+                passthroughProfile.setMaxResolutionY(deviceInfo.getMaxResolutionY());
+                passthroughProfile.setMaxHeads(deviceInfo.getMaxHeads());
+                passthroughProfile = vgpuProfileDao.persist(passthroughProfile);
+
+                String vgpuProfileKey = card.getUuid() + " | " + deviceInfo.getModelName();
+                vgpuProfileMap.put(vgpuProfileKey, passthroughProfile);
+                logger.info("Created GPU card: {} with passthrough profile: {}", card, passthroughProfile);
+            }
+            cardMap.put(cardMapKey, card);
+        }
+        return card;
+    }
+
+    private VgpuProfileVO getVgpuProfileAndUpdateMap(VgpuTypesInfo deviceInfo, GpuCardVO card,
+            Map<String, VgpuProfileVO> vgpuProfileMap) {
+        String vgpuProfileKey = card.getUuid() + " | " + deviceInfo.getModelName();
+        VgpuProfileVO vgpuProfile = vgpuProfileMap.get(vgpuProfileKey);
+        if (vgpuProfile == null) {
+            vgpuProfile = vgpuProfileDao.findByNameAndCardId(deviceInfo.getModelName(), card.getId());
+            if (vgpuProfile == null) {
+                // Create vGPU profile if it doesn't exist
+                logger.info("Creating new vGPU profile: {} for GPU card: {}", deviceInfo.getModelName(),
+                        card.getName());
+
+                vgpuProfile = new VgpuProfileVO(deviceInfo.getModelName(), deviceInfo.getModelName(), card.getId(),
+                        deviceInfo.getMaxVpuPerGpu() != null ? deviceInfo.getMaxVpuPerGpu() : 1L);
+                vgpuProfile.setVideoRam(deviceInfo.getVideoRam());
+                vgpuProfile.setMaxResolutionX(deviceInfo.getMaxResolutionX());
+                vgpuProfile.setMaxResolutionY(deviceInfo.getMaxResolutionY());
+                vgpuProfile.setMaxHeads(deviceInfo.getMaxHeads());
+                vgpuProfile = vgpuProfileDao.persist(vgpuProfile);
+
+                logger.info("Created vGPU profile: {}", vgpuProfile);
+            }
+            vgpuProfileMap.put(vgpuProfileKey, vgpuProfile);
+        }
+        return vgpuProfile;
+    }
+
+    private void createAndAddGpuDeviceToHost(VgpuTypesInfo deviceInfo, Host host, GpuCardVO card,
+            VgpuProfileVO vgpuProfile) {
+        Long parentGpuDeviceId = null;
+        GpuDeviceVO parentGpuDevice = null;
+        if (deviceInfo.getParentBusAddress() != null) {
+            parentGpuDevice = gpuDeviceDao.findByHostIdAndBusAddress(host.getId(),
+                    deviceInfo.getParentBusAddress());
+            if (parentGpuDevice != null) {
+                parentGpuDeviceId = parentGpuDevice.getId();
+            }
+        }
+        GpuDeviceVO gpuDevice = new GpuDeviceVO(card.getId(), vgpuProfile.getId(), deviceInfo.getBusAddress(),
+                host.getId(), parentGpuDeviceId, deviceInfo.getNumaNode(), deviceInfo.getPciRoot());
+        gpuDevice.setHostId(host.getId());
+        gpuDevice.setBusAddress(deviceInfo.getBusAddress());
+        gpuDevice.setCardId(card.getId());
+        setStateAndVmName(deviceInfo, gpuDevice, parentGpuDevice);
+        if (!deviceInfo.isPassthroughEnabled()) {
+            gpuDevice.setType(GpuDevice.DeviceType.VGPUOnly);
+        }
+
+        gpuDevice = gpuDeviceDao.persist(gpuDevice);
+        checkAndUpdateParentGpuDeviceState(parentGpuDevice);
+        logger.info("Added new GPU device {} to host {}", gpuDevice, host);
+    }
+
+    private void setStateAndVmName(VgpuTypesInfo deviceInfo, GpuDeviceVO device, GpuDeviceVO parentGpuDevice) {
+        if (StringUtils.isNotBlank(deviceInfo.getVmName())) {
+            VMInstanceVO vm = vmInstanceDao.findVMByInstanceName(deviceInfo.getVmName());
+            if (vm != null) {
+                device.setVmId(vm.getId());
+                device.setState(GpuDevice.State.Allocated);
+            } else {
+                device.setState(GpuDevice.State.Error);
+                logger.warn("VM with name {} not found for GPU device {}. Setting state to Error.",
+                        deviceInfo.getVmName(), device);
+            }
+        } else {
+            // If no VM name is provided, it's possible that the device is allocated to a stopped VM or not allocated at all.
+            if (device.getVmId() == null && !device.getState().equals(GpuDevice.State.PartiallyAllocated)) {
+                device.setState(GpuDevice.State.Free);
+            } else {
+                VMInstanceVO vm = vmInstanceDao.findById(device.getVmId());
+                if (vm != null && vm.getState().equals(VirtualMachine.State.Stopped) && !GpuDetachOnStop.valueIn(vm.getDomainId())) {
+                    device.setState(GpuDevice.State.Allocated);
+                } else {
+                    logger.warn("VM with ID {} not found for GPU device {}. Allocated to a removed VM. Setting state to Free.",
+                            device.getVmId(), device);
+                    device.setState(GpuDevice.State.Free);
+                    device.setVmId(null);
+                }
+            }
+        }
+    }
+
+    private boolean updateGpuDeviceManagedState(List<Long> gpuDeviceIds, GpuDevice.ManagedState managedState) {
+        if (CollectionUtils.isEmpty(gpuDeviceIds)) {
+            throw new InvalidParameterValueException("GPU device IDs cannot be empty");
+        }
+        List<GpuDeviceVO> gpuDevices = new ArrayList<>();
+        Set<Long> hostIds = new HashSet<>();
+        for (Long gpuDeviceId : gpuDeviceIds) {
+            GpuDeviceVO gpuDevice = gpuDeviceDao.findById(gpuDeviceId);
+            if (gpuDevice == null) {
+                throw new InvalidParameterValueException(String.format("GPU device with ID %d not found", gpuDeviceId));
+            }
+
+            if (gpuDevice.getManagedState().equals(managedState)) {
+                logger.debug("GPU device {} is already in resource state: {}. Skipping state update.", gpuDevice,
+                        managedState);
+            }
+
+            if (gpuDevice.getVmId() != null) {
+                throw new InvalidParameterValueException(
+                        String.format("Cannot change resource state of GPU device %s as it is in use by VM %d",
+                                gpuDevice, gpuDevice.getVmId()));
+            }
+            gpuDevices.add(gpuDevice);
+            hostIds.add(gpuDevice.getHostId());
+        }
+
+        for (GpuDeviceVO gpuDevice : gpuDevices) {
+            gpuDevice.setManagedState(managedState);
+            gpuDeviceDao.update(gpuDevice.getId(), gpuDevice);
+        }
+
+        for (Long hostId : hostIds) {
+            resourceManager.updateGPUDetails(hostId, getGpuGroupDetailsFromGpuDevicesOnHost(hostId));
+        }
+
+        return true;
+    }
+
+    private ListResponse<GpuDeviceResponse> getGpuDeviceResponseListResponse(BaseCmd cmd, List<GpuDeviceVO> gpuDevices,
+            Integer count) {
+        ListResponse<GpuDeviceResponse> response = new ListResponse<>();
+        List<GpuDeviceResponse> gpuDeviceResponses = new ArrayList<>();
+
+        ResponseObject.ResponseView view = ResponseObject.ResponseView.Full;
+        if (cmd instanceof ListGpuDevicesCmdByAdmin) {
+            ListGpuDevicesCmd listCmd = (ListGpuDevicesCmdByAdmin) cmd;
+            view = listCmd.getResponseView();
+        } else if (cmd instanceof ListGpuDevicesCmd) {
+            ListGpuDevicesCmd listCmd = (ListGpuDevicesCmd) cmd;
+            view = listCmd.getResponseView();
+        }
+
+        for (GpuDeviceVO gpuDevice : gpuDevices) {
+            GpuDeviceResponse gpuDeviceResponse = createGpuDeviceResponse(gpuDevice, view);
+            gpuDeviceResponses.add(gpuDeviceResponse);
+        }
+
+        response.setResponses(gpuDeviceResponses, count);
+        response.setResponseName(cmd.getCommandName());
+        return response;
+    }
+
+    private GpuDeviceResponse createGpuDeviceResponse(GpuDeviceVO gpuDevice, ResponseObject.ResponseView view) {
+        GpuDeviceResponse response = new GpuDeviceResponse();
+        response.setId(gpuDevice.getUuid());
+        if (view.equals(ResponseObject.ResponseView.Full)) {
+            response.setBussAddress(gpuDevice.getBusAddress());
+            response.setState(gpuDevice.getState());
+            response.setManagedState(gpuDevice.getManagedState());
+            response.setType(gpuDevice.getType());
+            response.setNumaNode(gpuDevice.getNumaNode());
+
+            // Host name lookup
+            HostVO host = hostDao.findById(gpuDevice.getHostId());
+            if (host != null) {
+                response.setHostName(host.getName());
+                response.setHostId(host.getUuid());
+            }
+
+            if (gpuDevice.getParentGpuDeviceId() != null) {
+                GpuDeviceVO parentGpuDevice = gpuDeviceDao.findById(gpuDevice.getParentGpuDeviceId());
+                if (parentGpuDevice != null) {
+                    response.setParentGpuDeviceId(parentGpuDevice.getUuid());
+                } else {
+                    logger.debug("Parent GPU device with ID {} not found for GPU device {}",
+                            gpuDevice.getParentGpuDeviceId(), gpuDevice.getUuid());
+                }
+            }
+        }
+        // GPU card info
+        GpuCardVO gpuCard = gpuCardDao.findById(gpuDevice.getCardId());
+        if (gpuCard != null) {
+            if (view.equals(ResponseObject.ResponseView.Full)) {
+                response.setGpuCardId(gpuCard.getUuid());
+            }
+            response.setGpuCardName(gpuCard.getName());
+        }
+
+        // vGPU profile info
+        VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(gpuDevice.getVgpuProfileId());
+        if (vgpuProfile != null) {
+            if (view.equals(ResponseObject.ResponseView.Full)) {
+                response.setVgpuProfileId(vgpuProfile.getUuid());
+            }
+            response.setVgpuProfileName(vgpuProfile.getName());
+        }
+
+        if (gpuDevice.getVmId() != null) {
+            UserVmVO vm = userVmManager.getVirtualMachine(gpuDevice.getVmId());
+            if (vm != null) {
+                response.setVmId(vm.getUuid());
+                response.setVmName(vm.getInstanceName());
+                response.setVmState(vm.getState());
+            } else {
+                logger.debug("VM with ID {} not found for GPU device {}", gpuDevice.getVmId(), gpuDevice.getUuid());
+            }
+        }
+
+        return response;
+    }
+
+    /**
+     * Allocates optimal GPU devices for KVM performance based on NUMA node alignment and PCI root optimization.
+     * <p>
+     * Performance priority (best to acceptable):
+     * 1. All GPUs from same NUMA node and same PCI root (best memory locality and PCI bandwidth)
+     * 2. All GPUs from same NUMA node across different PCI roots (good memory locality)
+     * 3. GPUs distributed across NUMA nodes with PCI root preference within each node
+     *
+     * @param availableGpuDevices List of available GPU devices
+     * @param gpuCount            Number of GPUs to allocate
+     * @return List of optimally selected GPU devices
+     */
+    public List<GpuDeviceVO> getGpuDevicesToAllocate(List<GpuDeviceVO> availableGpuDevices, int gpuCount) {
+        if (availableGpuDevices.size() < gpuCount) {
+            throw new CloudRuntimeException(
+                    String.format("Insufficient GPU devices available. Required: %d, Available: %d", gpuCount,
+                            availableGpuDevices.size()));
+        }
+
+        // Strategy 1: Try optimal allocation (same NUMA node + same PCI root)
+        List<GpuDeviceVO> optimalSelection = tryOptimalAllocation(availableGpuDevices, gpuCount);
+        if (optimalSelection != null) {
+            logger.info("Allocated {} GPU devices using optimal strategy (same NUMA node and PCI root)", gpuCount);
+            return optimalSelection;
+        }
+
+        // Strategy 2: Try single NUMA node allocation across multiple PCI roots
+        List<GpuDeviceVO> singleNumaSelection = trySingleNumaAllocation(availableGpuDevices, gpuCount);
+        if (singleNumaSelection != null) {
+            logger.info("Allocated {} GPU devices using single NUMA node strategy", gpuCount);
+            return singleNumaSelection;
+        }
+
+        // Strategy 3: Distribute across NUMA nodes with PCI root optimization
+        List<GpuDeviceVO> distributedSelection = tryDistributedAllocation(availableGpuDevices, gpuCount);
+        logger.info("Allocated {} GPU devices using distributed NUMA strategy", gpuCount);
+        return distributedSelection;
+    }
+
+    /**
+     * Attempts to allocate all GPUs from the same NUMA node and PCI root for optimal performance.
+     */
+    private List<GpuDeviceVO> tryOptimalAllocation(List<GpuDeviceVO> availableDevices, int gpuCount) {
+        Map<String, Map<String, List<GpuDeviceVO>>> topology = buildNumaPciTopology(availableDevices);
+
+        for (Map<String, List<GpuDeviceVO>> numaNode : topology.values()) {
+            for (List<GpuDeviceVO> pciRootDevices : numaNode.values()) {
+                if (pciRootDevices.size() >= gpuCount) {
+                    return selectDevicesFromGroup(pciRootDevices, gpuCount);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Attempts to allocate all GPUs from a single NUMA node across multiple PCI roots.
+     */
+    private List<GpuDeviceVO> trySingleNumaAllocation(List<GpuDeviceVO> availableDevices, int gpuCount) {
+        Map<String, List<GpuDeviceVO>> devicesByNuma = groupDevicesByNuma(availableDevices);
+
+        // Prioritize NUMA nodes with balanced device distribution
+        List<Map.Entry<String, List<GpuDeviceVO>>> sortedNumaNodes = new ArrayList<>();
+        for (Map.Entry<String, List<GpuDeviceVO>> entry : devicesByNuma.entrySet()) {
+            if (entry.getValue().size() >= gpuCount) {
+                sortedNumaNodes.add(entry);
+            }
+        }
+        sortedNumaNodes.sort(Map.Entry.comparingByValue(Comparator.comparing(List::size)));
+
+        for (Map.Entry<String, List<GpuDeviceVO>> numaEntry : sortedNumaNodes) {
+            List<GpuDeviceVO> selected = selectDevicesWithPciOptimization(numaEntry.getValue(), gpuCount);
+            if (selected.size() == gpuCount) {
+                return selected;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Distributes GPU allocation across NUMA nodes while optimizing PCI root usage within each node.
+     */
+    private List<GpuDeviceVO> tryDistributedAllocation(List<GpuDeviceVO> availableDevices, int gpuCount) {
+        Map<String, List<GpuDeviceVO>> devicesByNuma = groupDevicesByNuma(availableDevices);
+        List<GpuDeviceVO> selectedDevices = new ArrayList<>();
+
+        // Sort NUMA nodes by device count in order for balanced distribution
+        List<Map.Entry<String, List<GpuDeviceVO>>> sortedNumaNodes = new ArrayList<>(devicesByNuma.entrySet());
+        sortedNumaNodes.sort(Map.Entry.comparingByValue(Comparator.comparing(List::size)));
+
+        int remainingCount = gpuCount;
+        for (Map.Entry<String, List<GpuDeviceVO>> numaEntry : sortedNumaNodes) {
+            if (remainingCount <= 0) break;
+
+            int devicesNeeded = Math.min(remainingCount, numaEntry.getValue().size());
+            List<GpuDeviceVO> selectedFromNuma = selectDevicesWithPciOptimization(numaEntry.getValue(), devicesNeeded);
+
+            selectedDevices.addAll(selectedFromNuma);
+            remainingCount -= selectedFromNuma.size();
+
+            logger.debug("Selected {} devices from NUMA node {}", selectedFromNuma.size(), numaEntry.getKey());
+        }
+
+        if (selectedDevices.size() < gpuCount) {
+            throw new CloudRuntimeException(
+                    String.format("Could not allocate required GPU devices. Required: %d, Allocated: %d", gpuCount,
+                            selectedDevices.size()));
+        }
+
+        return selectedDevices;
+    }
+
+    /**
+     * Builds a hierarchical topology map: NUMA node -> PCI root -> devices.
+     */
+    private Map<String, Map<String, List<GpuDeviceVO>>> buildNumaPciTopology(List<GpuDeviceVO> devices) {
+        Map<String, Map<String, List<GpuDeviceVO>>> map = new HashMap<>();
+        for (GpuDeviceVO device : devices) {
+            map.computeIfAbsent(
+                    getNumaNodeKey(device), key -> new HashMap<>()
+            ).computeIfAbsent(
+                    getPciRootKey(device), k -> new ArrayList<>()
+            ).add(device);
+        }
+        return map;
+    }
+
+    /**
+     * Groups devices by NUMA node.
+     */
+    private Map<String, List<GpuDeviceVO>> groupDevicesByNuma(List<GpuDeviceVO> devices) {
+        Map<String, List<GpuDeviceVO>> map = new HashMap<>();
+        for (GpuDeviceVO device : devices) {
+            map.computeIfAbsent(getNumaNodeKey(device), k -> new ArrayList<>()).add(device);
+        }
+        return map;
+    }
+
+    /**
+     * Selects devices from a group with PCI root optimization, prioritizing same PCI roots.
+     */
+    private List<GpuDeviceVO> selectDevicesWithPciOptimization(List<GpuDeviceVO> numaDevices, int count) {
+        Map<String, List<GpuDeviceVO>> devicesByPciRoot = new HashMap<>();
+        for (GpuDeviceVO numaDevice : numaDevices) {
+            devicesByPciRoot.computeIfAbsent(getPciRootKey(numaDevice), k -> new ArrayList<>()).add(numaDevice);
+        }
+
+        List<GpuDeviceVO> selected = new ArrayList<>();
+
+        // Sort PCI roots by device count (descending) to prioritize roots with more devices
+        List<List<GpuDeviceVO>> sortedPciGroups = new ArrayList<>(devicesByPciRoot.values());
+        sortedPciGroups.sort(Comparator.comparing(List<GpuDeviceVO>::size).reversed());
+
+        for (List<GpuDeviceVO> pciGroup : sortedPciGroups) {
+            if (selected.size() >= count) break;
+
+            int devicesNeeded = Math.min(count - selected.size(), pciGroup.size());
+            selected.addAll(selectDevicesFromGroup(pciGroup, devicesNeeded));
+        }
+
+        return selected;
+    }
+
+    /**
+     * Selects devices from a group, sorted by ID for consistency.
+     */
+    private List<GpuDeviceVO> selectDevicesFromGroup(List<GpuDeviceVO> devices, int count) {
+        List<GpuDeviceVO> toSort = new ArrayList<>(devices);
+        toSort.sort(Comparator.comparing(GpuDeviceVO::getId));
+        List<GpuDeviceVO> list = new ArrayList<>();
+        long limit = count;
+        for (GpuDeviceVO device : toSort) {
+            if (limit-- == 0) break;
+            list.add(device);
+        }
+        return list;
+    }
+
+    /**
+     * Gets the NUMA node key, handling null/blank values.
+     */
+    private String getNumaNodeKey(GpuDeviceVO device) {
+        return StringUtils.isNotBlank(device.getNumaNode()) ? device.getNumaNode() : "unknown";
+    }
+
+    /**
+     * Gets the PCI root key, handling null/blank values.
+     */
+    private String getPciRootKey(GpuDeviceVO device) {
+        return StringUtils.isNotBlank(device.getPciRoot()) ? device.getPciRoot() : "unknown";
+    }
+}
diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index 9e570e635fa..b90c40dc95e 100644
--- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -392,6 +392,8 @@
 
     <bean id="guiThemeServiceImpl" class="org.apache.cloudstack.gui.theme.GuiThemeServiceImpl" />
 
+    <bean id="GpuServiceImpl" class="org.apache.cloudstack.gpu.GpuServiceImpl" />
+
     <bean id="ExternalOrchestratorDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExternalOrchestratorDaoImpl" />
     <bean id="ExternalOrchestratorDetailDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExternalOrchestratorDetailDaoImpl" />
     <bean id="ExtensionResourceMapDaoImpl" class="org.apache.cloudstack.hypervisor.external.provisioner.dao.ExtensionResourceMapDaoImpl" />
diff --git a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
index 83498fbbe76..0d6a6fa8ff9 100644
--- a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
+++ b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
@@ -28,6 +28,7 @@ import com.cloud.resource.ResourceManager;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
+import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.junit.Assert;
 import org.junit.Before;
@@ -63,6 +64,7 @@ public class FirstFitAllocatorTest {
 
     private Host host1;
     private Host host2;
+    private VirtualMachineProfile vmProfile;
     ConfigurationDao configDao;
 
     @Before
@@ -86,12 +88,16 @@ public class FirstFitAllocatorTest {
         host1 = mock(Host.class);
         host2 = mock(Host.class);
 
+        vmProfile = mock(VirtualMachineProfile.class);
+        when(vmProfile.getId()).thenReturn(1L);
+
         when(plan.getDataCenterId()).thenReturn(1L);
         when(offering.getCpu()).thenReturn(2);
         when(offering.getSpeed()).thenReturn(1000);
         when(offering.getRamSize()).thenReturn(2048);
         when(offering.getId()).thenReturn(123L);
         when(offering.getHostTag()).thenReturn(null);
+        when(offering.getVgpuProfileId()).thenReturn(null);
     }
 
     @Test
@@ -119,7 +125,11 @@ public class FirstFitAllocatorTest {
         when(capacityMgr.checkIfHostHasCpuCapabilityAndCapacity(eq(host2), eq(offering), eq(true)))
                 .thenReturn(new Pair<>(true, false));
 
-        List<Host> result = allocator.allocateTo(plan, offering, null, avoid, inputHosts, 2, true, account);
+
+        when(resourceMgr.isGPUDeviceAvailable(offering, host1, vmProfile.getId())).thenReturn(true);
+        when(resourceMgr.isGPUDeviceAvailable(offering, host2, vmProfile.getId())).thenReturn(true);
+
+        List<Host> result = allocator.allocateTo(vmProfile, plan, offering, null, avoid, inputHosts, 2, true, account);
 
         // Only host1 should be returned
         assertEquals(1, result.size());
@@ -136,7 +146,7 @@ public class FirstFitAllocatorTest {
 
         when(capacityMgr.checkIfHostReachMaxGuestLimit(host2)).thenReturn(true); // Reached limit
 
-        List<Host> result = allocator.allocateTo(plan, offering, null, avoid, inputHosts, 2, true, account);
+        List<Host> result = allocator.allocateTo(vmProfile, plan, offering, null, avoid, inputHosts, 2, true, account);
 
         assertTrue(result.isEmpty());
     }
@@ -154,9 +164,9 @@ public class FirstFitAllocatorTest {
         when(pciDetail.getValue()).thenReturn("NVIDIA");
         when(vgpuDetail.getValue()).thenReturn("GRID");
 
-        when(resourceMgr.isGPUDeviceAvailable(eq(host1), eq("NVIDIA"), eq("GRID"))).thenReturn(false);
+        when(resourceMgr.isGPUDeviceAvailable(offering, host1, vmProfile.getId())).thenReturn(false);
 
-        List<Host> result = allocator.allocateTo(plan, offering, null, avoid, inputHosts, 1, true, account);
+        List<Host> result = allocator.allocateTo(vmProfile, plan, offering, null, avoid, inputHosts, 1, true, account);
 
         assertTrue(result.isEmpty());
     }
diff --git a/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java b/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
index 7e25570dc82..5b03260d2d6 100644
--- a/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
+++ b/server/src/test/java/com/cloud/deploy/DeploymentPlanningManagerImplTest.java
@@ -39,6 +39,7 @@ import com.cloud.exception.AffinityConflictException;
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.gpu.GPU;
 import com.cloud.gpu.dao.HostGpuGroupsDao;
+import com.cloud.gpu.dao.VgpuProfileDao;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
@@ -1153,6 +1154,11 @@ public class DeploymentPlanningManagerImplTest {
             return Mockito.mock(VMTemplateDao.class);
         }
 
+        @Bean
+        public VgpuProfileDao vgpuProfileDao() {
+            return Mockito.mock(VgpuProfileDao.class);
+        }
+
         public static class Library implements TypeFilter {
 
             @Override
diff --git a/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
index 587aafa1587..1408a815322 100755
--- a/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
+++ b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
@@ -30,16 +30,19 @@ import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.gpu.HostGpuGroupsVO;
+import com.cloud.gpu.VgpuProfileVO;
 import com.cloud.host.Host;
 import com.cloud.host.Host.Type;
 import com.cloud.host.HostStats;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.offering.ServiceOffering;
 import com.cloud.org.Cluster;
 import com.cloud.resource.ResourceState.Event;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
 import org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;
@@ -650,11 +653,17 @@ public class MockResourceManagerImpl extends ManagerBase implements ResourceMana
     }
 
     @Override
-    public boolean isGPUDeviceAvailable(final Host host, final String groupName, final String vgpuType) {
+    public boolean isGPUDeviceAvailable(ServiceOffering offering, Host host, Long vmId) {
         // TODO Auto-generated method stub
         return false;
     }
 
+    @Override
+    public GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfileVO vgpuProfile, int gpuCount) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
     @Override
     public GPUDeviceTO getGPUDevice(final long hostId, final String groupName, final String vgpuType) {
         // TODO Auto-generated method stub
@@ -672,6 +681,16 @@ public class MockResourceManagerImpl extends ManagerBase implements ResourceMana
         // TODO Auto-generated method stub
     }
 
+    @Override
+    public void updateGPUDetailsForVmStop(final VirtualMachine vm, final GPUDeviceTO gpuDeviceTO) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void updateGPUDetailsForVmStart(long hostId, long vmId, GPUDeviceTO gpuDevice) {
+        // TODO Auto-generated method stub
+    }
+
     @Override
     public HashMap<String, HashMap<String, VgpuTypesInfo>> getGPUStatistics(final HostVO host) {
         // TODO Auto-generated method stub
diff --git a/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java b/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java
index ad841a58ddc..a968a2da0b7 100644
--- a/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java
+++ b/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java
@@ -335,6 +335,24 @@ public class ResourceLimitManagerImplTest {
         }
     }
 
+    @Test
+    public void testCheckVmGpuResourceLimit() {
+        ServiceOffering serviceOffering = Mockito.mock(ServiceOffering.class);
+        VirtualMachineTemplate template = Mockito.mock(VirtualMachineTemplate.class);
+        Mockito.when(serviceOffering.getHostTag()).thenReturn(hostTags.get(0));
+        Mockito.when(template.getTemplateTag()).thenReturn(hostTags.get(0));
+        Account account = Mockito.mock(Account.class);
+        long gpuCount = 2L;
+        try {
+            Mockito.doNothing().when(resourceLimitManager).checkResourceLimitWithTag(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+            resourceLimitManager.checkVmGpuResourceLimit(account, true, serviceOffering, template, gpuCount);
+            Mockito.verify(resourceLimitManager, Mockito.times(1)).checkResourceLimitWithTag(account, Resource.ResourceType.gpu, null, gpuCount);
+            Mockito.verify(resourceLimitManager, Mockito.times(1)).checkResourceLimitWithTag(account, Resource.ResourceType.gpu, hostTags.get(0), gpuCount);
+        } catch (ResourceAllocationException e) {
+            Assert.fail("Exception encountered: " + e.getMessage());
+        }
+    }
+
     @Test
     public void testCheckVolumeResourceLimit() {
         String checkTag = storageTags.get(0);
@@ -855,6 +873,26 @@ public class ResourceLimitManagerImplTest {
         Assert.assertEquals(vms.size() * memory, resourceLimitManager.calculateVmMemoryCountForAccount(accountId, tag));
     }
 
+    @Test
+    public void testCalculateVmGpuCountForAccount() {
+        long accountId = 1L;
+        String tag = null;
+        Mockito.doReturn(1L).when(resourceLimitManager).calculateGpuForAccount(accountId);
+        Assert.assertEquals(1L, resourceLimitManager.calculateVmGpuCountForAccount(accountId, tag));
+
+        tag = "";
+        Mockito.doReturn(2L).when(resourceLimitManager).calculateGpuForAccount(accountId);
+        Assert.assertEquals(2L, resourceLimitManager.calculateVmGpuCountForAccount(accountId, tag));
+
+        tag = "tag";
+        UserVmJoinVO vm = Mockito.mock(UserVmJoinVO.class);
+        int gpuCount = 2;
+        Mockito.when(vm.getGpuCount()).thenReturn(gpuCount);
+        List<UserVmJoinVO> vms = List.of(vm, vm);
+        Mockito.doReturn(vms).when(resourceLimitManager).getVmsWithAccountAndTag(accountId, tag);
+        Assert.assertEquals(vms.size() * gpuCount, resourceLimitManager.calculateVmGpuCountForAccount(accountId, tag));
+    }
+
     @Test
     public void testCalculatePrimaryStorageForAccount() {
         long accountId = 1L;
@@ -1245,6 +1283,56 @@ public class ResourceLimitManagerImplTest {
                 .decrementResourceCountWithTag(accountId, Resource.ResourceType.memory, tag, Long.valueOf(memory));
     }
 
+    @Test
+    public void testIncrementVmGpuResourceCount() {
+        long accountId = 1L;
+        String tag = "tag";
+        Mockito.doReturn(new ArrayList<>()).when(resourceLimitManager)
+                .getResourceLimitHostTagsForResourceCountOperation(Mockito.anyBoolean(),
+                        Mockito.any(ServiceOffering.class), Mockito.any(VirtualMachineTemplate.class));
+        resourceLimitManager.incrementVmGpuResourceCount(accountId, false,
+                Mockito.mock(ServiceOffering.class), Mockito.mock(VirtualMachineTemplate.class), null);
+        Mockito.verify(resourceLimitManager, Mockito.never()).incrementResourceCountWithTag(Mockito.anyLong(),
+                Mockito.eq(Resource.ResourceType.gpu), Mockito.anyString(), Mockito.anyLong());
+
+        Mockito.doReturn(List.of(tag)).when(resourceLimitManager)
+                .getResourceLimitHostTagsForResourceCountOperation(Mockito.anyBoolean(),
+                        Mockito.any(ServiceOffering.class), Mockito.any(VirtualMachineTemplate.class));
+        mockIncrementResourceCountWithTag();
+        ServiceOffering offering = Mockito.mock(ServiceOffering.class);
+        Long gpuCount = 2L;
+        resourceLimitManager.incrementVmGpuResourceCount(accountId, false,
+                offering, Mockito.mock(VirtualMachineTemplate.class), gpuCount);
+        Mockito.verify(resourceLimitManager, Mockito.times(1))
+                .incrementResourceCountWithTag(accountId, Resource.ResourceType.gpu, tag, gpuCount);
+    }
+
+
+    @Test
+    public void testDecrementVmGpuResourceCount() {
+        long accountId = 1L;
+        String tag = "tag";
+        Mockito.doReturn(new ArrayList<>()).when(resourceLimitManager)
+                .getResourceLimitHostTagsForResourceCountOperation(Mockito.anyBoolean(),
+                        Mockito.any(ServiceOffering.class), Mockito.any(VirtualMachineTemplate.class));
+        resourceLimitManager.decrementVmGpuResourceCount(accountId, false,
+                Mockito.mock(ServiceOffering.class), Mockito.mock(VirtualMachineTemplate.class), null);
+        Mockito.verify(resourceLimitManager, Mockito.never()).decrementResourceCountWithTag(Mockito.anyLong(),
+                Mockito.eq(Resource.ResourceType.gpu), Mockito.anyString(), Mockito.anyLong());
+
+        Mockito.doReturn(List.of(tag)).when(resourceLimitManager)
+                .getResourceLimitHostTagsForResourceCountOperation(Mockito.anyBoolean(),
+                        Mockito.any(ServiceOffering.class), Mockito.any(VirtualMachineTemplate.class));
+        mockDecrementResourceCountWithTag();
+        ServiceOffering offering = Mockito.mock(ServiceOffering.class);
+        int gpuCount = 1;
+        Mockito.when(offering.getGpuCount()).thenReturn(gpuCount);
+        resourceLimitManager.decrementVmGpuResourceCount(accountId, false,
+                offering, Mockito.mock(VirtualMachineTemplate.class), null);
+        Mockito.verify(resourceLimitManager, Mockito.times(1))
+                .decrementResourceCountWithTag(accountId, Resource.ResourceType.gpu, tag, Long.valueOf(gpuCount));
+    }
+
     @Test
     public void testUpdateResourceLimitForAccount() {
         Long accountId = 1L;
diff --git a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
index fb188d159e2..5b877cc6616 100644
--- a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
+++ b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
@@ -350,6 +350,7 @@ public class FirstFitPlannerTest {
         when(offering.getCpu()).thenReturn(noOfCpusInOffering);
         when(offering.getSpeed()).thenReturn(cpuSpeedInOffering);
         when(offering.getRamSize()).thenReturn(ramInOffering);
+        when(offering.getVgpuProfileId()).thenReturn(null);
 
         List<Long> clustersWithEnoughCapacity = new ArrayList<Long>();
         clustersWithEnoughCapacity.add(1L);
diff --git a/server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java
index 3f3220d0934..151c7ff8908 100644
--- a/server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockResourceLimitManagerImpl.java
@@ -381,4 +381,19 @@ public class MockResourceLimitManagerImpl extends ManagerBase implements Resourc
     public void decrementVmMemoryResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long memory) {
 
     }
+
+    @Override
+    public void checkVmGpuResourceLimit(Account owner, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) throws ResourceAllocationException {
+
+    }
+
+    @Override
+    public void incrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) {
+
+    }
+
+    @Override
+    public void decrementVmGpuResourceCount(long accountId, Boolean display, ServiceOffering serviceOffering, VirtualMachineTemplate template, Long gpu) {
+
+    }
 }
diff --git a/server/src/test/java/org/apache/cloudstack/gpu/GpuServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/gpu/GpuServiceImplTest.java
new file mode 100644
index 00000000000..b8c5bbc1dea
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/gpu/GpuServiceImplTest.java
@@ -0,0 +1,1495 @@
+// 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.
+package org.apache.cloudstack.gpu;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.GPUDeviceTO;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.gpu.GpuCardVO;
+import com.cloud.gpu.GpuDeviceVO;
+import com.cloud.gpu.VgpuProfileVO;
+import com.cloud.gpu.dao.GpuCardDao;
+import com.cloud.gpu.dao.GpuDeviceDao;
+import com.cloud.gpu.dao.VgpuProfileDao;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.CreateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DeleteVgpuProfileCmd;
+import org.apache.cloudstack.api.command.admin.gpu.ListGpuDevicesCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.gpu.UnmanageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.DiscoverGpuDevicesCmd;
+import org.apache.cloudstack.api.command.admin.gpu.ManageGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuCardCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateGpuDeviceCmd;
+import org.apache.cloudstack.api.command.admin.gpu.UpdateVgpuProfileCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListGpuCardsCmd;
+import org.apache.cloudstack.api.command.user.gpu.ListVgpuProfilesCmd;
+import org.apache.cloudstack.api.response.GpuCardResponse;
+import org.apache.cloudstack.api.response.GpuDeviceResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.VgpuProfileResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.naming.ConfigurationException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GpuServiceImplTest {
+
+    // Test Constants
+    private static final String GPU_DEVICE_ID = "1234";
+    private static final String GPU_DEVICE_NAME = "RTX 4090";
+    private static final String GPU_CARD_NAME = "NVIDIA RTX 4090";
+    private static final String GPU_VENDOR_NAME = "NVIDIA";
+    private static final String GPU_VENDOR_ID = "10de";
+    private static final String VGPU_PROFILE_NAME = "grid_rtx4090-8q";
+    private static final String VGPU_PROFILE_DESCRIPTION = "RTX 4090 8GB profile";
+    private static final String GPU_BUS_ADDRESS = "0000:01:00.0";
+    private static final String GPU_BUS_ADDRESS_2 = "0000:02:00.0";
+    private static final String GPU_BUS_ADDRESS_3 = "0000:03:00.0";
+    private static final String GPU_CARD_UUID = "gpu-card-uuid";
+    private static final String VGPU_PROFILE_UUID = "vgpu-profile-uuid";
+    private static final String GPU_DEVICE_UUID = "gpu-device-uuid";
+    private static final String HOST_UUID = "host-uuid";
+    private static final String HOST_NAME = "test-host";
+    private static final String VM_NAME = "test-vm";
+    private static final String NUMA_NODE_0 = "numa0";
+    private static final String NUMA_NODE_1 = "numa1";
+    private static final String PCI_ROOT_1 = "0000:00";
+    private static final String PCI_ROOT_2 = "0000:40";
+    private static final String PCI_ROOT_3 = "0000:80";
+    private static final String TEST_PROFILE_NAME = "test-profile";
+    private static final String UPDATED_PROFILE_NAME = "updated-profile";
+    private static final String UPDATED_PROFILE_DESCRIPTION = "Updated description";
+    private static final String UPDATED_GPU_DEVICE_NAME = "Updated RTX 4090";
+    private static final String UPDATED_GPU_CARD_NAME = "Updated NVIDIA RTX 4090";
+    private static final String UPDATED_GPU_VENDOR_NAME = "Updated NVIDIA";
+    private static final String PASSTHROUGH_PROFILE = "passthrough";
+    private static final String COMMAND_CREATE_VGPU_PROFILE = "createVgpuProfile";
+    private static final String COMMAND_UPDATE_VGPU_PROFILE = "updateVgpuProfile";
+    private static final String COMMAND_LIST_GPU_CARDS = "listGpuCards";
+    private static final String COMMAND_LIST_VGPU_PROFILES = "listVgpuProfiles";
+    private static final String COMMAND_LIST_GPU_DEVICES = "listGpuDevices";
+    private static final String COMMAND_DISCOVER_GPU_DEVICES = "discoverGpuDevices";
+    private static final String CONFIG_COMPONENT_NAME = "GpuService";
+
+    // Test IDs
+    private static final Long GPU_CARD_ID = 1L;
+    private static final Long SERVICE_OFFERING_ID = 1L;
+    private static final Long VGPU_PROFILE_ID = 1L;
+    private static final Long GPU_DEVICE_ID_LONG = 1L;
+    private static final Long HOST_ID = 1L;
+    private static final Long VM_ID = 1L;
+    private static final Long MAX_VGPU_PER_PGPU = 4L;
+    private static final Long UPDATED_MAX_VGPU_PER_PGPU = 8L;
+    private static final Long START_INDEX = 0L;
+    private static final Long PAGE_SIZE = 20L;
+    private static final Long INVALID_ID = 999L;
+    private static final Long VM_ID_100 = 100L;
+    private static final Long GPU_CARD_ID_2 = 2L;
+    private static final Long GPU_DEVICE_ID_2 = 2L;
+    private static final Long PARENT_GPU_DEVICE_ID = 2L;
+    private static final Long DIFFERENT_HOST_ID = 99L;
+    private static final Long DIFFERENT_CARD_ID = 99L;
+
+    @Mock
+    private GpuCardDao gpuCardDao;
+
+    @Mock
+    private VgpuProfileDao vgpuProfileDao;
+
+    @Mock
+    private GpuDeviceDao gpuDeviceDao;
+
+    @Mock
+    private ServiceOfferingDao serviceOfferingDao;
+
+    @Mock
+    private HostDao hostDao;
+
+    @Mock
+    private UserVmManager userVmManager;
+
+    @Mock
+    private VMInstanceDao vmInstanceDao;
+
+    @Mock
+    private ResourceManager resourceManager;
+
+    @InjectMocks
+    @Spy
+    private GpuServiceImpl gpuService;
+
+    @Mock
+    private GpuCardVO mockGpuCard;
+
+    @Mock
+    private VgpuProfileVO mockVgpuProfile;
+
+    @Mock
+    private ServiceOfferingVO mockServiceOffering;
+
+    @Mock
+    private GpuDeviceVO mockGpuDevice;
+
+    @Mock
+    private HostVO mockHost;
+
+    @Before
+    public void setUp() {
+        // Setup GPU Card mock
+        when(mockGpuCard.getId()).thenReturn(GPU_CARD_ID);
+        when(mockGpuCard.getUuid()).thenReturn(GPU_CARD_UUID);
+        when(mockGpuCard.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(mockGpuCard.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(mockGpuCard.getName()).thenReturn(GPU_CARD_NAME);
+        when(mockGpuCard.getVendorName()).thenReturn(GPU_VENDOR_NAME);
+        when(mockGpuCard.getVendorId()).thenReturn(GPU_VENDOR_ID);
+
+        // Setup vGPU Profile mock
+        when(mockVgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+        when(mockVgpuProfile.getUuid()).thenReturn(VGPU_PROFILE_UUID);
+        when(mockVgpuProfile.getName()).thenReturn(VGPU_PROFILE_NAME);
+        when(mockVgpuProfile.getDescription()).thenReturn(VGPU_PROFILE_DESCRIPTION);
+        when(mockVgpuProfile.getCardId()).thenReturn(GPU_CARD_ID);
+        when(mockVgpuProfile.getMaxVgpuPerPgpu()).thenReturn(MAX_VGPU_PER_PGPU);
+
+        // Setup GPU Device mock
+        when(mockGpuDevice.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+        when(mockGpuDevice.getUuid()).thenReturn(GPU_DEVICE_UUID);
+        when(mockGpuDevice.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+        when(mockGpuDevice.getHostId()).thenReturn(HOST_ID);
+        when(mockGpuDevice.getCardId()).thenReturn(GPU_CARD_ID);
+        when(mockGpuDevice.getVgpuProfileId()).thenReturn(VGPU_PROFILE_ID);
+        when(mockGpuDevice.getType()).thenReturn(GpuDevice.DeviceType.PCI);
+        when(mockGpuDevice.getState()).thenReturn(GpuDevice.State.Free);
+        when(mockGpuDevice.getManagedState()).thenReturn(GpuDevice.ManagedState.Managed);
+        when(mockGpuDevice.getVmId()).thenReturn(null);
+        when(mockGpuDevice.getParentGpuDeviceId()).thenReturn(null);
+
+        // Setup Host mock
+        when(mockHost.getId()).thenReturn(HOST_ID);
+        when(mockHost.getUuid()).thenReturn(HOST_UUID);
+        when(mockHost.getName()).thenReturn(HOST_NAME);
+        when(mockHost.getStatus()).thenReturn(Status.Up);
+
+        // Setup Service Offering mock
+        when(mockServiceOffering.getGpuDisplay()).thenReturn(false);
+
+    }
+
+    @Test
+    public void testConfigure() throws ConfigurationException {
+        Map<String, Object> params = new HashMap<>();
+        boolean result = gpuService.configure(CONFIG_COMPONENT_NAME, params);
+        assertTrue(result);
+    }
+
+    @Test
+    public void testGetCommands() {
+        List<Class<?>> commands = gpuService.getCommands();
+        assertNotNull(commands);
+        assertFalse(commands.isEmpty());
+        assertTrue(commands.contains(CreateGpuCardCmd.class));
+        assertTrue(commands.contains(ListGpuCardsCmd.class));
+        assertTrue(commands.contains(CreateVgpuProfileCmd.class));
+        assertTrue(commands.contains(ListGpuDevicesCmdByAdmin.class));
+    }
+
+    @Test
+    public void testGetConfigComponentName() {
+        String componentName = gpuService.getConfigComponentName();
+        assertEquals(CONFIG_COMPONENT_NAME, componentName);
+    }
+
+    // GPU Card Tests
+    @Test
+    public void testCreateGpuCard_Success() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(cmd.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(cmd.getName()).thenReturn(GPU_CARD_NAME);
+        when(cmd.getVendorName()).thenReturn(GPU_VENDOR_NAME);
+        when(cmd.getVendorId()).thenReturn(GPU_VENDOR_ID);
+
+        when(gpuCardDao.findByVendorIdAndDeviceId(GPU_VENDOR_ID, GPU_DEVICE_ID)).thenReturn(null);
+        when(gpuCardDao.persist(any(GpuCardVO.class))).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.persist(any(VgpuProfileVO.class))).thenReturn(mockVgpuProfile);
+
+        GpuCardVO result = gpuService.createGpuCard(cmd);
+
+        assertNotNull(result);
+        assertEquals(GPU_CARD_UUID, result.getUuid());
+        assertEquals(GPU_DEVICE_ID, result.getDeviceId());
+        assertEquals(GPU_DEVICE_NAME, result.getDeviceName());
+        assertEquals(GPU_CARD_NAME, result.getName());
+        assertEquals(GPU_VENDOR_NAME, result.getVendorName());
+        assertEquals(GPU_VENDOR_ID, result.getVendorId());
+        verify(gpuCardDao).persist(any(GpuCardVO.class));
+        verify(vgpuProfileDao).persist(any(VgpuProfileVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuCard_BlankDeviceId() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn("");
+
+        gpuService.createGpuCard(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuCard_NullDeviceId() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn(null);
+
+        gpuService.createGpuCard(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuCard_DuplicateCard() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(cmd.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(cmd.getName()).thenReturn(GPU_CARD_NAME);
+        when(cmd.getVendorName()).thenReturn(GPU_VENDOR_NAME);
+        when(cmd.getVendorId()).thenReturn(GPU_VENDOR_ID);
+
+        when(gpuCardDao.findByVendorIdAndDeviceId(GPU_VENDOR_ID, GPU_DEVICE_ID)).thenReturn(mockGpuCard);
+
+        gpuService.createGpuCard(cmd);
+    }
+
+    @Test
+    public void testUpdateGpuCard_Success() {
+        UpdateGpuCardCmd cmd = mock(UpdateGpuCardCmd.class);
+        when(cmd.getId()).thenReturn(GPU_CARD_ID);
+        when(cmd.getDeviceName()).thenReturn(UPDATED_GPU_DEVICE_NAME);
+        when(cmd.getName()).thenReturn(UPDATED_GPU_CARD_NAME);
+        when(cmd.getVendorName()).thenReturn(UPDATED_GPU_VENDOR_NAME);
+
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(gpuCardDao.update(eq(GPU_CARD_ID), any(GpuCardVO.class))).thenReturn(true);
+
+        GpuCardVO result = gpuService.updateGpuCard(cmd);
+
+        assertNotNull(result);
+        assertEquals(GPU_CARD_UUID, result.getUuid());
+        verify(gpuCardDao).update(eq(GPU_CARD_ID), any(GpuCardVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateGpuCard_NotFound() {
+        UpdateGpuCardCmd cmd = mock(UpdateGpuCardCmd.class);
+        when(cmd.getId()).thenReturn(INVALID_ID);
+
+        when(gpuCardDao.findById(INVALID_ID)).thenReturn(null);
+
+        gpuService.updateGpuCard(cmd);
+    }
+
+    @Test
+    public void testDeleteGpuCard_Success() {
+        DeleteGpuCardCmd cmd = mock(DeleteGpuCardCmd.class);
+        when(cmd.getId()).thenReturn(GPU_CARD_ID);
+
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(gpuDeviceDao.isGpuCardInUse(GPU_CARD_ID)).thenReturn(false);
+        when(gpuCardDao.remove(GPU_CARD_ID)).thenReturn(true);
+
+        boolean result = gpuService.deleteGpuCard(cmd);
+
+        assertTrue(result);
+        verify(gpuCardDao).remove(GPU_CARD_ID);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDeleteGpuCard_InUse() {
+        DeleteGpuCardCmd cmd = mock(DeleteGpuCardCmd.class);
+        when(cmd.getId()).thenReturn(GPU_CARD_ID);
+
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(gpuDeviceDao.isGpuCardInUse(GPU_CARD_ID)).thenReturn(true);
+
+        gpuService.deleteGpuCard(cmd);
+    }
+
+    // vGPU Profile Tests
+    @Test
+    public void testCreateVgpuProfile_Success() {
+        CreateVgpuProfileCmd cmd = mock(CreateVgpuProfileCmd.class);
+        when(cmd.getName()).thenReturn(VGPU_PROFILE_NAME);
+        when(cmd.getDescription()).thenReturn(VGPU_PROFILE_DESCRIPTION);
+        when(cmd.getCardId()).thenReturn(GPU_CARD_ID);
+        when(cmd.getMaxVgpuPerPgpu()).thenReturn(MAX_VGPU_PER_PGPU);
+        when(cmd.getCommandName()).thenReturn(COMMAND_CREATE_VGPU_PROFILE);
+
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.persist(any(VgpuProfileVO.class))).thenReturn(mockVgpuProfile);
+
+        VgpuProfileResponse result = gpuService.createVgpuProfile(cmd);
+
+        assertNotNull(result);
+        assertEquals(VGPU_PROFILE_UUID, result.getId());
+        assertEquals(VGPU_PROFILE_NAME, result.getName());
+        assertEquals(VGPU_PROFILE_DESCRIPTION, result.getDescription());
+        assertEquals(GPU_CARD_UUID, result.getGpuCardId());
+        verify(vgpuProfileDao).persist(any(VgpuProfileVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateVgpuProfile_BlankName() {
+        CreateVgpuProfileCmd cmd = mock(CreateVgpuProfileCmd.class);
+        when(cmd.getName()).thenReturn("");
+
+        gpuService.createVgpuProfile(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateVgpuProfile_InvalidCardId() {
+        CreateVgpuProfileCmd cmd = mock(CreateVgpuProfileCmd.class);
+        when(cmd.getName()).thenReturn(TEST_PROFILE_NAME);
+        when(cmd.getCardId()).thenReturn(INVALID_ID);
+
+        when(gpuCardDao.findById(INVALID_ID)).thenReturn(null);
+
+        gpuService.createVgpuProfile(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateVgpuProfile_DuplicateName() {
+        CreateVgpuProfileCmd cmd = mock(CreateVgpuProfileCmd.class);
+        when(cmd.getName()).thenReturn(TEST_PROFILE_NAME);
+        when(cmd.getCardId()).thenReturn(GPU_CARD_ID);
+
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findByNameAndCardId(TEST_PROFILE_NAME, GPU_CARD_ID)).thenReturn(mockVgpuProfile);
+
+        gpuService.createVgpuProfile(cmd);
+    }
+
+    @Test
+    public void testUpdateVgpuProfile_Success() {
+        UpdateVgpuProfileCmd cmd = mock(UpdateVgpuProfileCmd.class);
+        when(cmd.getId()).thenReturn(VGPU_PROFILE_ID);
+        when(cmd.getProfileName()).thenReturn(UPDATED_PROFILE_NAME);
+        when(cmd.getDescription()).thenReturn(UPDATED_PROFILE_DESCRIPTION);
+        when(cmd.getMaxVgpuPerPgpu()).thenReturn(UPDATED_MAX_VGPU_PER_PGPU);
+        when(cmd.getCommandName()).thenReturn(COMMAND_UPDATE_VGPU_PROFILE);
+
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(vgpuProfileDao.findByNameAndCardId(UPDATED_PROFILE_NAME, GPU_CARD_ID)).thenReturn(null);
+        when(vgpuProfileDao.update(eq(VGPU_PROFILE_ID), any(VgpuProfileVO.class))).thenReturn(true);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+
+        VgpuProfileResponse result = gpuService.updateVgpuProfile(cmd);
+
+        assertNotNull(result);
+        assertEquals(VGPU_PROFILE_UUID, result.getId());
+        verify(vgpuProfileDao).update(eq(VGPU_PROFILE_ID), any(VgpuProfileVO.class));
+    }
+
+    @Test
+    public void testDeleteVgpuProfile_Success() {
+        DeleteVgpuProfileCmd cmd = mock(DeleteVgpuProfileCmd.class);
+        when(cmd.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.isVgpuProfileInUse(VGPU_PROFILE_ID)).thenReturn(false);
+        when(vgpuProfileDao.remove(VGPU_PROFILE_ID)).thenReturn(true);
+
+        boolean result = gpuService.deleteVgpuProfile(cmd);
+
+        assertTrue(result);
+        verify(vgpuProfileDao).remove(VGPU_PROFILE_ID);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDeleteVgpuProfile_InUse() {
+        DeleteVgpuProfileCmd cmd = mock(DeleteVgpuProfileCmd.class);
+        when(cmd.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.isVgpuProfileInUse(VGPU_PROFILE_ID)).thenReturn(true);
+
+        gpuService.deleteVgpuProfile(cmd);
+    }
+
+    // List Methods Tests
+    @Test
+    public void testListGpuCards_Success() {
+        ListGpuCardsCmd cmd = mock(ListGpuCardsCmd.class);
+        when(cmd.getId()).thenReturn(null);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getVendorName()).thenReturn(null);
+        when(cmd.getVendorId()).thenReturn(null);
+        when(cmd.getDeviceId()).thenReturn(null);
+        when(cmd.getDeviceName()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(START_INDEX);
+        when(cmd.getPageSizeVal()).thenReturn(PAGE_SIZE);
+        when(cmd.getCommandName()).thenReturn(COMMAND_LIST_GPU_CARDS);
+
+        List<GpuCardVO> gpuCards = List.of(mockGpuCard);
+        Pair<List<GpuCardVO>, Integer> result = new Pair<>(gpuCards, 1);
+        when(gpuCardDao.searchAndCountGpuCards(any(), any(), any(), any(), any(), any(), anyBoolean(), any(), any())).thenReturn(
+                result);
+
+        ListResponse<GpuCardResponse> response = gpuService.listGpuCards(cmd);
+
+        assertNotNull(response);
+        assertEquals(1, response.getResponses().size());
+        assertEquals(GPU_CARD_UUID, response.getResponses().get(0).getId());
+    }
+
+    @Test
+    public void testListVgpuProfiles_Success() {
+        ListVgpuProfilesCmd cmd = mock(ListVgpuProfilesCmd.class);
+        when(cmd.getId()).thenReturn(null);
+        when(cmd.getName()).thenReturn(null);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getCardId()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(START_INDEX);
+        when(cmd.getPageSizeVal()).thenReturn(PAGE_SIZE);
+        when(cmd.getCommandName()).thenReturn(COMMAND_LIST_VGPU_PROFILES);
+
+        List<VgpuProfileVO> vgpuProfiles = List.of(mockVgpuProfile);
+        Pair<List<VgpuProfileVO>, Integer> result = new Pair<>(vgpuProfiles, 1);
+        when(vgpuProfileDao.searchAndCountVgpuProfiles(any(), any(), any(), any(), anyBoolean(), any(), any())).thenReturn(result);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+
+        ListResponse<VgpuProfileResponse> response = gpuService.listVgpuProfiles(cmd);
+
+        assertNotNull(response);
+        assertEquals(1, response.getResponses().size());
+        assertEquals(VGPU_PROFILE_UUID, response.getResponses().get(0).getId());
+    }
+
+    // GPU Device Tests
+    @Test
+    public void testCreateGpuDevice_Success() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(HOST_ID);
+        when(cmd.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+        when(cmd.getGpuCardId()).thenReturn(GPU_CARD_ID);
+        when(cmd.getVgpuProfileId()).thenReturn(VGPU_PROFILE_ID);
+        when(cmd.getType()).thenReturn(GpuDevice.DeviceType.PCI);
+        when(cmd.getParentGpuDeviceId()).thenReturn(null);
+        when(cmd.getNumaNode()).thenReturn(NUMA_NODE_0);
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(null);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+
+        GpuDeviceResponse result = gpuService.createGpuDevice(cmd);
+
+        assertNotNull(result);
+        assertEquals(GPU_DEVICE_UUID, result.getId());
+        assertEquals(GPU_BUS_ADDRESS, result.getBussAddress());
+        assertEquals(GPU_CARD_UUID, result.getGpuCardId());
+        assertEquals(VGPU_PROFILE_UUID, result.getVgpuProfileId());
+        assertEquals(HOST_UUID, result.getHostId());
+        verify(gpuDeviceDao).persist(any(GpuDeviceVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuDevice_HostNotFound() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(INVALID_ID);
+
+        when(hostDao.findById(INVALID_ID)).thenReturn(null);
+
+        gpuService.createGpuDevice(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuDevice_DuplicateBusAddress() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(HOST_ID);
+        when(cmd.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(mockGpuDevice);
+
+        gpuService.createGpuDevice(cmd);
+    }
+
+    @Test
+    public void testUpdateGpuDevice_Success() {
+        UpdateGpuDeviceCmd cmd = mock(UpdateGpuDeviceCmd.class);
+        when(cmd.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+        when(cmd.getGpuCardId()).thenReturn(GPU_CARD_ID_2);
+        when(cmd.getVgpuProfileId()).thenReturn(GPU_CARD_ID_2);
+        when(cmd.getParentGpuDeviceId()).thenReturn(null);
+
+        GpuDeviceVO device = mock(GpuDeviceVO.class);
+        when(device.getCardId()).thenReturn(GPU_CARD_ID);
+        when(device.getVgpuProfileId()).thenReturn(VGPU_PROFILE_ID);
+        when(device.getVmId()).thenReturn(null);
+
+        VgpuProfileVO newProfile = mock(VgpuProfileVO.class);
+        when(newProfile.getCardId()).thenReturn(GPU_CARD_ID_2);
+
+        when(gpuDeviceDao.findById(GPU_DEVICE_ID_LONG)).thenReturn(device);
+        when(gpuCardDao.findById(GPU_CARD_ID_2)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findById(GPU_CARD_ID_2)).thenReturn(newProfile);
+        when(gpuDeviceDao.update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class))).thenReturn(true);
+
+        GpuDeviceResponse result = gpuService.updateGpuDevice(cmd);
+
+        assertNotNull(result);
+        verify(gpuDeviceDao).update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testUpdateGpuDevice_DeviceAllocated() {
+        UpdateGpuDeviceCmd cmd = mock(UpdateGpuDeviceCmd.class);
+        when(cmd.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+
+        GpuDeviceVO device = mock(GpuDeviceVO.class);
+        when(device.getVmId()).thenReturn(VM_ID_100);
+
+        when(gpuDeviceDao.findById(GPU_DEVICE_ID_LONG)).thenReturn(device);
+
+        gpuService.updateGpuDevice(cmd);
+    }
+
+    @Test
+    public void testListGpuDevices_Success() {
+        ListGpuDevicesCmdByAdmin cmd = mock(ListGpuDevicesCmdByAdmin.class);
+        when(cmd.getId()).thenReturn(null);
+        when(cmd.getKeyword()).thenReturn(null);
+        when(cmd.getHostId()).thenReturn(null);
+        when(cmd.getGpuCardId()).thenReturn(null);
+        when(cmd.getVgpuProfileId()).thenReturn(null);
+        when(cmd.getVmId()).thenReturn(null);
+        when(cmd.getStartIndex()).thenReturn(START_INDEX);
+        when(cmd.getPageSizeVal()).thenReturn(PAGE_SIZE);
+        when(cmd.getCommandName()).thenReturn(COMMAND_LIST_GPU_DEVICES);
+        when(cmd.getResponseView()).thenReturn(ResponseObject.ResponseView.Full);
+
+        List<GpuDeviceVO> gpuDevices = List.of(mockGpuDevice);
+        Pair<List<GpuDeviceVO>, Integer> result = new Pair<>(gpuDevices, 1);
+        when(gpuDeviceDao.searchAndCountGpuDevices(any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(
+                result);
+
+        ListResponse<GpuDeviceResponse> response = gpuService.listGpuDevices(cmd);
+
+        assertNotNull(response);
+        assertEquals(1, response.getResponses().size());
+        assertEquals(GPU_DEVICE_UUID, response.getResponses().get(0).getId());
+    }
+
+    @Test
+    public void testDisableGpuDevice_Success() {
+        UnmanageGpuDeviceCmd cmd = mock(UnmanageGpuDeviceCmd.class);
+        when(cmd.getIds()).thenReturn(List.of(GPU_DEVICE_ID_LONG));
+
+        GpuDeviceVO device = mock(GpuDeviceVO.class);
+        when(device.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+        when(device.getManagedState()).thenReturn(GpuDevice.ManagedState.Managed);
+        when(device.getVmId()).thenReturn(null);
+        when(device.getHostId()).thenReturn(HOST_ID);
+
+        when(gpuDeviceDao.findById(GPU_DEVICE_ID_LONG)).thenReturn(device);
+        when(gpuDeviceDao.update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class))).thenReturn(true);
+
+        doReturn(null).when(gpuService).getGpuGroupDetailsFromGpuDevicesOnHost(anyLong());
+
+        boolean result = gpuService.disableGpuDevice(cmd);
+
+        assertTrue(result);
+        verify(gpuDeviceDao).update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testEnableGpuDevice_Success() {
+        ManageGpuDeviceCmd cmd = mock(ManageGpuDeviceCmd.class);
+        when(cmd.getIds()).thenReturn(List.of(GPU_DEVICE_ID_LONG));
+
+        GpuDeviceVO device = mock(GpuDeviceVO.class);
+        when(device.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+        when(device.getManagedState()).thenReturn(GpuDevice.ManagedState.Unmanaged);
+        when(device.getVmId()).thenReturn(null);
+        when(device.getHostId()).thenReturn(HOST_ID);
+
+        when(gpuDeviceDao.findById(GPU_DEVICE_ID_LONG)).thenReturn(device);
+        when(gpuDeviceDao.update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class))).thenReturn(true);
+
+        doReturn(null).when(gpuService).getGpuGroupDetailsFromGpuDevicesOnHost(anyLong());
+
+        boolean result = gpuService.enableGpuDevice(cmd);
+
+        assertTrue(result);
+        verify(gpuDeviceDao).update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDisableGpuDevice_EmptyIds() {
+        UnmanageGpuDeviceCmd cmd = mock(UnmanageGpuDeviceCmd.class);
+        when(cmd.getIds()).thenReturn(new ArrayList<>());
+
+        gpuService.disableGpuDevice(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDisableGpuDevice_DeviceInUse() {
+        UnmanageGpuDeviceCmd cmd = mock(UnmanageGpuDeviceCmd.class);
+        when(cmd.getIds()).thenReturn(List.of(GPU_DEVICE_ID_LONG));
+
+        GpuDeviceVO device = mock(GpuDeviceVO.class);
+        when(device.getVmId()).thenReturn(VM_ID);
+        when(device.getManagedState()).thenReturn(GpuDevice.ManagedState.Managed);
+
+        when(gpuDeviceDao.findById(GPU_DEVICE_ID_LONG)).thenReturn(device);
+
+        gpuService.disableGpuDevice(cmd);
+    }
+
+    @Test
+    public void testDeallocateAllGpuDevicesForVm_Success() {
+        List<GpuDeviceVO> devices = List.of(mockGpuDevice);
+        when(gpuDeviceDao.listByVmId(VM_ID)).thenReturn(devices);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+
+        gpuService.deallocateAllGpuDevicesForVm(VM_ID);
+
+        verify(gpuDeviceDao).persist(any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testDeallocateAllGpuDevicesForVmOnHost_NoDevices() {
+        when(gpuDeviceDao.listByVmId(VM_ID)).thenReturn(new ArrayList<>());
+
+        gpuService.deallocateAllGpuDevicesForVm(VM_ID);
+
+        verify(gpuDeviceDao, never()).persist(any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testDiscoverGpuDevices_Success() {
+        DiscoverGpuDevicesCmd cmd = mock(DiscoverGpuDevicesCmd.class);
+        when(cmd.getId()).thenReturn(HOST_ID);
+        when(cmd.getCommandName()).thenReturn(COMMAND_DISCOVER_GPU_DEVICES);
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+        when(resourceManager.getGPUStatistics(mockHost)).thenReturn(new HashMap<>());
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(List.of(mockGpuDevice));
+
+        ListResponse<GpuDeviceResponse> result = gpuService.discoverGpuDevices(cmd);
+
+        assertNotNull(result);
+        verify(resourceManager).getGPUStatistics(mockHost);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDiscoverGpuDevices_HostNotFound() {
+        DiscoverGpuDevicesCmd cmd = mock(DiscoverGpuDevicesCmd.class);
+        when(cmd.getId()).thenReturn(INVALID_ID);
+
+        when(hostDao.findById(INVALID_ID)).thenReturn(null);
+
+        gpuService.discoverGpuDevices(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testDiscoverGpuDevices_HostNotUp() {
+        DiscoverGpuDevicesCmd cmd = mock(DiscoverGpuDevicesCmd.class);
+        when(cmd.getId()).thenReturn(HOST_ID);
+
+        HostVO downHost = mock(HostVO.class);
+        when(downHost.getStatus()).thenReturn(Status.Down);
+
+        when(hostDao.findById(HOST_ID)).thenReturn(downHost);
+
+        gpuService.discoverGpuDevices(cmd);
+    }
+
+    @Test
+    public void testIsGPUDeviceAvailable_Sufficient() {
+        VgpuProfile vgpuProfile = mock(VgpuProfile.class);
+        when(vgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        GpuDeviceVO additionalDevice = mock(GpuDeviceVO.class);
+        List<GpuDeviceVO> availableDevices = List.of(mockGpuDevice, additionalDevice);
+        when(gpuDeviceDao.listDevicesForAllocation(HOST_ID, VGPU_PROFILE_ID)).thenReturn(availableDevices);
+
+        boolean result = gpuService.isGPUDeviceAvailable(mockHost, VM_ID, vgpuProfile, 2);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void testIsGPUDeviceAvailable_Insufficient() {
+        VgpuProfile vgpuProfile = mock(VgpuProfile.class);
+        when(vgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        List<GpuDeviceVO> availableDevices = List.of(mockGpuDevice);
+        List<GpuDeviceVO> existingDevices = new ArrayList<>();
+
+        when(gpuDeviceDao.listDevicesForAllocation(HOST_ID, VGPU_PROFILE_ID)).thenReturn(availableDevices);
+        when(gpuDeviceDao.listByHostAndVm(HOST_ID, VM_ID)).thenReturn(existingDevices);
+
+        boolean result = gpuService.isGPUDeviceAvailable(mockHost, VM_ID, vgpuProfile, 3);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void testGetGpuGroupDetailsFromGpuDevicesOnHost_Success() {
+        List<GpuDeviceVO> devices = List.of(mockGpuDevice);
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(devices);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+
+        HashMap<String, HashMap<String, VgpuTypesInfo>> result = gpuService.getGpuGroupDetailsFromGpuDevicesOnHost(HOST_ID);
+
+        assertNotNull(result);
+        assertFalse(result.isEmpty());
+    }
+
+    @Test
+    public void testAddGpuDevicesToHost_NewDevice() {
+        VgpuTypesInfo deviceInfo = mock(VgpuTypesInfo.class);
+        when(deviceInfo.getBusAddress()).thenReturn(GPU_BUS_ADDRESS_2);
+        when(deviceInfo.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(deviceInfo.getVendorId()).thenReturn(GPU_VENDOR_ID);
+        when(deviceInfo.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(deviceInfo.getVendorName()).thenReturn(GPU_VENDOR_NAME);
+        when(deviceInfo.getModelName()).thenReturn(PASSTHROUGH_PROFILE);
+
+        List<VgpuTypesInfo> newDevices = List.of(deviceInfo);
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(new ArrayList<>());
+        when(gpuCardDao.findByVendorIdAndDeviceId(GPU_VENDOR_ID, GPU_DEVICE_ID)).thenReturn(null);
+        when(gpuCardDao.persist(any(GpuCardVO.class))).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.persist(any(VgpuProfileVO.class))).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+
+        try (MockedStatic<GlobalLock> ignored = Mockito.mockStatic(GlobalLock.class)) {
+            GlobalLock lock = mock(GlobalLock.class);
+            when(GlobalLock.getInternLock("add-gpu-devices-to-host-" + HOST_ID)).thenReturn(lock);
+            when(lock.lock(30)).thenReturn(true);
+
+            gpuService.addGpuDevicesToHost(mockHost, newDevices);
+
+            verify(gpuCardDao).persist(any(GpuCardVO.class));
+            verify(vgpuProfileDao, times(1)).persist(any(VgpuProfileVO.class)); // passthrough
+            verify(gpuDeviceDao).persist(any(GpuDeviceVO.class));
+        }
+    }
+
+    @Test
+    public void testAddGpuDevicesToHost_ExistingDevice() {
+        VgpuTypesInfo deviceInfo = mock(VgpuTypesInfo.class);
+        when(deviceInfo.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+        when(deviceInfo.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(deviceInfo.getVendorId()).thenReturn(GPU_VENDOR_ID);
+        when(deviceInfo.getModelName()).thenReturn(PASSTHROUGH_PROFILE);
+
+        List<VgpuTypesInfo> newDevices = List.of(deviceInfo);
+        List<GpuDeviceVO> existingDevices = List.of(mockGpuDevice);
+
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(existingDevices);
+        when(gpuCardDao.findByVendorIdAndDeviceId(GPU_VENDOR_ID, GPU_DEVICE_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findByNameAndCardId(PASSTHROUGH_PROFILE, GPU_CARD_ID)).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class))).thenReturn(true);
+
+        try (MockedStatic<GlobalLock> ignored = Mockito.mockStatic(GlobalLock.class)) {
+            GlobalLock lock = mock(GlobalLock.class);
+            when(GlobalLock.getInternLock("add-gpu-devices-to-host-" + HOST_ID)).thenReturn(lock);
+            when(lock.lock(30)).thenReturn(true);
+
+            gpuService.addGpuDevicesToHost(mockHost, newDevices);
+            verify(gpuDeviceDao).update(eq(GPU_DEVICE_ID_LONG), any(GpuDeviceVO.class));
+        }
+    }
+
+    @Test
+    public void testAddGpuDevicesToHost_WithVmName() {
+        VgpuTypesInfo deviceInfo = mock(VgpuTypesInfo.class);
+        when(deviceInfo.getBusAddress()).thenReturn(GPU_BUS_ADDRESS_2);
+        when(deviceInfo.getVmName()).thenReturn(VM_NAME);
+        when(deviceInfo.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(deviceInfo.getVendorId()).thenReturn(GPU_VENDOR_ID);
+        when(deviceInfo.getModelName()).thenReturn(PASSTHROUGH_PROFILE);
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        when(vm.getId()).thenReturn(VM_ID_100);
+
+        List<VgpuTypesInfo> newDevices = List.of(deviceInfo);
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(new ArrayList<>());
+        when(gpuCardDao.findByVendorIdAndDeviceId(GPU_VENDOR_ID, GPU_DEVICE_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findByNameAndCardId(PASSTHROUGH_PROFILE, GPU_CARD_ID)).thenReturn(mockVgpuProfile);
+        when(vmInstanceDao.findVMByInstanceName(VM_NAME)).thenReturn(vm);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+
+        try (MockedStatic<GlobalLock> ignored = Mockito.mockStatic(GlobalLock.class)) {
+            GlobalLock lock = mock(GlobalLock.class);
+            when(GlobalLock.getInternLock("add-gpu-devices-to-host-" + HOST_ID)).thenReturn(lock);
+            when(lock.lock(30)).thenReturn(true);
+
+            gpuService.addGpuDevicesToHost(mockHost, newDevices);
+
+            verify(vmInstanceDao).findVMByInstanceName(VM_NAME);
+            verify(gpuDeviceDao).persist(any(GpuDeviceVO.class));
+        }
+    }
+
+    @Test
+    public void testGetGPUDevice_Success() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(vm.getId()).thenReturn(VM_ID);
+        when(vm.getHostId()).thenReturn(HOST_ID);
+        when(vm.getServiceOfferingId()).thenReturn(SERVICE_OFFERING_ID);
+
+        VgpuProfile vgpuProfile = mock(VgpuProfile.class);
+        when(vgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+        when(vgpuProfile.getCardId()).thenReturn(GPU_CARD_ID);
+        when(vgpuProfile.getName()).thenReturn(TEST_PROFILE_NAME);
+
+        List<GpuDeviceVO> availableDevices = List.of(mockGpuDevice);
+        // Setup mocks before transaction execution
+        when(gpuDeviceDao.listDevicesForAllocation(HOST_ID, VGPU_PROFILE_ID)).thenReturn(availableDevices);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(availableDevices);
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(serviceOfferingDao.findById(SERVICE_OFFERING_ID)).thenReturn(mockServiceOffering);
+        try (MockedStatic<Transaction> transactionMock = Mockito.mockStatic(Transaction.class)) {
+
+            transactionMock.when(() -> Transaction.execute(any(TransactionCallback.class))).thenAnswer(invocation -> {
+                TransactionCallback<GPUDeviceTO> callback = invocation.getArgument(0);
+                return callback.doInTransaction(null);
+            });
+
+            GPUDeviceTO result = gpuService.getGPUDevice(vm, HOST_ID, vgpuProfile, 1);
+
+            assertNotNull(result);
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetGPUDevice_InsufficientDevices() {
+        VirtualMachine vm = mock(VirtualMachine.class);
+        when(vm.getId()).thenReturn(VM_ID);
+        when(vm.getHostId()).thenReturn(HOST_ID);
+
+        VgpuProfile vgpuProfile = mock(VgpuProfile.class);
+        when(vgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        try (MockedStatic<Transaction> transactionMock = Mockito.mockStatic(Transaction.class)) {
+            when(gpuDeviceDao.listDevicesForAllocation(HOST_ID, VGPU_PROFILE_ID)).thenReturn(new ArrayList<>());
+
+            transactionMock.when(() -> Transaction.execute(any(TransactionCallback.class))).thenAnswer(invocation -> {
+                TransactionCallback<GPUDeviceTO> callback = invocation.getArgument(0);
+                return callback.doInTransaction(null);
+            });
+
+            gpuService.getGPUDevice(vm, HOST_ID, vgpuProfile, 2);
+        }
+    }
+
+    @Test
+    public void testAllocateGpuDevicesToVmOnHost_Success() {
+        VgpuTypesInfo deviceInfo = mock(VgpuTypesInfo.class);
+        when(deviceInfo.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+
+        List<VgpuTypesInfo> gpuDevices = List.of(deviceInfo);
+        when(gpuDeviceDao.listByVmId(VM_ID)).thenReturn(new ArrayList<>());
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(mockGpuDevice);
+        when(gpuDeviceDao.persist(any(GpuDeviceVO.class))).thenReturn(mockGpuDevice);
+
+        try (MockedStatic<Transaction> transactionMock = Mockito.mockStatic(Transaction.class)) {
+            transactionMock.when(() -> Transaction.execute(any(TransactionCallbackNoReturn.class))).thenAnswer(
+                    invocation -> {
+                        TransactionCallbackNoReturn callback = invocation.getArgument(0);
+                        callback.doInTransactionWithoutResult(null);
+                        return null;
+                    });
+
+            gpuService.allocateGpuDevicesToVmOnHost(VM_ID, HOST_ID, gpuDevices);
+
+            verify(gpuDeviceDao).findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS);
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testAllocateGpuDevicesToVmOnHost_DeviceNotFound() {
+        VgpuTypesInfo deviceInfo = mock(VgpuTypesInfo.class);
+        when(deviceInfo.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+
+        List<VgpuTypesInfo> gpuDevices = List.of(deviceInfo);
+        when(gpuDeviceDao.listByVmId(VM_ID)).thenReturn(new ArrayList<>());
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(null);
+
+        try (MockedStatic<Transaction> transactionMock = Mockito.mockStatic(Transaction.class)) {
+            transactionMock.when(() -> Transaction.execute(any(TransactionCallbackNoReturn.class))).thenAnswer(
+                    invocation -> {
+                        TransactionCallbackNoReturn callback = invocation.getArgument(0);
+                        callback.doInTransactionWithoutResult(null);
+                        return null;
+                    });
+
+            gpuService.allocateGpuDevicesToVmOnHost(VM_ID, HOST_ID, gpuDevices);
+        }
+    }
+
+    // Additional edge case tests
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuCard_BlankVendorName() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(cmd.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(cmd.getName()).thenReturn(GPU_CARD_NAME);
+        when(cmd.getVendorName()).thenReturn("");
+        when(cmd.getVendorId()).thenReturn(GPU_VENDOR_ID);
+
+        gpuService.createGpuCard(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuCard_BlankName() {
+        CreateGpuCardCmd cmd = mock(CreateGpuCardCmd.class);
+        when(cmd.getDeviceId()).thenReturn(GPU_DEVICE_ID);
+        when(cmd.getDeviceName()).thenReturn(GPU_DEVICE_NAME);
+        when(cmd.getName()).thenReturn("");
+        when(cmd.getVendorName()).thenReturn(GPU_VENDOR_NAME);
+        when(cmd.getVendorId()).thenReturn(GPU_VENDOR_ID);
+
+        gpuService.createGpuCard(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuDevice_BlankBusAddress() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(HOST_ID);
+        when(cmd.getBusAddress()).thenReturn("");
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+
+        gpuService.createGpuDevice(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuDevice_InvalidVgpuProfile() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(HOST_ID);
+        when(cmd.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+        when(cmd.getGpuCardId()).thenReturn(GPU_CARD_ID);
+        when(cmd.getVgpuProfileId()).thenReturn(GPU_CARD_ID_2); // Different card ID
+
+        VgpuProfileVO wrongProfile = mock(VgpuProfileVO.class);
+        when(wrongProfile.getCardId()).thenReturn(DIFFERENT_CARD_ID); // Different card ID
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(null);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findById(GPU_CARD_ID_2)).thenReturn(wrongProfile);
+
+        gpuService.createGpuDevice(cmd);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testCreateGpuDevice_ParentDeviceOnDifferentHost() {
+        CreateGpuDeviceCmd cmd = mock(CreateGpuDeviceCmd.class);
+        when(cmd.getHostId()).thenReturn(HOST_ID);
+        when(cmd.getBusAddress()).thenReturn(GPU_BUS_ADDRESS);
+        when(cmd.getGpuCardId()).thenReturn(GPU_CARD_ID);
+        when(cmd.getVgpuProfileId()).thenReturn(VGPU_PROFILE_ID);
+        when(cmd.getParentGpuDeviceId()).thenReturn(PARENT_GPU_DEVICE_ID);
+
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getHostId()).thenReturn(DIFFERENT_HOST_ID); // Different host
+
+        when(hostDao.findById(HOST_ID)).thenReturn(mockHost);
+        when(gpuDeviceDao.findByHostIdAndBusAddress(HOST_ID, GPU_BUS_ADDRESS)).thenReturn(null);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(gpuDeviceDao.findById(PARENT_GPU_DEVICE_ID)).thenReturn(parentDevice);
+
+        gpuService.createGpuDevice(cmd);
+    }
+
+    @Test
+    public void testIsGPUDeviceAvailable_WithExistingDevices() {
+        VgpuProfile vgpuProfile = mock(VgpuProfile.class);
+        when(vgpuProfile.getId()).thenReturn(VGPU_PROFILE_ID);
+
+        List<GpuDeviceVO> availableDevices = List.of(mockGpuDevice);
+
+        GpuDeviceVO existingDevice = mock(GpuDeviceVO.class);
+        when(existingDevice.getVgpuProfileId()).thenReturn(VGPU_PROFILE_ID);
+        List<GpuDeviceVO> existingDevices = List.of(existingDevice);
+
+        when(gpuDeviceDao.listDevicesForAllocation(HOST_ID, VGPU_PROFILE_ID)).thenReturn(availableDevices);
+        when(gpuDeviceDao.listByHostAndVm(HOST_ID, VM_ID)).thenReturn(existingDevices);
+
+        boolean result = gpuService.isGPUDeviceAvailable(mockHost, VM_ID, vgpuProfile, 2);
+
+        assertTrue(result);
+    }
+
+    @Test
+    public void testAddGpuDevicesToHost_DisableRemovedDevices() {
+        // Setup existing device that won't be in the new list
+        GpuDeviceVO existingDevice = mock(GpuDeviceVO.class);
+        when(existingDevice.getId()).thenReturn(GPU_DEVICE_ID_2);
+        when(existingDevice.getBusAddress()).thenReturn(GPU_BUS_ADDRESS_3);
+        List<GpuDeviceVO> existingDevices = List.of(existingDevice);
+
+        List<VgpuTypesInfo> newDevices = new ArrayList<>();
+
+        when(gpuDeviceDao.listByHostId(HOST_ID)).thenReturn(existingDevices);
+        when(gpuDeviceDao.update(eq(GPU_DEVICE_ID_2), any(GpuDeviceVO.class))).thenReturn(true);
+
+        try (MockedStatic<GlobalLock> ignored = Mockito.mockStatic(GlobalLock.class)) {
+            GlobalLock lock = mock(GlobalLock.class);
+            when(GlobalLock.getInternLock("add-gpu-devices-to-host-" + HOST_ID)).thenReturn(lock);
+            when(lock.lock(30)).thenReturn(true);
+
+            gpuService.addGpuDevicesToHost(mockHost, newDevices);
+            verify(gpuDeviceDao).update(eq(GPU_DEVICE_ID_2), any(GpuDeviceVO.class));
+        }
+    }
+
+    @Test
+    public void testUpdateVgpuProfile_SameName() {
+        UpdateVgpuProfileCmd cmd = mock(UpdateVgpuProfileCmd.class);
+        when(cmd.getId()).thenReturn(VGPU_PROFILE_ID);
+        when(cmd.getProfileName()).thenReturn(VGPU_PROFILE_NAME); // Same as existing
+        when(cmd.getDescription()).thenReturn(UPDATED_PROFILE_DESCRIPTION);
+        when(cmd.getCommandName()).thenReturn(COMMAND_UPDATE_VGPU_PROFILE);
+
+        when(vgpuProfileDao.findById(VGPU_PROFILE_ID)).thenReturn(mockVgpuProfile);
+        when(vgpuProfileDao.update(eq(VGPU_PROFILE_ID), any(VgpuProfileVO.class))).thenReturn(true);
+        when(gpuCardDao.findById(GPU_CARD_ID)).thenReturn(mockGpuCard);
+
+        VgpuProfileResponse result = gpuService.updateVgpuProfile(cmd);
+
+        assertNotNull(result);
+        assertEquals(VGPU_PROFILE_UUID, result.getId());
+        verify(vgpuProfileDao, never()).findByNameAndCardId(anyString(), anyLong());
+    }
+
+    // Tests for the refactored GPU allocation methods
+    @Test
+    public void testGetGpuDevicesToAllocate_OptimalAllocation() {
+        // Create devices in same NUMA node and PCIe root
+        List<GpuDeviceVO> availableDevices = createMockGpuDevices(4, NUMA_NODE_0, PCI_ROOT_1);
+
+        List<GpuDeviceVO> result = gpuService.getGpuDevicesToAllocate(availableDevices, 2);
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+        // Should select first 2 devices (sorted by ID)
+        assertEquals(GPU_DEVICE_ID_LONG.longValue(), result.get(0).getId());
+        assertEquals(GPU_DEVICE_ID_2.longValue(), result.get(1).getId());
+    }
+
+    // Helper methods for creating mock GPU devices
+    private List<GpuDeviceVO> createMockGpuDevices(int count, String numaNode, String pciRoot) {
+        return createMockGpuDevices(count, numaNode, pciRoot, GPU_DEVICE_ID_LONG);
+    }
+
+    private List<GpuDeviceVO> createMockGpuDevices(int count, String numaNode, String pciRoot, long startId) {
+        List<GpuDeviceVO> devices = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            GpuDeviceVO device = mock(GpuDeviceVO.class);
+            Long deviceId = startId + i;
+            when(device.getId()).thenReturn(deviceId);
+            when(device.getNumaNode()).thenReturn(numaNode);
+            when(device.getPciRoot()).thenReturn(pciRoot);
+            // Ensure mock is properly configured
+            devices.add(device);
+        }
+        return devices;
+    }
+
+    @Test
+    public void testGetGpuDevicesToAllocate_SingleNumaAllocation() {
+        // Create devices in same NUMA node but different PCIe roots
+        List<GpuDeviceVO> availableDevices = new ArrayList<>();
+        availableDevices.addAll(createMockGpuDevices(2, NUMA_NODE_0, PCI_ROOT_1, GPU_DEVICE_ID_LONG));
+        availableDevices.addAll(createMockGpuDevices(2, NUMA_NODE_0, PCI_ROOT_2, 3L));
+
+        List<GpuDeviceVO> result = gpuService.getGpuDevicesToAllocate(availableDevices, 3);
+
+        assertNotNull(result);
+        assertEquals(3, result.size());
+        // Should prefer devices from same PCIe root first
+        assertTrue(result.stream().allMatch(device -> NUMA_NODE_0.equals(device.getNumaNode())));
+    }
+
+    @Test
+    public void testGetGpuDevicesToAllocate_DistributedAllocation() {
+        // Create devices across different NUMA nodes
+        List<GpuDeviceVO> availableDevices = new ArrayList<>();
+        availableDevices.addAll(createMockGpuDevices(2, NUMA_NODE_0, PCI_ROOT_1, GPU_DEVICE_ID_LONG));
+        availableDevices.addAll(createMockGpuDevices(2, NUMA_NODE_1, PCI_ROOT_3, 3L));
+
+        List<GpuDeviceVO> result = gpuService.getGpuDevicesToAllocate(availableDevices, 3);
+
+        assertNotNull(result);
+        assertEquals(3, result.size());
+        // Should distribute across NUMA nodes
+        long numa0Count = result.stream().filter(device -> NUMA_NODE_0.equals(device.getNumaNode())).count();
+        long numa1Count = result.stream().filter(device -> NUMA_NODE_1.equals(device.getNumaNode())).count();
+        assertTrue(numa0Count > 0 && numa1Count > 0);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetGpuDevicesToAllocate_InsufficientDevices() {
+        List<GpuDeviceVO> availableDevices = createMockGpuDevices(2, NUMA_NODE_0, PCI_ROOT_1);
+
+        gpuService.getGpuDevicesToAllocate(availableDevices, 5);
+    }
+
+    @Test
+    public void testGetGpuDevicesToAllocate_UnknownNumaAndPci() {
+        // Test with devices having null/blank NUMA nodes and PCIe roots
+        List<GpuDeviceVO> availableDevices = createMockGpuDevicesWithNullValues(3);
+
+        List<GpuDeviceVO> result = gpuService.getGpuDevicesToAllocate(availableDevices, 2);
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+
+    private List<GpuDeviceVO> createMockGpuDevicesWithNullValues(int count) {
+        List<GpuDeviceVO> devices = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            GpuDeviceVO device = mock(GpuDeviceVO.class);
+            when(device.getId()).thenReturn((long) (i + 1));
+            when(device.getNumaNode()).thenReturn(i == 0 ? null : (i == 1 ? "" : NUMA_NODE_0));
+            when(device.getPciRoot()).thenReturn(i == 0 ? null : (i == 1 ? "" : PCI_ROOT_1));
+            devices.add(device);
+        }
+        return devices;
+    }
+
+    @Test
+    public void testGetGpuDevicesToAllocate_SimpleDebug() {
+        // Simple test with minimal setup
+        GpuDeviceVO device1 = mock(GpuDeviceVO.class);
+        when(device1.getId()).thenReturn(GPU_DEVICE_ID_LONG);
+        when(device1.getNumaNode()).thenReturn(NUMA_NODE_0);
+        when(device1.getPciRoot()).thenReturn(PCI_ROOT_1);
+
+        GpuDeviceVO device2 = mock(GpuDeviceVO.class);
+        when(device2.getId()).thenReturn(GPU_DEVICE_ID_2);
+        when(device2.getNumaNode()).thenReturn(NUMA_NODE_0);
+        when(device2.getPciRoot()).thenReturn(PCI_ROOT_1);
+
+        List<GpuDeviceVO> availableDevices = Arrays.asList(device1, device2);
+
+        List<GpuDeviceVO> result = gpuService.getGpuDevicesToAllocate(availableDevices, 1);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals(GPU_DEVICE_ID_LONG.longValue(), result.get(0).getId());
+    }
+
+    // Tests for checkAndUpdateParentGpuDeviceState methods
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_NullParentId() {
+        // Should not throw exception and not call any DAO methods
+        gpuService.checkAndUpdateParentGpuDeviceState((Long) null);
+
+        verify(gpuDeviceDao, never()).findById(any());
+        verify(gpuDeviceDao, never()).listByParentGpuDeviceId(any());
+        verify(gpuDeviceDao, never()).update(anyLong(), any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_ValidParentId() {
+        Long parentDeviceId = PARENT_GPU_DEVICE_ID;
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(parentDeviceId);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        when(gpuDeviceDao.findById(parentDeviceId)).thenReturn(parentDevice);
+        when(gpuDeviceDao.listByParentGpuDeviceId(parentDeviceId)).thenReturn(new ArrayList<>());
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDeviceId);
+
+        verify(gpuDeviceDao).findById(parentDeviceId);
+        verify(gpuDeviceDao).listByParentGpuDeviceId(parentDeviceId);
+        // Should not update since no child devices and already Free
+        verify(gpuDeviceDao, never()).update(eq(parentDeviceId), any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_NullParentDevice() {
+        // Should not throw exception and not call any DAO methods
+        gpuService.checkAndUpdateParentGpuDeviceState((GpuDeviceVO) null);
+
+        verify(gpuDeviceDao, never()).listByParentGpuDeviceId(any());
+        verify(gpuDeviceDao, never()).update(anyLong(), any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_NoChildDevices() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.PartiallyAllocated);
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(new ArrayList<>());
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.Free);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_AllFreeChildDevices() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.PartiallyAllocated);
+
+        // Create child devices all in Free state
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+        for (int i = 0; i < 3; i++) {
+            GpuDeviceVO child = mock(GpuDeviceVO.class);
+            when(child.getState()).thenReturn(GpuDevice.State.Free);
+            childDevices.add(child);
+        }
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.Free);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_SomeAllocatedChildDevices() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        // Create child devices with mixed states - some Free, some Allocated
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+
+        GpuDeviceVO child1 = mock(GpuDeviceVO.class);
+        when(child1.getState()).thenReturn(GpuDevice.State.Free);
+        childDevices.add(child1);
+
+        GpuDeviceVO child2 = mock(GpuDeviceVO.class);
+        when(child2.getState()).thenReturn(GpuDevice.State.Allocated);
+        childDevices.add(child2);
+
+        GpuDeviceVO child3 = mock(GpuDeviceVO.class);
+        when(child3.getState()).thenReturn(GpuDevice.State.Free);
+        childDevices.add(child3);
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.PartiallyAllocated);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_ErrorChildDevices() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        // Create child devices with mixed states - Error should take priority
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+
+        GpuDeviceVO child1 = mock(GpuDeviceVO.class);
+        when(child1.getState()).thenReturn(GpuDevice.State.Free);
+        childDevices.add(child1);
+
+        GpuDeviceVO child2 = mock(GpuDeviceVO.class);
+        when(child2.getState()).thenReturn(GpuDevice.State.Allocated);
+        childDevices.add(child2);
+
+        GpuDeviceVO child3 = mock(GpuDeviceVO.class);
+        when(child3.getState()).thenReturn(GpuDevice.State.Error);
+        childDevices.add(child3);
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.Error);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_AllAllocatedChildDevices() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        // Create child devices all in Allocated state
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            GpuDeviceVO child = mock(GpuDeviceVO.class);
+            when(child.getState()).thenReturn(GpuDevice.State.Allocated);
+            childDevices.add(child);
+        }
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.PartiallyAllocated);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_NoStateChange() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        // Create child devices all in Free state - should not change parent state
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            GpuDeviceVO child = mock(GpuDeviceVO.class);
+            when(child.getState()).thenReturn(GpuDevice.State.Free);
+            childDevices.add(child);
+        }
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice, never()).setState(any());
+        verify(gpuDeviceDao, never()).update(anyLong(), any(GpuDeviceVO.class));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_MultipleErrorStates() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.PartiallyAllocated);
+
+        // Create child devices with multiple Error states
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+
+        GpuDeviceVO child1 = mock(GpuDeviceVO.class);
+        when(child1.getState()).thenReturn(GpuDevice.State.Error);
+        childDevices.add(child1);
+
+        GpuDeviceVO child2 = mock(GpuDeviceVO.class);
+        childDevices.add(child2);
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.Error);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+
+    @Test
+    public void testCheckAndUpdateParentGpuDeviceState_ErrorTakesPriority() {
+        GpuDeviceVO parentDevice = mock(GpuDeviceVO.class);
+        when(parentDevice.getId()).thenReturn(PARENT_GPU_DEVICE_ID);
+        when(parentDevice.getState()).thenReturn(GpuDevice.State.Free);
+
+        // Create child devices - should break on first Error state found
+        List<GpuDeviceVO> childDevices = new ArrayList<>();
+
+        GpuDeviceVO child1 = mock(GpuDeviceVO.class);
+        when(child1.getState()).thenReturn(GpuDevice.State.Allocated);
+        childDevices.add(child1);
+
+        GpuDeviceVO child2 = mock(GpuDeviceVO.class);
+        when(child2.getState()).thenReturn(GpuDevice.State.Error);
+        childDevices.add(child2);
+
+        // This child should not affect the final state since Error was found first
+        GpuDeviceVO child3 = mock(GpuDeviceVO.class);
+        childDevices.add(child3);
+
+        when(gpuDeviceDao.listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID)).thenReturn(childDevices);
+        when(gpuDeviceDao.update(eq(PARENT_GPU_DEVICE_ID), any(GpuDeviceVO.class))).thenReturn(true);
+
+        gpuService.checkAndUpdateParentGpuDeviceState(parentDevice);
+
+        verify(gpuDeviceDao).listByParentGpuDeviceId(PARENT_GPU_DEVICE_ID);
+        verify(parentDevice).setState(GpuDevice.State.Error);
+        verify(gpuDeviceDao).update(eq(PARENT_GPU_DEVICE_ID), eq(parentDevice));
+    }
+}
diff --git a/setup/db/create-schema-simulator.sql b/setup/db/create-schema-simulator.sql
index 6cb6786311a..a723ab119ab 100644
--- a/setup/db/create-schema-simulator.sql
+++ b/setup/db/create-schema-simulator.sql
@@ -22,6 +22,7 @@ DROP TABLE IF EXISTS `simulator`.`mockstoragepool`;
 DROP TABLE IF EXISTS `simulator`.`mockvm`;
 DROP TABLE IF EXISTS `simulator`.`mockvolume`;
 DROP TABLE IF EXISTS `simulator`.`mocksecurityrules`;
+DROP TABLE IF EXISTS `simulator`.`mockgpudevice`;
 
 CREATE TABLE  `simulator`.`mockhost` (
   `id` bigint unsigned NOT NULL auto_increment,
@@ -127,3 +128,30 @@ CREATE TABLE `simulator`.`mocksecurityrules` (
   INDEX `i_mocksecurityrules__vmid`(`vmid`),
   INDEX `i_mocksecurityrules__hostid`(`hostid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+-- Mock GPU Devices for Simulator
+CREATE TABLE IF NOT EXISTS `simulator`.`mockgpudevice` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `bus_address` varchar(64) NOT NULL,
+  `vendor_id` varchar(32) NOT NULL,
+  `device_id` varchar(32) NOT NULL,
+  `numa_node` int unsigned NOT NULL,
+  `pci_root` varchar(64) NOT NULL,
+  `vendor_name` varchar(128) NOT NULL,
+  `device_name` varchar(128) NOT NULL,
+  `host_id` bigint unsigned DEFAULT NULL,
+  `vm_id` bigint unsigned DEFAULT NULL,
+  `max_vgpu_per_pgpu` bigint unsigned NOT NULL DEFAULT 1,
+  `video_ram` bigint unsigned NOT NULL DEFAULT 0,
+  `max_resolution_x` bigint unsigned NOT NULL DEFAULT 0,
+  `max_resolution_y` bigint unsigned NOT NULL DEFAULT 0,
+  `max_heads` bigint unsigned NOT NULL DEFAULT 0,
+  `state` varchar(32) DEFAULT 'Available',
+  `device_type` varchar(32) DEFAULT 'PCI',
+  `parent_device_id` bigint unsigned DEFAULT NULL,
+  `profile_name` varchar(128) DEFAULT NULL,
+  `passthrough_enabled` tinyint(1) DEFAULT 1,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_mockgpudevice__bus_address` (`bus_address`, `host_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
index 2808a3ce06e..d7994e3fe8d 100644
--- a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
+++ b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
@@ -24,7 +24,7 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 
 # base - contains all resources as entities and defines create, delete,
 # list operations on them
-from marvin.lib.base import Account, VirtualMachine, ServiceOffering, NetworkOffering, Network, Template
+from marvin.lib.base import Account, Host, Capacities, VirtualMachine, ServiceOffering, NetworkOffering, Network, Template, GpuDevice
 
 # utils - utility classes for common cleanup, external library wrappers etc
 from marvin.lib.utils import cleanup_resources, get_hypervisor_type, validateList
@@ -44,33 +44,34 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
     Test deploy a vGPU enabled VM into a user account
     """
     @classmethod
-    def setUpClass(self):
-        testClient = super(TestDeployvGPUenabledVM, self).getClsTestClient()
-        self.apiclient = testClient.getApiClient()
-        self.testdata = self.testClient.getParsedTestDataConfig()
-        self.hostConfig = self.config.__dict__["zones"][0].__dict__["pods"][0].__dict__["clusters"][0].__dict__["hosts"][0].__dict__
-        self._cleanup = []
-        self.unsupportedHypervisor = False
-        self.noSuitableHost = False
-        # Need to add check whether zone containing the xen hypervisor or not
-        # as well
+    def setUpClass(cls):
+        testClient = super(TestDeployvGPUenabledVM, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.testdata = cls.testClient.getParsedTestDataConfig()
+        cls.hostConfig = cls.config.__dict__["zones"][0].__dict__["pods"][0].__dict__["clusters"][0].__dict__["hosts"][0].__dict__
+        cls._cleanup = []
+        cls.unsupportedHypervisor = False
+        cls.noSuitableHost = False
+        cls.hypervisor = testClient.getHypervisorInfo()
+
+        if cls.hypervisor.lower() not in ["xenserver", "vmware", "kvm", "simulator"]:
+            cls.unsupportedHypervisor = True
+            cls.skipTest("Skipping test because suitable hypervisor/host not present")
         hosts = list_hosts(
-            self.apiclient,
-            hypervisor="XenServer"
+            cls.apiclient
         )
         if hosts is None:
-             # GPU feature is supported only on XenServer.Check listhosts response
-             self.unsupportedHypervisor = True
+             cls.unsupportedHypervisor = True
              return
-        else:
-            gpuhosts = 0
+        gpuhosts = 0
+        if cls.hypervisor.lower() in ["xenserver"]:
             for ghost in hosts:
-                if ghost.hypervisorversion >= "6.2.0":
+                if ghost and ghost.hypervisorversion >= "6.2.0":
                     sshClient = SshClient(
                         host=ghost.ipaddress,
-                        port=self.testdata['configurableData']['host']["publicport"],
-                        user=self.hostConfig['username'],
-                        passwd=self.hostConfig['password'])
+                        port=cls.testdata['configurableData']['host']["publicport"],
+                        user=cls.hostConfig['username'],
+                        passwd=cls.hostConfig['password'])
                     if ghost.hypervisorversion == "6.2.0":
                         res = sshClient.execute(
                             "xe patch-list uuid=0850b186-4d47-11e3-a720-001b2151a503")
@@ -82,9 +83,25 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
                         gpuhosts = gpuhosts + 1
                     else:
                         continue
+        elif cls.hypervisor.lower() == "kvm" or cls.hypervisor.lower() == "simulator":
+            # Check if the host has a GPU
+            for host in hosts:
+                h = Host(host.__dict__)
+                h.discoverGpuDevices(cls.apiclient)
+
+            hosts = list_hosts(
+                cls.apiclient
+            )
+            for host in hosts:
+                if host.gputotal != None and host.gputotal > 0:
+                    gpuhosts = gpuhosts + 1
+        elif cls.hypervisor.lower() in ["vmware"]:
+            #
+            cls.noSuitableHost = True
+
         if gpuhosts == 0:
             # No XenServer available with GPU Drivers installed
-            self.noSuitableHost = True
+            cls.noSuitableHost = True
             return
 
     def setUp(self):
@@ -92,11 +109,10 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
         if self.noSuitableHost or self.unsupportedHypervisor:
-            self.hypervisor = get_hypervisor_type(self.apiclient)
-            if self.hypervisor.lower() not in ["vmware"]:
-	            self.skipTest("Skipping test because suitable hypervisor/host not\
-        	            present")
-            self.testdata = self.testClient.getParsedTestDataConfig()
+            self.skipTest("Skipping test because suitable hypervisor/host not\
+                    present")
+        self.hypervisor = get_hypervisor_type(self.apiclient)
+        self.testdata = self.testClient.getParsedTestDataConfig()
 
         self.cleanup = []
 
@@ -110,6 +126,8 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
             domainid=self.domain.id
         )
 
+        self.gpu_capacity_total, self.gpu_capacity_used = self.get_gpu_capacity()
+
         if self.hypervisor.lower() in ["xenserver"]:
 
             # Before running this test for Xen Server, register a windows template with ostype as
@@ -123,39 +141,39 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
             self.testdata["mode"] = self.zone.networktype
 
             if self.template == FAILED:
-        	    assert False, "get_template() failed to return template with description %s" % self.testdata[
-                	"ostype"]
+                assert False, "get_template() failed to return template with description %s" % self.testdata[
+                    "ostype"]
 
             self.testdata["small"]["zoneid"] = self.zone.id
             self.testdata["small"]["template"] = self.template.id
 
             self.testdata["service_offerings"]["vgpu260qwin"]["serviceofferingdetails"] = [
-        	    {
-                	'pciDevice': 'Group of NVIDIA Corporation GK107GL [GRID K1] GPUs'}, {
-	                'vgpuType': 'GRID K120Q'}]
-        	# create a service offering
+                {
+                    'pciDevice': 'Group of NVIDIA Corporation GK107GL [GRID K1] GPUs'}, {
+                    'vgpuType': 'GRID K120Q'}]
+            # create a service offering
             self.service_offering = ServiceOffering.create(
-        	    self.apiclient,
-	            self.testdata["service_offerings"]["vgpu260qwin"],
-        	)
+                self.apiclient,
+                self.testdata["service_offerings"]["vgpu260qwin"],
+            )
             self.cleanup.append(self.service_offering)
 
         elif self.hypervisor.lower() in ["vmware"]:
             self.testdata["isolated_network"]["zoneid"] = self.zone.id
 
             self.userapiclient = self.testClient.getUserApiClient(
-         		UserName=self.account.name,
-		        DomainName=self.account.domain
-	        )
+                 UserName=self.account.name,
+                DomainName=self.account.domain
+            )
             self.service_offering = ServiceOffering.create(
-	            self.apiclient,
-        	    self.testdata["service_offering"])
+                self.apiclient,
+                self.testdata["service_offering"])
 
             # Create Shared Network Offering
             self.isolated_network_offering = NetworkOffering.create(
-	            self.apiclient,
-        	    self.testdata["isolated_network_offering"])
-        	# Enable Isolated Network offering
+                self.apiclient,
+                self.testdata["isolated_network_offering"])
+            # Enable Isolated Network offering
             self.isolated_network_offering.update(self.apiclient, state='Enabled')
 
             # Register a private template in the account with nic adapter vmxnet3
@@ -169,9 +187,51 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
                 details=[{"mks.enable3d" : "true", "mks.use3dRenderer" : "automatic",
                      "svga.autodetect" : "false", "svga.vramSize" : "131072"}]
             )
+        elif self.hypervisor.lower() in ["kvm", "simulator"]:
+            self.template = get_template(
+                self.apiclient,
+                self.zone.id,
+                self.testdata["ostype"])
+            self.cleanup.append(self.template)
+
+            # 1. Fetch available vgpu profile IDs from gpu devices on hosts
+            # 2. Create a service offering with vgpu profile ID
+            vgpu_profile_id_count_map = {}
+            vgpu_profile_id_device_map = {}
+            devices = GpuDevice.list(self.apiclient)
+            for device in devices:
+                if (device.state.lower() == "free" and device.managedstate.lower() == "managed" and device.gpudevicetype.lower() != "vgpuonly"):
+                    vgpu_profile_id_count_map[device.vgpuprofileid] = vgpu_profile_id_count_map.get(device.vgpuprofileid, 0) + 1
+                    vgpu_profile_id_device_map[device.vgpuprofileid] = device
+            if len(vgpu_profile_id_count_map) == 0:
+                self.skipTest("No GPU devices found on the host with state 'Free' and managed state 'Managed'")
+            else:
+                self.vgpu_profile_id = max(vgpu_profile_id_count_map, key=vgpu_profile_id_count_map.get)
+                self.vgpu_profile_name = vgpu_profile_id_device_map[self.vgpu_profile_id].vgpuprofilename
+                self.gpu_card_id = vgpu_profile_id_device_map[self.vgpu_profile_id].gpucardid
+                self.gpu_card_name = vgpu_profile_id_device_map[self.vgpu_profile_id].gpucardname
+                self.testdata["service_offering"]["vgpuprofileid"] = self.vgpu_profile_id
+                self.testdata["service_offering"]["gpucount"] = 1
+
+            self.service_offering = ServiceOffering.create(
+                self.apiclient,
+                self.testdata["service_offering"])
+            self.cleanup.append(self.service_offering)
+        else:
+            self.skipTest("Skipping test because suitable hypervisor/host not\
+                    present")
 
 
-    @attr(tags=['advanced', 'basic', 'vgpu'], required_hardware="true")
+    def get_gpu_capacity(self):
+        """Get GPU capacity for the host
+        """
+        capacities = Capacities.list(self.apiclient, fetchlatest=True)
+        for c in capacities:
+            if c.name == "GPU":
+                return c.capacitytotal, c.capacityused
+        return 0, 0
+
+    @attr(tags=['advanced', 'basic', 'vgpu'])
     def test_deploy_vgpu_enabled_vm(self):
         """Test Deploy Virtual Machine
 
@@ -180,18 +240,20 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
         # 2. Virtual Machine is vGPU enabled (via SSH)
         # 3. listVirtualMachines returns accurate information
         """
-        if self.hypervisor.lower() not in ["xenserver"]:
+        if self.hypervisor.lower() not in ["xenserver", "kvm", "simulator"]:
             self.cleanup.append(self.account)
             self.skipTest("This test case is written specifically\
-                    for XenServer hypervisor")
+                    for XenServer, KVM & Simulator hypervisor")
 
         self.virtual_machine = VirtualMachine.create(
             self.apiclient,
-            self.testdata["small"],
+            self.testdata["virtual_machine"],
+            hypervisor=self.hypervisor,
             accountid=self.account.name,
             domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
-            mode=self.testdata['mode']
+            templateid=self.template.id,
+            zoneid=self.zone.id
         )
         self.cleanup.append(self.virtual_machine)
 
@@ -199,10 +261,7 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
             self.apiclient,
             id=self.virtual_machine.id)
 
-        self.debug(
-            "Verify listVirtualMachines response for virtual machine: %s"
-            % self.virtual_machine.id
-        )
+        self.debug("Verify listVirtualMachines response for virtual machine: %s" % self.virtual_machine.id)
 
         self.assertEqual(
             isinstance(list_vms, list),
@@ -231,31 +290,53 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
             "Running",
             msg="VM is not in Running state"
         )
-        hosts = list_hosts(
-            self.apiclient,
-            id=vm.hostid
-        )
-        hostip = hosts[0].ipaddress
-        try:
-            sshClient = SshClient(
-                host=hostip,
-                port=self.testdata['configurableData']['host']["publicport"],
-                user=self.testdata['configurableData']['host']["username"],
-                passwd=self.testdata['configurableData']['host']["password"])
-            res = sshClient.execute(
-                "xe vgpu-list vm-name-label=%s params=type-uuid %s" %
-                (vm.instancename))
-            self.debug("SSH result: %s" % res)
-        except Exception as e:
-            self.fail("SSH Access failed for %s: %s" %
-                      (hostip, e)
-                      )
-        result = str(res)
+
+        # Check capacity changes
+        total, used = self.get_gpu_capacity()
+
         self.assertEqual(
-            result.count("type-uuid"),
-            1,
-            "VM is vGPU enabled."
+            total,
+            self.gpu_capacity_total,
+            "Total GPU capacity did not change after VM deployment"
         )
+        self.assertEqual(
+            used,
+            self.gpu_capacity_used + 1,
+            "Used GPU capacity did not change by 1 after VM deployment"
+        )
+
+        if self.hypervisor.lower() in ["xenserver"]:
+            hosts = list_hosts(
+                self.apiclient,
+                id=vm.hostid
+            )
+            hostip = hosts[0].ipaddress
+            try:
+                sshClient = SshClient(
+                    host=hostip,
+                    port=self.testdata['configurableData']['host']["publicport"],
+                    user=self.testdata['configurableData']['host']["username"],
+                    passwd=self.testdata['configurableData']['host']["password"])
+                res = sshClient.execute(
+                    "xe vgpu-list vm-name-label=%s params=type-uuid %s" %
+                    (vm.instancename))
+                self.debug("SSH result: %s" % res)
+            except Exception as e:
+                self.fail("SSH Access failed for %s: %s" %
+                        (hostip, e)
+                        )
+            result = str(res)
+            self.assertEqual(
+                result.count("type-uuid"),
+                1,
+                "VM is vGPU enabled."
+            )
+        elif self.hypervisor.lower() in ["kvm", "simulator"]:
+            self.assertEqual(self.virtual_machine.vgpuprofileid, self.vgpu_profile_id, "VM is vGPU enabled.")
+            self.assertEqual(self.virtual_machine.gpucount, 1, "VM is vGPU enabled.")
+            self.assertEqual(self.virtual_machine.gpucardid, self.gpu_card_id, "VM is vGPU enabled.")
+            self.assertEqual(self.virtual_machine.gpucardname, self.gpu_card_name, "VM is vGPU enabled.")
+            self.assertEqual(self.virtual_machine.vgpuprofilename, self.vgpu_profile_name, "VM is vGPU enabled.")
         self.cleanup.append(self.account)
 
     def tearDown(self):
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index d34d5480efc..bcaaca2e39a 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -266,6 +266,8 @@ known_categories = {
     'createGuiTheme': 'GUI Theme',
     'updateGuiTheme': 'GUI Theme',
     'removeGuiTheme': 'GUI Theme',
+    'Gpu': 'GPU',
+    'Vgpu': 'GPU',
     'Extension' : 'Extension',
     'Extensions' : 'Extension',
     'CustomAction' : 'Extension',
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 97bfe43896a..0c9843f4399 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -2714,6 +2714,13 @@ class ServiceOffering:
         if "diskofferingid" in services:
             cmd.diskofferingid = services["diskofferingid"]
 
+        if "vgpuprofileid" in services:
+            cmd.vgpuprofileid = services["vgpuprofileid"]
+            cmd.gpucount = 1
+
+        if "gpucount" in services:
+            cmd.gpucount = services["gpucount"]
+
         # Service Offering private to that domain
         if domainid:
             cmd.domainid = domainid
@@ -3334,6 +3341,14 @@ class Host:
         apiclient.deleteHost(cmd)
         return
 
+    def discoverGpuDevices(self, apiclient):
+        """Discover GPU devices on the host"""
+        # Host must be in maintenance mode before deletion
+        cmd = discoverGpuDevices.discoverGpuDevicesCmd()
+        cmd.id = self.id
+        apiclient.discoverGpuDevices(cmd)
+        return
+
     @classmethod
     def enableMaintenance(cls, apiclient, id):
         """enables maintenance mode Host"""
@@ -7831,3 +7846,83 @@ class SharedFS:
         cmd.diskofferingid = diskofferingid
         cmd.size = size
         return (apiclient.changeSharedFileSystemDiskOffering(cmd))
+
+class GpuDevice:
+
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+    """Manage GPU Device"""
+    @classmethod
+    def create(cls, apiclient, services, name, description=None, hostid=None, busaddress=None, gpuCardId=None, vgpuProfileId=None, type=None, parentGpuDeviceId=None, numaNode=None, pciRoot=None):
+        """Create GPU Device"""
+        cmd = createGpuDevice.createGpuDeviceCmd()
+        cmd.name = name
+
+        if description:
+            cmd.description = description
+
+
+        if hostid:
+            cmd.hostid = hostid
+        elif "hostid" in services:
+            cmd.hostid = services["hostid"]
+
+        if busaddress:
+            cmd.busaddress = busaddress
+        elif "busaddress" in services:
+            cmd.busaddress = services["busaddress"]
+
+        if gpuCardId:
+            cmd.gpuCardId = gpuCardId
+        elif "gpuCardId" in services:
+            cmd.gpuCardId = services["gpuCardId"]
+
+        if vgpuProfileId:
+            cmd.vgpuProfileId = vgpuProfileId
+        elif "vgpuProfileId" in services:
+            cmd.vgpuProfileId = services["vgpuProfileId"]
+
+        if type:
+            cmd.type = type
+        elif "type" in services:
+            cmd.type = services["type"]
+
+        if parentGpuDeviceId:
+            cmd.parentGpuDeviceId = parentGpuDeviceId
+        elif "parentGpuDeviceId" in services:
+            cmd.parentGpuDeviceId = services["parentGpuDeviceId"]
+
+        if numaNode:
+            cmd.numaNode = numaNode
+        elif "numaNode" in services:
+            cmd.numaNode = services["numaNode"]
+
+        if pciRoot:
+            cmd.pciRoot = pciRoot
+        elif "pciRoot" in services:
+            cmd.pciRoot = services["pciRoot"]
+
+        return GpuDevice(apiclient.createGpuDevice(cmd).__dict__)
+
+    def delete(self, apiclient, expunge=True, forced=True):
+        """Delete GPU Device"""
+        cmd = deleteGpuDevice.deleteGpuDeviceCmd()
+        cmd.id = self.id
+        cmd.expunge = expunge
+        cmd.forced = forced
+        apiclient.deleteGpuDevice(cmd)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
+        cmd = listGpuDevices.listGpuDevicesCmd()
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return (apiclient.listGpuDevices(cmd))
+
+    def update(self, apiclient, **kwargs):
+        """Update GPU Device"""
+        cmd = updateGpuDevice.updateGpuDeviceCmd()
+        cmd.id = self.id
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return (apiclient.updateGpuDevice(cmd))
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 4ec03d375a3..e644acb4e07 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -89,6 +89,7 @@
 "label.action.delete.egress.firewall": "Delete egress firewall rule",
 "label.action.delete.firewall": "Delete firewall rule",
 "label.action.delete.interface.static.route": "Remove Tungsten Fabric interface static route",
+"label.action.delete.gpu.card": "Delete GPU card",
 "label.action.delete.guest.os": "Delete guest OS",
 "label.action.delete.guest.os.category": "Delete guest OS category",
 "label.action.delete.guest.os.hypervisor.mapping": "Delete guest OS hypervisor mapping",
@@ -110,6 +111,7 @@
 "label.action.delete.template": "Delete Template",
 "label.action.delete.tungsten.router.table": "Remove Tungsten Fabric route table from Network",
 "label.action.delete.user": "Delete User",
+"label.action.delete.vgpu.profile": "Delete vGPU profile",
 "label.action.delete.volume": "Delete volume",
 "label.action.delete.zone": "Delete zone",
 "label.action.destroy.instance": "Destroy Instance",
@@ -268,6 +270,8 @@
 "label.add.f5.device": "Add F5 device",
 "label.add.firewall": "Add firewall rule",
 "label.add.firewallrule": "Add Firewall Rule",
+"label.add.gpu.card": "Add GPU card",
+"label.add.gpu.device": "Add GPU device",
 "label.add.guest.network": "Add guest Network",
 "label.add.guest.os": "Add guest OS",
 "label.add.guest.os.category": "Add guest OS category",
@@ -339,6 +343,7 @@
 "label.add.user": "Add User",
 "label.add.upstream.ipv4.routes": "Add upstream IPv4 routes",
 "label.add.upstream.ipv6.routes": "Add upstream IPv6 routes",
+"label.add.vgpu.profile": "Add profile",
 "label.add.vm": "Add Instance",
 "label.add.vms": "Add Instances",
 "label.add.vmware.datacenter": "Add VMware datacenter",
@@ -538,6 +543,7 @@
 "label.cks.cluster.worker.nodes.templateid": "Template for Worker Nodes",
 "label.cleanup": "Clean up",
 "label.clear": "Clear",
+"label.clear.all": "Clear all",
 "label.clear.list": "Clear list",
 "label.clear.notification": "Clear notification",
 "label.clientid": "Provider Client ID",
@@ -625,6 +631,7 @@
 "label.copy.password": "Copy password",
 "label.core": "Core",
 "label.core.zone.type": "Core zone type",
+"label.count": "Count",
 "label.counter": "Counter",
 "label.counter.name": "Name of the counter for which the policy will be evaluated",
 "label.cpu": "CPU",
@@ -829,6 +836,7 @@
 "label.desttaguuid": "Destination Tag",
 "label.details": "Details",
 "label.deviceid": "Device ID",
+"label.devicename": "Device Name",
 "label.devices": "Devices",
 "label.dhcp": "DHCP",
 "label.direct.attached.public.ip": "Direct attached public IP",
@@ -847,6 +855,7 @@
 "label.disable.webhook": "Disable Webhook",
 "label.disabled": "Disabled",
 "label.disconnected": "Last disconnected",
+"label.discover.gpu.devices": "Discover GPU devices",
 "label.disk": "Disk",
 "label.disk.offerings": "Disk offerings",
 "label.disk.path": "Disk Path",
@@ -1090,6 +1099,26 @@
 "label.glustervolume": "Volume",
 "label.go.back": "Go back",
 "label.gpu": "GPU",
+"label.gpucardid": "GPU Card",
+"label.gpucardname": "GPU Card",
+"label.gpu.card": "GPU Card",
+"label.gpu.card.types": "GPU Card Types",
+"label.gpu.count": "GPU Count",
+"label.gpucount": "GPU Count",
+"label.gpu.device": "GPU Device",
+"label.gpu.devices": "GPU Devices",
+"label.gpu.enabled": "GPU Enabled",
+"label.gpuenabled": "GPU Enabled",
+"label.gpudevicetype": "Device Type",
+"label.gpu.devices.add": "Add GPU Device",
+"label.gpu.devices.delete": "Delete GPU Device",
+"label.gpu.devices.manage": "Manage GPU Device",
+"label.gpu.devices.unmanage": "Unmanage GPU Device",
+"label.gpu.display": "GPU Display",
+"label.gpulimit": "GPU limits",
+"label.gpu.summary": "Summary",
+"label.gputotal": "GPU Total",
+"label.gpuused": "GPU Used",
 "label.chart.info": "Information about the charts",
 "label.group": "Group",
 "label.group.optional": "Group (Optional)",
@@ -1472,7 +1501,9 @@
 "label.maxcpunumber": "Max CPU cores",
 "label.maxdatavolumeslimit": "Max data volumes limit",
 "label.maxerrorretry": "Max error retry",
+"label.maxgpu": "Max. GPUs",
 "label.maxguestslimit": "Max guest limit",
+"label.maxheads": "Max. heads",
 "label.maxhostspercluster": "Max hosts per cluster",
 "label.maximum": "Maximum",
 "label.maxinstance": "Max Instances",
@@ -1484,12 +1515,15 @@
 "label.maxprimarystorage": "Max. primary storage (GiB)",
 "label.maxproject": "Max. projects",
 "label.maxpublicip": "Max. public IPs",
+"label.maxresolutionx": "Max. resolution X",
+"label.maxresolutiony": "Max. resolution Y",
 "label.maxsecondarystorage": "Max. secondary storage (GiB)",
 "label.maxsize": "Maximum size",
 "label.maxsnapshot": "Max. Snapshots",
 "label.maxtemplate": "Max. Templates",
 "label.maxuservm": "Max. User Instances",
 "label.maxvolume": "Max. volumes",
+"label.maxvgpuperphysicalgpu": "Max. vGPUs per physical GPU",
 "label.maxvpc": "Max. VPCs",
 "label.may.continue": "You may now continue.",
 "label.mb.memory": "MB memory",
@@ -1673,6 +1707,7 @@
 "label.nsx.supports.internal.lb": "Enable NSX internal LB service",
 "label.nsx.supports.lb": "Enable NSX LB service",
 "label.num.cpu.cores": "# of CPU cores",
+"label.numanode": "NUMA node",
 "label.number": "#Rule",
 "label.numretries": "Number of retries",
 "label.nvpdeviceid": "ID",
@@ -1759,6 +1794,7 @@
 "label.param.name": "Parameter name",
 "label.param.value": "Parameter value",
 "label.parentdomainname": "Parent domain",
+"label.parentgpudeviceid": "Parent GPU device",
 "label.parentname": "Parent",
 "label.parentsubnet": "Parent Subnet",
 "label.passive": "Passive",
@@ -2033,6 +2069,7 @@
 "label.reset.userdata.on.autoscale.vm.group": "Reset Userdata on AutoScale VM Group",
 "label.reset.userdata.on.vm": "Reset Userdata on Instance",
 "label.reset.vpn.connection": "Reset VPN connection",
+"label.resolution": "Resolution",
 "label.resource": "Resource",
 "label.resource.limit.exceeded": "Resource limit exceeded",
 "label.resource.name": "Resource name",
@@ -2141,6 +2178,8 @@
 "label.see.more.info.shown.charts": "See more info about the shown charts",
 "label.select-view": "Select view",
 "label.select.a.zone": "Select a zone",
+"label.select.all": "Select all",
+"label.select.columns": "Select columns",
 "label.select.deployment.infrastructure": "Select deployment infrastructure",
 "label.select.guest.os.type": "Please select the guest OS type",
 "label.select.network": "Select Network",
@@ -2198,6 +2237,7 @@
 "label.sharedrouteripv6": "IPv6 address for the VR in this shared Network.",
 "label.sharewith": "Share with",
 "label.showing": "Showing",
+"label.show.only.gpu.enabled.offerings": "Show only GPU enabled offerings",
 "label.show.usage.records": "Show usage records",
 "label.showing.results.for": "Showing results for \"%x\"",
 "label.shrinkok": "Shrink OK",
@@ -2504,6 +2544,8 @@
 "label.update.autoscale.vmgroup": "Update AutoScaling Group",
 "label.update.bgp.peer": "Update BGP peer",
 "label.update.condition": "Update condition",
+"label.update.gpu.device": "Update GPU device",
+"label.update.vgpu.profile": "Update vGPU profile",
 "label.update.custom.action": "Update Custom Action",
 "label.update.extension": "Update Extension",
 "label.update.sharedfs": "Update Shared FileSystem",
@@ -2583,11 +2625,18 @@
 "label.vcenterpassword": "vCenter password",
 "label.vcenterusername": "vCenter username",
 "label.vcsdeviceid": "ID",
+"label.vendorid": "Vendor ID",
+"label.vendorname": "Vendor Name",
 "label.verify": "Verify",
 "label.version": "Version",
 "label.versions": "Versions",
-"label.vgpu": "VGPU",
+"label.vgpu": "Profile",
+"label.vgpuprofileid": "Profile",
+"label.vgpuprofileids": "Profile",
+"label.vgpuprofilename": "Profile",
+"label.vgpu.profile": "GPU Profile",
 "label.vgputype": "vGPU type",
+"label.videoram": "Video RAM",
 "label.view": "View",
 "label.view.all": "View all",
 "label.view.console": "View console",
@@ -2704,6 +2753,7 @@
 "label.vpn.users": "VPN Users",
 "label.vpncustomergateway": "IP address of the remote gateway",
 "label.vpncustomergatewayid": "VPN customer gateway",
+"label.vramsize": "VRAM Size",
 "label.vsmipaddress": "Nexus 1000v IP address",
 "label.vsmpassword": "Nexus 1000v password",
 "label.vsmusername": "Nexus 1000v username",
@@ -2751,6 +2801,7 @@
 "label.zones": "Zones",
 "label.zonewizard.traffictype.storage": "Storage: Traffic between primary and secondary storage servers, such as Instance Templates and Snapshots.",
 "label.buckets": "Buckets",
+"label.busaddress": "Address",
 "label.objectstorageid": "Object Storage Pool",
 "label.oobm.address": "Out-of-band management address",
 "label.oobm.driver": "Out-of-band management driver",
@@ -2796,6 +2847,7 @@
 "message.action.delete.external.load.balancer": "Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.",
 "message.action.delete.ingress.rule": "Please confirm that you want to delete this ingress rule.",
 "message.action.delete.ipv4.subnet": "Please confirm that you want to delete this IPv4 subnet.",
+"message.action.delete.gpu.card": "Please confirm that you want to delete this GPU card.",
 "message.action.delete.guest.os": "Please confirm that you want to delete this guest os. System defined entry cannot be deleted.",
 "message.action.delete.guest.os.category": "Please confirm that you want to delete this guest os category.",
 "message.action.delete.guest.os.hypervisor.mapping": "Please confirm that you want to delete this guest os hypervisor mapping. System defined entry cannot be deleted.",
@@ -2814,6 +2866,7 @@
 "message.action.delete.snapshot": "Please confirm that you want to delete this Snapshot.",
 "message.action.delete.template": "Please confirm that you want to delete this Template.",
 "message.action.delete.tungsten.router.table": "Please confirm that you want to remove Route Table from this Network?",
+"message.action.delete.vgpu.profile": "Please confirm that you want to delete this vGPU profile.",
 "message.action.delete.volume": "Please confirm that you want to delete this volume. Note: this will not delete any Snapshots of this volume.",
 "message.action.delete.vpn.user": "Please confirm that you want to delete the VPN user.",
 "message.action.delete.zone": "Please confirm that you want to delete this zone.",
@@ -2832,6 +2885,7 @@
 "message.action.disable.pod": "Please confirm that you want to disable this pod.",
 "message.action.disable.static.nat": "Please confirm that you want to disable static NAT.",
 "message.action.disable.zone": "Please confirm that you want to disable this zone.",
+"message.action.discover.gpu.devices": "Please confirm that you want to discover GPU devices.",
 "message.action.download.iso": "Please confirm that you want to download this ISO.",
 "message.action.download.snapshot": "Please confirm that you want to download this Snapshot.",
 "message.action.download.template": "Please confirm that you want to download this Template.",
@@ -3031,6 +3085,8 @@
 "message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch.",
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v.",
 "message.confirm.delete.ciscovnmc.resource": "Please confirm you want to delete CiscoVNMC resource.",
+"message.confirm.delete.gpu.devices": "Please confirm that you would like to delete this GPU device?",
+"message.confirm.delete.vgpu.profile": "Please confirm that you want to delete this vGPU profile?",
 "message.confirm.delete.f5": "Please confirm that you would like to delete F5.",
 "message.confirm.delete.internal.lb": "Please confirm you want to delete internal LB.",
 "message.confirm.delete.netscaler": "Please confirm that you would like to delete NetScaler.",
@@ -3049,6 +3105,7 @@
 "message.confirm.disable.storage": "Please confirm that you want to disable the storage pool.",
 "message.confirm.disable.vpc.offering": "Are you sure you want to disable this VPC offering?",
 "message.confirm.disable.webhook": "Please confirm that you want to disable this webhook.",
+"message.confirm.discover.gpu.devices": "Please confirm that you want to discover GPU devices?",
 "message.confirm.enable.autoscale.vmgroup": "Please confirm that you want to enable this autoscaling group.",
 "message.confirm.enable.custom.action": "Please confirm that you want to enable this custom action.",
 "message.confirm.enable.extension": "Please confirm that you want to enable this extension.",
@@ -3058,6 +3115,7 @@
 "message.confirm.enable.storage": "Please confirm that you want to enable the storage pool.",
 "message.confirm.enable.vpc.offering": "Are you sure you want to enable this VPC offering?",
 "message.confirm.enable.webhook": "Please confirm that you want to enable this webhook.",
+"message.confirm.manage.gpu.devices": "Please confirm that you want to manage the selected GPU devices?",
 "message.confirm.remove.firewall.rule": "Please confirm that you want to delete this Firewall Rule?",
 "message.confirm.remove.ip.range": "Please confirm that you would like to remove this IP range.",
 "message.confirm.remove.network.offering": "Are you sure you want to remove this Network offering?",
@@ -3075,6 +3133,7 @@
 "message.confirm.start.lb.vm": "Please confirm you want to start LB Instance.",
 "message.confirm.sync.storage": "Please confirm you want to sync the storage pool",
 "message.confirm.type": "To confirm, please type",
+"message.confirm.unmanage.gpu.devices": "Please confirm that you want to unmanage the selected GPU devices?",
 "message.confirm.upgrade.router.newer.template": "Please confirm that you want to upgrade router to use newer Template.",
 "message.cpu.usage.info": "The CPU usage percentage can exceed 100% if the Instance has more than 1 vCPU or when CPU Cap is not enabled. This behavior happens according to the hypervisor being used (e.g: in KVM), due to how they account the stats",
 "message.create.bucket.failed": "Failed to create bucket.",
@@ -3648,6 +3707,7 @@
 "message.success.add.egress.rule": "Successfully added new egress rule",
 "message.success.add.firewall.rule": "Successfully added new firewall rule",
 "message.success.add.guest.network": "Successfully created guest Network",
+"message.success.add.gpu.device": "Successfully added GPU device",
 "message.success.add.interface.static.route": "Successfully added interface Static Route",
 "message.success.add.iprange": "Successfully added IP range",
 "message.success.add.ipv4.subnet": "Successfully added IPv4 subnet",
@@ -3718,6 +3778,7 @@
 "message.success.delete.backup.schedule": "Successfully deleted configure Instance backup schedule",
 "message.success.delete.bgp.peer": "Successfully deleted BGP peer",
 "message.success.delete.custom.action": "Successfully deleted Custom Action",
+"message.success.delete.gpu.devices": "Successfully deleted GPU device(s)",
 "message.success.delete.icon": "Successfully deleted icon of",
 "message.success.delete.interface.static.route": "Successfully removed interface Static Route",
 "message.success.delete.ipv4.subnet": "Successfully removed IPv4 subnet",
@@ -3733,12 +3794,14 @@
 "message.success.delete.vpn.gateway": "Successfully deleted VPN gateway",
 "message.success.disable.saml.auth": "Successfully disabled SAML authorization",
 "message.success.disable.vpn": "Successfully disabled VPN",
+"message.success.discover.gpu.devices": "Successfully discovered GPU devices",
 "message.success.edit.acl": "Successfully edited ACL rule",
 "message.success.edit.primary.storage": "Successfully edited Primary Storage",
 "message.success.edit.rule": "Successfully edited rule",
 "message.success.enable.saml.auth": "Successfully enabled SAML Authorization",
 "message.success.import.instance": "Successfully imported Instance",
 "message.success.import.volume": "Successfully imported Volume",
+"message.success.manage.gpu.devices": "Successfully managed GPU device(s)",
 "message.success.migrate.volume": "Successfully migrated volume",
 "message.success.migrating": "Migration completed successfully for",
 "message.success.migration": "Migration completed successfully",
@@ -3772,6 +3835,7 @@
 "message.success.reset.network.permissions": "Successfully reset Network Permissions",
 "message.success.resize.volume": "Successfully resized volume",
 "message.success.scale.kubernetes": "Successfully scaled Kubernetes cluster",
+"message.success.unmanage.gpu.devices": "Successfully unmanaged GPU device(s)",
 "message.success.unmanage.instance": "Successfully unmanaged Instance",
 "message.success.unmanage.volume": "Successfully unmanaged Volume",
 "message.success.unregister.extension": "Successfull unregistered Extension",
@@ -3779,6 +3843,10 @@
 "message.success.update.bgp.peer": "Successfully updated BGP peer",
 "message.success.update.bucket": "Successfully updated bucket",
 "message.success.update.condition": "Successfully updated condition",
+"message.success.update.gpu.device": "Successfully updated GPU device",
+"message.success.create.vgpu.profile": "Successfully created vGPU profile",
+"message.success.update.vgpu.profile": "Successfully updated vGPU profile",
+"message.success.delete.vgpu.profile": "Successfully deleted vGPU profile",
 "message.success.update.custom.action": "Successfully updated Custom Action",
 "message.success.update.extension": "Successfully updated Extension",
 "message.success.update.sharedfs": "Successfully updated Shared FileSystem",
@@ -3947,6 +4015,7 @@
 "state.stopped": "Stopped",
 "state.stopping": "Stopping",
 "state.suspended": "Suspended",
+"state.partiallyallocated": "Partially Allocated",
 "user.login": "Login",
 "user.logout": "Logout",
 "ALLOCATED_VM": "Allocated VM",
diff --git a/ui/src/components/view/GPUDevicesTab.vue b/ui/src/components/view/GPUDevicesTab.vue
new file mode 100644
index 00000000000..ee67a81b07d
--- /dev/null
+++ b/ui/src/components/view/GPUDevicesTab.vue
@@ -0,0 +1,902 @@
+// 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.
+
+<template>
+  <div>
+    <!-- Toolbar for bulk actions -->
+    <div
+      v-if="resourceType === 'Host'"
+      style="margin-bottom: 16px;"
+    >
+      <a-space wrap>
+        <!-- Bulk GPU Device Actions -->
+        <a-popconfirm
+          :title="$t('message.confirm.manage.gpu.devices', { count: selectedDeviceCount })"
+          @confirm="bulkManageGpuDevices"
+          :disabled="!hasSelectedDevices"
+          okText="Yes"
+          cancelText="No"
+        >
+          <a-button
+            type="primary"
+            :disabled="!hasSelectedDevices"
+          >
+            {{ $t('label.gpu.devices.manage') }}
+          </a-button>
+        </a-popconfirm>
+
+        <a-popconfirm
+          :title="$t('message.confirm.unmanage.gpu.devices', { count: selectedDeviceCount })"
+          @confirm="bulkUnmanageGpuDevices"
+          :disabled="!hasSelectedDevices"
+          okText="Yes"
+          cancelText="No"
+        >
+          <a-button
+            type="primary"
+            danger
+            :disabled="!hasSelectedDevices"
+          >
+            {{ $t('label.gpu.devices.unmanage') }}
+          </a-button>
+        </a-popconfirm>
+
+        <a-popconfirm
+          :title="$t('message.confirm.delete.gpu.devices', { count: selectedDeviceCount })"
+          @confirm="bulkDeleteGpuDevices"
+          :disabled="!hasSelectedDevices"
+          okText="Yes"
+          cancelText="No"
+        >
+          <a-button
+            v-if="isAdmin"
+            type="primary"
+            danger
+            :disabled="!hasSelectedDevices"
+          >
+            {{ $t('label.gpu.devices.delete') }}
+          </a-button>
+        </a-popconfirm>
+      </a-space>
+    </div>
+
+    <a-table
+      :loading="loading"
+      :columns="columns"
+      :dataSource="items"
+      :pagination="false"
+      :rowKey="record => record.id"
+      :childrenColumnName="'children'"
+      :defaultExpandAllRows="true"
+      :expandedRowKeys="expandedRowKeys"
+      @expand="onExpand"
+      :rowSelection="resourceType === 'Host' && isAdmin ? {
+        selectedRowKeys: selectedGpuDeviceIds,
+        onChange: onGpuDeviceSelectionChange
+      } : null"
+      :customRow="customRowProps"
+      size="small"
+    >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'busaddress'">
+          <span :style="{ paddingLeft: record.parentgpudeviceid ? '20px' : '0px' }">
+            {{ record.busaddress }}
+          </span>
+        </template>
+        <template v-else-if="column.key === 'virtualmachinename'">
+          <div style="display: flex; align-items: center; gap: 8px;">
+            <Status
+              v-if="record.vmstate"
+              :text="record.vmstate"
+              :displayText="false"
+              :vmState="true"
+            />
+            <div v-if="record.virtualmachinename">
+              <router-link
+                v-if="record.virtualmachineid"
+                :to="{ path: '/vm/' + record.virtualmachineid }"
+              >
+                {{ record.virtualmachinename }}
+              </router-link>
+              <span v-else>{{ record.virtualmachinename }}</span>
+            </div>
+            <span v-else>{{ record.virtualmachinename }}</span>
+          </div>
+        </template>
+        <template v-else-if="column.key === 'gpucardname'">
+          <router-link
+            v-if="record.gpucardid"
+            :to="{ path: '/gpucard/' + record.gpucardid }"
+            :title="record.gpucardname"
+            class="text-ellipsis"
+          >
+            {{ record.gpucardname }}
+          </router-link>
+          <span
+            v-else
+            :title="record.gpucardname"
+            class="text-ellipsis"
+          >{{ record.gpucardname }}</span>
+        </template>
+        <template v-else-if="column.key === 'vgpuprofilename'">
+          <span v-if="!(record.children && record.children.length > 0)">
+            <router-link
+              v-if="record.vgpuprofileid"
+              :to="{ path: '/vgpuprofile/' + record.vgpuprofileid }"
+              :title="record.vgpuprofilename"
+              class="text-ellipsis"
+            >
+              {{ record.vgpuprofilename }}
+            </router-link>
+            <span
+              v-else
+              :title="record.vgpuprofilename"
+              class="text-ellipsis"
+            >{{ record.vgpuprofilename }}</span>
+          </span>
+          <span v-else></span>
+        </template>
+        <template v-else-if="column.key === 'hostname'">
+          <router-link
+            v-if="record.hostid"
+            :to="{ path: '/host/' + record.hostid }"
+            :title="record.hostname"
+            class="text-ellipsis"
+          >
+            {{ record.hostname }}
+          </router-link>
+          <span
+            v-else
+            :title="record.hostname"
+            class="text-ellipsis"
+          >{{ record.hostname }}</span>
+        </template>
+        <template v-else-if="column.key === 'managedstate'">
+          <Status
+            v-if="!record.children || record.children.length === 0"
+            :text="record.managedstate"
+            :displayText="true"
+          />
+          <span v-else></span>
+        </template>
+        <template v-else-if="column.key === 'state'">
+          <Status
+            v-if="!record.children || record.children.length === 0"
+            :text="record.state"
+            :displayText="true"
+          />
+          <span v-else></span>
+        </template>
+        <template v-else-if="column.key === 'actions'">
+          <a-space v-if="!record.children || record.children.length === 0">
+            <!-- Manage/Unmanage Action -->
+            <a-popconfirm
+              v-if="record.managedstate && record.managedstate.toLowerCase() === 'unmanaged'"
+              :title="$t('message.confirm.manage.gpu.devices')"
+              @confirm="manageGpuDevice(record)"
+              okText="Yes"
+              cancelText="No"
+            >
+              <a-tooltip :title="$t('label.gpu.devices.manage')">
+                <a-button
+                  type="primary"
+                  size="small"
+                  shape="circle"
+                >
+                  <template #icon><play-circle-outlined /></template>
+                </a-button>
+              </a-tooltip>
+            </a-popconfirm>
+            <a-popconfirm
+              v-else-if="record.managedstate && record.managedstate.toLowerCase() === 'managed'"
+              :title="$t('message.confirm.unmanage.gpu.devices')"
+              @confirm="unmanageGpuDevice(record)"
+              okText="Yes"
+              cancelText="No"
+            >
+              <a-tooltip :title="$t('label.gpu.devices.unmanage')">
+                <a-button
+                  size="small"
+                  shape="circle"
+                >
+                  <template #icon><pause-circle-outlined /></template>
+                </a-button>
+              </a-tooltip>
+            </a-popconfirm>
+
+            <!-- Edit Action -->
+            <a-tooltip :title="$t('label.edit')">
+              <a-button
+                type="primary"
+                size="small"
+                shape="circle"
+                @click="showUpdateGpuDeviceModal(record)"
+              >
+                <template #icon><edit-outlined /></template>
+              </a-button>
+            </a-tooltip>
+
+            <!-- Delete Action -->
+            <a-popconfirm
+              :title="$t('message.confirm.delete.gpu.devices')"
+              @confirm="deleteGpuDevice(record)"
+              okText="Yes"
+              cancelText="No"
+            >
+              <a-tooltip :title="$t('label.delete')">
+                <a-button
+                  type="primary"
+                  danger
+                  size="small"
+                  shape="circle"
+                >
+                  <template #icon><delete-outlined /></template>
+                </a-button>
+              </a-tooltip>
+            </a-popconfirm>
+          </a-space>
+        </template>
+      </template>
+
+      <!-- Custom Filter Dropdown for Column Selection -->
+      <template #customFilterDropdown="{ column }">
+        <div
+          v-if="column.key === 'columnFilter'"
+          style="padding: 8px; min-width: 200px;"
+        >
+          <div style="margin-bottom: 8px; font-weight: 500;">{{ $t('label.select.columns') }}</div>
+          <div style="margin-bottom: 8px;">
+            <a-space>
+              <a-button
+                size="small"
+                @click="selectAllColumns"
+              >
+                {{ $t('label.select.all') }}
+              </a-button>
+              <a-button
+                size="small"
+                @click="clearAllColumns"
+              >
+                {{ $t('label.clear.all') }}
+              </a-button>
+            </a-space>
+          </div>
+          <div style="max-height: 200px; overflow-y: auto;">
+            <div
+              v-for="columnKey in columnKeys"
+              :key="columnKey"
+              style="margin-bottom: 4px;"
+            >
+              <a-checkbox
+                :checked="selectedColumnKeys.includes(columnKey)"
+                @change="updateSelectedColumns(columnKey)"
+              >
+                {{ $t('label.' + String(columnKey).toLowerCase()) }}
+              </a-checkbox>
+            </div>
+          </div>
+        </div>
+      </template>
+    </a-table>
+  </div>
+
+  <!-- Update GPU Device Modal -->
+  <a-modal
+    :visible="updateGpuDeviceModalVisible"
+    :title="$t('label.update.gpu.device')"
+    @ok="updateGpuDevice"
+    @cancel="updateGpuDeviceModalVisible = false"
+  >
+    <a-form layout="vertical">
+      <a-form-item
+        v-for="field in updateFormFields"
+        :key="field.key"
+        :label="field.label"
+        :required="field.required"
+      >
+        <!-- Input field -->
+        <a-input
+          v-if="field.type === 'input'"
+          v-model:value="gpuDeviceForm[field.key]"
+          :placeholder="field.placeholder"
+        />
+
+        <!-- Select field -->
+        <a-select
+          v-else-if="field.type === 'select'"
+          v-model:value="gpuDeviceForm[field.key]"
+          :placeholder="field.placeholder"
+          :loading="field.loading"
+          :show-search="field.showSearch"
+          :filter-option="filterOption"
+          :allow-clear="field.allowClear"
+          @change="field.onChange"
+        >
+          <a-select-option
+            v-for="option in field.options"
+            :key="option.value"
+            :value="option.value"
+          >
+            {{ option.label }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+
+<script>
+import { getAPI, postAPI } from '@/api'
+import { genericCompare } from '@/utils/sort.js'
+import Status from '@/components/widgets/Status'
+import { EditOutlined, DeleteOutlined, PlayCircleOutlined, PauseCircleOutlined } from '@ant-design/icons-vue'
+
+export default {
+  name: 'GPUDevicesTab',
+  components: {
+    Status,
+    EditOutlined,
+    DeleteOutlined,
+    PlayCircleOutlined,
+    PauseCircleOutlined
+  },
+  emits: ['refresh'],
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    resourceType: {
+      type: String,
+      required: true,
+      default: 'Host'
+    }
+  },
+  data () {
+    return {
+      columnKeys: ['gpucardname', 'vgpuprofilename', 'managedstate', 'state'],
+      selectedColumnKeys: [],
+      columns: [],
+      items: [],
+      expandedRowKeys: [],
+      selectedGpuDeviceIds: [],
+      updateGpuDeviceModalVisible: false,
+      selectedGpuDevice: null,
+      gpuDeviceForm: {},
+      gpuCards: [],
+      vgpuProfiles: [],
+      parentGpuDevices: [],
+      loadingGpuCards: false,
+      loadingVgpuProfiles: false,
+      loadingParentDevices: false,
+      updateApiParams: {},
+      updateFormFields: []
+    }
+  },
+  computed: {
+    hasSelectedDevices () {
+      return this.selectedGpuDeviceIds.length > 0
+    },
+    selectedDeviceCount () {
+      return this.selectedGpuDeviceIds.length
+    },
+    isAdmin () {
+      return this.$store.getters.userInfo.roletype === 'Admin'
+    }
+  },
+  created () {
+    this.fetchUpdateApiParams()
+    this.selectedColumnKeys = this.columnKeys
+    if (this.resourceType === 'VirtualMachine') {
+      // For VMs: GPU card, GPU profile, BUS ID/uuid, VRAM/metadata, Host (admin only)
+      this.columnKeys = ['gpucardname', 'vgpuprofilename']
+      if (this.$store.getters.userInfo.roletype === 'Admin') {
+        this.columnKeys.push('hostname', 'busaddress', 'managedstate', 'state')
+      }
+    } else {
+      // For other resource types (like Host)
+      this.columnKeys = ['busaddress', 'gpucardname', 'vgpuprofilename', 'managedstate', 'state', 'virtualmachinename']
+    }
+    this.selectedColumnKeys = this.columnKeys
+    this.updateColumns()
+    this.fetchDevicesData()
+  },
+  watch: {
+    resource: {
+      handler () {
+        this.fetchDevicesData()
+      }
+    }
+  },
+  methods: {
+    fetchDevicesData () {
+      if (!this.resource.id) {
+        return
+      }
+      // Reset expanded keys when fetching new data
+      this.expandedRowKeys = []
+
+      const params = {}
+      if (this.resourceType === 'Host') {
+        params.hostid = this.resource.id
+      } else if (this.resourceType === 'VirtualMachine') {
+        params.virtualmachineid = this.resource.id
+      }
+      getAPI('listGpuDevices', params).then(json => {
+        const devices = json?.listgpudevicesresponse?.gpudevice || []
+        this.items = this.buildGpuTree(devices)
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    buildGpuTree (devices) {
+      // Separate parent devices and vGPUs
+      const parentDevices = []
+      const vgpuDevices = []
+      for (const device of devices) {
+        if (device.parentgpudeviceid) {
+          vgpuDevices.push(device)
+        } else {
+          parentDevices.push(device)
+        }
+      }
+
+      // Sort parent devices by busaddress
+      parentDevices.sort((a, b) => {
+        const busAddressA = a.busaddress || ''
+        const busAddressB = b.busaddress || ''
+        return busAddressA.localeCompare(busAddressB)
+      })
+
+      // Group vGPUs by their parent ID
+      const vgpusByParent = {}
+      vgpuDevices.forEach(vgpu => {
+        const parentId = vgpu.parentgpudeviceid
+        if (!vgpusByParent[parentId]) {
+          vgpusByParent[parentId] = []
+        }
+        vgpusByParent[parentId].push(vgpu)
+      })
+
+      // Sort vGPUs within each parent group by busaddress
+      Object.keys(vgpusByParent).forEach(parentId => {
+        vgpusByParent[parentId].sort((a, b) => {
+          const busA = a.busaddress || ''
+          const busB = b.busaddress || ''
+          return busA.localeCompare(busB, undefined, { numeric: true })
+        })
+      })
+
+      // Build tree structure and collect parent IDs that have children
+      const expandedKeys = []
+      const treeData = parentDevices.map(parent => {
+        const children = vgpusByParent[parent.id] || []
+        if (children.length > 0) {
+          expandedKeys.push(parent.id)
+          return {
+            ...parent,
+            children: children
+          }
+        }
+        return parent
+      })
+
+      // Set expanded row keys for all parents with children
+      this.expandedRowKeys = expandedKeys
+
+      if (treeData.length === 0) {
+        // Sort standalone vGPU devices by busaddress
+        return vgpuDevices.sort((a, b) => {
+          const busA = a.busaddress || ''
+          const busB = b.busaddress || ''
+          return busA.localeCompare(busB, undefined, { numeric: true })
+        })
+      }
+
+      return treeData
+    },
+    validateBulkOperation () {
+      if (this.selectedGpuDeviceIds.length === 0) {
+        this.$notification.warning({
+          message: this.$t('label.warning'),
+          description: this.$t('message.please.select.gpu.devices')
+        })
+        return false
+      }
+      return true
+    },
+    handleBulkOperationSuccess (messageKey, count) {
+      this.$notification.success({
+        message: this.$t('label.success'),
+        description: this.$t(messageKey, { count })
+      })
+      this.selectedGpuDeviceIds = []
+      this.refresh()
+    },
+    updateSelectedColumns (key) {
+      if (this.selectedColumnKeys.includes(key)) {
+        this.selectedColumnKeys = this.selectedColumnKeys.filter(x => x !== key)
+      } else {
+        this.selectedColumnKeys.push(key)
+      }
+      this.updateColumns()
+    },
+    updateColumns () {
+      this.columns = []
+      for (var columnKey of this.columnKeys) {
+        if (!this.selectedColumnKeys.includes(columnKey)) continue
+        this.columns.push({
+          key: columnKey,
+          title: this.$t('label.' + String(columnKey).toLowerCase()),
+          dataIndex: columnKey,
+          sorter: (a, b) => { return genericCompare(a[columnKey] || '', b[columnKey] || '') }
+        })
+      }
+
+      // Add actions column for admin users (only for Host resource type)
+      if (this.isAdmin && this.resourceType === 'Host') {
+        this.columns.push({
+          key: 'actions',
+          title: this.$t('label.actions'),
+          width: 120,
+          fixed: 'right'
+        })
+      }
+
+      // Add column filter as the last column
+      this.columns.push({
+        key: 'columnFilter',
+        title: null,
+        dataIndex: 'columnFilter',
+        customFilterDropdown: true,
+        onFilter: () => true
+      })
+    },
+    onGpuDeviceSelectionChange (keys) {
+      this.selectedGpuDeviceIds = keys
+    },
+    onExpand (expanded, record) {
+      if (expanded) {
+        if (!this.expandedRowKeys.includes(record.id)) {
+          this.expandedRowKeys.push(record.id)
+        }
+      } else {
+        this.expandedRowKeys = this.expandedRowKeys.filter(key => key !== record.id)
+      }
+    },
+    customRowProps (record) {
+      return {
+        class: record.parentgpudeviceid ? 'vgpu-row' : 'parent-gpu-row'
+      }
+    },
+    selectAllColumns () {
+      this.selectedColumnKeys = this.columnKeys
+      this.updateColumns()
+    },
+    clearAllColumns () {
+      this.selectedColumnKeys = []
+      this.updateColumns()
+    },
+    bulkManageGpuDevices () {
+      if (!this.validateBulkOperation()) return
+
+      getAPI('manageGpuDevice', {
+        ids: this.selectedGpuDeviceIds.join(',')
+      }).then(() => {
+        this.handleBulkOperationSuccess('message.success.manage.gpu.devices', this.selectedGpuDeviceIds.length)
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    bulkUnmanageGpuDevices () {
+      if (!this.validateBulkOperation()) return
+
+      getAPI('unmanageGpuDevice', {
+        ids: this.selectedGpuDeviceIds.join(',')
+      }).then(() => {
+        this.handleBulkOperationSuccess('message.success.unmanage.gpu.devices', this.selectedGpuDeviceIds.length)
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    manageGpuDevice (record) {
+      getAPI('manageGpuDevice', {
+        ids: record.id
+      }).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t('message.success.manage.gpu.devices')
+        })
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    unmanageGpuDevice (record) {
+      getAPI('unmanageGpuDevice', {
+        ids: record.id
+      }).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t('message.success.unmanage.gpu.devices')
+        })
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    filterOption (input, option) {
+      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    fetchUpdateApiParams () {
+      this.updateApiParams = this.$getApiParams('updateGpuDevice') || {}
+      this.generateUpdateFormFields()
+    },
+    generateUpdateFormFields () {
+      // Generate update form fields
+      this.updateFormFields = this.buildFormFieldsFromParams(this.updateApiParams, 'update')
+    },
+    buildFormFieldsFromParams (apiParams, formType) {
+      const fields = []
+      const fieldOrder = ['gpucardid', 'vgpuprofileid', 'type', 'parentgpudeviceid']
+
+      fieldOrder.forEach(paramName => {
+        if (paramName === 'hostid') return // Skip hostid as it's auto-populated
+
+        const param = apiParams[paramName]
+        if (!param) return
+
+        const field = {
+          key: paramName,
+          label: this.$t(`label.${paramName}`),
+          required: param.required,
+          placeholder: param.description,
+          type: this.getFieldType(paramName, param)
+        }
+
+        // Add special configurations for dropdown fields
+        if (field.type === 'select') {
+          field.options = this.getFieldOptions(paramName)
+          field.loading = this.getFieldLoading(paramName)
+          field.showSearch = true
+          field.allowClear = true
+
+          if (paramName === 'gpucardid') {
+            field.onChange = this.onGpuCardChange
+          }
+        }
+
+        fields.push(field)
+      })
+
+      return fields
+    },
+    getFieldType (paramName, param) {
+      const selectFields = ['gpucardid', 'vgpuprofileid', 'parentgpudeviceid', 'type']
+      return selectFields.includes(paramName) ? 'select' : 'input'
+    },
+    getFieldOptions (paramName) {
+      switch (paramName) {
+        case 'gpucardid':
+          return this.gpuCards.map(card => ({ value: card.id, label: card.name }))
+        case 'vgpuprofileid':
+          return this.vgpuProfiles.map(profile => ({ value: profile.id, label: profile.name }))
+        case 'parentgpudeviceid':
+          return this.parentGpuDevices.map(device => ({
+            value: device.id,
+            label: `${device.gpucardname} - ${device.busaddress}`
+          }))
+        case 'type':
+          return [
+            { value: 'PCI', label: 'PCI' },
+            { value: 'MDEV', label: 'MDEV' },
+            { value: 'VGPUOnly', label: 'VGPUOnly' }
+          ]
+        default:
+          return []
+      }
+    },
+    getFieldLoading (paramName) {
+      switch (paramName) {
+        case 'gpucardid':
+          return this.loadingGpuCards
+        case 'vgpuprofileid':
+          return this.loadingVgpuProfiles
+        case 'parentgpudeviceid':
+          return this.loadingParentDevices
+        default:
+          return false
+      }
+    },
+    onGpuCardChange (gpucardid) {
+      // Clear the selected vGPU profile when GPU card changes
+      this.gpuDeviceForm.vgpuprofileid = null
+      // Fetch vGPU profiles for the selected GPU card
+      if (gpucardid) {
+        this.fetchVgpuProfiles(gpucardid)
+      } else {
+        this.vgpuProfiles = []
+      }
+    },
+    fetchGpuCards () {
+      this.loadingGpuCards = true
+      getAPI('listGpuCards').then(json => {
+        this.gpuCards = json?.listgpucardsresponse?.gpucard || []
+        this.generateUpdateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingGpuCards = false
+      })
+    },
+    fetchVgpuProfiles (gpucardid = null) {
+      this.loadingVgpuProfiles = true
+      const params = {}
+      if (gpucardid) {
+        params.gpucardid = gpucardid
+      }
+      getAPI('listVgpuProfiles', params).then(json => {
+        this.vgpuProfiles = json?.listvgpuprofilesresponse?.vgpuprofile || []
+        this.generateUpdateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingVgpuProfiles = false
+      })
+    },
+    fetchParentGpuDevices () {
+      if (!this.resource.id || this.resourceType !== 'Host') {
+        return
+      }
+      this.loadingParentDevices = true
+      getAPI('listGpuDevices', { hostid: this.resource.id }).then(json => {
+        const devices = json?.listgpudevicesresponse?.gpudevice || []
+        // Only include devices that can be parent devices (not virtual GPU devices)
+        this.parentGpuDevices = devices.filter(device => !device.parentgpudeviceid)
+        this.generateUpdateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingParentDevices = false
+      })
+    },
+
+    showUpdateGpuDeviceModal (record) {
+      this.selectedGpuDevice = record
+      this.gpuDeviceForm = {
+        gpucardid: record.gpucardid,
+        vgpuprofileid: record.vgpuprofileid,
+        type: record.type,
+        numanode: record.numanode,
+        parentgpudeviceid: record.parentgpudeviceid
+      }
+      this.fetchGpuCards()
+      // Fetch vGPU profiles for the selected card if available
+      if (record.gpucardid) {
+        this.fetchVgpuProfiles(record.gpucardid)
+      } else {
+        this.vgpuProfiles = []
+      }
+      this.fetchParentGpuDevices()
+      this.updateGpuDeviceModalVisible = true
+    },
+
+    updateGpuDevice () {
+      const params = {
+        id: this.selectedGpuDevice.id
+      }
+
+      // Add only fields that have values
+      if (this.gpuDeviceForm.gpucardid) {
+        params.gpucardid = this.gpuDeviceForm.gpucardid
+      }
+      if (this.gpuDeviceForm.vgpuprofileid) {
+        params.vgpuprofileid = this.gpuDeviceForm.vgpuprofileid
+      }
+      if (this.gpuDeviceForm.type) {
+        params.type = this.gpuDeviceForm.type
+      }
+      if (this.gpuDeviceForm.numanode) {
+        params.numanode = this.gpuDeviceForm.numanode
+      }
+      if (this.gpuDeviceForm.parentgpudeviceid) {
+        params.parentgpudeviceid = this.gpuDeviceForm.parentgpudeviceid
+      }
+
+      postAPI('updateGpuDevice', params).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t('message.success.update.gpu.device')
+        })
+        this.updateGpuDeviceModalVisible = false
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    deleteGpuDevice (record) {
+      this.deleteGpuDevices([record.id], 'message.success.delete.gpu.devices')
+    },
+    bulkDeleteGpuDevices () {
+      if (!this.validateBulkOperation()) return
+      this.deleteGpuDevices(this.selectedGpuDeviceIds, 'message.success.delete.gpu.devices')
+    },
+    deleteGpuDevices (deviceIds, successMessageKey) {
+      postAPI('deleteGpuDevice', {
+        ids: deviceIds.join(',')
+      }).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t(successMessageKey, { count: deviceIds.length })
+        })
+        if (deviceIds.length > 1) {
+          this.selectedGpuDeviceIds = []
+        }
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    refresh () {
+      this.fetchDevicesData()
+      this.$emit('refresh')
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* Background colors for GPU device types */
+:deep(.parent-gpu-row) {
+  background-color: #fafafa;
+}
+
+:deep(.vgpu-row) {
+  background-color: #f0f8ff;
+}
+
+:deep(.parent-gpu-row:hover) {
+  background-color: #f5f5f5 !important;
+}
+
+:deep(.vgpu-row:hover) {
+  background-color: #e6f4ff !important;
+}
+
+/* Text truncation for long names */
+:deep(.ant-table-tbody .ant-table-cell) {
+  max-width: 200px;
+}
+
+:deep(.ant-table-tbody .ant-table-cell:has([data-column="gpucardname"]),
+  .ant-table-tbody .ant-table-cell:has([data-column="vgpuprofilename"]),
+  .ant-table-tbody .ant-table-cell:has([data-column="hostname"])) {
+  max-width: 150px;
+}
+
+.text-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+  display: inline-block;
+}
+</style>
diff --git a/ui/src/components/view/GPUSummaryTab.vue b/ui/src/components/view/GPUSummaryTab.vue
new file mode 100644
index 00000000000..8b649e05662
--- /dev/null
+++ b/ui/src/components/view/GPUSummaryTab.vue
@@ -0,0 +1,301 @@
+
+// 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.
+
+<template>
+  <a-table
+    :loading="loading"
+    :columns="summaryColumns"
+    :dataSource="summaryData"
+    :pagination="false"
+    :rowKey="record => record.key"
+    :childrenColumnName="'children'"
+    :defaultExpandAllRows="true"
+    :expandedRowKeys="expandedRowKeys"
+    @expand="onExpand"
+    size="small"
+  >
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.key === 'name'">
+        <span
+          :style="{ paddingLeft: record.isProfile ? '20px' : '0px', fontWeight: record.isProfile ? 'normal' : 'bold' }"
+        >
+          <router-link
+            v-if="record.isProfile && record.vgpuprofileid"
+            :to="{ path: '/vgpuprofile/' + record.vgpuprofileid }"
+            :title="record.name"
+            class="text-ellipsis"
+          >
+            {{ record.name }}
+          </router-link>
+          <router-link
+            v-else-if="!record.isProfile && record.gpucardid"
+            :to="{ path: '/gpucard/' + record.gpucardid }"
+            :title="record.name"
+            class="text-ellipsis"
+          >
+            {{ record.name }}
+          </router-link>
+          <span
+            v-else
+            :title="record.name"
+            class="text-ellipsis"
+          >{{ record.name }}</span>
+        </span>
+      </template>
+    </template>
+  </a-table>
+</template>
+
+<script>
+import { getAPI } from '@/api'
+
+export default {
+  name: 'GPUSummaryTab',
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    resourceType: {
+      type: String,
+      required: true,
+      default: 'Host'
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      summaryColumns: [],
+      summaryData: [],
+      expandedRowKeys: []
+    }
+  },
+  created () {
+    this.updateSummaryColumns()
+    this.fetchSummaryData()
+  },
+  watch: {
+    resource: {
+      handler () {
+        this.fetchSummaryData()
+      }
+    }
+  },
+  methods: {
+    fetchSummaryData () {
+      if (!this.resource.id) {
+        return
+      }
+      // Reset expanded keys when fetching new data
+      this.expandedRowKeys = []
+
+      const params = {}
+      if (this.resourceType === 'Host') {
+        params.hostid = this.resource.id
+      } else if (this.resourceType === 'VirtualMachine') {
+        params.virtualmachineid = this.resource.id
+      }
+
+      getAPI('listGpuDevices', params).then(json => {
+        const devices = json?.listgpudevicesresponse?.gpudevice || []
+        this.summaryData = this.buildSummaryData(devices)
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    onExpand (expanded, record) {
+      if (expanded) {
+        if (!this.expandedRowKeys.includes(record.key)) {
+          this.expandedRowKeys.push(record.key)
+        }
+      } else {
+        this.expandedRowKeys = this.expandedRowKeys.filter(key => key !== record.key)
+      }
+    },
+    buildSummaryData (devices) {
+      // Group devices by GPU card
+      const cardGroups = {}
+
+      devices.forEach(device => {
+        const cardKey = device.gpucardname || 'Unknown GPU Card'
+        if (!cardGroups[cardKey]) {
+          cardGroups[cardKey] = {
+            gpucardname: cardKey,
+            gpucardid: device.gpucardid,
+            profiles: {},
+            devices: []
+          }
+        }
+        cardGroups[cardKey].devices.push(device)
+
+        // Group by vGPU profile within each card
+        if (device.vgpuprofilename) {
+          const profileKey = device.vgpuprofilename
+          if (!cardGroups[cardKey].profiles[profileKey]) {
+            cardGroups[cardKey].profiles[profileKey] = {
+              vgpuprofilename: profileKey,
+              vgpuprofileid: device.vgpuprofileid,
+              devices: []
+            }
+          }
+          cardGroups[cardKey].profiles[profileKey].devices.push(device)
+        }
+      })
+
+      // Build summary tree structure and collect expanded keys
+      const summaryTree = []
+      const expandedKeys = []
+
+      Object.values(cardGroups).forEach(cardGroup => {
+        const profileCount = Object.keys(cardGroup.profiles).length
+
+        // Filter devices for card summary calculation
+        // Exclude passthrough profile devices from aggregates if there are multiple profiles
+        let cardDevicesForSummary = cardGroup.devices
+        if (profileCount > 1) {
+          cardDevicesForSummary = cardGroup.devices.filter(device => !device.vgpuprofilename || device.vgpuprofilename.toLowerCase() !== 'passthrough'
+          )
+        }
+
+        const cardSummary = this.calculateSummary(cardDevicesForSummary)
+        const cardKey = `card-${cardGroup.gpucardname}`
+
+        const cardNode = {
+          key: cardKey,
+          name: cardGroup.gpucardname,
+          gpucardid: cardGroup.gpucardid,
+          isProfile: false,
+          ...cardSummary
+        }
+
+        // If there's more than 1 profile, show profiles as children
+        if (profileCount > 1) {
+          // Add this card to expanded keys since it has children
+          expandedKeys.push(cardKey)
+
+          cardNode.children = Object.values(cardGroup.profiles)
+            .filter(profile => profile.vgpuprofilename.toLowerCase() !== 'passthrough')
+            .map(profile => {
+              const profileSummary = this.calculateSummary(profile.devices)
+              return {
+                key: `profile-${profile.vgpuprofilename}-${cardGroup.gpucardname}`,
+                name: profile.vgpuprofilename,
+                vgpuprofileid: profile.vgpuprofileid,
+                isProfile: true,
+                ...profileSummary
+              }
+            })
+        }
+
+        summaryTree.push(cardNode)
+      })
+
+      // Set expanded row keys for all cards with children
+      this.expandedRowKeys = expandedKeys
+
+      return summaryTree
+    },
+    calculateSummary (devices) {
+      const summary = {
+        total: 0,
+        allocated: 0,
+        available: 0,
+        uniqueVMs: new Set()
+      }
+
+      devices.forEach(device => {
+        summary.total++
+
+        if (device.virtualmachineid) {
+          summary.allocated++
+          summary.uniqueVMs.add(device.virtualmachineid)
+        } else if (device.managedstate !== 'Unmanaged' && device.state !== 'Error') {
+          summary.available++
+        }
+      })
+
+      return {
+        total: summary.total,
+        allocated: summary.allocated,
+        available: summary.available,
+        uniqueVMs: summary.uniqueVMs.size
+      }
+    },
+    updateSummaryColumns () {
+      this.summaryColumns = [
+        {
+          key: 'name',
+          title: this.$t('label.name'),
+          dataIndex: 'name',
+          sorter: (a, b) => { return (a.name || '').localeCompare(b.name || '') }
+        },
+        {
+          key: 'total',
+          title: this.$t('label.total'),
+          dataIndex: 'total',
+          align: 'center',
+          sorter: (a, b) => { return a.total - b.total }
+        }]
+      if (this.$store.getters.userInfo.roletype === 'Admin') {
+        this.summaryColumns.push(
+          {
+            key: 'allocated',
+            title: this.$t('label.allocated'),
+            dataIndex: 'allocated',
+            align: 'center',
+            sorter: (a, b) => { return a.allocated - b.allocated }
+          },
+          {
+            key: 'available',
+            title: this.$t('label.available'),
+            dataIndex: 'available',
+            align: 'center',
+            sorter: (a, b) => { return a.available - b.available }
+          }
+        )
+      }
+      if (this.resourceType === 'Host') {
+        this.summaryColumns.push({
+          key: 'uniqueVMs',
+          title: this.$t('label.vms'),
+          dataIndex: 'uniqueVMs',
+          align: 'center',
+          sorter: (a, b) => { return a.uniqueVMs - b.uniqueVMs }
+        })
+      }
+    },
+    refresh () {
+      this.fetchSummaryData()
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* Text truncation for long names */
+.text-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+  display: inline-block;
+}
+</style>
diff --git a/ui/src/components/view/GPUTab.vue b/ui/src/components/view/GPUTab.vue
new file mode 100644
index 00000000000..d2cd2f3d2cb
--- /dev/null
+++ b/ui/src/components/view/GPUTab.vue
@@ -0,0 +1,440 @@
+// 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.
+
+<template>
+  <div>
+    <!-- GPU Device Management Buttons (before tabs, for Host resource type only) -->
+    <div
+      v-if="resourceType === 'Host'"
+      style="margin-bottom: 16px;"
+    >
+      <a-space wrap>
+        <!-- GPU Device Discovery -->
+        <a-popconfirm
+          :title="$t('message.confirm.discover.gpu.devices')"
+          @confirm="discoverGpuDevices"
+          okText="Yes"
+          cancelText="No"
+        >
+          <a-button type="default">
+            {{ $t('label.discover.gpu.devices') }}
+          </a-button>
+        </a-popconfirm>
+
+        <!-- Add GPU Device (Admin Only) -->
+        <a-button
+          v-if="isAdmin"
+          type="primary"
+          @click="showAddGpuDeviceModal"
+        >
+          {{ $t('label.gpu.devices.add') }}
+        </a-button>
+      </a-space>
+    </div>
+
+    <!-- For VMs: Show tabs only for admin, summary only for regular users -->
+    <div v-if="resourceType === 'VirtualMachine' && !isAdmin">
+      <!-- Summary only for non-admin users viewing VMs -->
+      <GPUSummaryTab
+        ref="summaryTabSimple"
+        :resource="resource"
+        :resourceType="resourceType"
+        :loading="loading"
+        @refresh="$emit('refresh')"
+      />
+    </div>
+
+    <!-- For admins on VMs or all users on other resource types: Show tabs -->
+    <a-tabs
+      v-else
+      defaultActiveKey="summary"
+      :tabBarStyle="{ marginBottom: '16px' }"
+    >
+      <!-- Summary Tab -->
+      <a-tab-pane
+        key="summary"
+        :tab="$t('label.gpu.summary')"
+      >
+        <GPUSummaryTab
+          ref="summaryTab"
+          :resource="resource"
+          :resourceType="resourceType"
+          :loading="loading"
+          @refresh="$emit('refresh')"
+        />
+      </a-tab-pane>
+
+      <!-- Devices Tab -->
+      <a-tab-pane
+        key="devices"
+        :tab="$t('label.gpu.devices')"
+      >
+        <GPUDevicesTab
+          ref="devicesTab"
+          :resource="resource"
+          :resourceType="resourceType"
+          :loading="loading"
+          @refresh="refresh(true)"
+        />
+      </a-tab-pane>
+    </a-tabs>
+
+    <!-- Add GPU Device Modal -->
+    <a-modal
+      :visible="addGpuDeviceModalVisible"
+      :title="$t('label.gpu.devices.add')"
+      @ok="addGpuDevice"
+      @cancel="addGpuDeviceModalVisible = false"
+    >
+      <a-form layout="vertical">
+        <a-form-item
+          v-for="field in createFormFields"
+          :key="field.key"
+          :label="field.label"
+          :required="field.required"
+        >
+          <!-- Input field -->
+          <a-input
+            v-if="field.type === 'input'"
+            v-model:value="gpuDeviceForm[field.key]"
+            :placeholder="field.placeholder"
+          />
+
+          <!-- Select field -->
+          <a-select
+            v-else-if="field.type === 'select'"
+            v-model:value="gpuDeviceForm[field.key]"
+            :placeholder="field.placeholder"
+            :loading="field.loading"
+            :show-search="field.showSearch"
+            :filter-option="filterOption"
+            :allow-clear="field.allowClear"
+            @change="field.onChange"
+          >
+            <a-select-option
+              v-for="option in field.options"
+              :key="option.value"
+              :value="option.value"
+            >
+              {{ option.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { getAPI, postAPI } from '@/api'
+import GPUSummaryTab from '@/components/view/GPUSummaryTab'
+import GPUDevicesTab from '@/components/view/GPUDevicesTab'
+
+export default {
+  name: 'GPUTab',
+  components: {
+    GPUSummaryTab,
+    GPUDevicesTab
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      required: true
+    },
+    resourceType: {
+      type: String,
+      required: true,
+      default: 'Host'
+    }
+  },
+  data () {
+    return {
+      addGpuDeviceModalVisible: false,
+      gpuDeviceForm: {},
+      gpuCards: [],
+      vgpuProfiles: [],
+      parentGpuDevices: [],
+      loadingGpuCards: false,
+      loadingVgpuProfiles: false,
+      loadingParentDevices: false,
+      createApiParams: {},
+      createFormFields: []
+    }
+  },
+  computed: {
+    isAdmin () {
+      return this.$store.getters.userInfo.roletype === 'Admin'
+    }
+  },
+  created () {
+    this.fetchApiParams()
+  },
+  methods: {
+    discoverGpuDevices () {
+      if (!this.resource.id) {
+        return
+      }
+
+      getAPI('discoverGpuDevices', {
+        id: this.resource.id
+      }).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t('message.success.discover.gpu.devices')
+        })
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    fetchApiParams () {
+      this.createApiParams = this.$getApiParams('createGpuDevice') || {}
+      this.generateFormFields()
+    },
+    generateFormFields () {
+      const fields = []
+      const fieldOrder = ['busaddress', 'gpucardid', 'vgpuprofileid', 'type', 'numanode', 'parentgpudeviceid']
+
+      fieldOrder.forEach(paramName => {
+        if (paramName === 'hostid') return // Skip hostid as it's auto-populated
+
+        const param = this.createApiParams[paramName]
+        if (!param) return
+
+        const field = {
+          key: paramName,
+          label: this.$t(`label.${paramName}`),
+          required: param.required || ['busaddress', 'gpucardid', 'vgpuprofileid'].includes(paramName),
+          placeholder: param.description,
+          type: this.getFieldType(paramName, param)
+        }
+
+        // Add special configurations for dropdown fields
+        if (field.type === 'select') {
+          field.options = this.getFieldOptions(paramName)
+          field.loading = this.getFieldLoading(paramName)
+          field.showSearch = true
+          field.allowClear = false
+
+          if (paramName === 'gpucardid') {
+            field.onChange = this.onGpuCardChange
+          }
+        }
+
+        fields.push(field)
+      })
+
+      this.createFormFields = fields
+    },
+    getFieldType (paramName, param) {
+      const selectFields = ['gpucardid', 'vgpuprofileid', 'parentgpudeviceid', 'type']
+      return selectFields.includes(paramName) ? 'select' : 'input'
+    },
+    getFieldOptions (paramName) {
+      switch (paramName) {
+        case 'gpucardid':
+          return this.gpuCards.map(card => ({ value: card.id, label: card.name }))
+        case 'vgpuprofileid':
+          return this.vgpuProfiles.map(profile => ({ value: profile.id, label: profile.name }))
+        case 'parentgpudeviceid':
+          return this.parentGpuDevices.map(device => ({
+            value: device.id,
+            label: `${device.gpucardname} - ${device.busaddress}`
+          }))
+        case 'type':
+          return [
+            { value: 'PCI', label: 'PCI' },
+            { value: 'MDEV', label: 'MDEV' },
+            { value: 'VGPUOnly', label: 'VGPUOnly' }
+          ]
+        default:
+          return []
+      }
+    },
+    getFieldLoading (paramName) {
+      switch (paramName) {
+        case 'gpucardid':
+          return this.loadingGpuCards
+        case 'vgpuprofileid':
+          return this.loadingVgpuProfiles
+        case 'parentgpudeviceid':
+          return this.loadingParentDevices
+        default:
+          return false
+      }
+    },
+    onGpuCardChange (gpucardid) {
+      // Clear the selected vGPU profile when GPU card changes
+      this.gpuDeviceForm.vgpuprofileid = null
+      // Fetch vGPU profiles for the selected GPU card
+      if (gpucardid) {
+        this.fetchVgpuProfiles(gpucardid)
+      } else {
+        this.vgpuProfiles = []
+      }
+    },
+    fetchGpuCards () {
+      this.loadingGpuCards = true
+      getAPI('listGpuCards').then(json => {
+        this.gpuCards = json?.listgpucardsresponse?.gpucard || []
+        this.generateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingGpuCards = false
+      })
+    },
+    fetchVgpuProfiles (gpucardid = null) {
+      this.loadingVgpuProfiles = true
+      const params = {}
+      if (gpucardid) {
+        params.gpucardid = gpucardid
+      }
+      getAPI('listVgpuProfiles', params).then(json => {
+        this.vgpuProfiles = json?.listvgpuprofilesresponse?.vgpuprofile || []
+        this.generateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingVgpuProfiles = false
+      })
+    },
+    fetchParentGpuDevices () {
+      if (!this.resource.id || this.resourceType !== 'Host') {
+        return
+      }
+      this.loadingParentDevices = true
+      getAPI('listGpuDevices', { hostid: this.resource.id }).then(json => {
+        const devices = json?.listgpudevicesresponse?.gpudevice || []
+        // Only include devices that can be parent devices (not virtual GPU devices)
+        this.parentGpuDevices = devices.filter(device => !device.parentgpudeviceid)
+        this.generateFormFields() // Refresh form fields with new data
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.loadingParentDevices = false
+      })
+    },
+    filterOption (input, option) {
+      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    showAddGpuDeviceModal () {
+      this.gpuDeviceForm = {
+        type: 'PCI' // Set default type
+      }
+      this.vgpuProfiles = [] // Clear profiles initially
+      this.fetchGpuCards()
+      this.fetchParentGpuDevices()
+      this.addGpuDeviceModalVisible = true
+    },
+    addGpuDevice () {
+      // Validate required fields
+      if (!this.gpuDeviceForm.busaddress || !this.gpuDeviceForm.gpucardid || !this.gpuDeviceForm.vgpuprofileid) {
+        this.$notification.warning({
+          message: this.$t('label.warning'),
+          description: this.$t('message.please.fill.required.fields')
+        })
+        return
+      }
+
+      const params = {
+        hostid: this.resource.id,
+        busaddress: this.gpuDeviceForm.busaddress,
+        gpucardid: this.gpuDeviceForm.gpucardid,
+        vgpuprofileid: this.gpuDeviceForm.vgpuprofileid
+      }
+
+      // Add optional parameters only if they have values
+      if (this.gpuDeviceForm.type) {
+        params.type = this.gpuDeviceForm.type
+      }
+      if (this.gpuDeviceForm.numanode) {
+        params.numanode = this.gpuDeviceForm.numanode
+      }
+      if (this.gpuDeviceForm.parentgpudeviceid) {
+        params.parentgpudeviceid = this.gpuDeviceForm.parentgpudeviceid
+      }
+
+      postAPI('createGpuDevice', params).then(() => {
+        this.$notification.success({
+          message: this.$t('label.success'),
+          description: this.$t('message.success.add.gpu.device')
+        })
+        this.addGpuDeviceModalVisible = false
+        this.refresh()
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    refresh (skipDevicesTab = false) {
+      // Refresh summary tabs
+      const summaryTab = this.$refs.summaryTab || this.$refs.summaryTabSimple
+      if (summaryTab?.refresh) {
+        summaryTab.refresh()
+      }
+      // Refresh devices tab only if not skipped
+      if (!skipDevicesTab && this.$refs.devicesTab?.refresh) {
+        this.$refs.devicesTab.refresh()
+      }
+      // Emit refresh to parent
+      this.$emit('refresh')
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* Background colors for GPU device types */
+:deep(.parent-gpu-row) {
+  background-color: #fafafa;
+}
+
+:deep(.vgpu-row) {
+  background-color: #f0f8ff;
+}
+
+:deep(.parent-gpu-row:hover) {
+  background-color: #f5f5f5 !important;
+}
+
+:deep(.vgpu-row:hover) {
+  background-color: #e6f4ff !important;
+}
+
+/* Text truncation for long names */
+:deep(.ant-table-tbody .ant-table-cell) {
+  max-width: 200px;
+}
+
+:deep(.ant-table-tbody .ant-table-cell:has([data-column="gpucardname"]),
+  .ant-table-tbody .ant-table-cell:has([data-column="vgpuprofilename"]),
+  .ant-table-tbody .ant-table-cell:has([data-column="hostname"])) {
+  max-width: 150px;
+}
+
+.text-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+  display: inline-block;
+}
+</style>
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index baedfc12170..449172112a0 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -256,6 +256,26 @@
                 </span>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
+              <div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
+              <div class="resource-detail-item__details">
+                <font-awesome-icon
+                  :icon="['fa-solid', 'fa-microchip']"
+                  class="anticon"
+                  :style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
+                <span>
+                  {{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
+                  <router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
+                  <span v-else>{{ resource.gpucardname }}</span>
+                  <router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
+                  <span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
+                  <span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
+                    <br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') +  ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
+                    (resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
+                  </span>
+                </span>
+              </div>
+            </div>
             <div class="resource-detail-item" v-else-if="resource.memorytotalgb">
               <div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
               <div class="resource-detail-item__details">
@@ -321,6 +341,27 @@
 
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.gputotal">
+              <div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
+              <div class="resource-detail-item__details">
+                <font-awesome-icon
+                  :icon="['fa-solid', 'fa-microchip']"
+                  class="anticon"
+                  :style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
+                {{ resource.gputotal + ' ' + $t('label.gpu') }}
+              </div>
+              <div>
+                <span v-if="resource.gpuused">
+                  <a-progress
+                    class="progress-bar"
+                    size="small"
+                    status="active"
+                    :percent="Number(parseFloat(100.0 * parseFloat(resource.gpuused) / parseFloat(resource.gputotal)).toFixed(2))"
+                    :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.used')"
+                  />
+                </span>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="resource.volumes || resource.sizegb">
               <div class="resource-detail-item__label" v-if="$route.meta.name === 'backup'">{{ $t('label.size') }}</div>
               <div class="resource-detail-item__label" v-else>{{ $t('label.disksize') }}</div>
@@ -584,6 +625,17 @@
                 <router-link v-if="!isStatic && ($route.meta.name === 'router' || $route.meta.name === 'systemvm')" :to="{ path: '/systemoffering/' + resource.serviceofferingid}">{{ resource.serviceofferingname || resource.serviceofferingid }} </router-link>
                 <router-link v-else-if="$router.resolve('/computeoffering/' + resource.serviceofferingid).matched[0].redirect !== '/exception/404'" :to="{ path: '/computeoffering/' + resource.serviceofferingid }">{{ resource.serviceofferingname || resource.serviceofferingid }} </router-link>
                 <span v-else>{{ resource.serviceofferingname || resource.serviceofferingid }}</span>
+                <span v-if="resource.leaseduration !== undefined">
+                  <a-tooltip>
+                    <template #title>{{ $t('label.remainingdays')  + ": " + getRemainingLeaseText(record.leaseduration) }}</template>
+                    <field-time-outlined
+                      :style="{
+                        color: $store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' },
+                        fontSize: '20px',
+                        paddingLeft: '5px'
+                      }"/>
+                  </a-tooltip>
+                </span>
               </div>
             </div>
             <div class="resource-detail-item" v-if="resource.controlofferingname && resource.controlofferingid">
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 8f9d17ff23b..e5d843d4ce4 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -29,10 +29,20 @@
     :style="{ 'overflow-y': this.$route.name === 'usage' ? 'hidden' : 'auto' }"
   >
     <template #customFilterDropdown>
-      <div style="padding: 8px" class="filter-dropdown">
+      <div
+        style="padding: 8px"
+        class="filter-dropdown"
+      >
         <a-menu>
-          <a-menu-item v-for="(column, idx) in columnKeys" :key="idx" @click="updateSelectedColumns(column)">
-            <a-checkbox :id="idx.toString()" :checked="selectedColumns.includes(getColumnKey(column))"/>
+          <a-menu-item
+            v-for="(column, idx) in columnKeys"
+            :key="idx"
+            @click="updateSelectedColumns(column)"
+          >
+            <a-checkbox
+              :id="idx.toString()"
+              :checked="selectedColumns.includes(getColumnKey(column))"
+            />
             {{ $t('label.' + String(getColumnTitle(column)).toLowerCase()) }}
           </a-menu-item>
         </a-menu>
@@ -40,21 +50,41 @@
     </template>
     <template #bodyCell="{ column, text, record }">
       <template v-if="['name', 'provider'].includes(column.key) ">
-        <span v-if="['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
+        <span
+          v-if="['vm', 'vnfapp'].includes($route.path.split('/')[1])"
+          style="margin-right: 5px"
+        >
           <span v-if="record.icon && record.icon.base64image">
-            <resource-icon :image="record.icon.base64image" size="2x"/>
+            <resource-icon
+              :image="record.icon.base64image"
+              size="2x"
+            />
           </span>
-          <os-logo v-else :osId="record.ostypeid" :osName="record.osdisplayname" size="xl" />
+          <os-logo
+            v-else
+            :osId="record.ostypeid"
+            :osName="record.osdisplayname"
+            size="xl"
+          />
         </span>
-        <span style="min-width: 120px" >
+        <span style="min-width: 120px">
           <QuickView
             style="margin-left: 5px"
             :actions="actions"
             :resource="record"
             :enabled="quickViewEnabled() && actions.length > 0 && columns && ['name', 'provider'].includes(columns[0].dataIndex)"
-            @exec-action="$parent.execAction"/>
-          <span v-if="$route.path.startsWith('/project')" style="margin-right: 5px">
-            <tooltip-button type="dashed" size="small" icon="LoginOutlined" @onClick="changeProject(record)" />
+            @exec-action="$parent.execAction"
+          />
+          <span
+            v-if="$route.path.startsWith('/project')"
+            style="margin-right: 5px"
+          >
+            <tooltip-button
+              type="dashed"
+              size="small"
+              icon="LoginOutlined"
+              @onClick="changeProject(record)"
+            />
           </span>
           <span v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
             <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="2x"/>
@@ -62,41 +92,92 @@
             <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 16px;" :icon="$route.meta.icon"/>
             <render-icon v-else style="font-size: 16px;" :svgIcon="$route.meta.icon" />
           </span>
-          <span v-else :style="{ 'margin-right': record.ostypename ? '5px' : '0' }">
-            <os-logo v-if="record.ostypename" :osName="record.ostypename" size="xl" />
+          <span
+            v-else
+            :style="{ 'margin-right': record.ostypename ? '5px' : '0' }"
+          >
+            <os-logo
+              v-if="record.ostypename"
+              :osName="record.ostypename"
+              size="xl"
+            />
           </span>
           <span v-if="record.hasannotations">
             <span v-if="record.id">
               <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
-              <router-link :to="{ path: $route.path + '/' + record.id, query: { tab: 'comments' } }"><message-filled style="padding-left: 10px" size="small"/></router-link>
+              <router-link :to="{ path: $route.path + '/' + record.id, query: { tab: 'comments' } }"><message-filled
+                  style="padding-left: 10px"
+                  size="small"
+                /></router-link>
             </span>
-            <router-link v-else :to="{ path: $route.path + '/' + record.name }" >{{ text }}</router-link>
+            <router-link
+              v-else
+              :to="{ path: $route.path + '/' + record.name }"
+            >{{ text }}</router-link>
           </span>
           <span v-else-if="$route.path.startsWith('/globalsetting')">{{ text }}</span>
           <span v-else-if="$route.path.startsWith('/alert')">
-            <router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
-            <router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.id }"
+              v-if="record.id"
+            >{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.name }"
+              v-else
+            >{{ $t(text.toLowerCase()) }}</router-link>
           </span>
           <span v-else-if="$route.path.startsWith('/tungstenfabric')">
-            <router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
-            <router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.id }"
+              v-if="record.id"
+            >{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.name }"
+              v-else
+            >{{ $t(text.toLowerCase()) }}</router-link>
           </span>
           <span v-else-if="isTungstenPath()">
-            <router-link :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: record.zoneid } }" v-if="record.uuid && record.zoneid">{{ $t(text.toLowerCase()) }}</router-link>
-            <router-link :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: $route.query.zoneid } }" v-else-if="record.uuid && $route.query.zoneid">{{ $t(text.toLowerCase()) }}</router-link>
-            <router-link :to="{ path: $route.path }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: record.zoneid } }"
+              v-if="record.uuid && record.zoneid"
+            >{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.uuid, query: { zoneid: $route.query.zoneid } }"
+              v-else-if="record.uuid && $route.query.zoneid"
+            >{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path }"
+              v-else
+            >{{ $t(text.toLowerCase()) }}</router-link>
           </span>
           <span v-else-if="$route.path.startsWith('/guestnetwork') && record.id && record.displaynetwork === false">
-            <router-link :to="{ path: $route.path + '/' + record.id, query: { displaynetwork: false } }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.id, query: { displaynetwork: false } }"
+              v-if="record.id"
+            >{{ $t(text.toLowerCase()) }}</router-link>
+          </span>
+          <span v-else-if="$route.path.startsWith('/gpucard') && record.gpucardid">
+            <router-link
+              :to="{ path: '/vgpuprofile/' + record.id }"
+              v-if="record.id"
+            >{{ $t(text.toLowerCase()) }}</router-link>
           </span>
           <span v-else>
-            <router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
-            <router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
-            <span v-if="['guestnetwork','vpc'].includes($route.path.split('/')[1]) && record.restartrequired && !record.vpcid">
+            <router-link
+              :to="{ path: $route.path + '/' + record.id }"
+              v-if="record.id"
+            >{{ text }}</router-link>
+            <router-link
+              :to="{ path: $route.path + '/' + record.name }"
+              v-else
+            >{{ text }}</router-link>
+            <span
+              v-if="['guestnetwork','vpc'].includes($route.path.split('/')[1]) && record.restartrequired && !record.vpcid"
+            >
               &nbsp;
               <a-tooltip>
                 <template #title>{{ $t('label.restartrequired') }}</template>
-                <warning-outlined style="color: #f5222d"/>
+                <warning-outlined style="color: #f5222d" />
               </a-tooltip>
             </span>
           </span>
@@ -114,6 +195,12 @@
                   }"/>
               </a-tooltip>
           </span>
+          <span
+            v-if="['zone', 'host', 'vm', 'computeoffering', 'systemoffering'].includes($route.path.split('/')[1]) && (record?.gputotal > 0 || record?.gpucount > 0)"
+            style="margin-right: 5px"
+          >
+            <a-tag style="margin-left: 5px">{{ $t('label.gpu.enabled') }}</a-tag>
+          </span>
           <span v-if="$route.path.startsWith('/extension') && !record.isuserdefined" style="padding-left: 10px;">
             <a-tag :color="$config.theme['@link-color']">{{ $t('label.inbuilt') }}</a-tag>
           </span>
@@ -122,18 +209,37 @@
       <template v-if="column.key === 'templatetype'">
         <span>{{ text }}</span>
       </template>
+      <template v-if="column.key === 'gpu'">
+        <span v-if="record.gpucardname && record.vgpuprofilename">
+          {{ record?.gpucount > 0 ? record.gpucount + 'x' : '' }}
+          <router-link v-if="record.gpucardid" :to="{ path: '/gpucard/' + record.gpucardid }">{{ record.gpucardname }}</router-link>
+          <span v-else>{{ record.gpucardname }}</span>
+          <router-link v-if="record.vgpuprofileid && record.vgpuprofilename !== 'passthrough'" :to="{ path: '/vgpuprofile/' + record.vgpuprofileid }">{{ record.vgpuprofilename === 'passthrough' ? '' : "(" + record.vgpuprofilename + ")"}}</router-link>
+          <span v-else>{{ record.vgpuprofilename === 'passthrough' ? '' : "(" + record.vgpuprofilename + ")"}}</span>
+        </span>
+      </template>
+      <template v-if="column.key === 'resolution'">
+        <span v-if="record.maxresolutionx && record.maxresolutiony">
+          {{ record.maxresolutionx }}x{{ record.maxresolutiony }}
+        </span>
+        <span v-else>
+          {{ text }}
+        </span>
+      </template>
       <template v-if="column.key === 'templateid'">
         <router-link :to="{ path: '/template/' + record.templateid }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'type'">
-        <span v-if="['USER.LOGIN', 'USER.LOGOUT', 'ROUTER.HEALTH.CHECKS', 'FIREWALL.CLOSE', 'ALERT.SERVICE.DOMAINROUTER'].includes(text)">{{ $t(text.toLowerCase()) }}</span>
+        <span
+          v-if="['USER.LOGIN', 'USER.LOGOUT', 'ROUTER.HEALTH.CHECKS', 'FIREWALL.CLOSE', 'ALERT.SERVICE.DOMAINROUTER'].includes(text)"
+        >{{ $t(text.toLowerCase()) }}</span>
         <span v-else>{{ text }}</span>
       </template>
 
       <template v-if="column.key === 'schedule'">
-          {{ text }}
-          <br/>
-          ({{ generateHumanReadableSchedule(text) }})
+        {{ text }}
+        <br />
+        ({{ generateHumanReadableSchedule(text) }})
       </template>
       <template v-if="column.key === 'displayname'">
         <QuickView
@@ -141,30 +247,63 @@
           :actions="actions"
           :resource="record"
           :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'displayname' "
-          @exec-action="$parent.execAction"/>
+          @exec-action="$parent.execAction"
+        />
         <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'username'">
-        <span v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
-          <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="2x"/>
-          <user-outlined v-else style="font-size: 16px;" />
+        <span
+          v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])"
+          style="margin-right: 5px"
+        >
+          <resource-icon
+            v-if="$showIcon() && record.icon && record.icon.base64image"
+            :image="record.icon.base64image"
+            size="2x"
+          />
+          <user-outlined
+            v-else
+            style="font-size: 16px;"
+          />
         </span>
-        <router-link :to="{ path: $route.path + '/' + record.id }" v-if="['/accountuser', '/vpnuser'].includes($route.path)">{{ text }}</router-link>
-        <router-link :to="{ path: '/accountuser', query: { username: record.username, domainid: record.domainid } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
+        <router-link
+          :to="{ path: $route.path + '/' + record.id }"
+          v-if="['/accountuser', '/vpnuser'].includes($route.path)"
+        >{{ text }}</router-link>
+        <router-link
+          :to="{ path: '/accountuser', query: { username: record.username, domainid: record.domainid } }"
+          v-else-if="$store.getters.userInfo.roletype !== 'User'"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'entityid'">
-        <router-link :to="{ path: generateCommentsPath(record), query: { tab: 'comments' } }">{{ record.entityname }}</router-link>
+        <router-link :to="{ path: generateCommentsPath(record), query: { tab: 'comments' } }">{{ record.entityname
+          }}</router-link>
       </template>
       <template v-if="column.key === 'entitytype'">
         {{ generateHumanReadableEntityType(record) }}
       </template>
       <template v-if="column.key === 'adminsonly' && ['Admin'].includes($store.getters.userInfo.roletype)">
-        <a-checkbox :checked="record.adminsonly" :value="record.id" v-if="record.userid === $store.getters.userInfo.id" @change="e => updateAdminsOnly(e)" />
-        <a-checkbox :checked="record.adminsonly" disabled v-else />
+        <a-checkbox
+          :checked="record.adminsonly"
+          :value="record.id"
+          v-if="record.userid === $store.getters.userInfo.id"
+          @change="e => updateAdminsOnly(e)"
+        />
+        <a-checkbox
+          :checked="record.adminsonly"
+          disabled
+          v-else
+        />
       </template>
-      <template v-if="column.key === 'ipaddress'" href="javascript:;">
-        <router-link v-if="['/publicip', '/privategw'].includes($route.path)" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
+      <template
+        v-if="column.key === 'ipaddress'"
+        href="javascript:;"
+      >
+        <router-link
+          v-if="['/publicip', '/privategw'].includes($route.path)"
+          :to="{ path: $route.path + '/' + record.id }"
+        >{{ text }}</router-link>
         <span v-else>
           <copy-label :label="text" />
         </span>
@@ -181,28 +320,51 @@
           <a-tag>system</a-tag>
         </span>
       </template>
-      <template v-if="column.key === 'ip6address'" href="javascript:;">
+      <template
+        v-if="column.key === 'ip6address'"
+        href="javascript:;"
+      >
         <span>{{ ipV6Address(text, record) }}</span>
       </template>
       <template v-if="column.key === 'publicip'">
-        <router-link v-if="['/autoscalevmgroup'].includes($route.path)" :to="{ path: '/publicip' + '/' + record.publicipid }">{{ text }}</router-link>
-        <router-link v-else :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
+        <router-link
+          v-if="['/autoscalevmgroup'].includes($route.path)"
+          :to="{ path: '/publicip' + '/' + record.publicipid }"
+        >{{ text }}</router-link>
+        <router-link
+          v-else
+          :to="{ path: $route.path + '/' + record.id }"
+        >{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'traffictype'">
         {{ text }}
       </template>
       <template v-if="column.key === 'vmname'">
-        <router-link :to="{ path: createPathBasedOnVmType(record.vmtype, record.virtualmachineid) }">{{ text }}</router-link>
+        <router-link :to="{ path: createPathBasedOnVmType(record.vmtype, record.virtualmachineid) }">{{ text
+          }}</router-link>
       </template>
       <template v-if="column.key === 'virtualmachinename'">
         <router-link :to="{ path: getVmRouteUsingType(record) + record.virtualmachineid }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'volumename'">
-        <router-link v-if="resourceIdToValidLinksMap[record.id]?.volume" :to="{ path: '/volume/' + record.volumeid }">{{ text }}</router-link>
+        <router-link
+          v-if="resourceIdToValidLinksMap[record.id]?.volume"
+          :to="{ path: '/volume/' + record.volumeid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
-      <template v-if="record.clustertype === 'ExternalManaged' && $route.path.split('/')[1] === 'kubernetes' && ['kubernetesversionname', 'cpunumber', 'memory', 'size'].includes(column.key)">
-        <span>{{ text <= 0 || !text ? 'N/A' : text }}</span>
+      <template
+        v-if="record.clustertype === 'ExternalManaged' && $route.path.split('/')[1] === 'kubernetes' && ['kubernetesversionname', 'cpunumber', 'memory', 'size'].includes(column.key)"
+      >
+        <span>{{ text <=
+            0
+            ||
+            !text
+            ? 'N/A'
+            :
+            text
+            }}</span
+          >
       </template>
       <template v-else-if="['size', 'virtualsize'].includes(column.key)">
         <span v-if="text && $route.path === '/kubernetes'">
@@ -217,6 +379,11 @@
           {{ isNaN(text) ? text : (parseFloat(parseFloat(text) / 1024.0 / 1024.0 / 1024.0).toFixed(2) + ' GiB') }}
         </span>
       </template>
+      <template v-if="column.key === 'videoram'">
+        <span v-if="text">
+          {{ isNaN(text) ? text : (parseFloat(text) / 1024.0).toFixed(2) + ' GB' }}
+        </span>
+      </template>
       <template v-if="column.key === 'physicalnetworkname'">
         <router-link :to="{ path: '/physicalnetwork/' + record.physicalnetworkid }">{{ text }}</router-link>
       </template>
@@ -233,7 +400,8 @@
             :actions="actions"
             :resource="record"
             :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'hypervisor' "
-            @exec-action="$parent.execAction"/>
+            @exec-action="$parent.execAction"
+          />
           <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
         </span>
         <span v-else>{{ text }}</span>
@@ -254,49 +422,96 @@
         <span>{{ text ? $t('label.yes') : $t('label.no') }}</span>
       </template>
       <template v-if="column.key === 'state'">
-        <status v-if="$route.path.startsWith('/host')" :text="getHostState(record)" displayText />
-        <status v-else :text="text ? text : ''" displayText :styles="{ 'min-width': '80px' }" />
+        <status
+          v-if="$route.path.startsWith('/host')"
+          :text="getHostState(record)"
+          displayText
+        />
+        <status
+          v-else
+          :text="text ? text : ''"
+          displayText
+          :styles="{ 'min-width': '80px' }"
+        />
       </template>
       <template v-if="column.key === 'status'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'allocationstate'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'redundantstate'">
-        <status v-if="record && record.isredundantrouter" :text="text ? text : ''" displayText />
-        <status v-else :text="'N/A'" displayText :styles="{ 'min-width': '80px' }" />
+        <status
+          v-if="record && record.isredundantrouter"
+          :text="text ? text : ''"
+          displayText
+        />
+        <status
+          v-else
+          :text="'N/A'"
+          displayText
+          :styles="{ 'min-width': '80px' }"
+        />
       </template>
       <template v-if="column.key === 'resourcestate'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'powerstate'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'agentstate'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'availability' && $route.path.startsWith('/extension')">
         <status :text="text ? text : ''" displayText />
       </template>
       <template v-if="column.key === 'cpunumber'">
-        <span>{{ record.serviceofferingdetails?.mincpunumber && record.serviceofferingdetails?.maxcpunumber ? `${record.serviceofferingdetails.mincpunumber} - ${record.serviceofferingdetails.maxcpunumber}` : record.cpunumber }}</span>
+        <span>{{ record.serviceofferingdetails?.mincpunumber && record.serviceofferingdetails?.maxcpunumber ?
+          `${record.serviceofferingdetails.mincpunumber} - ${record.serviceofferingdetails.maxcpunumber}` :
+          record.cpunumber }}</span>
       </template>
       <template v-if="column.key === 'memory'">
-        <span>{{ record.serviceofferingdetails?.minmemory && record.serviceofferingdetails?.maxmemory ? `${record.serviceofferingdetails.minmemory} - ${record.serviceofferingdetails.maxmemory}` : record.memory }}</span>
+        <span>{{ record.serviceofferingdetails?.minmemory && record.serviceofferingdetails?.maxmemory ?
+          `${record.serviceofferingdetails.minmemory} - ${record.serviceofferingdetails.maxmemory}` : record.memory
+          }}</span>
       </template>
       <template v-if="column.key === 'quotastate'">
-        <status :text="text ? text : ''" displayText />
+        <status
+          :text="text ? text : ''"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'vmstate'">
-        <status :text="text ? text : ''" displayText vmState/>
+        <status
+          :text="text ? text : ''"
+          displayText
+          vmState
+        />
       </template>
       <template v-if="column.key === 'offerha'">
         {{ text ? $t('state.enabled') : $t('state.disabled')}}
       </template>
       <template v-if="column.key === 'vlan'">
         <a href="javascript:;">
-          <router-link v-if="$route.path === '/guestvlans'" :to="{ path: '/guestvlans/' + record.id }">{{ text }}</router-link>
+          <router-link
+            v-if="$route.path === '/guestvlans'"
+            :to="{ path: '/guestvlans/' + record.id }"
+          >{{ text }}</router-link>
         </a>
       </template>
       <template v-if="column.key === 'networkname'">
@@ -305,17 +520,23 @@
       <template v-if="column.key === 'guestnetworkname'">
         <span v-if="['/router'].includes($route.path) && record.vpcid">
           <router-link :to="{ path: '/vpc/' + record.vpcid }">
-            <deployment-unit-outlined/>
+            <deployment-unit-outlined />
             {{ record.vpcname || record.vpcid }}
           </router-link>
         </span>
-        <router-link v-else :to="{ path: '/guestnetwork/' + record.guestnetworkid }">
-          <apartment-outlined/>
+        <router-link
+          v-else
+          :to="{ path: '/guestnetwork/' + record.guestnetworkid }"
+        >
+          <apartment-outlined />
           {{ text }}
         </router-link>
       </template>
       <template v-if="column.key === 'guest.networks' && record.network">
-        <template v-for="(item, idx) in record.network" :key="idx">
+        <template
+          v-for="(item, idx) in record.network"
+          :key="idx"
+        >
           <router-link :to="{ path: '/guestnetwork/' + item.id }">{{ item.name }}</router-link>
           <span v-if="idx < (record.network.length - 1)">, </span>
         </template>
@@ -331,28 +552,52 @@
       </template>
       <template v-if="column.key === 'subnet'">
         <a href="javascript:;">
-          <router-link v-if="$route.path === '/ipv4subnets'" :to="{ path: '/ipv4subnets/' + record.id }">{{ text }}</router-link>
+          <router-link
+            v-if="$route.path === '/ipv4subnets'"
+            :to="{ path: '/ipv4subnets/' + record.id }"
+          >{{ text }}</router-link>
         </a>
       </template>
       <template v-if="column.key === 'hostname'">
-        <router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
-        <router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
+        <router-link
+          v-if="record.hostid"
+          :to="{ path: '/host/' + record.hostid }"
+        >{{ text }}</router-link>
+        <router-link
+          v-else-if="record.hostname"
+          :to="{ path: $route.path + '/' + record.id }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'storage'">
-        <router-link v-if="record.storageid" :to="{ path: '/storagepool/' + record.storageid }">{{ text }}</router-link>
+        <router-link
+          v-if="record.storageid"
+          :to="{ path: '/storagepool/' + record.storageid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
-      <template v-for="(value, name) in thresholdMapping" :key="name">
+      <template
+        v-for="(value, name) in thresholdMapping"
+        :key="name"
+      >
         <template v-if="column.key === name">
           <span>
-            <span v-if="record[value.disable]" class="alert-disable-threshold">
+            <span
+              v-if="record[value.disable]"
+              class="alert-disable-threshold"
+            >
               {{ text }}
             </span>
-            <span v-else-if="record[value.notification]" class="alert-notification-threshold">
+            <span
+              v-else-if="record[value.notification]"
+              class="alert-notification-threshold"
+            >
               {{ text }}
             </span>
-            <span style="padding: 10%;" v-else>
+            <span
+              style="padding: 10%;"
+              v-else
+            >
               {{ text }}
             </span>
           </span>
@@ -376,11 +621,20 @@
       </template>
       <template v-if="column.key === 'account'">
         <template v-if="record.owner">
-          <template v-for="(item, idx) in record.owner" :key="idx">
+          <template
+            v-for="(item, idx) in record.owner"
+            :key="idx"
+          >
             <span style="margin-right:5px">
               <span v-if="$store.getters.userInfo.roletype !== 'User'">
-                <router-link v-if="'user' in item" :to="{ path: '/accountuser', query: { username: item.user, domainid: record.domainid }}">{{ item.account + '(' + item.user + ')' }}</router-link>
-                <router-link v-else :to="{ path: '/account', query: { name: item.account, domainid: record.domainid, dataView: true } }">{{ item.account }}</router-link>
+                <router-link
+                  v-if="'user' in item"
+                  :to="{ path: '/accountuser', query: { username: item.user, domainid: record.domainid }}"
+                >{{ item.account + '(' + item.user + ')' }}</router-link>
+                <router-link
+                  v-else
+                  :to="{ path: '/account', query: { name: item.account, domainid: record.domainid, dataView: true } }"
+                >{{ item.account }}</router-link>
               </span>
               <span v-else>{{ item.user ? item.account + '(' + item.user + ')' : item.account }}</span>
             </span>
@@ -389,58 +643,93 @@
         <template v-if="text && !text.startsWith('PrjAcct-')">
           <router-link
             v-if="'quota' in record && $router.resolve(`${$route.path}/${record.account}`).matched[0].redirect !== '/exception/404'"
-            :to="{ path: `${$route.path}/${record.account}`, query: { account: record.account, domainid: record.domainid, quota: true } }">{{ text }}</router-link>
-          <router-link :to="{ path: '/account/' + record.accountid }" v-else-if="record.accountid">{{ text }}</router-link>
-          <router-link :to="{ path: '/account', query: { name: record.account, domainid: record.domainid, dataView: true } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
+            :to="{ path: `${$route.path}/${record.account}`, query: { account: record.account, domainid: record.domainid, quota: true } }"
+          >{{ text }}</router-link>
+          <router-link
+            :to="{ path: '/account/' + record.accountid }"
+            v-else-if="record.accountid"
+          >{{ text }}</router-link>
+          <router-link
+            :to="{ path: '/account', query: { name: record.account, domainid: record.domainid, dataView: true } }"
+            v-else-if="$store.getters.userInfo.roletype !== 'User'"
+          >{{ text }}</router-link>
           <span v-else>{{ text }}</span>
         </template>
       </template>
       <template v-if="column.key === 'resource'">
-        <resource-label :resourceType="record.resourcetype" :resourceId="record.resourceid" :resourceName="record.resourcename" />
+        <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>
+        <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-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'domainpath'">
-        <router-link v-if="record.domainid && !record.domainid.includes(',') && $router.resolve('/domain/' + record.domainid).matched[0].redirect !== '/exception/404'" :to="{ path: '/domain/' + record.domainid, query: { tab: 'details' } }">{{ text }}</router-link>
+        <router-link
+          v-if="record.domainid && !record.domainid.includes(',') && $router.resolve('/domain/' + record.domainid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/domain/' + record.domainid, query: { tab: 'details' } }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'zone'">
-        <router-link v-if="record.zoneid && !record.zoneid.includes(',') && $router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zone/' + record.zoneid }">{{ text || record.zoneid }}</router-link>
+        <router-link
+          v-if="record.zoneid && !record.zoneid.includes(',') && $router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/zone/' + record.zoneid }"
+        >{{ text || record.zoneid }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'zonename'">
-        <router-link v-if="$router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
-        <router-link v-else-if="$router.resolve('/zones/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zones/' + record.zoneid }">{{ text }}</router-link>
+        <router-link
+          v-if="$router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/zone/' + record.zoneid }"
+        >{{ text }}</router-link>
+        <router-link
+          v-else-if="$router.resolve('/zones/' + record.zoneid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/zones/' + record.zoneid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'rolename'">
-        <router-link v-if="record.roleid && $router.resolve('/role/' + record.roleid).matched[0].redirect !== '/exception/404'" :to="{ path: '/role/' + record.roleid }">{{ text }}</router-link>
+        <router-link
+          v-if="record.roleid && $router.resolve('/role/' + record.roleid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/role/' + record.roleid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'project'">
-        <router-link v-if="$router.resolve('/project/' + record.projectid).matched[0].redirect !== '/exception/404'" :to="{ path: '/project/' + record.projectid }">{{ text }}</router-link>
+        <router-link
+          v-if="$router.resolve('/project/' + record.projectid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/project/' + record.projectid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'templateversion'">
-        <span>  {{ record.version }} </span>
+        <span> {{ record.version }} </span>
       </template>
       <template v-if="column.key === 'drsimbalance'">
-        <span>  {{ record.drsimbalance }} </span>
+        <span> {{ record.drsimbalance }} </span>
       </template>
       <template v-if="column.key === 'softwareversion'">
-        <span>  {{ record.softwareversion ? record.softwareversion : 'N/A' }} </span>
+        <span> {{ record.softwareversion ? record.softwareversion : 'N/A' }} </span>
       </template>
       <template v-if="column.key === 'readonly'">
-        <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText />
+        <status
+          :text="record.readonly ? 'ReadOnly' : 'ReadWrite'"
+          displayText
+        />
       </template>
       <template v-if="column.key === 'requiresupgrade'">
         <status :text="record.requiresupgrade ? 'warning' : ''" />
         {{ record.requiresupgrade ? 'Yes' : 'No' }}
       </template>
       <template v-if="column.key === 'loadbalancerrule'">
-        <span>  {{ record.loadbalancerrule }} </span>
+        <span> {{ record.loadbalancerrule }} </span>
       </template>
       <template v-if="column.key === 'autoscalingenabled'">
         <status :text="record.autoscalingenabled ? 'Enabled' : 'Disabled'" />
@@ -453,10 +742,14 @@
         <status :text="record.enabled ? record.enabled.toString() : 'false'" />
         {{ record.enabled ? 'Enabled' : 'Disabled' }}
       </template>
-      <template v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate', 'allocated'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)">
+      <template
+        v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate', 'allocated'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)"
+      >
         {{ text && $toLocaleDate(text) }}
       </template>
-      <template v-if="['startdate', 'enddate'].includes(column.key) && ['vm', 'vnfapp'].includes($route.path.split('/')[1])">
+      <template
+        v-if="['startdate', 'enddate'].includes(column.key) && ['vm', 'vnfapp'].includes($route.path.split('/')[1])"
+      >
         {{ getDateAtTimeZone(text, record.timezone) }}
       </template>
       <template v-if="column.key === 'payloadurl'">
@@ -466,27 +759,50 @@
         <copy-label :label="text" />
       </template>
       <template v-if="column.key === 'eventtype'">
-        <router-link v-if="$router.resolve('/event/' + record.eventid).matched[0].redirect !== '/exception/404'" :to="{ path: '/event/' + record.eventid }">{{ text }}</router-link>
+        <router-link
+          v-if="$router.resolve('/event/' + record.eventid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/event/' + record.eventid }"
+        >{{ text }}</router-link>
+        <span v-else>{{ text }}</span>
+      </template>
+      <template v-if="column.key === 'gpucardname'">
+        <router-link
+          v-if="$router.resolve('/gpucard/' + record.gpucardid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/gpucard/' + record.gpucardid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'managementservername'">
-        <router-link v-if="$router.resolve('/managementserver/' + record.managementserverid).matched[0].redirect !== '/exception/404'" :to="{ path: '/managementserver/' + record.managementserverid }">{{ text }}</router-link>
-        <router-link v-else-if="$router.resolve('/managementservers/' + record.managementserverid).matched[0].redirect !== '/exception/404'" :to="{ path: '/managementservers/' + record.managementserverid }">{{ text }}</router-link>
+        <router-link
+          v-if="$router.resolve('/managementserver/' + record.managementserverid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/managementserver/' + record.managementserverid }"
+        >{{ text }}</router-link>
+        <router-link
+          v-else-if="$router.resolve('/managementservers/' + record.managementserverid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/managementservers/' + record.managementserverid }"
+        >{{ text }}</router-link>
         <span v-else>{{ text }}</span>
       </template>
       <template v-if="column.key === 'payload'">
-        <router-link v-if="$router.resolve('/webhookdeliveries/' + record.id).matched[0].redirect !== '/exception/404'" :to="{ path: '/webhookdeliveries/' + record.id }">{{ getTrimmedText(text, 48) }}</router-link>
-        <span v-else>  {{ getTrimmedText(text, 48) }} </span>
+        <router-link
+          v-if="$router.resolve('/webhookdeliveries/' + record.id).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/webhookdeliveries/' + record.id }"
+        >{{ getTrimmedText(text, 48) }}</router-link>
+        <span v-else> {{ getTrimmedText(text, 48) }} </span>
         <QuickView
           style="margin-left: 5px"
           :actions="actions"
           :resource="record"
           :enabled="quickViewEnabled() && actions.length > 0"
-          @exec-action="$parent.execAction"/>
+          @exec-action="$parent.execAction"
+        />
       </template>
       <template v-if="column.key === 'webhookname'">
-        <router-link v-if="$router.resolve('/webhook/' + record.webhookid).matched[0].redirect !== '/exception/404'" :to="{ path: '/webhook/' + record.webhookid }">{{ text }}</router-link>
-        <span v-else>  {{ text }} </span>
+        <router-link
+          v-if="$router.resolve('/webhook/' + record.webhookid).matched[0].redirect !== '/exception/404'"
+          :to="{ path: '/webhook/' + record.webhookid }"
+        >{{ text }}</router-link>
+        <span v-else> {{ text }} </span>
       </template>
       <template v-if="column.key === 'extensionname'">
         <router-link v-if="$router.resolve('/extension/' + record.extensionid).matched[0].redirect !== '/exception/404'" :to="{ path: '/extension/' + record.extensionid }">{{ text }}</router-link>
@@ -496,10 +812,11 @@
         <status :text="text ? 'success' : 'error'" />
       </template>
       <template v-if="column.key === 'response'">
-        <span>  {{ getTrimmedText(text, 48) }} </span>
+        <span> {{ getTrimmedText(text, 48) }} </span>
       </template>
-      <template v-if="column.key === 'duration' && ['webhook', 'webhookdeliveries'].includes($route.path.split('/')[1])">
-        <span>  {{ getDuration(record.startdate, record.enddate) }} </span>
+      <template
+        v-if="column.key === 'duration' && ['webhook', 'webhookdeliveries'].includes($route.path.split('/')[1])">
+        <span> {{ getDuration(record.startdate, record.enddate) }} </span>
       </template>
       <template v-if="['startdate', 'enddate'].includes(column.key) && ['usage'].includes($route.path.split('/')[1])">
         {{ $toLocaleDate(text.replace('\'T\'', ' ')) }}
@@ -509,12 +826,16 @@
       </template>
       <template v-if="column.key === 'order'">
         <div class="shift-btns">
-          <a-tooltip :name="text" placement="top">
+          <a-tooltip
+            :name="text"
+            placement="top"
+          >
             <template #title>{{ $t('label.move.to.top') }}</template>
             <a-button
               shape="round"
               @click="moveItemTop(record)"
-              class="shift-btn">
+              class="shift-btn"
+            >
               <DoubleLeftOutlined class="shift-btn shift-btn--rotated" />
             </a-button>
           </a-tooltip>
@@ -523,19 +844,28 @@
             <a-button
               shape="round"
               @click="moveItemBottom(record)"
-              class="shift-btn">
+              class="shift-btn"
+            >
               <DoubleRightOutlined class="shift-btn shift-btn--rotated" />
             </a-button>
           </a-tooltip>
           <a-tooltip placement="top">
             <template #title>{{ $t('label.move.up.row') }}</template>
-            <a-button shape="round" @click="moveItemUp(record)" class="shift-btn">
+            <a-button
+              shape="round"
+              @click="moveItemUp(record)"
+              class="shift-btn"
+            >
               <CaretUpOutlined class="shift-btn" />
             </a-button>
           </a-tooltip>
           <a-tooltip placement="top">
             <template #title>{{ $t('label.move.down.row') }}</template>
-            <a-button shape="round" @click="moveItemDown(record)" class="shift-btn">
+            <a-button
+              shape="round"
+              @click="moveItemDown(record)"
+              class="shift-btn"
+            >
               <CaretDownOutlined class="shift-btn" />
             </a-button>
           </a-tooltip>
@@ -550,9 +880,13 @@
           :disabled="!('updateConfiguration' in $store.getters.apis)"
           v-model:value="editableValue"
           @keydown.esc="editableValueKey = null"
-          @pressEnter="saveValue(record)">
+          @pressEnter="saveValue(record)"
+        >
         </a-input>
-        <div v-else style="width: 200px; word-break: break-all">
+        <div
+          v-else
+          style="width: 200px; word-break: break-all"
+        >
           {{ text }}
         </div>
       </template>
@@ -562,32 +896,65 @@
           :disabled="!('updateConfiguration' in $store.getters.apis)"
           v-if="editableValueKey !== record.key"
           icon="edit-outlined"
-          @onClick="editValue(record)" />
+          @onClick="editValue(record)"
+        />
         <tooltip-button
           :tooltip="$t('label.cancel')"
           @onClick="editableValueKey = null"
           v-if="editableValueKey === record.key"
           iconType="CloseCircleTwoTone"
-          iconTwoToneColor="#f5222d" />
+          iconTwoToneColor="#f5222d"
+        />
         <tooltip-button
           :tooltip="$t('label.ok')"
           :disabled="!('updateConfiguration' in $store.getters.apis)"
           @onClick="saveValue(record)"
           v-if="editableValueKey === record.key"
           iconType="CheckCircleTwoTone"
-          iconTwoToneColor="#52c41a" />
+          iconTwoToneColor="#52c41a"
+        />
         <tooltip-button
           :tooltip="$t('label.reset.config.value')"
           @onClick="$resetConfigurationValueConfirm(item, resetConfig)"
           v-if="editableValueKey !== record.key"
           icon="reload-outlined"
-          :disabled="!('updateConfiguration' in $store.getters.apis)" />
+          :disabled="!('updateConfiguration' in $store.getters.apis)"
+        />
+      </template>
+      <template v-if="column.key === 'gpuDeviceActions'">
+        <a-popconfirm
+          v-if="record.state === 'Disabled'"
+          :title="`${$t('label.action.enable.gpu.device')}?`"
+          @confirm="$emit('enable-gpu-device', record)"
+          :okText="$t('label.yes')"
+          :cancelText="$t('label.no')"
+        >
+          <tooltip-button
+            :tooltip="$t('label.enable.gpu.device')"
+            :disabled="!('enableGpuDevice' in $store.getters.apis)"
+            icon="play-circle-outlined"
+          />
+        </a-popconfirm>
+        <a-popconfirm
+          v-else
+          :title="`${$t('label.action.disable.gpu.device')}?`"
+          @confirm="$emit('disable-gpu-device', record)"
+          :okText="$t('label.yes')"
+          :cancelText="$t('label.no')"
+        >
+          <tooltip-button
+            :tooltip="$t('label.disable.gpu.device')"
+            :disabled="!('disableGpuDevice' in $store.getters.apis)"
+            icon="pause-circle-outlined"
+          />
+        </a-popconfirm>
       </template>
       <template v-if="column.key === 'usageActions'">
         <tooltip-button
           :tooltip="$t('label.view')"
           icon="search-outlined"
-          @onClick="$emit('view-usage-record', record)" />
+          @onClick="$emit('view-usage-record', record)"
+        />
         <slot></slot>
       </template>
       <template v-if="column.key === 'tariffActions'">
@@ -596,7 +963,8 @@
           v-if="editableValueKey !== record.key"
           :disabled="!('quotaTariffUpdate' in $store.getters.apis)"
           icon="edit-outlined"
-          @onClick="editTariffValue(record)" />
+          @onClick="editTariffValue(record)"
+        />
         <slot></slot>
       </template>
       <template v-if="column.key === 'vmScheduleActions'">
@@ -604,14 +972,19 @@
           :tooltip="$t('label.edit')"
           :disabled="!('updateVMSchedule' in $store.getters.apis)"
           icon="edit-outlined"
-          @onClick="updateVMSchedule(record)" />
+          @onClick="updateVMSchedule(record)"
+        />
         <tooltip-button
           :tooltip="$t('label.remove')"
           :disabled="!('deleteVMSchedule' in $store.getters.apis)"
           icon="delete-outlined"
           :danger="true"
           type="primary"
-          @onClick="removeVMSchedule(record)" />
+          @onClick="removeVMSchedule(record)"
+        />
+      </template>
+      <template v-if="column.key === 'vgpuActions'">
+        <slot name="actionButtons" :record="record" :actions="actions"></slot>
       </template>
     </template>
     <template #footer>
@@ -770,7 +1143,7 @@ export default {
         '/zone', '/pod', '/cluster', '/host', '/storagepool', '/imagestore', '/systemvm', '/router', '/ilbvm', '/annotation',
         '/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering',
         '/tungstenfabric', '/oauthsetting', '/guestos', '/guestoshypervisormapping', '/webhook', 'webhookdeliveries', '/quotatariff', '/sharedfs',
-        '/ipv4subnets', '/managementserver', '/extension'].join('|'))
+        '/ipv4subnets', '/managementserver', '/gpucard', '/gpudevices', '/vgpuprofile', '/extension'].join('|'))
         .test(this.$route.path)
     },
     enableGroupAction () {
@@ -778,7 +1151,7 @@ export default {
         'vmsnapshot', 'backup', 'guestnetwork', 'vpc', 'publicip', 'vpnuser', 'vpncustomergateway', 'vnfapp',
         'project', 'account', 'systemvm', 'router', 'computeoffering', 'systemoffering',
         'diskoffering', 'backupoffering', 'networkoffering', 'vpcoffering', 'ilbvm', 'kubernetes', 'comment', 'buckets',
-        'webhook', 'webhookdeliveries', 'sharedfs', 'ipv4subnets', 'asnumbers', 'guestos'
+        'webhook', 'webhookdeliveries', 'sharedfs', 'ipv4subnets', 'asnumbers', 'guestos', 'gpucard', 'gpudevices', 'vgpuprofile'
       ].includes(this.$route.name)
     },
     getDateAtTimeZone (date, timezone) {
diff --git a/ui/src/components/view/ResourceCountUsage.vue b/ui/src/components/view/ResourceCountUsage.vue
index 265c6e78955..688a706948b 100644
--- a/ui/src/components/view/ResourceCountUsage.vue
+++ b/ui/src/components/view/ResourceCountUsage.vue
@@ -91,7 +91,7 @@ export default {
   data () {
     return {
       usageList: [
-        'vm', 'cpu', 'memory', 'primarystorage', 'volume', 'ip', 'network',
+        'vm', 'cpu', 'memory', 'gpu', 'primarystorage', 'volume', 'ip', 'network',
         'vpc', 'secondarystorage', 'snapshot', 'template', 'project', 'backup', 'backupstorage', 'bucket', 'objectstorage'
       ],
       taggedUsage: {},
@@ -115,6 +115,7 @@ export default {
         0: 'vm',
         8: 'cpu',
         9: 'memory',
+        16: 'gpu',
         2: 'volume',
         10: 'primarystorage'
       }
diff --git a/ui/src/components/view/SearchView.vue b/ui/src/components/view/SearchView.vue
index 7621aaba8e8..a254669b756 100644
--- a/ui/src/components/view/SearchView.vue
+++ b/ui/src/components/view/SearchView.vue
@@ -72,7 +72,7 @@
                       v-for="(opt, idx) in field.opts"
                       :key="idx"
                       :value="['account'].includes(field.name) ? opt.name : opt.id"
-                      :label="$t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name)">
+                      :label="field.name === 'vgpuprofileid' ? `${opt.gpucardname} - ${opt.name}` : $t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name)">
                       <div>
                         <span v-if="(field.name.startsWith('zone'))">
                           <span v-if="opt.icon">
@@ -89,7 +89,12 @@
                         <span v-if="(field.name.startsWith('managementserver'))">
                           <status :text="opt.state" />
                         </span>
-                        {{ $t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name) }}
+                        <span v-if="field.name === 'vgpuprofileid'">
+                          {{ opt.gpucardname }} - {{ opt.name }}
+                        </span>
+                        <span v-else>
+                          {{ $t((field.name.startsWith('domain') && opt.path) ? opt.path : opt.name) }}
+                        </span>
                       </div>
                     </a-select-option>
                   </a-select>
@@ -253,6 +258,13 @@ export default {
       if (fetchAccountOptions) {
         this.fetchDynamicFieldData('account')
       }
+
+      const fetchVgpuProfileOptions = fieldname === 'gpucardid' && this.fields.some((field) => field.name === 'vgpuprofileid')
+      if (fetchVgpuProfileOptions) {
+        // Clear the currently selected vGPU profile when GPU card changes
+        this.form.vgpuprofileid = null
+        this.fetchDynamicFieldData('vgpuprofileid')
+      }
     },
     onVisibleForm () {
       this.visibleFilter = !this.visibleFilter
@@ -308,8 +320,8 @@ export default {
         if (['zoneid', 'domainid', 'imagestoreid', 'storageid', 'state', 'account', 'hypervisor', 'level',
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
           'type', 'scope', 'managementserverid', 'serviceofferingid',
-          'diskofferingid', 'networkid', 'usagetype', 'restartrequired',
-          'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype',
+          'diskofferingid', 'networkid', 'usagetype', 'restartrequired', 'gpuenabled',
+          'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype', 'gpucardid', 'vgpuprofileid',
           'extensionid'].includes(item)
         ) {
           type = 'list'
@@ -418,6 +430,16 @@ export default {
         this.fields[restartRequiredIndex].loading = false
       }
 
+      if (arrayField.includes('gpuenabled')) {
+        const gpuEnabledIndex = this.fields.findIndex(item => item.name === 'gpuenabled')
+        this.fields[gpuEnabledIndex].loading = true
+        this.fields[gpuEnabledIndex].opts = [
+          { id: 'true', name: 'label.yes' },
+          { id: 'false', name: 'label.no' }
+        ]
+        this.fields[gpuEnabledIndex].loading = false
+      }
+
       if (arrayField.includes('resourcetype')) {
         const resourceTypeIndex = this.fields.findIndex(item => item.name === 'resourcetype')
         this.fields[resourceTypeIndex].loading = true
@@ -486,6 +508,8 @@ export default {
       let usageTypeIndex = -1
       let volumeIndex = -1
       let osCategoryIndex = -1
+      let gpuCardIndex = -1
+      let vgpuProfileIndex = -1
       let extensionIndex = -1
 
       if (arrayField.includes('type')) {
@@ -602,6 +626,18 @@ export default {
         promises.push(await this.fetchOsCategories(searchKeyword))
       }
 
+      if (arrayField.includes('gpucardid')) {
+        gpuCardIndex = this.fields.findIndex(item => item.name === 'gpucardid')
+        this.fields[gpuCardIndex].loading = true
+        promises.push(await this.fetchGpuCards(searchKeyword))
+      }
+
+      if (arrayField.includes('vgpuprofileid')) {
+        vgpuProfileIndex = this.fields.findIndex(item => item.name === 'vgpuprofileid')
+        this.fields[vgpuProfileIndex].loading = true
+        promises.push(await this.fetchVgpuProfiles(searchKeyword))
+      }
+
       Promise.all(promises).then(response => {
         if (typeIndex > -1) {
           const types = response.filter(item => item.type === 'type')
@@ -711,6 +747,20 @@ export default {
             this.fields[osCategoryIndex].opts = this.sortArray(osCategories[0].data)
           }
         }
+
+        if (gpuCardIndex > -1) {
+          const gpuCards = response.filter(item => item.type === 'gpucardid')
+          if (gpuCards && gpuCards.length > 0) {
+            this.fields[gpuCardIndex].opts = this.sortArray(gpuCards[0].data)
+          }
+        }
+
+        if (vgpuProfileIndex > -1) {
+          const vgpuProfiles = response.filter(item => item.type === 'vgpuprofileid')
+          if (vgpuProfiles && vgpuProfiles.length > 0) {
+            this.fields[vgpuProfileIndex].opts = this.sortArray(vgpuProfiles[0].data)
+          }
+        }
       }).finally(() => {
         if (typeIndex > -1) {
           this.fields[typeIndex].loading = false
@@ -763,6 +813,12 @@ export default {
         if (osCategoryIndex > -1) {
           this.fields[osCategoryIndex].loading = false
         }
+        if (gpuCardIndex > -1) {
+          this.fields[gpuCardIndex].loading = false
+        }
+        if (vgpuProfileIndex > -1) {
+          this.fields[vgpuProfileIndex].loading = false
+        }
         if (Array.isArray(arrayField)) {
           this.fillFormFieldValues()
         }
@@ -1403,6 +1459,39 @@ export default {
         }
       ]
     },
+    fetchGpuCards (searchKeyword) {
+      return new Promise((resolve, reject) => {
+        getAPI('listGpuCards', { keyword: searchKeyword }).then(json => {
+          const gpuCards = json.listgpucardsresponse.gpucard
+          resolve({
+            type: 'gpucardid',
+            data: gpuCards
+          })
+        }).catch(error => {
+          reject(error.response.headers['x-description'])
+        })
+      })
+    },
+    fetchVgpuProfiles (searchKeyword) {
+      return new Promise((resolve, reject) => {
+        const params = { keyword: searchKeyword }
+
+        // If a GPU card is selected, filter vGPU profiles by that GPU card
+        if (this.form.gpucardid) {
+          params.gpucardid = this.form.gpucardid
+        }
+
+        getAPI('listVgpuProfiles', params).then(json => {
+          const vgpuProfiles = json.listvgpuprofilesresponse.vgpuprofile
+          resolve({
+            type: 'vgpuprofileid',
+            data: vgpuProfiles
+          })
+        }).catch(error => {
+          reject(error.response.headers['x-description'])
+        })
+      })
+    },
     onSearch (value) {
       this.paramsFilter = {}
       this.searchQuery = value
@@ -1424,6 +1513,13 @@ export default {
         await this.fetchDynamicFieldData('account')
       }
 
+      const refreshVgpuProfileOptions = ['gpucardid', 'vgpuprofileid'].every((field) => {
+        return this.fields.some((searchViewField) => searchViewField.name === field)
+      })
+      if (refreshVgpuProfileOptions) {
+        await this.fetchDynamicFieldData('vgpuprofileid')
+      }
+
       this.$emit('search', this.paramsFilter)
     },
     handleSubmit () {
diff --git a/ui/src/components/view/VgpuProfilesTab.vue b/ui/src/components/view/VgpuProfilesTab.vue
new file mode 100644
index 00000000000..b5c2af591c2
--- /dev/null
+++ b/ui/src/components/view/VgpuProfilesTab.vue
@@ -0,0 +1,405 @@
+// 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.
+
+<template>
+  <div>
+    <a-button
+      type="primary"
+      @click="createVgpuProfile"
+    >
+      {{ $t('label.add.vgpu.profile') }}
+    </a-button>
+    <list-view
+      :tabLoading="tabLoading"
+      :columns="columns"
+      :items="items"
+      :columnKeys="columnKeys"
+      :selectedColumns="selectedColumnKeys"
+      ref="listview"
+      @update-selected-columns="updateSelectedColumns"
+      @refresh="this.fetchData"
+    >
+      <template #actionButtons="{ record }">
+        <a-space>
+          <!-- Edit Action -->
+          <a-tooltip :title="$t('label.edit')">
+            <a-button
+              type="primary"
+              size="small"
+              shape="circle"
+              @click="editVgpuProfile(record)"
+            >
+              <template #icon><edit-outlined /></template>
+            </a-button>
+          </a-tooltip>
+
+          <!-- Delete Action -->
+          <a-popconfirm
+            :title="$t('message.confirm.delete.vgpu.profile')"
+            @confirm="deleteVgpuProfile(record)"
+            okText="Yes"
+            cancelText="No"
+          >
+            <a-tooltip :title="$t('label.delete')">
+              <a-button
+                type="primary"
+                danger
+                size="small"
+                shape="circle"
+              >
+                <template #icon><delete-outlined /></template>
+              </a-button>
+            </a-tooltip>
+          </a-popconfirm>
+        </a-space>
+      </template>
+    </list-view>
+
+    <!-- Create/Update VGPU Profile Modal -->
+    <a-modal
+      :visible="showModal"
+      :title="isEditing ? $t('label.update.vgpu.profile') : $t('label.add.vgpu.profile')"
+      :closable="true"
+      :maskClosable="false"
+      :footer="null"
+      @cancel="closeModal"
+      centered
+      width="450px"
+    >
+      <a-spin
+        :spinning="actionLoading"
+        v-ctrl-enter="handleSubmit"
+      >
+        <a-form
+          ref="vgpuForm"
+          :model="form"
+          :rules="rules"
+          layout="vertical"
+          @finish="handleSubmit"
+        >
+          <a-form-item
+            v-for="field in formFields"
+            :key="field.key"
+            :name="field.key"
+            :ref="field.key"
+            :label="field.label"
+          >
+            <!-- Input field -->
+            <a-input
+              v-if="field.type === 'input'"
+              v-model:value="form[field.key]"
+              :placeholder="field.placeholder"
+              :v-focus="field.key === 'name'"
+            />
+
+            <!-- Number input field -->
+            <a-input-number
+              v-else-if="field.type === 'number'"
+              style="width: 100%"
+              v-model:value="form[field.key]"
+              :min="field.min"
+              :placeholder="field.placeholder"
+            />
+          </a-form-item>
+
+          <div
+            :span="24"
+            class="action-button"
+          >
+            <a-button @click="closeModal">{{ $t('label.cancel') }}</a-button>
+            <a-button
+              type="primary"
+              ref="submit"
+              @click="handleSubmit"
+            >{{ $t('label.ok') }}</a-button>
+          </div>
+        </a-form>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { reactive, toRaw } from 'vue'
+import { getAPI, postAPI } from '@/api'
+import { genericCompare } from '@/utils/sort.js'
+import ListView from '@/components/view/ListView'
+import { EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
+
+export default {
+  name: 'VgpuProfilesTab',
+  components: {
+    ListView,
+    EditOutlined,
+    DeleteOutlined
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data () {
+    return {
+      tabLoading: false,
+      columnKeys: ['name', 'videoram', 'maxheads', 'resolution', 'maxvgpuperphysicalgpu'],
+      selectedColumnKeys: [],
+      columns: [],
+      cols: [],
+      items: [],
+      showModal: false,
+      isEditing: false,
+      selectedVgpuProfile: null,
+      actionLoading: false,
+      form: {},
+      rules: {},
+      formFields: [],
+      createApiParams: {},
+      updateApiParams: {}
+    }
+  },
+  computed: {
+    isAdmin () {
+      return this.$store.getters.userInfo.roletype === 'Admin'
+    }
+  },
+  created () {
+    this.fetchApiParams()
+    this.selectedColumnKeys = this.columnKeys
+    this.updateColumns()
+    this.fetchData()
+  },
+  methods: {
+    fetchApiParams () {
+      this.createApiParams = this.$getApiParams('createVgpuProfile') || {}
+      this.updateApiParams = this.$getApiParams('updateVgpuProfile') || {}
+    },
+    generateFormFields (isEdit = false) {
+      const apiParams = isEdit ? this.updateApiParams : this.createApiParams
+      const fields = []
+      const fieldOrder = ['name', 'description', 'videoram', 'maxheads', 'maxresolutionx', 'maxresolutiony', 'maxvgpuperphysicalgpu']
+
+      fieldOrder.forEach(paramName => {
+        if (paramName === 'gpucardid' && !isEdit) return // Skip gpucardid for create as it's auto-populated
+
+        const param = apiParams[paramName]
+        if (!param && !isEdit) return // For create, only include params that exist in API
+
+        const field = {
+          key: paramName,
+          label: this.$t(`label.${paramName}`),
+          required: param?.required || (paramName === 'name' || paramName === 'maxvgpuperphysicalgpu'),
+          placeholder: param?.description || this.$t(`label.${paramName}`),
+          type: this.getFieldType(paramName, param)
+        }
+
+        fields.push(field)
+      })
+
+      this.formFields = fields
+    },
+    getFieldType (paramName, param) {
+      const numberFields = ['maxvgpuperphysicalgpu']
+      const selectFields = []
+
+      if (numberFields.includes(paramName)) {
+        return 'number'
+      } else if (selectFields.includes(paramName)) {
+        return 'select'
+      } else {
+        return 'input'
+      }
+    },
+    initForm (isEdit = false, record = null) {
+      const formData = {
+        name: '',
+        description: '',
+        maxvgpuperphysicalgpu: 1
+      }
+
+      if (isEdit && record) {
+        formData.name = record.name || ''
+        formData.description = record.description || ''
+        formData.maxvgpuperphysicalgpu = record.maxvgpuperphysicalgpu || 1
+        formData.videoram = record.videoram || 0
+        formData.maxheads = record.maxheads || 0
+        formData.maxresolutionx = record.maxresolutionx || 0
+        formData.maxresolutiony = record.maxresolutiony || 0
+      }
+
+      this.form = reactive(formData)
+
+      const validationRules = {
+        name: [{ required: true, message: this.$t('message.error.required.input') }],
+        maxvgpuperphysicalgpu: [{ required: true, message: this.$t('message.error.required.input') }]
+      }
+
+      this.rules = reactive(validationRules)
+    },
+    createVgpuProfile () {
+      this.isEditing = false
+      this.selectedVgpuProfile = null
+      this.generateFormFields(false)
+      this.initForm(false)
+      this.showModal = true
+    },
+    editVgpuProfile (record) {
+      this.isEditing = true
+      this.selectedVgpuProfile = record
+      this.generateFormFields(true)
+      this.initForm(true, record)
+      this.showModal = true
+    },
+    closeModal () {
+      this.showModal = false
+      this.isEditing = false
+      this.selectedVgpuProfile = null
+      this.actionLoading = false
+    },
+    filterOption (input, option) {
+      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    handleSubmit (e) {
+      if (e) {
+        e.preventDefault()
+      }
+      if (this.actionLoading) return
+
+      this.$refs.vgpuForm.validate().then(() => {
+        this.actionLoading = true
+        const formRaw = toRaw(this.form)
+
+        if (this.isEditing) {
+          this.updateVgpuProfile(formRaw)
+        } else {
+          this.createVgpuProfileSubmit(formRaw)
+        }
+      }).catch((error) => {
+        this.$message.error(error)
+      })
+    },
+    createVgpuProfileSubmit (formRaw) {
+      const params = {
+        name: formRaw.name,
+        gpucardid: this.resource.id,
+        maxvgpuperphysicalgpu: formRaw.maxvgpuperphysicalgpu
+      }
+
+      if (formRaw.description) {
+        params.description = formRaw.description
+      }
+
+      postAPI('createVgpuProfile', params).then(response => {
+        this.$message.success(this.$t('message.success.create.vgpu.profile'))
+        this.closeModal()
+        this.fetchData()
+      }).catch(error => {
+        console.error('Error creating vGPU profile:', error)
+        this.$notifyError(error)
+      }).finally(() => {
+        this.actionLoading = false
+      })
+    },
+    updateVgpuProfile (formRaw) {
+      const params = {
+        id: this.selectedVgpuProfile.id
+      }
+
+      // Add only fields that have values
+      if (formRaw.name) {
+        params.name = formRaw.name
+      }
+      if (formRaw.description) {
+        params.description = formRaw.description
+      }
+      if (formRaw.maxvgpuperphysicalgpu) {
+        params.maxvgpuperphysicalgpu = formRaw.maxvgpuperphysicalgpu
+      }
+
+      postAPI('updateVgpuProfile', params).then(() => {
+        this.$message.success(this.$t('message.success.update.vgpu.profile'))
+        this.closeModal()
+        this.fetchData()
+      }).catch(error => {
+        console.error('Error updating vGPU profile:', error)
+        this.$notifyError(error)
+      }).finally(() => {
+        this.actionLoading = false
+      })
+    },
+    deleteVgpuProfile (record) {
+      postAPI('deleteVgpuProfile', {
+        id: record.id
+      }).then(() => {
+        this.$message.success(this.$t('message.success.delete.vgpu.profile'))
+        this.fetchData()
+      }).catch(error => {
+        console.error('Error deleting vGPU profile:', error)
+        this.$notifyError(error)
+      })
+    },
+    fetchData () {
+      this.fetchVgpuProfiles()
+    },
+    updateSelectedColumns (key) {
+      if (this.selectedColumnKeys.includes(key)) {
+        this.selectedColumnKeys = this.selectedColumnKeys.filter(x => x !== key)
+      } else {
+        this.selectedColumnKeys.push(key)
+      }
+      this.updateColumns()
+    },
+    updateColumns () {
+      this.columns = []
+      for (var columnKey of this.columnKeys) {
+        if (!this.selectedColumnKeys.includes(columnKey)) continue
+        this.columns.push({
+          key: columnKey,
+          title: columnKey === 'name' ? this.$t('label.vgpu.profile') : this.$t('label.' + String(columnKey).toLowerCase()),
+          dataIndex: columnKey,
+          sorter: (a, b) => { return genericCompare(a[columnKey] || '', b[columnKey] || '') }
+        })
+      }
+
+      // Add actions column for admin users
+      if (this.isAdmin) {
+        this.columns.push({
+          key: 'vgpuActions',
+          title: this.$t('label.actions'),
+          width: 120,
+          fixed: 'right'
+        })
+      }
+
+      if (this.columns.length > 0) {
+        this.columns[this.columns.length - 1].customFilterDropdown = true
+      }
+    },
+    fetchVgpuProfiles () {
+      getAPI('listVgpuProfiles', {
+        gpucardid: this.resource.id
+      }).then(res => {
+        this.items = res?.listvgpuprofilesresponse?.vgpuprofile || []
+      })
+    }
+  }
+}
+</script>
diff --git a/ui/src/components/widgets/Status.vue b/ui/src/components/widgets/Status.vue
index 809f7a8a7a3..6b9f71b5de8 100644
--- a/ui/src/components/widgets/Status.vue
+++ b/ui/src/components/widgets/Status.vue
@@ -88,6 +88,9 @@ export default {
           case 'ReadWrite':
             state = this.$t('state.readwrite')
             break
+          case 'partiallyallocated':
+            state = this.$t('state.partiallyallocated')
+            break
           case 'InProgress':
             state = this.$t('state.inprogress')
             break
@@ -130,6 +133,7 @@ export default {
         case 'success':
         case 'poweron':
         case 'primary':
+        case 'managed':
         case 'yes':
           status = 'success'
           break
@@ -145,6 +149,7 @@ export default {
         case 'poweroff':
         case 'stopped':
         case 'failed':
+        case 'unmanaged':
         case 'no':
           status = 'error'
           break
@@ -169,6 +174,7 @@ export default {
         case 'unsecure':
         case 'warning':
         case 'backup':
+        case 'partiallyallocated':
           status = 'warning'
           break
       }
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 1b4d1da32a4..0538f1d43c6 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -81,10 +81,10 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'extensionid', 'tags'],
+      searchFilters: ['name', 'gpuenabled', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'extensionid', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
-          'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'arch', 'boottype', 'bootmode', 'account',
+          'serviceofferingname', 'gpucount', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'arch', 'boottype', 'bootmode', 'account',
           'domain', 'zonename', 'userdataid', 'userdataname', 'userdataparams', 'userdatadetails', 'userdatapolicy',
           'hostcontrolstate', 'deleteprotection', 'leaseexpirydate', 'leaseexpiryaction']
         const listZoneHaveSGEnabled = store.getters.zones.filter(zone => zone.securitygroupsenabled === true)
diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js
index e075506866d..a432eafc082 100644
--- a/ui/src/config/section/config.js
+++ b/ui/src/config/section/config.js
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import { shallowRef, defineAsyncComponent } from 'vue'
+
 export default {
   name: 'config',
   title: 'label.configuration',
@@ -340,6 +342,95 @@ export default {
           popup: true
         }
       ]
+    },
+    {
+      name: 'gpucard',
+      title: 'label.gpu.card.types',
+      icon: 'laptop-outlined',
+      permission: ['listGpuCards'],
+      columns: ['name', 'deviceid', 'devicename', 'vendorid', 'vendorname'],
+      details: ['name', 'deviceid', 'devicename', 'vendorid', 'vendorname'],
+      related: [{
+        name: 'gpudevices',
+        title: 'label.gpu.device',
+        param: 'gpucardid'
+      }, {
+        name: 'vgpuprofile',
+        title: 'label.vgpu.profile',
+        param: 'gpucardid'
+      }],
+      tabs: [{
+        name: 'details',
+        component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
+      }, {
+        name: 'vgpu',
+        component: shallowRef(defineAsyncComponent(() => import('@/components/view/VgpuProfilesTab.vue')))
+      }],
+      actions: [
+        {
+          api: 'createGpuCard',
+          icon: 'plus-outlined',
+          label: 'label.add.gpu.card',
+          listView: true,
+          dataView: false,
+          args: ['name', 'deviceid', 'devicename', 'vendorid', 'vendorname', 'videoram']
+        },
+        {
+          api: 'updateGpuCard',
+          icon: 'edit-outlined',
+          label: 'label.edit',
+          dataView: true,
+          popup: true,
+          args: ['name', 'devicename', 'vendorname']
+        },
+        {
+          api: 'deleteGpuCard',
+          icon: 'delete-outlined',
+          label: 'label.action.delete.gpu.card',
+          message: 'message.action.delete.gpu.card',
+          dataView: true,
+          popup: true,
+          groupAction: true,
+          groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
+        }
+      ]
+    },
+    {
+      name: 'vgpuprofile',
+      title: 'label.vgpu.profile',
+      icon: 'laptop-outlined',
+      permission: ['listVgpuProfiles'],
+      hidden: true,
+      columns: ['name', 'gpucardname', 'description', 'videoram', 'maxheads', 'resolution', 'maxvgpuperphysicalgpu'],
+      details: ['gpucardname', 'name', 'description', 'videoram', 'maxheads', 'maxresolutionx', 'maxresolutiony', 'maxvgpuperphysicalgpu'],
+      actions: [
+        {
+          api: 'createVgpuProfile',
+          icon: 'plus-outlined',
+          label: 'label.add.vgpu.profile',
+          listView: true,
+          dataView: false,
+          args: ['name', 'description', 'gpucardid', 'videoram', 'maxheads', 'maxresolutionx', 'maxresolutiony', 'maxvgpuperphysicalgpu']
+        },
+        {
+          api: 'updateVgpuProfile',
+          icon: 'edit-outlined',
+          label: 'label.edit',
+          dataView: true,
+          popup: true,
+          args: ['name', 'description', 'videoram', 'maxheads', 'maxresolutionx', 'maxresolutiony', 'maxvgpuperphysicalgpu']
+        },
+        {
+          api: 'deleteVgpuProfile',
+          icon: 'delete-outlined',
+          label: 'label.action.delete.vgpu.profile',
+          message: 'message.action.delete.vgpu.profile',
+          dataView: true,
+          popup: true,
+          groupAction: true,
+          groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
+        }
+      ]
     }
   ]
 }
diff --git a/ui/src/config/section/infra.js b/ui/src/config/section/infra.js
index cb91d4d7b04..ae074002834 100644
--- a/ui/src/config/section/infra.js
+++ b/ui/src/config/section/infra.js
@@ -63,6 +63,27 @@ export default {
       permission: ['listHosts'],
       component: () => import('@/views/infra/CpuSockets.vue')
     },
+    {
+      name: 'gpudevices',
+      title: 'label.gpu.devices',
+      icon: 'BoxPlotOutlined',
+      hidden: true,
+      permission: ['listGpuDevices'],
+      columns: ['busaddress', 'gpucardname', 'vgpuprofilename', 'hostname', 'virtualmachinename'],
+      details: ['id', 'busaddress', 'gpucardname', 'vgpuprofilename', 'hostname', 'virtualmachinename'],
+      searchFilters: ['gpucardid', 'vgpuprofileid'],
+      actions: [
+        {
+          api: 'deleteGpuDevice',
+          icon: 'delete-outlined',
+          label: 'label.delete.gpu.device',
+          dataView: true,
+          popup: true,
+          groupAction: true,
+          groupMap: (selection) => { return selection.map(x => { return { id: x.id } }) }
+        }
+      ]
+    },
     {
       name: 'metric',
       title: 'label.db.usage.metrics',
diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js
index 81e25a9c794..2f27db5780b 100644
--- a/ui/src/config/section/infra/hosts.js
+++ b/ui/src/config/section/infra/hosts.js
@@ -36,7 +36,7 @@ export default {
       'name', 'state', 'resourcestate', 'ipaddress', 'arch', 'hypervisor',
       { field: 'systeminstances', customTitle: 'system.vms' }, 'version'
     ]
-    const metricsFields = ['instances', 'powerstate', 'cpunumber', 'cputotalghz', 'cpuusedghz', 'cpuallocatedghz', 'memorytotalgb', 'memoryusedgb', 'memoryallocatedgb', 'networkread', 'networkwrite']
+    const metricsFields = ['instances', 'powerstate', 'cpunumber', 'cputotalghz', 'cpuusedghz', 'cpuallocatedghz', 'memorytotalgb', 'memoryusedgb', 'memoryallocatedgb', 'gputotal', 'gpuused', 'networkread', 'networkwrite']
     if (store.getters.metrics) {
       fields.push(...metricsFields)
     }
@@ -49,6 +49,10 @@ export default {
   tabs: [{
     name: 'details',
     component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
+  }, {
+    name: 'gpu',
+    resourceType: 'Host',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/GPUTab.vue')))
   }, {
     name: 'events',
     resourceType: 'Host',
diff --git a/ui/src/config/section/infra/zones.js b/ui/src/config/section/infra/zones.js
index de971858ab4..c957f885469 100644
--- a/ui/src/config/section/infra/zones.js
+++ b/ui/src/config/section/infra/zones.js
@@ -27,7 +27,7 @@ export default {
   searchFilters: ['name', 'domainid', 'tags'],
   columns: () => {
     const fields = ['name', 'allocationstate', 'type', 'networktype']
-    const metricsFields = ['clusters', 'cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal']
+    const metricsFields = ['clusters', 'cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal', 'gputotal', 'gpuused']
     if (store.getters.metrics) {
       fields.push(...metricsFields)
     }
diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js
index de18b84100c..7bdd992039c 100644
--- a/ui/src/config/section/offering.js
+++ b/ui/src/config/section/offering.js
@@ -30,7 +30,7 @@ export default {
       docHelp: 'adminguide/service_offerings.html#compute-and-disk-service-offerings',
       icon: 'cloud-outlined',
       permission: ['listServiceOfferings'],
-      searchFilters: ['name', 'zoneid', 'domainid', 'cpunumber', 'cpuspeed', 'memory'],
+      searchFilters: ['name', 'gpuenabled', 'zoneid', 'domainid', 'cpunumber', 'cpuspeed', 'memory'],
       params: () => {
         var params = {}
         if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
@@ -39,9 +39,9 @@ export default {
         return params
       },
       filters: ['active', 'inactive'],
-      columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
+      columns: ['name', 'displaytext', 'state', 'cpunumber', 'cpuspeed', 'memory', 'gpu', 'domain', 'zone', 'order'],
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'leaseexpiryaction', 'externaldetails']
+        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'storageaccessgroups', 'storagetags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness', 'encryptroot', 'purgeresources', 'leaseduration', 'gpucardid', 'gpucardname', 'vgpuprofileid', 'vgpuprofilename', 'gpucount', 'gpudisplay', 'leaseexpiryaction', 'externaldetails']
         if (store.getters.apis.createServiceOffering &&
           store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
           fields.splice(6, 0, 'vspherestoragepolicy')
diff --git a/ui/src/core/ext.js b/ui/src/core/ext.js
index 06bea8cd7d2..ac8e0e45fcb 100644
--- a/ui/src/core/ext.js
+++ b/ui/src/core/ext.js
@@ -19,10 +19,10 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
 import { faCentos, faUbuntu, faDebian, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava } from '@fortawesome/free-brands-svg-icons'
-import { fas, faCompactDisc, faCameraRetro, faDharmachakra } from '@fortawesome/free-solid-svg-icons'
+import { fas, faCompactDisc, faCameraRetro, faDharmachakra, faMicrochip } from '@fortawesome/free-solid-svg-icons'
 
 library.add(faCentos, faUbuntu, faDebian, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava)
-library.add(fas, faCompactDisc, faCameraRetro, faDharmachakra)
+library.add(fas, faCompactDisc, faCameraRetro, faDharmachakra, faMicrochip)
 
 export default {
   install: (app) => {
diff --git a/ui/src/core/lazy_lib/icons_use.js b/ui/src/core/lazy_lib/icons_use.js
index 82cd1ae5a46..502eb5de0b6 100644
--- a/ui/src/core/lazy_lib/icons_use.js
+++ b/ui/src/core/lazy_lib/icons_use.js
@@ -83,6 +83,7 @@ import {
   FieldTimeOutlined,
   FileDoneOutlined,
   FileProtectOutlined,
+  FileSyncOutlined,
   FileTextOutlined,
   FileZipOutlined,
   FilterOutlined,
@@ -257,6 +258,7 @@ export default {
     app.component('FieldTimeOutlined', FieldTimeOutlined)
     app.component('FileDoneOutlined', FileDoneOutlined)
     app.component('FileProtectOutlined', FileProtectOutlined)
+    app.component('FileSyncOutlined', FileSyncOutlined)
     app.component('FileTextOutlined', FileTextOutlined)
     app.component('FileZipOutlined', FileZipOutlined)
     app.component('FilterOutlined', FilterOutlined)
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 589def212a2..1483669a3be 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -18,9 +18,15 @@
 <template>
   <div>
     <a-affix :offsetTop="this.$store.getters.maintenanceInitiated || this.$store.getters.shutdownTriggered ? 103 : 78">
-      <a-card class="breadcrumb-card" style="z-index: 10">
+      <a-card
+        class="breadcrumb-card"
+        style="z-index: 10"
+      >
         <a-row>
-          <a-col :span="device === 'mobile' ? 24 : 12" style="padding-left: 12px; margin-top: 10px">
+          <a-col
+            :span="device === 'mobile' ? 24 : 12"
+            style="padding-left: 12px; margin-top: 10px"
+          >
             <breadcrumb :resource="resource">
               <template #end>
                 <a-button
@@ -28,7 +34,8 @@
                   style="margin-bottom: 5px"
                   shape="round"
                   size="small"
-                  @click="fetchData({ irefresh: true })">
+                  @click="fetchData({ irefresh: true })"
+                >
                   <template #icon><reload-outlined /></template>
                   {{ $t('label.refresh') }}
                 </a-button>
@@ -47,22 +54,27 @@
                     optionFilterProp="label"
                     :filterOption="(input, option) => {
                       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    }" >
+                    }"
+                  >
                     <template #suffixIcon><filter-outlined class="ant-select-suffix" /></template>
                     <a-select-option
                       v-if="['Admin', 'DomainAdmin'].includes($store.getters.userInfo.roletype) &&
                       ['vm', 'iso', 'template', 'pod', 'cluster', 'host', 'systemvm', 'router', 'storagepool', 'kubernetes', 'computeoffering', 'systemoffering', 'diskoffering', 'sharedfs', 'extension'].includes($route.name) ||
                       ['account'].includes($route.name)"
                       key="all"
-                      :label="$t('label.all')">
+                      :label="$t('label.all')"
+                    >
                       {{ $t('label.all') }}
                     </a-select-option>
                     <a-select-option
                       v-for="filter in filters"
                       :key="filter"
-                      :label="$t('label.' + (['comment'].includes($route.name) ? 'filter.annotations.' : '') + filter)">
+                      :label="$t('label.' + (['comment'].includes($route.name) ? 'filter.annotations.' : '') + filter)"
+                    >
                       {{ $t('label.' + (['comment'].includes($route.name) ? 'filter.annotations.' : '') + filter) }}
-                      <clock-circle-outlined v-if="['comment'].includes($route.name) && !['Admin'].includes($store.getters.userInfo.roletype) && filter === 'all'" />
+                      <clock-circle-outlined
+                        v-if="['comment'].includes($route.name) && !['Admin'].includes($store.getters.userInfo.roletype) && filter === 'all'"
+                      />
                     </a-select-option>
                   </a-select>
                 </a-tooltip>
@@ -72,21 +84,27 @@
                   :checked-children="$t('label.metrics')"
                   :un-checked-children="$t('label.metrics')"
                   :checked="$store.getters.metrics"
-                  @change="(checked, event) => { $store.dispatch('SetMetrics', checked) }"/>
+                  @change="(checked, event) => { $store.dispatch('SetMetrics', checked) }"
+                />
                 <a-switch
                   v-if="!projectView && hasProjectId"
                   style="margin-left: 8px; min-height: 23px; margin-bottom: 4px"
                   :checked-children="$t('label.projects')"
                   :un-checked-children="$t('label.projects')"
                   :checked="$store.getters.listAllProjects"
-                  @change="(checked, event) => { $store.dispatch('SetListAllProjects', checked) }"/>
+                  @change="(checked, event) => { $store.dispatch('SetListAllProjects', checked) }"
+                />
               </template>
             </breadcrumb>
           </a-col>
           <a-col
             :span="device === 'mobile' ? 24 : 12"
-            :style="device === 'mobile' ? { float: 'right', 'margin-top': '12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right', display: 'table', 'margin-top': '6px' }" >
-            <slot name="action" v-if="dataView && $route.path.startsWith('/publicip')"></slot>
+            :style="device === 'mobile' ? { float: 'right', 'margin-top': '12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right', display: 'table', 'margin-top': '6px' }"
+          >
+            <slot
+              name="action"
+              v-if="dataView && $route.path.startsWith('/publicip')"
+            ></slot>
             <action-button
               v-else
               :style="dataView ? { float: device === 'mobile' ? 'left' : 'right' } : { 'margin-right': '10px', display: getStyle() }"
@@ -96,21 +114,25 @@
               :selectedItems="selectedItems"
               :dataView="dataView"
               :resource="resource"
-              @exec-action="(action) => execAction(action, action.groupAction && !dataView)"/>
+              @exec-action="(action) => execAction(action, action.groupAction && !dataView)"
+            />
             <search-view
               v-if="!dataView"
               :searchFilters="searchFilters"
               :searchParams="searchParams"
               :apiName="apiName"
               @search="onSearch"
-              @change-filter="changeFilter"/>
+              @change-filter="changeFilter"
+            />
           </a-col>
         </a-row>
       </a-card>
     </a-affix>
 
     <div v-show="showAction">
-      <keep-alive v-if="currentAction.component && (!currentAction.groupAction || selectedRowKeys.length === 0 || (this.selectedRowKeys.length > 0 && currentAction.api === 'destroyVirtualMachine'))">
+      <keep-alive
+        v-if="currentAction.component && (!currentAction.groupAction || selectedRowKeys.length === 0 || (this.selectedRowKeys.length > 0 && currentAction.api === 'destroyVirtualMachine'))"
+      >
         <a-modal
           :visible="showAction"
           :closable="true"
@@ -129,7 +151,8 @@
               v-if="currentAction.docHelp || $route.meta.docHelp"
               style="margin-left: 5px"
               :href="$config.docBase + '/' + (currentAction.docHelp || $route.meta.docHelp)"
-              target="_blank">
+              target="_blank"
+            >
               <question-circle-outlined />
             </a>
           </template>
@@ -146,7 +169,8 @@
               @refresh-data="fetchData"
               @poll-action="pollActionCompletion"
               @close-action="closeAction"
-              @cancel-bulk-action="handleCancel"/>
+              @cancel-bulk-action="handleCancel"
+            />
           </keep-alive>
         </a-modal>
       </keep-alive>
@@ -170,25 +194,39 @@
             v-if="currentAction.docHelp || $route.meta.docHelp"
             style="margin-left: 5px"
             :href="$config.docBase + '/' + (currentAction.docHelp || $route.meta.docHelp)"
-            target="_blank">
+            target="_blank"
+          >
             <question-circle-outlined />
           </a>
         </template>
-        <a-spin :spinning="actionLoading" v-ctrl-enter="handleSubmit">
+        <a-spin
+          :spinning="actionLoading"
+          v-ctrl-enter="handleSubmit"
+        >
           <span v-if="currentAction.message">
             <div v-if="selectedRowKeys.length > 0">
               <a-alert
                 v-if="['delete-outlined', 'DeleteOutlined', 'poweroff-outlined', 'PoweroffOutlined'].includes(currentAction.icon)"
-                type="error">
+                type="error"
+              >
                 <template #message>
                   <exclamation-circle-outlined style="color: red; fontSize: 30px; display: inline-flex" />
-                  <span style="padding-left: 5px" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
+                  <span
+                    style="padding-left: 5px"
+                    v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`"
+                  />
                   <span v-html="currentAction.message" />
                 </template>
               </a-alert>
-              <a-alert v-else type="warning">
+              <a-alert
+                v-else
+                type="warning"
+              >
                 <template #message>
-                  <span v-if="selectedRowKeys.length > 0" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
+                  <span
+                    v-if="selectedRowKeys.length > 0"
+                    v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`"
+                  />
                   <span v-html="currentAction.message" />
                 </template>
               </a-alert>
@@ -218,15 +256,19 @@
                 </template>
               </a-table>
             </div>
-            <br v-if="currentAction.paramFields.length > 0"/>
+            <br v-if="currentAction.paramFields.length > 0" />
           </span>
           <a-form
             :ref="formRef"
             :model="form"
             :rules="rules"
             @finish="handleSubmit"
-            layout="vertical">
-            <div v-for="(field, fieldIndex) in currentAction.paramFields" :key="fieldIndex">
+            layout="vertical"
+          >
+            <div
+              v-for="(field, fieldIndex) in currentAction.paramFields"
+              :key="fieldIndex"
+            >
               <a-form-item
                 :name="field.name"
                 :ref="field.name"
@@ -237,8 +279,13 @@
                   <tooltip-label
                     v-if="['domain', 'guestcidraddress'].includes(field.name) && ['createZone', 'updateZone'].includes(currentAction.api)"
                     :title="$t('label.default.network.' + field.name + '.isolated.network')"
-                    :tooltip="field.description"/>
-                  <tooltip-label v-else :title="$t('label.' + field.name)" :tooltip="field.description"/>
+                    :tooltip="field.description"
+                  />
+                  <tooltip-label
+                    v-else
+                    :title="$t('label.' + field.name)"
+                    :tooltip="field.description"
+                  />
                 </template>
 
                 <a-switch
@@ -259,11 +306,15 @@
                     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
                   }"
                 >
-                  <a-select-option key="" label="">{{ }}</a-select-option>
+                  <a-select-option
+                    key=""
+                    label=""
+                  >{{ }}</a-select-option>
                   <a-select-option
                     v-for="(opt, optIndex) in currentAction.mapping[field.name].options"
                     :key="optIndex"
-                    :label="opt">
+                    :label="opt"
+                  >
                     {{ opt }}
                   </a-select-option>
                 </a-select>
@@ -280,11 +331,15 @@
                   }"
                   v-focus="fieldIndex === firstIndex"
                 >
-                  <a-select-option key="" label="">{{ }}</a-select-option>
+                  <a-select-option
+                    key=""
+                    label=""
+                  >{{ }}</a-select-option>
                   <a-select-option
                     v-for="(opt, optIndex) in field.opts"
                     :key="optIndex"
-                    :label="opt.name || opt.description || opt.traffictype || opt.publicip">
+                    :label="opt.name || opt.description || opt.traffictype || opt.publicip"
+                  >
                     {{ opt.name || opt.description || opt.traffictype || opt.publicip }}
                   </a-select-option>
                 </a-select>
@@ -300,44 +355,96 @@
                   }"
                   v-focus="fieldIndex === firstIndex"
                 >
-                  <a-select-option key="" label="">{{ }}</a-select-option>
-                  <a-select-option v-for="opt in field.opts" :key="opt.id" :label="opt.name || opt.description || opt.traffictype || opt.publicip">
+                  <a-select-option
+                    key=""
+                    label=""
+                  >{{ }}</a-select-option>
+                  <a-select-option
+                    v-for="opt in field.opts"
+                    :key="opt.id"
+                    :label="opt.name || opt.description || opt.traffictype || opt.publicip"
+                  >
                     <div>
                       <span v-if="(field.name.startsWith('template') || field.name.startsWith('iso'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <os-logo v-else :osId="opt.ostypeid" :osName="opt.ostypename" size="lg" style="margin-left: -1px" />
+                        <os-logo
+                          v-else
+                          :osId="opt.ostypeid"
+                          :osName="opt.ostypename"
+                          size="lg"
+                          style="margin-left: -1px"
+                        />
                       </span>
                       <span v-if="(field.name.startsWith('zone'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <global-outlined v-else style="margin-right: 5px" />
+                        <global-outlined
+                          v-else
+                          style="margin-right: 5px"
+                        />
                       </span>
                       <span v-if="(field.name.startsWith('project'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <project-outlined v-else style="margin-right: 5px" />
+                        <project-outlined
+                          v-else
+                          style="margin-right: 5px"
+                        />
                       </span>
                       <span v-if="(field.name.startsWith('account') || field.name.startsWith('user'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <user-outlined v-else style="margin-right: 5px"/>
+                        <user-outlined
+                          v-else
+                          style="margin-right: 5px"
+                        />
                       </span>
                       <span v-if="(field.name.startsWith('network'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <apartment-outlined v-else style="margin-right: 5px"/>
+                        <apartment-outlined
+                          v-else
+                          style="margin-right: 5px"
+                        />
                       </span>
                       <span v-if="(field.name.startsWith('domain'))">
                         <span v-if="opt.icon">
-                          <resource-icon :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
+                          <resource-icon
+                            :image="opt.icon.base64image"
+                            size="1x"
+                            style="margin-right: 5px"
+                          />
                         </span>
-                        <block-outlined v-else style="margin-right: 5px"/>
+                        <block-outlined
+                          v-else
+                          style="margin-right: 5px"
+                        />
                       </span>
                       {{ opt.name || opt.description || opt.traffictype || opt.publicip }}
                     </div>
@@ -359,8 +466,9 @@
                   <a-select-option
                     v-for="(opt, optIndex) in field.opts"
                     :key="optIndex"
-                    :label="opt.name && opt.type ? opt.name + ' (' + opt.type + ')' : opt.name || opt.description">
-                    {{ opt.name && opt.type ? opt.name + ' (' + opt.type + ')' : opt.name || opt.description }}
+                    :label="(opt.name && opt.type ? opt.name + ' (' + opt.type + ')' : opt.name || opt.description)"
+                  >
+                    {{ (opt.name && opt.type ? opt.name + ' (' + opt.type + ')' : opt.name || opt.description) }}
                   </a-select-option>
                 </a-select>
                 <details-input
@@ -391,13 +499,21 @@
                   v-else
                   v-focus="fieldIndex === firstIndex"
                   v-model:value="form[field.name]"
-                  :placeholder="field.description" />
+                  :placeholder="field.description"
+                />
               </a-form-item>
             </div>
 
-            <div :span="24" class="action-button">
+            <div
+              :span="24"
+              class="action-button"
+            >
               <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
-              <a-button type="primary" @click="handleSubmit" ref="submit">{{ $t('label.ok') }}</a-button>
+              <a-button
+                type="primary"
+                @click="handleSubmit"
+                ref="submit"
+              >{{ $t('label.ok') }}</a-button>
             </div>
           </a-form>
         </a-spin>
@@ -405,16 +521,25 @@
       </a-modal>
     </div>
 
-    <div :style="this.$store.getters.maintenanceInitiated || this.$store.getters.shutdownTriggered ? 'margin-top: 24px; margin-bottom: 12px' : null">
+    <div
+      :style="this.$store.getters.maintenanceInitiated || this.$store.getters.shutdownTriggered ? 'margin-top: 24px; margin-bottom: 12px' : null"
+    >
       <div v-if="dataView">
-        <slot name="resource" v-if="$route.path.startsWith('/quotasummary') || $route.path.startsWith('/publicip')"></slot>
+        <slot
+          name="resource"
+          v-if="$route.path.startsWith('/quotasummary') || $route.path.startsWith('/publicip')"
+        ></slot>
         <resource-view
           v-else
           :resource="resource"
           :loading="loading"
-          :tabs="$route.meta.tabs" />
+          :tabs="$route.meta.tabs"
+        />
       </div>
-      <div class="row-element" v-else>
+      <div
+        class="row-element"
+        v-else
+      >
         <list-view
           :loading="loading"
           :columns="columns"
@@ -441,7 +566,8 @@
           @change="changePage"
           @showSizeChange="changePageSize"
           showSizeChanger
-          showQuickJumper>
+          showQuickJumper
+        >
           <template #buildOptionText="props">
             <span>{{ props.value }} / {{ $t('label.page') }}</span>
           </template>
@@ -453,7 +579,8 @@
       :selectedItems="selectedItems"
       :selectedColumns="bulkColumns"
       :message="modalInfo"
-      @handle-cancel="handleCancel" />
+      @handle-cancel="handleCancel"
+    />
   </div>
 </template>
 
diff --git a/ui/src/views/compute/CreateAutoScaleVmGroup.vue b/ui/src/views/compute/CreateAutoScaleVmGroup.vue
index 3e635b0711a..1ef3cdbb524 100644
--- a/ui/src/views/compute/CreateAutoScaleVmGroup.vue
+++ b/ui/src/views/compute/CreateAutoScaleVmGroup.vue
@@ -166,6 +166,7 @@
                       :value="serviceOffering ? serviceOffering.id : ''"
                       :loading="loading.serviceOfferings"
                       :preFillContent="dataPreFill"
+                      :show-gpu-filter="zone.gputotal && zone.gputotal > 0"
                       :minimum-cpunumber="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpunumber ? selectedTemplateConfiguration.cpunumber : 0"
                       :minimum-cpuspeed="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpuspeed ? selectedTemplateConfiguration.cpuspeed : 0"
                       :minimum-memory="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.memory ? selectedTemplateConfiguration.memory : 0"
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 3a7b015e533..10c6a555a60 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -251,6 +251,7 @@
                       :value="serviceOffering ? serviceOffering.id : ''"
                       :loading="loading.serviceOfferings"
                       :preFillContent="dataPreFill"
+                      :show-gpu-filter="zone.gputotal && zone.gputotal > 0"
                       :minimum-cpunumber="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpunumber ? selectedTemplateConfiguration.cpunumber : 0"
                       :minimum-cpuspeed="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpuspeed ? selectedTemplateConfiguration.cpuspeed : 0"
                       :minimum-memory="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.memory ? selectedTemplateConfiguration.memory : 0"
@@ -1620,6 +1621,11 @@ export default {
           if (this.serviceOffering.memory) {
             this.vm.memory = this.serviceOffering.memory
           }
+          this.vm.gpucardid = this.serviceOffering.gpucardid ? this.serviceOffering.gpucardid : ''
+          this.vm.gpucardname = this.serviceOffering.gpucardname ? this.serviceOffering.gpucardname : ''
+          this.vm.gpucount = this.serviceOffering.gpucount ? this.serviceOffering.gpucount : 0
+          this.vm.vgpuprofileid = this.serviceOffering.vgpuprofileid ? this.serviceOffering.vgpuprofileid : ''
+          this.vm.vgpuprofilename = this.serviceOffering.vgpuprofilename ? this.serviceOffering.vgpuprofilename : ''
         }
 
         if (this.template && !this.template.deployasis && this.template.childtemplates && this.template.childtemplates.length > 0) {
@@ -2161,7 +2167,6 @@ export default {
     },
     handleSubmit (e) {
       console.log('wizard submit')
-      e.preventDefault()
       if (this.loading.deploy) return
       this.formRef.value.validate().then(async () => {
         const values = toRaw(this.form)
@@ -3211,10 +3216,20 @@ export default {
     .ant-card-body {
       min-height: 250px;
       max-height: calc(100vh - 140px);
+      overflow: hidden; // Prevent the entire card from scrolling
+    }
+
+    .card-content {
+      max-height: calc(100vh - 240px); // Reserve space for footer and card header/padding
       overflow-y: auto;
       scroll-behavior: smooth;
     }
 
+    .card-footer {
+      border-top: 1px solid #f0f0f0;
+      flex-shrink: 0; // Ensure footer doesn't shrink
+    }
+
     .resource-detail-item__label {
       font-weight: normal;
     }
diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue
index a5618f5d9d4..06c41728a41 100644
--- a/ui/src/views/compute/DeployVnfAppliance.vue
+++ b/ui/src/views/compute/DeployVnfAppliance.vue
@@ -163,6 +163,7 @@
                       :value="serviceOffering ? serviceOffering.id : ''"
                       :loading="loading.serviceOfferings"
                       :preFillContent="dataPreFill"
+                      :show-gpu-filter="zone.gputotal && zone.gputotal > 0"
                       :minimum-cpunumber="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpunumber ? selectedTemplateConfiguration.cpunumber : 0"
                       :minimum-cpuspeed="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.cpuspeed ? selectedTemplateConfiguration.cpuspeed : 0"
                       :minimum-memory="templateConfigurationExists && selectedTemplateConfiguration && selectedTemplateConfiguration.memory ? selectedTemplateConfiguration.memory : 0"
diff --git a/ui/src/views/compute/InstanceTab.vue b/ui/src/views/compute/InstanceTab.vue
index 8dc90efae06..291f5510e03 100644
--- a/ui/src/views/compute/InstanceTab.vue
+++ b/ui/src/views/compute/InstanceTab.vue
@@ -44,6 +44,15 @@
         </a-button>
         <volumes-tab :resource="vm" :loading="loading" />
       </a-tab-pane>
+      <a-tab-pane :tab="$t('label.gpu')" key="gpu" v-if="dataResource.gpucardname">
+        <GPUTab
+          apiName="listGpuDevices"
+          :resource="dataResource"
+          :params="{virtualmachineid: dataResource.id}"
+          resourceType="VirtualMachine"
+          :columns="['gpucardname', 'vgpuprofilename', 'state'].concat($store.getters.userInfo.roletype === 'Admin' ? ['id', 'hostname'] : [])"
+          :routerlinks="(record) => { return { displayname: '/gpudevice/' + record.id } }"/>
+      </a-tab-pane>
       <a-tab-pane :tab="$t('label.nics')" key="nics" v-if="'listNics' in $store.getters.apis">
         <NicsTab :resource="vm"/>
       </a-tab-pane>
@@ -143,6 +152,7 @@ import ResourceIcon from '@/components/view/ResourceIcon'
 import AnnotationsTab from '@/components/view/AnnotationsTab'
 import VolumesTab from '@/components/view/VolumesTab.vue'
 import SecurityGroupSelection from '@views/compute/wizard/SecurityGroupSelection'
+import GPUTab from '@/components/view/GPUTab.vue'
 
 export default {
   name: 'InstanceTab',
@@ -154,6 +164,7 @@ export default {
     DetailSettings,
     CreateVolume,
     NicsTab,
+    GPUTab,
     InstanceSchedules,
     ListResourceTable,
     SecurityGroupSelection,
diff --git a/ui/src/views/compute/MigrateWizard.vue b/ui/src/views/compute/MigrateWizard.vue
index e559d45d81b..f70a08e8006 100644
--- a/ui/src/views/compute/MigrateWizard.vue
+++ b/ui/src/views/compute/MigrateWizard.vue
@@ -231,7 +231,8 @@ export default {
         }
         this.totalCount = response.findhostsformigrationresponse.count
       }).catch(error => {
-        this.$message.error(`${this.$t('message.load.host.failed')}: ${error}`)
+        this.$notifyError(error)
+        this.closeModal()
       }).finally(() => {
         this.loading = false
       })
diff --git a/ui/src/views/compute/ScaleVM.vue b/ui/src/views/compute/ScaleVM.vue
index 17e64d0fa91..1a80f595f63 100644
--- a/ui/src/views/compute/ScaleVM.vue
+++ b/ui/src/views/compute/ScaleVM.vue
@@ -142,6 +142,7 @@ export default {
         keyword: options.keyword,
         page: options.page,
         pageSize: options.pageSize,
+        gpuenabled: options.gpuenabled,
         details: 'min',
         response: 'json'
       }).then(response => {
diff --git a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue
index b52918f2b55..eb6e228a93f 100644
--- a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue
+++ b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue
@@ -17,11 +17,17 @@
 
 <template>
   <div>
-    <a-input-search
-      style="width: 25vw;float: right;margin-bottom: 10px; z-index: 8"
-      :placeholder="$t('label.search')"
-      v-model:value="filter"
-      @search="handleSearch" />
+    <div style="margin-bottom: 16px; display: flex; justify-content: right; align-items: center;">
+      <div v-if="showGpuFilter" style="display: flex; align-items: center; margin-right: 16px;">
+        <span>{{ $t('label.show.only.gpu.enabled.offerings') }}</span>
+        <a-switch style="margin-left: 8px;" v-model:checked="showGpu" @change="handleSearch(this.filter)" />
+      </div>
+      <a-input-search
+        style="width: 25vw; margin-right: 16px;"
+        :placeholder="$t('label.search')"
+        v-model:value="filter"
+        @search="handleSearch" />
+    </div>
     <a-table
       :columns="columns"
       :dataSource="tableSource"
@@ -35,6 +41,13 @@
       <template #headerCell="{ column }">
         <template v-if="column.key === 'cpu'"><appstore-outlined /> {{ $t('label.cpu') }}</template>
         <template v-if="column.key === 'ram'"><bulb-outlined /> {{ $t('label.memory') }}</template>
+        <template v-if="column.key === 'gpu'"><font-awesome-icon
+              :icon="['fa-solid', 'fa-microchip']"
+              class="anticon"
+              :style="{
+                color: $store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' },
+                fontSize: '20px'
+              }"/> {{ $t('label.gpu') }}</template>
       </template>
       <template #displayText="{ record }">
         <span>{{ record.name }}</span>
@@ -53,6 +66,12 @@
           </a-tooltip>
         </span>
       </template>
+      <template #gpuColumn="{ record }">
+        <span>{{ record.gpu }}</span>
+        <span v-if="record.gpuDetails" style="display: block;">
+          {{ record.gpuDetails }}
+        </span>
+      </template>
     </a-table>
 
     <div style="display: block; text-align: right;">
@@ -126,12 +145,30 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    showGpuFilter: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data () {
     return {
+      showGpu: false,
       filter: '',
-      columns: [
+
+      selectedRowKeys: [],
+      oldZoneId: null,
+      options: {
+        page: 1,
+        pageSize: 10,
+        keyword: null
+      }
+    }
+  },
+  computed: {
+    columns () {
+      const baseColumns = [
         {
           key: 'name',
           dataIndex: 'name',
@@ -149,17 +186,19 @@ export default {
           dataIndex: 'ram',
           width: '30%'
         }
-      ],
-      selectedRowKeys: [],
-      oldZoneId: null,
-      options: {
-        page: 1,
-        pageSize: 10,
-        keyword: null
+      ]
+
+      if (this.computeItems.some(item => item.gpucardname !== undefined && item.gpucardname !== null)) {
+        baseColumns.push({
+          key: 'gpu',
+          dataIndex: 'gpu',
+          width: '30%',
+          slots: { customRender: 'gpuColumn' }
+        })
       }
-    }
-  },
-  computed: {
+
+      return baseColumns
+    },
     tableSource () {
       return this.computeItems.map((item) => {
         var maxCpuNumber = item.cpunumber
@@ -204,13 +243,31 @@ export default {
         if (this.allowAllOfferings) {
           disabled = false
         }
+        var gpuEnabledOffering = false
+        var gpuCount = 0
+        var gpuType = ''
+        var gpuValue = ''
+        if (item.gpucardname !== undefined && item.gpucardname !== null) {
+          gpuEnabledOffering = true
+          gpuCount = item.gpucount
+          gpuType = item.gpucardname
+          if (item.vgpuprofilename && item.vgpuprofilename.toLowerCase() !== 'passthrough') {
+            gpuType = item.gpucardname + ' (' + item.vgpuprofilename + ')'
+          }
+          gpuValue = gpuCount + ' x ' + gpuType
+        }
         return {
           key: item.id,
           name: item.name,
           cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU x ${cpuSpeedValue} Ghz` : '',
           ram: ramValue.length > 0 ? `${ramValue} MB` : '',
           disabled: disabled,
-          leaseduration: item.leaseduration
+          leaseduration: item.leaseduration,
+          gpuEnabledOffering: gpuEnabledOffering,
+          gpuCount: gpuCount,
+          gpuType: gpuType,
+          gpu: gpuValue,
+          gpuDetails: this.getGpuDetails(item)
         }
       })
     },
@@ -266,6 +323,11 @@ export default {
       this.options.page = 1
       this.options.pageSize = 10
       this.options.keyword = this.filter
+      if (this.showGpu) {
+        this.options.gpuenabled = true
+      } else {
+        this.options.gpuenabled = undefined
+      }
       this.$emit('handle-search-filter', this.options)
     },
     onChangePage (page, pageSize) {
@@ -297,6 +359,15 @@ export default {
       } else {
         return 'over'
       }
+    },
+    getGpuDetails (item) {
+      let gpuDetails = ''
+      if (item.videoram || (item.maxresolutionx && item.maxresolutiony)) {
+        gpuDetails = '[' + (item.videoram ? (item.videoram + 'MB') : '') +
+        ((item.videoram && item.maxresolutionx && item.maxresolutiony) ? ', ' : '') +
+        (item.maxresolutionx && item.maxresolutiony ? item.maxresolutionx + 'x' + item.maxresolutiony : '') + ']'
+      }
+      return gpuDetails
     }
   }
 }
diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue
index f1fc415c6b7..6ca7577f037 100644
--- a/ui/src/views/dashboard/UsageDashboard.vue
+++ b/ui/src/views/dashboard/UsageDashboard.vue
@@ -163,7 +163,7 @@
       </chart-card>
     </a-col>
     <a-col :xs="{ span: 24 }" :lg="{ span: 12 }" :xl="{ span: 8 }" :xxl="{ span: 8 }" v-if="'listVirtualMachines' in $store.getters.apis">
-      <chart-card :loading="loading" class="dashboard-card">
+      <chart-card :loading="loading" class="dashboard-compute">
         <template #title>
           <div class="center">
             <h3>
@@ -200,7 +200,7 @@
         </a-row>
         <a-divider style="margin: 1px 0px; border-width: 0px;"/>
         <div
-          v-for="usageType in ['vm', 'cpu', 'memory', 'project']"
+          v-for="usageType in ['vm', 'cpu', 'memory', 'gpu', 'project']"
           :key="usageType">
           <div v-if="usageType + 'total' in entity">
             <div>
@@ -606,6 +606,8 @@ export default {
           return 'label.cpunumber'
         case 'memory':
           return 'label.memory'
+        case 'gpu':
+          return 'label.gpu'
         case 'primarystorage':
           return 'label.primary.storage'
         case 'secondarystorage':
@@ -681,6 +683,13 @@ export default {
     min-height: 420px;
   }
 
+  .dashboard-compute {
+    width: 100%;
+    overflow-x:hidden;
+    overflow-y: scroll;
+    max-height: 420px;
+  }
+
   .dashboard-storage {
     width: 100%;
     overflow-x:hidden;
diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue
index 08d782451d4..da394ba6f8f 100644
--- a/ui/src/views/offering/AddComputeOffering.vue
+++ b/ui/src/views/offering/AddComputeOffering.vue
@@ -243,35 +243,60 @@
             </a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-form-item name="pcidevice" ref="pcidevice" :label="$t('label.gpu')" v-if="!isSystem">
+        <a-form-item name="gpucardid" ref="gpucardid" :label="$t('label.gpu.card')" v-if="!isSystem">
           <a-select
-            v-model:value="form.pcidevice"
-            showSearch
-            optionFilterProp="label"
-            :filterOption="(input, option) => {
-              return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            }"
-            :placeholder="$t('label.gpu')"
-            @change="handleGpuChange">
-            <a-select-option v-for="(opt, optIndex) in gpuTypes" :key="optIndex" :value="opt.value">
-              {{ opt.title }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item name="vgputype" ref="vgputype" :label="$t('label.vgputype')" v-if="vGpuVisible">
-          <a-select
-            v-model:value="form.vgputype"
+            v-model:value="form.gpucardid"
             showSearch
             optionFilterProp="label"
             :filterOption="(input, option) => {
               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }"
-            :placeholder="$t('label.vgputype')">
-            <a-select-option v-for="(opt, optIndex) in vGpuTypes" :key="optIndex" :label="opt">
-              {{ opt }}
+            :loading="gpuCardLoading"
+            :placeholder="$t('label.gpu.card')"
+            @change="handleGpuCardChange">
+            <a-select-option v-for="(opt, optIndex) in gpuCards" :key="optIndex" :value="opt.id" :label="opt.name || opt.description || ''">
+              {{ opt.description || opt.name || '' }}
             </a-select-option>
           </a-select>
         </a-form-item>
+        <a-form-item name="vgpuprofile" ref="vgpuprofile" :label="$t('label.vgpu.profile')" v-if="!isSystem && form.gpucardid && vgpuProfiles.length > 0">
+          <a-select
+            v-model:value="form.vgpuprofile"
+            showSearch
+            optionFilterProp="label"
+            :filterOption="(input, option) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :loading="vgpuProfileLoading"
+            :placeholder="$t('label.vgpu.profile')">
+            <a-select-option v-for="(vgpu, vgpuIndex) in vgpuProfiles" :key="vgpuIndex" :value="vgpu.id" :label="vgpu.vgpuprofile || ''">
+              {{ vgpu.name }} {{ getVgpuProfileDetails(vgpu) }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-row :gutter="12" v-if="!isSystem && form.gpucardid">
+          <a-col :md="12" :lg="12">
+            <a-form-item name="gpucount" ref="gpucount">
+              <template #label>
+                <tooltip-label :title="$t('label.gpu.count')" :tooltip="apiParams.gpucount.description"/>
+              </template>
+              <a-input
+                v-model:value="form.gpucount"
+                type="number"
+                min="1"
+                max="16"
+                :placeholder="$t('label.gpu.count')"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="12" :lg="12">
+            <a-form-item name="gpudisplay" ref="gpudisplay">
+              <template #label>
+                <tooltip-label :title="$t('label.gpu.display')" :tooltip="apiParams.gpudisplay.description"/>
+              </template>
+              <a-switch v-model:checked="form.gpudisplay" />
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-form-item name="ispublic" ref="ispublic" :label="$t('label.ispublic')" v-show="isAdmin()">
           <a-switch v-model:checked="form.ispublic" />
         </a-form-item>
@@ -687,47 +712,10 @@ export default {
       deploymentPlannerLoading: false,
       plannerModeVisible: false,
       plannerMode: '',
-      selectedGpu: '',
+      selectedGpuCard: '',
       showDiskOfferingModal: false,
-      gpuTypes: [
-        {
-          value: '',
-          title: this.$t('label.none'),
-          vgpu: []
-        },
-        {
-          value: 'Group of NVIDIA Corporation GV100GL [TESLA V100] GPUs',
-          title: 'NVIDIA TESLA V100',
-          vgpu: ['', 'passthrough', 'GRID V100D-1A', 'GRID V100D-1B', 'GRID V100D-1Q', 'GRID V100D-2A', 'GRID V100D-2B', 'GRID V100D-2B4', 'GRID V100D-2Q', 'GRID V100D-4A', 'GRID V100D-4Q', 'GRID V100D-8A', 'GRID V100D-8Q', 'GRID V100D-16A', 'GRID V100D-16Q', 'GRID V100D-32A', 'GRID V100D-32Q']
-        },
-        {
-          value: 'Group of Nvidia Corporation TU104GL [Tesla T4] GPUs',
-          title: 'NVIDIA TESLA T4',
-          vgpu: ['', 'passthrough', 'GRID T4-1A', 'GRID T4-1B', 'GRID T4-1Q', 'GRID T4-2A', 'GRID T4-2B', 'GRID T4-2B4', 'GRID T4-2Q', 'GRID T4-4A', 'GRID T4-4Q', 'GRID T4-8A', 'GRID T4-8Q', 'GRID T4-16A', 'GRID T4-16Q']
-        },
-        {
-          value: 'Group of Nvidia Corporation GA102 [RTX A5500] GPUs',
-          title: 'NVIDIA RTX A5500',
-          vgpu: ['', 'passthrough', 'NVIDIA RTXA5500-1A', 'NVIDIA RTXA5500-1B', 'NVIDIA RTXA5500-1Q', 'NVIDIA RTXA5500-2A', 'NVIDIA RTXA5500-2B', 'NVIDIA RTXA5500-2Q', 'NVIDIA RTXA5500-3A', 'NVIDIA RTXA5500-3Q', 'NVIDIA RTXA5500-4A', 'NVIDIA RTXA5500-4Q', 'NVIDIA RTXA5500-6A', 'NVIDIA RTXA5500-6Q', 'NVIDIA RTXA5500-8A', 'NVIDIA RTXA5500-8Q', 'NVIDIA RTXA5500-12A', 'NVIDIA RTXA5500-12Q', 'NVIDIA RTXA5500-24A', 'NVIDIA RTXA5500-24Q']
-        },
-        {
-          value: 'Group of NVIDIA Corporation GA102GL [A40] GPUs',
-          title: 'NVIDIA RTX A40',
-          vgpu: ['', 'passthrough', 'NVIDIA A40-1A', 'NVIDIA A40-1B', 'NVIDIA A40-1Q', 'NVIDIA A40-2A', 'NVIDIA A40-2B', 'NVIDIA A40-2Q', 'NVIDIA A40-3A', 'NVIDIA A40-3Q', 'NVIDIA A40-4A', 'NVIDIA A40-4Q', 'NVIDIA A40-6A', 'NVIDIA A40-6Q', 'NVIDIA A40-8A', 'NVIDIA A40-8Q', 'NVIDIA A40-12A', 'NVIDIA A40-12Q', 'NVIDIA A40-16A', 'NVIDIA A40-16Q', 'NVIDIA A40-24A', 'NVIDIA A40-24Q', 'NVIDIA A40-48A', 'NVIDIA A40-48Q']
-        },
-        {
-          value: 'Group of NVIDIA Corporation GA107 [NVIDIA A16/NVIDIA A2] GPUs',
-          title: 'NVIDIA RTX A2',
-          vgpu: ['', 'passthrough', 'NVIDIA A2-1A', 'NVIDIA A2-1B', 'NVIDIA A2-1Q', 'NVIDIA A2-2A', 'NVIDIA A2-2B', 'NVIDIA A2-2Q', 'NVIDIA A2-4A', 'NVIDIA A2-4Q', 'NVIDIA A2-8A', 'NVIDIA A2-8Q', 'NVIDIA A2-16A', 'NVIDIA A2-16Q']
-        },
-        {
-          value: 'Group of NVIDIA Corporation GA102GL [A10] GPUs',
-          title: 'NVIDIA RTX A10',
-          vgpu: ['', 'passthrough', 'NVIDIA A10-1A', 'NVIDIA A10-1B', 'NVIDIA A10-1Q', 'NVIDIA A10-2A', 'NVIDIA A10-2B', 'NVIDIA A10-2Q', 'NVIDIA A10-3A', 'NVIDIA A10-3Q', 'NVIDIA A10-4A', 'NVIDIA A10-4Q', 'NVIDIA A10-6A', 'NVIDIA A10-6Q', 'NVIDIA A10-8A', 'NVIDIA A10-8Q', 'NVIDIA A10-12A', 'NVIDIA A10-12Q', 'NVIDIA A10-24A', 'NVIDIA A10-24Q']
-        }
-      ],
-      vGpuVisible: false,
-      vGpuTypes: [],
+      gpuCardLoading: false,
+      gpuCards: [],
       loading: false,
       dynamicscalingenabled: true,
       diskofferingstrictness: false,
@@ -745,6 +733,8 @@ export default {
       defaultLeaseExpiryAction: 'STOP',
       leaseduration: undefined,
       leaseexpiryaction: undefined,
+      vgpuProfiles: [],
+      vgpuProfileLoading: false,
       externalDetailsEnabled: false
     }
   },
@@ -775,7 +765,10 @@ export default {
         ispublic: this.isPublic,
         dynamicscalingenabled: true,
         plannermode: this.plannerMode,
-        pcidevice: this.selectedGpu,
+        gpucardid: this.selectedGpuCard,
+        vgpuprofile: '',
+        gpucount: '1',
+        gpudisplay: false,
         computeonly: this.computeonly,
         storagetype: this.storageType,
         provisioningtype: this.provisioningType,
@@ -829,6 +822,15 @@ export default {
         hypervisorsnapshotreserve: [this.naturalNumberRule],
         domainid: [{ type: 'array', required: true, message: this.$t('message.error.select') }],
         diskofferingid: [{ required: true, message: this.$t('message.error.select') }],
+        gpucount: [{
+          type: 'number',
+          validator: async (rule, value) => {
+            if (value && (isNaN(value) || value < 1)) {
+              return Promise.reject(this.$t('message.error.number.minimum.one'))
+            }
+            return Promise.resolve()
+          }
+        }],
         zoneid: [{
           type: 'array',
           validator: async (rule, value) => {
@@ -844,6 +846,7 @@ export default {
     fetchData () {
       this.fetchDomainData()
       this.fetchZoneData()
+      this.fetchGPUCards()
       if (isAdmin()) {
         this.fetchStorageTagData()
         this.fetchDeploymentPlannerData()
@@ -855,6 +858,20 @@ export default {
       }
       this.fetchDiskOfferings()
     },
+    fetchGPUCards () {
+      this.gpuCardLoading = true
+      getAPI('listGpuCards', {
+      }).then(json => {
+        this.gpuCards = json.listgpucardsresponse.gpucard || []
+        // Add a "None" option at the beginning
+        this.gpuCards.unshift({
+          id: '',
+          name: this.$t('label.none')
+        })
+      }).finally(() => {
+        this.gpuCardLoading = false
+      })
+    },
     addDiskOffering () {
       this.showDiskOfferingModal = true
     },
@@ -886,6 +903,23 @@ export default {
     isDomainAdmin () {
       return ['DomainAdmin'].includes(this.$store.getters.userInfo.roletype)
     },
+    getVgpuProfileDetails (vgpuProfile) {
+      let output = '('
+      if (vgpuProfile?.videoram) {
+        output += `${vgpuProfile.videoram} MB`
+      }
+      if (vgpuProfile?.maxresolutionx && vgpuProfile?.maxresolutiony) {
+        if (output !== '(') {
+          output += ', '
+        }
+        output += `${vgpuProfile.maxresolutionx}x${vgpuProfile.maxresolutiony}`
+      }
+      output += ')'
+      if (output === '()') {
+        return ''
+      }
+      return output
+    },
     checkIfDomainAdminIsAllowedToInformTag () {
       const params = { id: store.getters.userInfo.accountid }
       getAPI('isAccountAllowedToCreateOfferingsWithTags', params).then(json => {
@@ -986,19 +1020,31 @@ export default {
     handlePlannerModeChange (val) {
       this.plannerMode = val
     },
-    handleGpuChange (val) {
-      this.vGpuTypes = []
-      for (var gpuType of this.gpuTypes) {
-        if (gpuType.value === val) {
-          this.vGpuTypes = gpuType.vgpu
-          break
-        }
-      }
-      this.vGpuVisible = true
-      if (!this.arrayHasItems(this.vGpuTypes)) {
-        this.vGpuVisible = false
+    handleGpuCardChange (cardId) {
+      this.selectedGpuCard = cardId
+      this.form.vgpuprofile = ''
+      if (cardId && cardId !== '') {
+        this.fetchVgpuProfiles(cardId)
+      } else {
+        this.vgpuProfiles = []
+        this.form.gpucount = '1'
       }
     },
+    fetchVgpuProfiles (gpuCardId) {
+      this.vgpuProfileLoading = true
+      this.vgpuProfiles = []
+      getAPI('listVgpuProfiles', {
+        gpucardid: gpuCardId
+      }).then(json => {
+        this.vgpuProfiles = json.listvgpuprofilesresponse.vgpuprofile || []
+        this.form.vgpuprofile = this.vgpuProfiles.length > 0 ? this.vgpuProfiles[0].id : ''
+      }).catch(error => {
+        console.error('Error fetching vGPU profiles:', error)
+        this.vgpuProfiles = []
+      }).finally(() => {
+        this.vgpuProfileLoading = false
+      })
+    },
     onExternalDetailsEnabledChange (val) {
       if (val || !this.form.externaldetails) {
         return
@@ -1028,10 +1074,22 @@ export default {
           leaseduration: values.leaseduration,
           leaseexpiryaction: values.leaseexpiryaction
         }
+
         if (values.diskofferingid) {
           params.diskofferingid = values.diskofferingid
         }
 
+        // Add GPU parameters
+        if (values.vgpuprofile) {
+          params.vgpuprofileid = values.vgpuprofile
+        }
+        if (values.gpucount && values.gpucount > 0) {
+          params.gpucount = values.gpucount
+        }
+        if (values.gpudisplay !== undefined) {
+          params.gpudisplay = values.gpudisplay
+        }
+
         // custom fields (begin)
         if (values.offeringtype === 'fixed') {
           params.cpunumber = values.cpunumber
@@ -1107,15 +1165,6 @@ export default {
           params['serviceofferingdetails[0].key'] = 'ImplicitDedicationMode'
           params['serviceofferingdetails[0].value'] = values.plannermode
         }
-        if ('pcidevice' in values &&
-          values.pcidevice !== undefined && values.pcidevice !== '') {
-          params['serviceofferingdetails[1].key'] = 'pciDevice'
-          params['serviceofferingdetails[1].value'] = values.pcidevice
-        }
-        if ('vgputype' in values && this.arrayHasItems(this.vGpuTypes)) {
-          params['serviceofferingdetails[2].key'] = 'vgpuType'
-          params['serviceofferingdetails[2].value'] = this.vGpuTypes[values.vgputype]
-        }
         if ('isvolatile' in values && values.isvolatile !== undefined) {
           params.isvolatile = values.isvolatile === true
         }
diff --git a/ui/tests/unit/views/compute/MigrateWizard.spec.js b/ui/tests/unit/views/compute/MigrateWizard.spec.js
index 0ade85c2051..b847551f423 100644
--- a/ui/tests/unit/views/compute/MigrateWizard.spec.js
+++ b/ui/tests/unit/views/compute/MigrateWizard.spec.js
@@ -80,7 +80,8 @@ mocks = {
         }
         break
     }
-  })
+  }),
+  $notifyError: jest.fn()
 }
 
 const factory = (opts = {}) => {
@@ -295,17 +296,16 @@ describe('Views > compute > MigrateWizard.vue', () => {
         done()
       })
 
-      it('check $message.error should be called when api is called with throw error', async (done) => {
+      it('check $notifyError should be called when api is called with throw error', async (done) => {
         const mockError = 'Error: throw error message'
 
         await mockAxios.mockRejectedValue(mockError)
         await wrapper.setProps({ resource: {} })
         await wrapper.vm.fetchData()
         await flushPromises()
-        await flushPromises()
 
-        expect(mocks.$message.error).toHaveBeenCalled()
-        expect(mocks.$message.error).toHaveBeenLastCalledWith(`${i18n.global.t('message.load.host.failed')}: ${mockError}`)
+        expect(mocks.$notifyError).toHaveBeenCalled()
+        expect(mocks.$notifyError).toHaveBeenLastCalledWith(mockError)
         done()
       })
     })
diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
index 7ba2bb1b4d9..0db5c4b326f 100644
--- a/utils/src/main/java/com/cloud/utils/script/Script.java
+++ b/utils/src/main/java/com/cloud/utils/script/Script.java
@@ -1,4 +1,3 @@
-//
 // 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

From 86827f871d24def41c5c8cf6d8b7bad910979a55 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Tue, 29 Jul 2025 14:00:14 +0530
Subject: [PATCH 87/94] Update CIDR/Gateway of the Shared Networks from Guest
 IP ranges (#11249)

---
 .../META-INF/db/schema-42010to42100.sql       |  5 ++
 .../network/element/BigSwitchBcfElement.java  | 54 +++++++--------
 .../java/com/cloud/api/ApiResponseHelper.java | 17 ++---
 .../ConfigurationManagerImpl.java             | 68 +++++++++++++++++++
 .../java/com/cloud/utils/StringUtils.java     | 52 ++++++++++++++
 5 files changed, 161 insertions(+), 35 deletions(-)

diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
index 103b9363d6c..4c7fe74cbcd 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
@@ -659,3 +659,8 @@ CALL `cloud`.`INSERT_EXTENSION_CUSTOM_ACTION_DETAILS_IF_NOT_EXISTS`(
     'Resume',
     '[]'
 );
+
+ALTER TABLE `cloud`.`networks` MODIFY COLUMN `cidr` varchar(255) DEFAULT NULL COMMENT 'CloudStack managed vms get IP address from cidr.In general this cidr also serves as the network CIDR. But in case IP reservation feature is being used by a Guest network, networkcidr is the Effective network CIDR for that network';
+ALTER TABLE `cloud`.`networks` MODIFY COLUMN `gateway` varchar(255) DEFAULT NULL COMMENT 'gateway(s) for this network configuration';
+ALTER TABLE `cloud`.`networks` MODIFY COLUMN `ip6_cidr` varchar(1024) DEFAULT NULL COMMENT 'IPv6 cidr(s) for this network';
+ALTER TABLE `cloud`.`networks` MODIFY COLUMN `ip6_gateway` varchar(1024) DEFAULT NULL COMMENT 'IPv6 gateway(s) for this network';
diff --git a/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java
index adb957c3b5e..db0efd71b1d 100644
--- a/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java
+++ b/plugins/network-elements/bigswitch/src/main/java/com/cloud/network/element/BigSwitchBcfElement.java
@@ -237,7 +237,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         // get arguments for CreateBcfAttachmentCommand
         // determine whether this is VPC network or stand-alone network
         Vpc vpc = null;
-        if(network.getVpcId()!=null){
+        if (network.getVpcId() != null) {
             vpc = _vpcDao.acquireInLockTable(network.getVpcId());
         }
 
@@ -264,7 +264,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         String vmwareVswitchLabel = _networkModel.getDefaultGuestTrafficLabel(zoneId, HypervisorType.VMware);
         String[] labelArray = null;
         String vswitchName = null;
-        if(vmwareVswitchLabel!=null){
+        if (vmwareVswitchLabel != null) {
             labelArray=vmwareVswitchLabel.split(",");
             vswitchName = labelArray[0];
         }
@@ -273,9 +273,9 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         //   kvm: ivs port name
         //   vmware: specific portgroup naming convention
         String pgName = "";
-        if (dest.getHost().getHypervisorType() == HypervisorType.KVM){
+        if (dest.getHost().getHypervisorType() == HypervisorType.KVM) {
             pgName = hostname;
-        } else if (dest.getHost().getHypervisorType() == HypervisorType.VMware){
+        } else if (dest.getHost().getHypervisorType() == HypervisorType.VMware) {
             pgName = hostname + "-" + vswitchName;
         }
 
@@ -306,7 +306,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         String nicId = nic.getUuid();
 
         String tenantId;
-        if(network.getVpcId()!=null) {
+        if (network.getVpcId() != null) {
             tenantId = network.getNetworkDomain();
         } else {
             tenantId = networkId;
@@ -439,16 +439,16 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
 
         DataCenterVO zone = _zoneDao.findById(physicalNetwork.getDataCenterId());
         String zoneName;
-        if(zone!= null){
+        if (zone != null) {
             zoneName = zone.getName();
         } else {
             zoneName = String.valueOf(zoneId);
         }
 
         Boolean natNow =  _bcfUtils.isNatEnabled();
-        if (!nat && natNow){
+        if (!nat && natNow) {
             throw new CloudRuntimeException("NAT is enabled in existing controller. Enable NAT for new controller or remove existing controller first.");
-        } else if (nat && !natNow){
+        } else if (nat && !natNow) {
             throw new CloudRuntimeException("NAT is disabled in existing controller. Disable NAT for new controller or remove existing controller first.");
         }
 
@@ -582,7 +582,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         BigSwitchBcfResource bcfResource = (BigSwitchBcfResource) resource;
         bcfUtilsInit();
 
-        if(_bcfUtils.getTopology()!=null){
+        if (_bcfUtils.getTopology() != null) {
             bcfResource.setTopology(_bcfUtils.getTopology());
         }
 
@@ -621,7 +621,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         _bcfUtils.listACLbyNetwork(network);
 
         Vpc vpc = null;
-        if(network.getVpcId()!=null){
+        if (network.getVpcId() != null) {
             vpc = _vpcDao.acquireInLockTable(network.getVpcId());
         }
 
@@ -635,11 +635,11 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
             tenantId = network.getUuid();
         }
 
-        for (StaticNat rule: rules){
+        for (StaticNat rule: rules) {
             String srcIp = _ipAddressDao.findById(rule.getSourceIpAddressId()).getAddress().addr();
             String dstIp = rule.getDestIpAddress();
             String mac = rule.getSourceMacAddress();
-            if(!rule.isForRevoke()) {
+            if (!rule.isForRevoke()) {
                 logger.debug("BCF enables static NAT for public IP: " + srcIp + " private IP " + dstIp
                         + " mac " + mac);
                 CreateBcfStaticNatCommand cmd = new CreateBcfStaticNatCommand(
@@ -671,13 +671,13 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         SubnetUtils utils;
         String cidr = null;
         List<String> cidrList;
-        for(NetworkACLItem r: rules){
-            if(r.getState()==NetworkACLItem.State.Revoke){
+        for (NetworkACLItem r: rules) {
+            if (r.getState() == NetworkACLItem.State.Revoke) {
                 continue;
             }
             cidrList = r.getSourceCidrList();
-            if(cidrList != null){
-                if(cidrList.size()>1 || !r.getSourcePortEnd().equals(r.getSourcePortStart())){
+            if (cidrList != null) {
+                if (cidrList.size() > 1 || !r.getSourcePortEnd().equals(r.getSourcePortStart())) {
                     throw new ResourceUnavailableException("One CIDR and one port only please.",
                             Network.class, network.getId());
                 } else {
@@ -688,7 +688,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
                 cidr = "";
             } else {
                 utils = new SubnetUtils(cidr);
-                if(!utils.getInfo().getNetworkAddress().equals(utils.getInfo().getAddress())){
+                if (!utils.getInfo().getNetworkAddress().equals(utils.getInfo().getAddress())) {
                     throw new ResourceUnavailableException("Invalid CIDR in Network ACL rule.",
                             Network.class, network.getId());
                 }
@@ -710,13 +710,13 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         SubnetUtils utils;
         String cidr = null;
         List<String> cidrList;
-        for(FirewallRule r: rules){
-            if(r.getState()==FirewallRule.State.Revoke){
+        for (FirewallRule r: rules) {
+            if (r.getState() == FirewallRule.State.Revoke) {
                 continue;
             }
             cidrList = r.getSourceCidrList();
-            if(cidrList != null){
-                if(cidrList.size()>1 || !r.getSourcePortEnd().equals(r.getSourcePortStart())){
+            if (cidrList != null) {
+                if (cidrList.size()>1 || !r.getSourcePortEnd().equals(r.getSourcePortStart())) {
                     throw new ResourceUnavailableException("One CIDR and one port only please.",
                             Network.class, network.getId());
                 } else {
@@ -727,7 +727,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
                 cidr = "";
             } else {
                 utils = new SubnetUtils(cidr);
-                if(!utils.getInfo().getNetworkAddress().equals(utils.getInfo().getAddress())){
+                if (!utils.getInfo().getNetworkAddress().equals(utils.getInfo().getAddress())) {
                     throw new ResourceUnavailableException("Invalid CIDR in Firewall rule.",
                             Network.class, network.getId());
                 }
@@ -741,7 +741,7 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         bcfUtilsInit();
 
         Vpc vpc = null;
-        if(network.getVpcId()!=null){
+        if (network.getVpcId() != null) {
             vpc = _vpcDao.acquireInLockTable(network.getVpcId());
         }
 
@@ -756,23 +756,23 @@ NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter {
         UpdateBcfRouterCommand cmd = new UpdateBcfRouterCommand(tenantId);
 
         List<AclData> aclList = _bcfUtils.listACLbyNetwork(network);
-        for(AclData acl: aclList){
+        for (AclData acl: aclList) {
             cmd.addAcl(acl);
         }
 
-        if(vpc != null){
+        if (vpc != null) {
             cmd.setPublicIp(_bcfUtils.getPublicIpByVpc(vpc));
         } else {
             cmd.setPublicIp(_bcfUtils.getPublicIpByNetwork(network));
         }
 
         BcfAnswer answer = _bcfUtils.sendBcfCommandWithNetworkSyncCheck(cmd, network);
-        if(answer != null && !answer.getResult()){
+        if (answer != null && !answer.getResult()) {
             throw new IllegalArgumentException("Illegal router update arguments");
         }
     }
 
-    private void bcfUtilsInit(){
+    private void bcfUtilsInit() {
         if (_bcfUtils == null) {
             _bcfUtils = new BigSwitchBcfUtils(_networkDao, _nicDao,
                     _vmDao, _hostDao, _vpcDao, _bigswitchBcfDao,
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index a4dafd60562..0293e0d08fb 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -2539,10 +2539,11 @@ public class ApiResponseHelper implements ResponseGenerator {
             response.setType(network.getGuestType().toString());
         }
 
-        response.setGateway(network.getGateway());
+        response.setGateway(com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(network.getGateway()));
+        String cidr = com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(network.getCidr());
 
         // FIXME - either set netmask or cidr
-        response.setCidr(network.getCidr());
+        response.setCidr(cidr);
         if (network.getNetworkCidr() != null) {
             response.setNetworkCidr((network.getNetworkCidr()));
         }
@@ -2553,18 +2554,18 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (network.getNetworkCidr() != null) {
             response.setNetmask(NetUtils.cidr2Netmask(network.getNetworkCidr()));
         }
-        if (((network.getCidr()) != null) && (network.getNetworkCidr() == null)) {
-            response.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
+        if ((cidr != null) && (network.getNetworkCidr() == null)) {
+            response.setNetmask(NetUtils.cidr2Netmask(cidr));
         }
 
-        response.setIp6Gateway(network.getIp6Gateway());
-        response.setIp6Cidr(network.getIp6Cidr());
+        response.setIp6Gateway(com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(network.getIp6Gateway()));
+        response.setIp6Cidr(com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(network.getIp6Cidr()));
 
         // create response for reserved IP ranges that can be used for
         // non-cloudstack purposes
         String reservation = null;
-        if ((network.getCidr() != null) && (NetUtils.isNetworkAWithinNetworkB(network.getCidr(), network.getNetworkCidr()))) {
-            String[] guestVmCidrPair = network.getCidr().split("\\/");
+        if ((cidr != null) && (NetUtils.isNetworkAWithinNetworkB(cidr, network.getNetworkCidr()))) {
+            String[] guestVmCidrPair = cidr.split("\\/");
             String[] guestCidrPair = network.getNetworkCidr().split("\\/");
 
             Long guestVmCidrSize = Long.valueOf(guestVmCidrPair[1]);
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index a60b84bf2b6..03b97af4e10 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -5397,9 +5397,42 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         final VlanVO vlan = commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, domain, vlanOwner, vlanIp6Gateway, vlanIp6Cidr,
                 ipv4, zone, vlanType, ipv6Range, ipRange, forSystemVms, provider);
 
+        if (vlan != null) {
+            if (ipv4) {
+                addCidrAndGatewayForIpv4(networkId, vlanGateway, vlanNetmask);
+            } else if (ipv6) {
+                addCidrAndGatewayForIpv6(networkId, vlanIp6Gateway, vlanIp6Cidr);
+            }
+        }
+
         return vlan;
     }
 
+    private void addCidrAndGatewayForIpv4(final long networkId, final String vlanGateway, final String vlanNetmask) {
+        final NetworkVO networkVO = _networkDao.findById(networkId);
+        String networkCidr = networkVO.getCidr();
+        String newCidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask);
+        String newNetworkCidr = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkCidr, newCidr, true);
+        networkVO.setCidr(newNetworkCidr);
+
+        String networkGateway = networkVO.getGateway();
+        String newNetworkGateway = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkGateway, vlanGateway, true);
+        networkVO.setGateway(newNetworkGateway);
+        _networkDao.update(networkId, networkVO);
+    }
+
+    private void addCidrAndGatewayForIpv6(final long networkId, final String vlanIp6Gateway, final String vlanIp6Cidr) {
+        final NetworkVO networkVO = _networkDao.findById(networkId);
+        String networkIp6Cidr = networkVO.getIp6Cidr();
+        String newNetworkIp6Cidr = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkIp6Cidr, vlanIp6Cidr, true);
+        networkVO.setIp6Cidr(newNetworkIp6Cidr);
+
+        String networkIp6Gateway = networkVO.getIp6Gateway();
+        String newNetworkIp6Gateway = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkIp6Gateway, vlanIp6Gateway, true);
+        networkVO.setIp6Gateway(newNetworkIp6Gateway);
+        _networkDao.update(networkId, networkVO);
+    }
+
     private boolean isConnectivityWithoutVlan(Network network) {
         boolean connectivityWithoutVlan = false;
         if (_networkModel.areServicesSupportedInNetwork(network.getId(), Service.Connectivity)) {
@@ -6440,12 +6473,47 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
     private boolean deleteAndPublishVlanAndPublicIpRange(final long userId, final long vlanDbId, final Account caller) {
         VlanVO deletedVlan = deleteVlanAndPublicIpRange(userId, vlanDbId, caller);
         if (deletedVlan != null) {
+            final boolean ipv4 = deletedVlan.getVlanGateway() != null;
+            final boolean ipv6 = deletedVlan.getIp6Gateway() != null;
+            final long networkId = deletedVlan.getNetworkId();
+
+            if (ipv4) {
+                removeCidrAndGatewayForIpv4(networkId, deletedVlan);
+            } else if (ipv6) {
+                removeCidrAndGatewayForIpv6(networkId, deletedVlan);
+            }
+
             messageBus.publish(_name, MESSAGE_DELETE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, deletedVlan);
             return true;
         }
         return false;
     }
 
+    private void removeCidrAndGatewayForIpv4(final long networkId, VlanVO deletedVlan) {
+        final NetworkVO networkVO = _networkDao.findById(networkId);
+        String networkCidr = networkVO.getCidr();
+        String cidrToRemove = NetUtils.getCidrFromGatewayAndNetmask(deletedVlan.getVlanGateway(), deletedVlan.getVlanNetmask());
+        String newNetworkCidr = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkCidr, cidrToRemove, false);
+        networkVO.setCidr(newNetworkCidr);
+
+        String networkGateway = networkVO.getGateway();
+        String newNetworkGateway = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkGateway, deletedVlan.getVlanGateway(), false);
+        networkVO.setGateway(newNetworkGateway);
+        _networkDao.update(networkId, networkVO);
+    }
+
+    private void removeCidrAndGatewayForIpv6(final long networkId, VlanVO deletedVlan) {
+        final NetworkVO networkVO = _networkDao.findById(networkId);
+        String networkIp6Cidr = networkVO.getIp6Cidr();
+        String newNetworkIp6Cidr = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkIp6Cidr, deletedVlan.getIp6Cidr(), false);
+        networkVO.setIp6Cidr(newNetworkIp6Cidr);
+
+        String networkIp6Gateway = networkVO.getIp6Gateway();
+        String newNetworkIp6Gateway = com.cloud.utils.StringUtils.updateCommaSeparatedStringWithValue(networkIp6Gateway, deletedVlan.getIp6Gateway(), false);
+        networkVO.setIp6Gateway(newNetworkIp6Gateway);
+        _networkDao.update(networkId, networkVO);
+    }
+
     @Override
     public void checkDiskOfferingAccess(final Account caller, final DiskOffering dof, DataCenter zone) {
         for (final SecurityChecker checker : _secChecker) {
diff --git a/utils/src/main/java/com/cloud/utils/StringUtils.java b/utils/src/main/java/com/cloud/utils/StringUtils.java
index 3e4e970af2e..94295e3bb2e 100644
--- a/utils/src/main/java/com/cloud/utils/StringUtils.java
+++ b/utils/src/main/java/com/cloud/utils/StringUtils.java
@@ -24,14 +24,17 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class StringUtils extends org.apache.commons.lang3.StringUtils {
     private static final char[] hexChar = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
@@ -409,4 +412,53 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         String[] finalMergedTagsArray = appendedTags.split(",");
         return finalMergedTagsArray;
     }
+
+
+    /**
+     * Converts the comma separated numbers and ranges to numbers
+     * @param originalString the original string (can be null or empty) containing list of comma separated values that has to be updated
+     * @param value the value to add to, or remove from the original string
+     * @param add if true, adds the input value; if false, removes it
+     * @return String containing the modified original string (or null if empty)
+     */
+    public static String updateCommaSeparatedStringWithValue(String originalString, String value, boolean add) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(value)) {
+            return originalString;
+        }
+
+        Set<String> values = new LinkedHashSet<>();
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(originalString)) {
+            values.addAll(Arrays.stream(originalString.split(","))
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .collect(Collectors.toList()));
+        }
+
+        if (add) {
+            values.add(value);
+        } else {
+            values.remove(value);
+        }
+
+        return values.isEmpty() ? null : String.join(",", values);
+    }
+
+    /**
+     * Returns the first value from a comma-separated string.
+     * @param inputString the input string (can be null or empty) containing list of comma separated values
+     * @return the first value, or null if none found
+     */
+    public static String getFirstValueFromCommaSeparatedString(String inputString) {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(inputString)) {
+            return inputString;
+        }
+
+        String[] values = inputString.split(",");
+        if (values.length > 0) {
+            return values[0].trim();
+        }
+
+        return null;
+    }
 }

From 8756be5c18796469f6d480d3bebdde983e6a2a53 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Tue, 29 Jul 2025 06:41:43 -0300
Subject: [PATCH 88/94] [Multi-Arch] Select Template Arch when creating
 template from volume (#11068)

Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Co-authored-by: Vishesh <vishesh92@gmail.com>
---
 .../user/template/CreateTemplateCmd.java      | 10 ++++++++
 .../cloud/template/TemplateManagerImpl.java   |  2 +-
 ui/src/views/storage/CreateTemplate.vue       | 25 +++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index 0a7bf291843..5f09ac6698d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -20,6 +20,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.cpu.CPU;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
@@ -148,6 +149,11 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd implements UserCmd {
           since = "4.19.0")
     private String accountName;
 
+    @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
+            description = "the CPU arch of the template. Valid options are: x86_64, aarch64. Defaults to x86_64",
+            since = "4.20.2")
+    private String arch;
+
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
@@ -234,6 +240,10 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd implements UserCmd {
         return accountName;
     }
 
+    public CPU.CPUArch getArch() {
+        return CPU.CPUArch.fromType(arch);
+    }
+
     // ///////////////////////////////////////////////////
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index 9f23bdef142..cf88ccec919 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -1831,6 +1831,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
             throw new InvalidParameterValueException("Failed to create private template record, please specify only one of volume ID (" + volumeId +
                     ") and snapshot ID (" + snapshotId + ")");
         }
+        CPU.CPUArch arch = cmd.getArch();
 
         HypervisorType hyperType;
         VolumeVO volume = null;
@@ -1923,7 +1924,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         String description = cmd.getDisplayText();
         boolean isExtractable = false;
         Long sourceTemplateId = null;
-        CPU.CPUArch arch = CPU.CPUArch.amd64;
         if (volume != null) {
             VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
             isExtractable = template != null && template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM;
diff --git a/ui/src/views/storage/CreateTemplate.vue b/ui/src/views/storage/CreateTemplate.vue
index 65941d39a9d..d974092a5f8 100644
--- a/ui/src/views/storage/CreateTemplate.vue
+++ b/ui/src/views/storage/CreateTemplate.vue
@@ -129,6 +129,25 @@
           </a-select-option>
           </a-select>
       </a-form-item>
+      <a-form-item
+        name="arch"
+        ref="arch">
+        <template #label>
+          <tooltip-label :title="$t('label.arch')" :tooltip="apiParams.arch.description"/>
+        </template>
+        <a-select
+          showSearch
+          optionFilterProp="label"
+          :filterOption="(input, option) => {
+            return option.children[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }"
+          v-model:value="form.arch"
+          :placeholder="apiParams.arch.description">
+          <a-select-option v-for="opt in architectureTypes.opts" :key="opt.id">
+            {{ opt.name || opt.description }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-row :gutter="12">
         <a-col :md="24" :lg="12">
           <a-form-item ref="isdynamicallyscalable" name="isdynamicallyscalable">
@@ -163,7 +182,7 @@
                 <tooltip-label :title="$t('label.isfeatured')" :tooltip="apiParams.isfeatured.description"/>
               </template>
               <a-switch v-model:checked="form.isfeatured" />
-            </a-form-item>
+          </a-form-item>
         </a-col>
       </a-row>
       <div :span="24" class="action-button">
@@ -204,7 +223,8 @@ export default {
       accounts: [],
       domainLoading: false,
       domainid: null,
-      account: null
+      account: null,
+      architectureTypes: {}
     }
   },
   computed: {
@@ -239,6 +259,7 @@ export default {
       if ('listDomains' in this.$store.getters.apis) {
         this.fetchDomains()
       }
+      this.architectureTypes.opts = this.$fetchCpuArchitectureTypes()
     },
     fetchOsTypes () {
       this.osTypes.opts = []

From e9918ba15de6e115ec4aa3528519b9b43daa26a3 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 29 Jul 2025 17:12:31 +0530
Subject: [PATCH 89/94] ui: fix volume size not showing (#11328)

Fixes #11321

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/config/section/storage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js
index a86650874ba..12d1d547a90 100644
--- a/ui/src/config/section/storage.js
+++ b/ui/src/config/section/storage.js
@@ -39,7 +39,7 @@ export default {
         }
       },
       columns: () => {
-        const fields = ['name', 'state', 'sizegb', 'type', 'vmname']
+        const fields = ['name', 'state', 'size', 'type', 'vmname']
         const metricsFields = ['diskkbsread', 'diskkbswrite', 'diskiopstotal']
 
         if (store.getters.userInfo.roletype === 'Admin') {

From 4b1a605e597316f30a99528ffd368ddd4915f14b Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 29 Jul 2025 18:33:05 +0530
Subject: [PATCH 90/94] server: fix IllegalMonitorStateException on cluster
 managedstate change (#11310)

* server: fix IllegalMonitorStateException on cluster managedstate change

Fixes #11293

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

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
---
 .../src/main/java/com/cloud/resource/ResourceManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index c05776ee6e1..e0cefc7b4bf 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -1217,9 +1217,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
                     for (int i = 0; i < retry; i++) {
                         lsuccess = true;
                         try {
-                            Thread.currentThread().wait(5 * 1000);
+                            Thread.sleep(5 * 1000);
                         } catch (final InterruptedException e) {
-                            s_logger.debug("thread unexpectedly interupted during wait, while updating cluster");
+                            s_logger.debug("thread unexpectedly interrupted during wait, while updating cluster");
                         }
                         hosts = listAllUpAndEnabledHosts(Host.Type.Routing, cluster.getId(), cluster.getPodId(), cluster.getDataCenterId());
                         for (final HostVO host : hosts) {

From f2bda464193d1b0cb2d65f4ac67bc9a2b5813824 Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Tue, 29 Jul 2025 18:47:37 +0530
Subject: [PATCH 91/94] Upgrade noVNC from 1.4.0 to 1.6.0 (#11119)

---
 .pre-commit-config.yaml                       |    2 +-
 systemvm/agent/noVNC/app/error-handler.js     |    2 +-
 systemvm/agent/noVNC/app/locale/cs.json       |   24 +-
 systemvm/agent/noVNC/app/locale/de.json       |   29 +-
 systemvm/agent/noVNC/app/locale/el.json       |   51 +-
 systemvm/agent/noVNC/app/locale/es.json       |   16 +-
 systemvm/agent/noVNC/app/locale/fr.json       |   56 +-
 systemvm/agent/noVNC/app/locale/it.json       |   10 +-
 systemvm/agent/noVNC/app/locale/ja.json       |   47 +-
 systemvm/agent/noVNC/app/locale/ko.json       |   22 +-
 systemvm/agent/noVNC/app/locale/nl.json       |   78 +-
 systemvm/agent/noVNC/app/locale/pl.json       |   25 +-
 systemvm/agent/noVNC/app/locale/pt_BR.json    |   26 +-
 systemvm/agent/noVNC/app/locale/ru.json       |   26 +-
 systemvm/agent/noVNC/app/locale/sv.json       |   37 +-
 systemvm/agent/noVNC/app/locale/tr.json       |    2 +-
 systemvm/agent/noVNC/app/locale/zh_CN.json    |   90 +-
 systemvm/agent/noVNC/app/locale/zh_TW.json    |   22 +-
 systemvm/agent/noVNC/app/localization.js      |   53 +-
 systemvm/agent/noVNC/app/styles/base.css      |  949 ++++++++--------
 systemvm/agent/noVNC/app/styles/constants.css |   30 +
 systemvm/agent/noVNC/app/styles/input.css     |  845 ++++++++++----
 systemvm/agent/noVNC/app/ui.js                |  195 ++--
 systemvm/agent/noVNC/app/webutil.js           |   98 +-
 systemvm/agent/noVNC/core/crypto/aes.js       |  178 +++
 systemvm/agent/noVNC/core/crypto/bigint.js    |   34 +
 systemvm/agent/noVNC/core/crypto/crypto.js    |   90 ++
 systemvm/agent/noVNC/core/{ => crypto}/des.js |   72 +-
 systemvm/agent/noVNC/core/crypto/dh.js        |   55 +
 .../agent/noVNC/core/{util => crypto}/md5.js  |   13 +-
 systemvm/agent/noVNC/core/crypto/rsa.js       |  132 +++
 .../agent/noVNC/core/decoders/copyrect.js     |    2 +-
 systemvm/agent/noVNC/core/decoders/h264.js    |  321 ++++++
 systemvm/agent/noVNC/core/decoders/hextile.js |   36 +-
 systemvm/agent/noVNC/core/decoders/jpeg.js    |  233 ++--
 systemvm/agent/noVNC/core/decoders/raw.js     |   59 +-
 systemvm/agent/noVNC/core/decoders/rre.js     |    2 +-
 systemvm/agent/noVNC/core/decoders/tight.js   |   80 +-
 .../agent/noVNC/core/decoders/tightpng.js     |    2 +-
 systemvm/agent/noVNC/core/decoders/zlib.js    |   51 +
 systemvm/agent/noVNC/core/decoders/zrle.js    |    4 +-
 systemvm/agent/noVNC/core/deflator.js         |    7 +-
 systemvm/agent/noVNC/core/display.js          |   78 +-
 systemvm/agent/noVNC/core/encodings.js        |    8 +-
 systemvm/agent/noVNC/core/inflator.js         |    5 +-
 .../agent/noVNC/core/input/domkeytable.js     |    2 +-
 systemvm/agent/noVNC/core/input/fixedkeys.js  |    2 +-
 .../agent/noVNC/core/input/gesturehandler.js  |    2 +-
 systemvm/agent/noVNC/core/input/keyboard.js   |   59 +-
 systemvm/agent/noVNC/core/input/util.js       |    2 +-
 systemvm/agent/noVNC/core/input/vkeys.js      |    2 +-
 systemvm/agent/noVNC/core/ra2.js              |  345 +-----
 systemvm/agent/noVNC/core/rfb.js              | 1005 +++++++++--------
 systemvm/agent/noVNC/core/util/browser.js     |   85 +-
 systemvm/agent/noVNC/core/util/cursor.js      |    6 +-
 systemvm/agent/noVNC/core/util/element.js     |    2 +-
 systemvm/agent/noVNC/core/util/events.js      |    2 +-
 systemvm/agent/noVNC/core/util/eventtarget.js |    2 +-
 systemvm/agent/noVNC/core/util/int.js         |    2 +-
 systemvm/agent/noVNC/core/util/logging.js     |    2 +-
 systemvm/agent/noVNC/core/util/strings.js     |    2 +-
 systemvm/agent/noVNC/core/websock.js          |  140 +--
 systemvm/agent/noVNC/defaults.json            |    1 +
 systemvm/agent/noVNC/docs/novnc_proxy.1       |    8 +-
 systemvm/agent/noVNC/mandatory.json           |    1 +
 systemvm/agent/noVNC/package.json             |   17 +-
 systemvm/agent/noVNC/po/fr.po                 |  243 ++--
 systemvm/agent/noVNC/po/it.po                 |   12 +-
 systemvm/agent/noVNC/po/pt_BR.po              |   28 +-
 systemvm/agent/noVNC/utils/convert.js         |    2 +-
 systemvm/agent/noVNC/vnc.html                 |   97 +-
 systemvm/agent/noVNC/vnc_lite.html            |   16 +-
 72 files changed, 3962 insertions(+), 2322 deletions(-)
 create mode 100644 systemvm/agent/noVNC/app/styles/constants.css
 create mode 100644 systemvm/agent/noVNC/core/crypto/aes.js
 create mode 100644 systemvm/agent/noVNC/core/crypto/bigint.js
 create mode 100644 systemvm/agent/noVNC/core/crypto/crypto.js
 rename systemvm/agent/noVNC/core/{ => crypto}/des.js (87%)
 create mode 100644 systemvm/agent/noVNC/core/crypto/dh.js
 rename systemvm/agent/noVNC/core/{util => crypto}/md5.js (93%)
 create mode 100644 systemvm/agent/noVNC/core/crypto/rsa.js
 create mode 100644 systemvm/agent/noVNC/core/decoders/h264.js
 create mode 100644 systemvm/agent/noVNC/core/decoders/zlib.js
 create mode 100644 systemvm/agent/noVNC/defaults.json
 create mode 100644 systemvm/agent/noVNC/mandatory.json

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 901d3f02bc1..32b70145e59 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -75,7 +75,7 @@ repos:
         name: run codespell
         description: Check spelling with codespell
         args: [--ignore-words=.github/linters/codespell.txt]
-        exclude: ^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$
+        exclude: ^systemvm/agent/noVNC/|^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$
   - repo: https://github.com/pycqa/flake8
     rev: 7.0.0
     hooks:
diff --git a/systemvm/agent/noVNC/app/error-handler.js b/systemvm/agent/noVNC/app/error-handler.js
index 67b63720cba..5f6ffb674f0 100644
--- a/systemvm/agent/noVNC/app/error-handler.js
+++ b/systemvm/agent/noVNC/app/error-handler.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/app/locale/cs.json b/systemvm/agent/noVNC/app/locale/cs.json
index eba5ee3de52..06df02f92a4 100644
--- a/systemvm/agent/noVNC/app/locale/cs.json
+++ b/systemvm/agent/noVNC/app/locale/cs.json
@@ -14,7 +14,7 @@
     "Password is required": "Je vyžadováno heslo",
     "noVNC encountered an error:": "noVNC narazilo na chybu:",
     "Hide/Show the control bar": "Skrýt/zobrazit ovládací panel",
-    "Move/Drag Viewport": "Přesunout/přetáhnout výřez",
+    "Move/Drag viewport": "Přesunout/přetáhnout výřez",
     "viewport drag": "přesun výřezu",
     "Active Mouse Button": "Aktivní tlačítka myši",
     "No mousebutton": "Žádné",
@@ -22,9 +22,9 @@
     "Middle mousebutton": "Prostřední tlačítko myši",
     "Right mousebutton": "Pravé tlačítko myši",
     "Keyboard": "Klávesnice",
-    "Show Keyboard": "Zobrazit klávesnici",
+    "Show keyboard": "Zobrazit klávesnici",
     "Extra keys": "Extra klávesy",
-    "Show Extra Keys": "Zobrazit extra klávesy",
+    "Show extra keys": "Zobrazit extra klávesy",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Přepnout Ctrl",
     "Alt": "Alt",
@@ -45,13 +45,13 @@
     "Clear": "Vymazat",
     "Fullscreen": "Celá obrazovka",
     "Settings": "Nastavení",
-    "Shared Mode": "Sdílený režim",
-    "View Only": "Pouze prohlížení",
-    "Clip to Window": "Přizpůsobit oknu",
-    "Scaling Mode:": "Přizpůsobení velikosti",
+    "Shared mode": "Sdílený režim",
+    "View only": "Pouze prohlížení",
+    "Clip to window": "Přizpůsobit oknu",
+    "Scaling mode:": "Přizpůsobení velikosti",
     "None": "Žádné",
-    "Local Scaling": "Místní",
-    "Remote Resizing": "Vzdálené",
+    "Local scaling": "Místní",
+    "Remote resizing": "Vzdálené",
     "Advanced": "Pokročilé",
     "Repeater ID:": "ID opakovače",
     "WebSocket": "WebSocket",
@@ -59,9 +59,9 @@
     "Host:": "Hostitel:",
     "Port:": "Port:",
     "Path:": "Cesta",
-    "Automatic Reconnect": "Automatická obnova připojení",
-    "Reconnect Delay (ms):": "Zpoždění připojení (ms)",
-    "Show Dot when No Cursor": "Tečka místo chybějícího kurzoru myši",
+    "Automatic reconnect": "Automatická obnova připojení",
+    "Reconnect delay (ms):": "Zpoždění připojení (ms)",
+    "Show dot when no cursor": "Tečka místo chybějícího kurzoru myši",
     "Logging:": "Logování:",
     "Disconnect": "Odpojit",
     "Connect": "Připojit",
diff --git a/systemvm/agent/noVNC/app/locale/de.json b/systemvm/agent/noVNC/app/locale/de.json
index 15099d7d06d..20bd2708d71 100644
--- a/systemvm/agent/noVNC/app/locale/de.json
+++ b/systemvm/agent/noVNC/app/locale/de.json
@@ -13,7 +13,7 @@
     "Password is required": "Passwort ist erforderlich",
     "noVNC encountered an error:": "Ein Fehler ist aufgetreten:",
     "Hide/Show the control bar": "Kontrollleiste verstecken/anzeigen",
-    "Move/Drag Viewport": "Ansichtsfenster verschieben/ziehen",
+    "Move/Drag viewport": "Ansichtsfenster verschieben/ziehen",
     "viewport drag": "Ansichtsfenster ziehen",
     "Active Mouse Button": "Aktive Maustaste",
     "No mousebutton": "Keine Maustaste",
@@ -21,9 +21,9 @@
     "Middle mousebutton": "Mittlere Maustaste",
     "Right mousebutton": "Rechte Maustaste",
     "Keyboard": "Tastatur",
-    "Show Keyboard": "Tastatur anzeigen",
+    "Show keyboard": "Tastatur anzeigen",
     "Extra keys": "Zusatztasten",
-    "Show Extra Keys": "Zusatztasten anzeigen",
+    "Show extra keys": "Zusatztasten anzeigen",
     "Ctrl": "Strg",
     "Toggle Ctrl": "Strg umschalten",
     "Alt": "Alt",
@@ -44,13 +44,13 @@
     "Clear": "Löschen",
     "Fullscreen": "Vollbild",
     "Settings": "Einstellungen",
-    "Shared Mode": "Geteilter Modus",
-    "View Only": "Nur betrachten",
-    "Clip to Window": "Auf Fenster begrenzen",
-    "Scaling Mode:": "Skalierungsmodus:",
+    "Shared mode": "Geteilter Modus",
+    "View only": "Nur betrachten",
+    "Clip to window": "Auf Fenster begrenzen",
+    "Scaling mode:": "Skalierungsmodus:",
     "None": "Keiner",
-    "Local Scaling": "Lokales skalieren",
-    "Remote Resizing": "Serverseitiges skalieren",
+    "Local scaling": "Lokales skalieren",
+    "Remote resizing": "Serverseitiges skalieren",
     "Advanced": "Erweitert",
     "Repeater ID:": "Repeater ID:",
     "WebSocket": "WebSocket",
@@ -58,12 +58,17 @@
     "Host:": "Server:",
     "Port:": "Port:",
     "Path:": "Pfad:",
-    "Automatic Reconnect": "Automatisch wiederverbinden",
-    "Reconnect Delay (ms):": "Wiederverbindungsverzögerung (ms):",
+    "Automatic reconnect": "Automatisch wiederverbinden",
+    "Reconnect delay (ms):": "Wiederverbindungsverzögerung (ms):",
     "Logging:": "Protokollierung:",
     "Disconnect": "Verbindung trennen",
     "Connect": "Verbinden",
     "Password:": "Passwort:",
     "Cancel": "Abbrechen",
-    "Canvas not supported.": "Canvas nicht unterstützt."
+    "Canvas not supported.": "Canvas nicht unterstützt.",
+    "Disconnect timeout": "Zeitüberschreitung beim Trennen",
+    "Local Downscaling": "Lokales herunterskalieren",
+    "Local Cursor": "Lokaler Mauszeiger",
+    "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "'Clipping-Modus' aktiviert, Scrollbalken in 'IE-Vollbildmodus' werden nicht unterstützt",
+    "True Color": "True Color"
 }
diff --git a/systemvm/agent/noVNC/app/locale/el.json b/systemvm/agent/noVNC/app/locale/el.json
index 19cdb581bc1..69e3086cbcd 100644
--- a/systemvm/agent/noVNC/app/locale/el.json
+++ b/systemvm/agent/noVNC/app/locale/el.json
@@ -1,4 +1,5 @@
 {
+    "HTTPS is required for full functionality": "Το HTTPS είναι απαιτούμενο για πλήρη λειτουργικότητα",
     "Connecting...": "Συνδέεται...",
     "Disconnecting...": "Aποσυνδέεται...",
     "Reconnecting...": "Επανασυνδέεται...",
@@ -7,19 +8,15 @@
     "Connected (encrypted) to ": "Συνδέθηκε (κρυπτογραφημένα) με το ",
     "Connected (unencrypted) to ": "Συνδέθηκε (μη κρυπτογραφημένα) με το ",
     "Something went wrong, connection is closed": "Κάτι πήγε στραβά, η σύνδεση διακόπηκε",
+    "Failed to connect to server": "Αποτυχία στη σύνδεση με το διακομιστή",
     "Disconnected": "Αποσυνδέθηκε",
     "New connection has been rejected with reason: ": "Η νέα σύνδεση απορρίφθηκε διότι: ",
     "New connection has been rejected": "Η νέα σύνδεση απορρίφθηκε ",
-    "Password is required": "Απαιτείται ο κωδικός πρόσβασης",
+    "Credentials are required": "Απαιτούνται διαπιστευτήρια",
     "noVNC encountered an error:": "το noVNC αντιμετώπισε ένα σφάλμα:",
     "Hide/Show the control bar": "Απόκρυψη/Εμφάνιση γραμμής ελέγχου",
+    "Drag": "Σύρσιμο",
     "Move/Drag Viewport": "Μετακίνηση/Σύρσιμο Θεατού πεδίου",
-    "viewport drag": "σύρσιμο θεατού πεδίου",
-    "Active Mouse Button": "Ενεργό Πλήκτρο Ποντικιού",
-    "No mousebutton": "Χωρίς Πλήκτρο Ποντικιού",
-    "Left mousebutton": "Αριστερό Πλήκτρο Ποντικιού",
-    "Middle mousebutton": "Μεσαίο Πλήκτρο Ποντικιού",
-    "Right mousebutton": "Δεξί Πλήκτρο Ποντικιού",
     "Keyboard": "Πληκτρολόγιο",
     "Show Keyboard": "Εμφάνιση Πληκτρολογίου",
     "Extra keys": "Επιπλέον πλήκτρα",
@@ -28,6 +25,8 @@
     "Toggle Ctrl": "Εναλλαγή Ctrl",
     "Alt": "Alt",
     "Toggle Alt": "Εναλλαγή Alt",
+    "Toggle Windows": "Εναλλαγή Παράθυρων",
+    "Windows": "Παράθυρα",
     "Send Tab": "Αποστολή Tab",
     "Tab": "Tab",
     "Esc": "Esc",
@@ -41,8 +40,8 @@
     "Reboot": "Επανεκκίνηση",
     "Reset": "Επαναφορά",
     "Clipboard": "Πρόχειρο",
-    "Clear": "Καθάρισμα",
-    "Fullscreen": "Πλήρης Οθόνη",
+    "Edit clipboard content in the textarea below.": "Επεξεργαστείτε το περιεχόμενο του πρόχειρου στην περιοχή κειμένου παρακάτω.",
+    "Full Screen": "Πλήρης Οθόνη",
     "Settings": "Ρυθμίσεις",
     "Shared Mode": "Κοινόχρηστη Λειτουργία",
     "View Only": "Μόνο Θέαση",
@@ -52,6 +51,8 @@
     "Local Scaling": "Τοπική Κλιμάκωση",
     "Remote Resizing": "Απομακρυσμένη Αλλαγή μεγέθους",
     "Advanced": "Για προχωρημένους",
+    "Quality:": "Ποιότητα:",
+    "Compression level:": "Επίπεδο συμπίεσης:",
     "Repeater ID:": "Repeater ID:",
     "WebSocket": "WebSocket",
     "Encrypt": "Κρυπτογράφηση",
@@ -60,10 +61,40 @@
     "Path:": "Διαδρομή:",
     "Automatic Reconnect": "Αυτόματη επανασύνδεση",
     "Reconnect Delay (ms):": "Καθυστέρηση επανασύνδεσης (ms):",
+    "Show Dot when No Cursor": "Εμφάνιση Τελείας όταν δεν υπάρχει Δρομέας",
     "Logging:": "Καταγραφή:",
+    "Version:": "Έκδοση:",
     "Disconnect": "Αποσύνδεση",
     "Connect": "Σύνδεση",
+    "Server identity": "Ταυτότητα Διακομιστή",
+    "The server has provided the following identifying information:": "Ο διακομιστής παρείχε την ακόλουθη πληροφορία ταυτοποίησης:",
+    "Fingerprint:": "Δακτυλικό αποτύπωμα:",
+    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "Παρακαλώ επαληθεύσετε ότι η πληροφορία είναι σωστή και πιέστε \"Αποδοχή\". Αλλιώς πιέστε \"Απόρριψη\".",
+    "Approve": "Αποδοχή",
+    "Reject": "Απόρριψη",
+    "Credentials": "Διαπιστευτήρια",
+    "Username:": "Κωδικός Χρήστη:",
     "Password:": "Κωδικός Πρόσβασης:",
+    "Send Credentials": "Αποστολή Διαπιστευτηρίων",
     "Cancel": "Ακύρωση",
-    "Canvas not supported.": "Δεν υποστηρίζεται το στοιχείο Canvas"
+    "Password is required": "Απαιτείται ο κωδικός πρόσβασης",
+    "viewport drag": "σύρσιμο θεατού πεδίου",
+    "Active Mouse Button": "Ενεργό Πλήκτρο Ποντικιού",
+    "No mousebutton": "Χωρίς Πλήκτρο Ποντικιού",
+    "Left mousebutton": "Αριστερό Πλήκτρο Ποντικιού",
+    "Middle mousebutton": "Μεσαίο Πλήκτρο Ποντικιού",
+    "Right mousebutton": "Δεξί Πλήκτρο Ποντικιού",
+    "Clear": "Καθάρισμα",
+    "Canvas not supported.": "Δεν υποστηρίζεται το στοιχείο Canvas",
+    "Disconnect timeout": "Παρέλευση χρονικού ορίου αποσύνδεσης",
+    "Local Downscaling": "Τοπική Συρρίκνωση",
+    "Local Cursor": "Τοπικός Δρομέας",
+    "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "Εφαρμογή λειτουργίας αποκοπής αφού δεν υποστηρίζονται οι λωρίδες κύλισης σε πλήρη οθόνη στον IE",
+    "True Color": "Πραγματικά Χρώματα",
+    "Style:": "Στυλ:",
+    "default": "προεπιλεγμένο",
+    "Apply": "Εφαρμογή",
+    "Connection": "Σύνδεση",
+    "Token:": "Διακριτικό:",
+    "Send Password": "Αποστολή Κωδικού Πρόσβασης"
 }
diff --git a/systemvm/agent/noVNC/app/locale/es.json b/systemvm/agent/noVNC/app/locale/es.json
index 61365e2887b..39e7c0e5774 100644
--- a/systemvm/agent/noVNC/app/locale/es.json
+++ b/systemvm/agent/noVNC/app/locale/es.json
@@ -10,7 +10,7 @@
     "Disconnect timeout": "Tiempo de desconexión agotado",
     "noVNC encountered an error:": "noVNC ha encontrado un error:",
     "Hide/Show the control bar": "Ocultar/Mostrar la barra de control",
-    "Move/Drag Viewport": "Mover/Arrastrar la ventana",
+    "Move/Drag viewport": "Mover/Arrastrar la ventana",
     "viewport drag": "Arrastrar la ventana",
     "Active Mouse Button": "Botón activo del ratón",
     "No mousebutton": "Ningún botón del ratón",
@@ -18,7 +18,7 @@
     "Middle mousebutton": "Botón central del ratón",
     "Right mousebutton": "Botón derecho del ratón",
     "Keyboard": "Teclado",
-    "Show Keyboard": "Mostrar teclado",
+    "Show keyboard": "Mostrar teclado",
     "Extra keys": "Teclas adicionales",
     "Show Extra Keys": "Mostrar Teclas Adicionales",
     "Ctrl": "Ctrl",
@@ -43,13 +43,13 @@
     "Settings": "Configuraciones",
     "Encrypt": "Encriptar",
     "Shared Mode": "Modo Compartido",
-    "View Only": "Solo visualización",
-    "Clip to Window": "Recortar al tamaño de la ventana",
-    "Scaling Mode:": "Modo de escalado:",
+    "View only": "Solo visualización",
+    "Clip to window": "Recortar al tamaño de la ventana",
+    "Scaling mode:": "Modo de escalado:",
     "None": "Ninguno",
     "Local Scaling": "Escalado Local",
     "Local Downscaling": "Reducción de escala local",
-    "Remote Resizing": "Cambio de tamaño remoto",
+    "Remote resizing": "Cambio de tamaño remoto",
     "Advanced": "Avanzado",
     "Local Cursor": "Cursor Local",
     "Repeater ID:": "ID del Repetidor:",
@@ -57,8 +57,8 @@
     "Host:": "Host:",
     "Port:": "Puerto:",
     "Path:": "Ruta:",
-    "Automatic Reconnect": "Reconexión automática",
-    "Reconnect Delay (ms):": "Retraso en la reconexión (ms):",
+    "Automatic reconnect": "Reconexión automática",
+    "Reconnect delay (ms):": "Retraso en la reconexión (ms):",
     "Logging:": "Registrando:",
     "Disconnect": "Desconectar",
     "Connect": "Conectar",
diff --git a/systemvm/agent/noVNC/app/locale/fr.json b/systemvm/agent/noVNC/app/locale/fr.json
index 51e45891a9a..2d66088fd75 100644
--- a/systemvm/agent/noVNC/app/locale/fr.json
+++ b/systemvm/agent/noVNC/app/locale/fr.json
@@ -1,10 +1,10 @@
 {
-    "HTTPS is required for full functionality": "",
+    "Running without HTTPS is not recommended, crashes or other issues are likely.": "Lancer sans HTTPS n'est pas recommandé, crashs ou autres problèmes en vue.",
     "Connecting...": "En cours de connexion...",
     "Disconnecting...": "Déconnexion en cours...",
     "Reconnecting...": "Reconnexion en cours...",
     "Internal error": "Erreur interne",
-    "Must set host": "Doit définir l'hôte",
+    "Failed to connect to server: ": "Échec de connexion au serveur ",
     "Connected (encrypted) to ": "Connecté (chiffré) à ",
     "Connected (unencrypted) to ": "Connecté (non chiffré) à ",
     "Something went wrong, connection is closed": "Quelque chose s'est mal passé, la connexion a été fermée",
@@ -16,19 +16,19 @@
     "noVNC encountered an error:": "noVNC a rencontré une erreur :",
     "Hide/Show the control bar": "Masquer/Afficher la barre de contrôle",
     "Drag": "Faire glisser",
-    "Move/Drag Viewport": "Déplacer/faire glisser le Viewport",
+    "Move/Drag viewport": "Déplacer la fenêtre de visualisation",
     "Keyboard": "Clavier",
-    "Show Keyboard": "Afficher le clavier",
+    "Show keyboard": "Afficher le clavier",
     "Extra keys": "Touches supplémentaires",
-    "Show Extra Keys": "Afficher les touches supplémentaires",
+    "Show extra keys": "Afficher les touches supplémentaires",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Basculer Ctrl",
     "Alt": "Alt",
     "Toggle Alt": "Basculer Alt",
     "Toggle Windows": "Basculer Windows",
-    "Windows": "Windows",
-    "Send Tab": "Envoyer l'onglet",
-    "Tab": "l'onglet",
+    "Windows": "Fenêtre",
+    "Send Tab": "Envoyer Tab",
+    "Tab": "Tabulation",
     "Esc": "Esc",
     "Send Escape": "Envoyer Escape",
     "Ctrl+Alt+Del": "Ctrl+Alt+Del",
@@ -40,15 +40,16 @@
     "Reboot": "Redémarrer",
     "Reset": "Réinitialiser",
     "Clipboard": "Presse-papiers",
-    "Edit clipboard content in the textarea below.": "",
+    "Edit clipboard content in the textarea below.": "Editer le contenu du presse-papier dans la zone ci-dessous.",
+    "Full screen": "Plein écran",
     "Settings": "Paramètres",
-    "Shared Mode": "Mode partagé",
-    "View Only": "Afficher uniquement",
-    "Clip to Window": "Clip à fenêtre",
-    "Scaling Mode:": "Mode mise à l'échelle :",
+    "Shared mode": "Mode partagé",
+    "View only": "Afficher uniquement",
+    "Clip to window": "Ajuster à la fenêtre",
+    "Scaling mode:": "Mode mise à l'échelle :",
     "None": "Aucun",
-    "Local Scaling": "Mise à l'échelle locale",
-    "Remote Resizing": "Redimensionnement à distance",
+    "Local scaling": "Mise à l'échelle locale",
+    "Remote resizing": "Redimensionnement à distance",
     "Advanced": "Avancé",
     "Quality:": "Qualité :",
     "Compression level:": "Niveau de compression :",
@@ -58,21 +59,24 @@
     "Host:": "Hôte :",
     "Port:": "Port :",
     "Path:": "Chemin :",
-    "Automatic Reconnect": "Reconnecter automatiquemen",
-    "Reconnect Delay (ms):": "Délai de reconnexion (ms) :",
-    "Show Dot when No Cursor": "Afficher le point lorsqu'il n'y a pas de curseur",
+    "Automatic reconnect": "Reconnecter automatiquement",
+    "Reconnect delay (ms):": "Délai de reconnexion (ms) :",
+    "Show dot when no cursor": "Afficher le point lorsqu'il n'y a pas de curseur",
     "Logging:": "Se connecter :",
     "Version:": "Version :",
     "Disconnect": "Déconnecter",
     "Connect": "Connecter",
-    "Server identity": "",
-    "The server has provided the following identifying information:": "",
-    "Fingerprint:": "",
-    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "",
-    "Approve": "",
-    "Reject": "",
+    "Server identity": "Identité du serveur",
+    "The server has provided the following identifying information:": "Le serveur a fourni l'identification suivante :",
+    "Fingerprint:": "Empreinte digitale :",
+    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "SVP, verifiez que l'information est correcte et pressez \"Accepter\". Sinon pressez \"Refuser\".",
+    "Approve": "Accepter",
+    "Reject": "Refuser",
+    "Credentials": "Envoyer les identifiants",
     "Username:": "Nom d'utilisateur :",
     "Password:": "Mot de passe :",
-    "Send Credentials": "Envoyer les identifiants",
-    "Cancel": "Annuler"
+    "Send credentials": "Envoyer les identifiants",
+    "Cancel": "Annuler",
+    "Must set host": "Doit définir l'hôte",
+    "Clear": "Effacer"
 }
diff --git a/systemvm/agent/noVNC/app/locale/it.json b/systemvm/agent/noVNC/app/locale/it.json
index 552018d2584..61256b2920e 100644
--- a/systemvm/agent/noVNC/app/locale/it.json
+++ b/systemvm/agent/noVNC/app/locale/it.json
@@ -14,10 +14,8 @@
     "Credentials are required": "Le credenziali sono obbligatorie",
     "noVNC encountered an error:": "noVNC ha riscontrato un errore:",
     "Hide/Show the control bar": "Nascondi/Mostra la barra di controllo",
-    "Drag": "",
-    "Move/Drag Viewport": "",
     "Keyboard": "Tastiera",
-    "Show Keyboard": "Mostra tastiera",
+    "Show keyboard": "Mostra tastiera",
     "Extra keys": "Tasti Aggiuntivi",
     "Show Extra Keys": "Mostra Tasti Aggiuntivi",
     "Ctrl": "Ctrl",
@@ -42,10 +40,9 @@
     "Clear": "Pulisci",
     "Fullscreen": "Schermo intero",
     "Settings": "Impostazioni",
-    "Shared Mode": "Modalità condivisa",
+    "Shared mode": "Modalità condivisa",
     "View Only": "Sola Visualizzazione",
-    "Clip to Window": "",
-    "Scaling Mode:": "Modalità di ridimensionamento:",
+    "Scaling mode:": "Modalità di ridimensionamento:",
     "None": "Nessuna",
     "Local Scaling": "Ridimensionamento Locale",
     "Remote Resizing": "Ridimensionamento Remoto",
@@ -61,7 +58,6 @@
     "Automatic Reconnect": "Riconnessione Automatica",
     "Reconnect Delay (ms):": "Ritardo Riconnessione (ms):",
     "Show Dot when No Cursor": "Mostra Punto quando Nessun Cursore",
-    "Logging:": "",
     "Version:": "Versione:",
     "Disconnect": "Disconnetti",
     "Connect": "Connetti",
diff --git a/systemvm/agent/noVNC/app/locale/ja.json b/systemvm/agent/noVNC/app/locale/ja.json
index e85edf9029d..3fe1a24c005 100644
--- a/systemvm/agent/noVNC/app/locale/ja.json
+++ b/systemvm/agent/noVNC/app/locale/ja.json
@@ -1,12 +1,14 @@
 {
+    "Running without HTTPS is not recommended, crashes or other issues are likely.": "HTTPS接続なしで実行することは推奨されません。クラッシュしたりその他の問題が発生したりする可能性があります。",
     "Connecting...": "接続しています...",
     "Disconnecting...": "切断しています...",
     "Reconnecting...": "再接続しています...",
     "Internal error": "内部エラー",
     "Must set host": "ホストを設定する必要があります",
+    "Failed to connect to server: ": "サーバーへの接続に失敗しました: ",
     "Connected (encrypted) to ": "接続しました (暗号化済み): ",
     "Connected (unencrypted) to ": "接続しました (暗号化されていません): ",
-    "Something went wrong, connection is closed": "何らかの問題で、接続が閉じられました",
+    "Something went wrong, connection is closed": "問題が発生したため、接続が閉じられました",
     "Failed to connect to server": "サーバーへの接続に失敗しました",
     "Disconnected": "切断しました",
     "New connection has been rejected with reason: ": "新規接続は次の理由で拒否されました: ",
@@ -15,16 +17,16 @@
     "noVNC encountered an error:": "noVNC でエラーが発生しました:",
     "Hide/Show the control bar": "コントロールバーを隠す/表示する",
     "Drag": "ドラッグ",
-    "Move/Drag Viewport": "ビューポートを移動/ドラッグ",
+    "Move/Drag viewport": "ビューポートを移動/ドラッグ",
     "Keyboard": "キーボード",
-    "Show Keyboard": "キーボードを表示",
+    "Show keyboard": "キーボードを表示",
     "Extra keys": "追加キー",
-    "Show Extra Keys": "追加キーを表示",
+    "Show extra keys": "追加キーを表示",
     "Ctrl": "Ctrl",
-    "Toggle Ctrl": "Ctrl キーを切り替え",
+    "Toggle Ctrl": "Ctrl キーをトグル",
     "Alt": "Alt",
-    "Toggle Alt": "Alt キーを切り替え",
-    "Toggle Windows": "Windows キーを切り替え",
+    "Toggle Alt": "Alt キーをトグル",
+    "Toggle Windows": "Windows キーをトグル",
     "Windows": "Windows",
     "Send Tab": "Tab キーを送信",
     "Tab": "Tab",
@@ -39,16 +41,16 @@
     "Reboot": "再起動",
     "Reset": "リセット",
     "Clipboard": "クリップボード",
-    "Clear": "クリア",
-    "Fullscreen": "全画面表示",
+    "Edit clipboard content in the textarea below.": "以下の入力欄からクリップボードの内容を編集できます。",
+    "Full screen": "全画面表示",
     "Settings": "設定",
-    "Shared Mode": "共有モード",
-    "View Only": "表示のみ",
-    "Clip to Window": "ウィンドウにクリップ",
-    "Scaling Mode:": "スケーリングモード:",
+    "Shared mode": "共有モード",
+    "View only": "表示専用",
+    "Clip to window": "ウィンドウにクリップ",
+    "Scaling mode:": "スケーリングモード:",
     "None": "なし",
-    "Local Scaling": "ローカルスケーリング",
-    "Remote Resizing": "リモートでリサイズ",
+    "Local scaling": "ローカルでスケーリング",
+    "Remote resizing": "リモートでリサイズ",
     "Advanced": "高度",
     "Quality:": "品質:",
     "Compression level:": "圧縮レベル:",
@@ -58,15 +60,22 @@
     "Host:": "ホスト:",
     "Port:": "ポート:",
     "Path:": "パス:",
-    "Automatic Reconnect": "自動再接続",
-    "Reconnect Delay (ms):": "再接続する遅延 (ミリ秒):",
-    "Show Dot when No Cursor": "カーソルがないときにドットを表示",
+    "Automatic reconnect": "自動再接続",
+    "Reconnect delay (ms):": "再接続する遅延 (ミリ秒):",
+    "Show dot when no cursor": "カーソルがないときにドットを表示する",
     "Logging:": "ロギング:",
     "Version:": "バージョン:",
     "Disconnect": "切断",
     "Connect": "接続",
+    "Server identity": "サーバーの識別情報",
+    "The server has provided the following identifying information:": "サーバーは以下の識別情報を提供しています:",
+    "Fingerprint:": "フィンガープリント:",
+    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "この情報が正しい場合は「承認」を、そうでない場合は「拒否」を押してください。",
+    "Approve": "承認",
+    "Reject": "拒否",
+    "Credentials": "資格情報",
     "Username:": "ユーザー名:",
     "Password:": "パスワード:",
-    "Send Credentials": "資格情報を送信",
+    "Send credentials": "資格情報を送信",
     "Cancel": "キャンセル"
 }
diff --git a/systemvm/agent/noVNC/app/locale/ko.json b/systemvm/agent/noVNC/app/locale/ko.json
index aa9c1109e1a..97f320aa291 100644
--- a/systemvm/agent/noVNC/app/locale/ko.json
+++ b/systemvm/agent/noVNC/app/locale/ko.json
@@ -14,7 +14,7 @@
     "Password is required": "비밀번호가 필요합니다.",
     "noVNC encountered an error:": "noVNC에 오류가 발생했습니다:",
     "Hide/Show the control bar": "컨트롤 바 숨기기/보이기",
-    "Move/Drag Viewport": "움직이기/드래그 뷰포트",
+    "Move/Drag viewport": "움직이기/드래그 뷰포트",
     "viewport drag": "뷰포트 드래그",
     "Active Mouse Button": "마우스 버튼 활성화",
     "No mousebutton": "마우스 버튼 없음",
@@ -22,9 +22,9 @@
     "Middle mousebutton": "중간 마우스 버튼",
     "Right mousebutton": "오른쪽 마우스 버튼",
     "Keyboard": "키보드",
-    "Show Keyboard": "키보드 보이기",
+    "Show keyboard": "키보드 보이기",
     "Extra keys": "기타 키들",
-    "Show Extra Keys": "기타 키들 보이기",
+    "Show extra keys": "기타 키들 보이기",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Ctrl 켜기/끄기",
     "Alt": "Alt",
@@ -45,13 +45,13 @@
     "Clear": "지우기",
     "Fullscreen": "전체화면",
     "Settings": "설정",
-    "Shared Mode": "공유 모드",
-    "View Only": "보기 전용",
-    "Clip to Window": "창에 클립",
-    "Scaling Mode:": "스케일링 모드:",
+    "Shared mode": "공유 모드",
+    "View only": "보기 전용",
+    "Clip to window": "창에 클립",
+    "Scaling mode:": "스케일링 모드:",
     "None": "없음",
-    "Local Scaling": "로컬 스케일링",
-    "Remote Resizing": "원격 크기 조절",
+    "Local scaling": "로컬 스케일링",
+    "Remote resizing": "원격 크기 조절",
     "Advanced": "고급",
     "Repeater ID:": "중계 ID",
     "WebSocket": "웹소켓",
@@ -59,8 +59,8 @@
     "Host:": "호스트:",
     "Port:": "포트:",
     "Path:": "위치:",
-    "Automatic Reconnect": "자동 재연결",
-    "Reconnect Delay (ms):": "재연결 지연 시간 (ms)",
+    "Automatic reconnect": "자동 재연결",
+    "Reconnect delay (ms):": "재연결 지연 시간 (ms)",
     "Logging:": "로깅",
     "Disconnect": "연결 해제",
     "Connect": "연결",
diff --git a/systemvm/agent/noVNC/app/locale/nl.json b/systemvm/agent/noVNC/app/locale/nl.json
index 1ad75647b3b..09186d403a5 100644
--- a/systemvm/agent/noVNC/app/locale/nl.json
+++ b/systemvm/agent/noVNC/app/locale/nl.json
@@ -1,36 +1,32 @@
 {
-    "Connecting...": "Verbinden...",
-    "Disconnecting...": "Verbinding verbreken...",
+    "Running without HTTPS is not recommended, crashes or other issues are likely.": "Het is niet aan te raden om zonder HTTPS te werken, crashes of andere problemen zijn dan waarschijnlijk.",
+    "Connecting...": "Aan het verbinden…",
+    "Disconnecting...": "Bezig om verbinding te verbreken...",
     "Reconnecting...": "Opnieuw verbinding maken...",
     "Internal error": "Interne fout",
-    "Must set host": "Host moeten worden ingesteld",
+    "Failed to connect to server: ": "Verbinding maken met server is mislukt",
     "Connected (encrypted) to ": "Verbonden (versleuteld) met ",
     "Connected (unencrypted) to ": "Verbonden (onversleuteld) met ",
     "Something went wrong, connection is closed": "Er iets fout gelopen, verbinding werd verbroken",
     "Failed to connect to server": "Verbinding maken met server is mislukt",
     "Disconnected": "Verbinding verbroken",
-    "New connection has been rejected with reason: ": "Nieuwe verbinding is geweigerd omwille van de volgende reden: ",
+    "New connection has been rejected with reason: ": "Nieuwe verbinding is geweigerd met de volgende reden: ",
     "New connection has been rejected": "Nieuwe verbinding is geweigerd",
-    "Password is required": "Wachtwoord is vereist",
+    "Credentials are required": "Inloggegevens zijn nodig",
     "noVNC encountered an error:": "noVNC heeft een fout bemerkt:",
     "Hide/Show the control bar": "Verberg/Toon de bedieningsbalk",
-    "Move/Drag Viewport": "Verplaats/Versleep Kijkvenster",
-    "viewport drag": "kijkvenster slepen",
-    "Active Mouse Button": "Actieve Muisknop",
-    "No mousebutton": "Geen muisknop",
-    "Left mousebutton": "Linker muisknop",
-    "Middle mousebutton": "Middelste muisknop",
-    "Right mousebutton": "Rechter muisknop",
+    "Drag": "Sleep",
+    "Move/Drag viewport": "Verplaats/Versleep Kijkvenster",
     "Keyboard": "Toetsenbord",
-    "Show Keyboard": "Toon Toetsenbord",
+    "Show keyboard": "Toon Toetsenbord",
     "Extra keys": "Extra toetsen",
-    "Show Extra Keys": "Toon Extra Toetsen",
+    "Show extra keys": "Toon Extra Toetsen",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Ctrl omschakelen",
     "Alt": "Alt",
     "Toggle Alt": "Alt omschakelen",
-    "Toggle Windows": "Windows omschakelen",
-    "Windows": "Windows",
+    "Toggle Windows": "Vensters omschakelen",
+    "Windows": "Vensters",
     "Send Tab": "Tab Sturen",
     "Tab": "Tab",
     "Esc": "Esc",
@@ -44,30 +40,56 @@
     "Reboot": "Herstarten",
     "Reset": "Resetten",
     "Clipboard": "Klembord",
-    "Clear": "Wissen",
-    "Fullscreen": "Volledig Scherm",
+    "Edit clipboard content in the textarea below.": "Edit de inhoud van het klembord in het tekstveld hieronder",
+    "Full screen": "Volledig Scherm",
     "Settings": "Instellingen",
-    "Shared Mode": "Gedeelde Modus",
-    "View Only": "Alleen Kijken",
-    "Clip to Window": "Randen buiten venster afsnijden",
-    "Scaling Mode:": "Schaalmodus:",
+    "Shared mode": "Gedeelde Modus",
+    "View only": "Alleen Kijken",
+    "Clip to window": "Randen buiten venster afsnijden",
+    "Scaling mode:": "Schaalmodus:",
     "None": "Geen",
-    "Local Scaling": "Lokaal Schalen",
-    "Remote Resizing": "Op Afstand Formaat Wijzigen",
+    "Local scaling": "Lokaal Schalen",
+    "Remote resizing": "Op Afstand Formaat Wijzigen",
     "Advanced": "Geavanceerd",
+    "Quality:": "Kwaliteit:",
+    "Compression level:": "Compressieniveau:",
     "Repeater ID:": "Repeater ID:",
     "WebSocket": "WebSocket",
     "Encrypt": "Versleutelen",
     "Host:": "Host:",
     "Port:": "Poort:",
     "Path:": "Pad:",
-    "Automatic Reconnect": "Automatisch Opnieuw Verbinden",
-    "Reconnect Delay (ms):": "Vertraging voor Opnieuw Verbinden (ms):",
-    "Show Dot when No Cursor": "Geef stip weer indien geen cursor",
+    "Automatic reconnect": "Automatisch Opnieuw Verbinden",
+    "Reconnect delay (ms):": "Vertraging voor Opnieuw Verbinden (ms):",
+    "Show dot when no cursor": "Geef stip weer indien geen cursor",
     "Logging:": "Logmeldingen:",
+    "Version:": "Versie:",
     "Disconnect": "Verbinding verbreken",
     "Connect": "Verbinden",
+    "Server identity": "Serveridentiteit",
+    "The server has provided the following identifying information:": "De server geeft de volgende identificerende informatie:",
+    "Fingerprint:": "Vingerafdruk:",
+    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "Verifieer dat de informatie is correct en druk “OK”. Druk anders op “Afwijzen”.",
+    "Approve": "OK",
+    "Reject": "Afwijzen",
+    "Credentials": "Inloggegevens",
+    "Username:": "Gebruikersnaam:",
     "Password:": "Wachtwoord:",
+    "Send credentials": "Stuur inloggegevens",
+    "Cancel": "Annuleren",
+    "Must set host": "Host moeten worden ingesteld",
+    "Password is required": "Wachtwoord is vereist",
+    "viewport drag": "kijkvenster slepen",
+    "Active Mouse Button": "Actieve Muisknop",
+    "No mousebutton": "Geen muisknop",
+    "Left mousebutton": "Linker muisknop",
+    "Middle mousebutton": "Middelste muisknop",
+    "Right mousebutton": "Rechter muisknop",
+    "Clear": "Wissen",
     "Send Password": "Verzend Wachtwoord:",
-    "Cancel": "Annuleren"
+    "Disconnect timeout": "Timeout tijdens verbreken van verbinding",
+    "Local Downscaling": "Lokaal Neerschalen",
+    "Local Cursor": "Lokale Cursor",
+    "Canvas not supported.": "Canvas wordt niet ondersteund.",
+    "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "''Clipping mode' ingeschakeld, omdat schuifbalken in volledige-scherm-modus in IE niet worden ondersteund"
 }
diff --git a/systemvm/agent/noVNC/app/locale/pl.json b/systemvm/agent/noVNC/app/locale/pl.json
index 12a46564012..8edb8985f15 100644
--- a/systemvm/agent/noVNC/app/locale/pl.json
+++ b/systemvm/agent/noVNC/app/locale/pl.json
@@ -21,9 +21,9 @@
     "Middle mousebutton": "Środkowy przycisk myszy",
     "Right mousebutton": "Prawy przycisk myszy",
     "Keyboard": "Klawiatura",
-    "Show Keyboard": "Pokaż klawiaturę",
+    "Show keyboard": "Pokaż klawiaturę",
     "Extra keys": "Przyciski dodatkowe",
-    "Show Extra Keys": "Pokaż przyciski dodatkowe",
+    "Show extra keys": "Pokaż przyciski dodatkowe",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Przełącz Ctrl",
     "Alt": "Alt",
@@ -49,8 +49,8 @@
     "Clip to Window": "Przytnij do Okna",
     "Scaling Mode:": "Tryb Skalowania:",
     "None": "Brak",
-    "Local Scaling": "Skalowanie lokalne",
-    "Remote Resizing": "Skalowanie zdalne",
+    "Local scaling": "Skalowanie lokalne",
+    "Remote resizing": "Skalowanie zdalne",
     "Advanced": "Zaawansowane",
     "Repeater ID:": "ID Repeatera:",
     "WebSocket": "WebSocket",
@@ -58,12 +58,23 @@
     "Host:": "Host:",
     "Port:": "Port:",
     "Path:": "Ścieżka:",
-    "Automatic Reconnect": "Automatycznie wznawiaj połączenie",
-    "Reconnect Delay (ms):": "Opóźnienie wznawiania (ms):",
+    "Automatic reconnect": "Automatycznie wznawiaj połączenie",
+    "Reconnect delay (ms):": "Opóźnienie wznawiania (ms):",
     "Logging:": "Poziom logowania:",
     "Disconnect": "Rozłącz",
     "Connect": "Połącz",
     "Password:": "Hasło:",
     "Cancel": "Anuluj",
-    "Canvas not supported.": "Element Canvas nie jest wspierany."
+    "Canvas not supported.": "Element Canvas nie jest wspierany.",
+    "Disconnect timeout": "Timeout rozłączenia",
+    "Local Downscaling": "Downscaling lokalny",
+    "Local Cursor": "Lokalny kursor",
+    "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "Wymuszam clipping mode ponieważ paski przewijania nie są wspierane przez IE w trybie pełnoekranowym",
+    "True Color": "True Color",
+    "Style:": "Styl:",
+    "default": "domyślny",
+    "Apply": "Zapisz",
+    "Connection": "Połączenie",
+    "Token:": "Token:",
+    "Send Password": "Wyślij Hasło"
 }
diff --git a/systemvm/agent/noVNC/app/locale/pt_BR.json b/systemvm/agent/noVNC/app/locale/pt_BR.json
index 42b16b6111f..885471c5cb8 100644
--- a/systemvm/agent/noVNC/app/locale/pt_BR.json
+++ b/systemvm/agent/noVNC/app/locale/pt_BR.json
@@ -15,11 +15,11 @@
     "noVNC encountered an error:": "O noVNC encontrou um erro:",
     "Hide/Show the control bar": "Esconder/mostrar a barra de controles",
     "Drag": "Arrastar",
-    "Move/Drag Viewport": "Mover/arrastar a janela",
+    "Move/Drag viewport": "Mover/arrastar a janela",
     "Keyboard": "Teclado",
-    "Show Keyboard": "Mostrar teclado",
+    "Show keyboard": "Mostrar teclado",
     "Extra keys": "Teclas adicionais",
-    "Show Extra Keys": "Mostar teclas adicionais",
+    "Show extra keys": "Mostar teclas adicionais",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Pressionar/soltar Ctrl",
     "Alt": "Alt",
@@ -42,13 +42,13 @@
     "Clear": "Limpar",
     "Fullscreen": "Tela cheia",
     "Settings": "Configurações",
-    "Shared Mode": "Modo compartilhado",
-    "View Only": "Apenas visualizar",
-    "Clip to Window": "Recortar à janela",
-    "Scaling Mode:": "Modo de dimensionamento:",
+    "Shared mode": "Modo compartilhado",
+    "View only": "Apenas visualizar",
+    "Clip to window": "Recortar à janela",
+    "Scaling mode:": "Modo de dimensionamento:",
     "None": "Nenhum",
-    "Local Scaling": "Local",
-    "Remote Resizing": "Remoto",
+    "Local scaling": "Local",
+    "Remote resizing": "Remoto",
     "Advanced": "Avançado",
     "Quality:": "Qualidade:",
     "Compression level:": "Nível de compressão:",
@@ -58,15 +58,15 @@
     "Host:": "Host:",
     "Port:": "Porta:",
     "Path:": "Caminho:",
-    "Automatic Reconnect": "Reconexão automática",
-    "Reconnect Delay (ms):": "Atraso da reconexão (ms)",
-    "Show Dot when No Cursor": "Mostrar ponto quando não há cursor",
+    "Automatic reconnect": "Reconexão automática",
+    "Reconnect delay (ms):": "Atraso da reconexão (ms)",
+    "Show dot when no cursor": "Mostrar ponto quando não há cursor",
     "Logging:": "Registros:",
     "Version:": "Versão:",
     "Disconnect": "Desconectar",
     "Connect": "Conectar",
     "Username:": "Nome de usuário:",
     "Password:": "Senha:",
-    "Send Credentials": "Enviar credenciais",
+    "Send credentials": "Enviar credenciais",
     "Cancel": "Cancelar"
 }
diff --git a/systemvm/agent/noVNC/app/locale/ru.json b/systemvm/agent/noVNC/app/locale/ru.json
index 72bde7164b5..3714d696811 100644
--- a/systemvm/agent/noVNC/app/locale/ru.json
+++ b/systemvm/agent/noVNC/app/locale/ru.json
@@ -15,16 +15,16 @@
     "noVNC encountered an error:": "Ошибка noVNC: ",
     "Hide/Show the control bar": "Скрыть/Показать контрольную панель",
     "Drag": "Переместить",
-    "Move/Drag Viewport": "Переместить окно",
+    "Move/Drag viewport": "Переместить окно",
     "Keyboard": "Клавиатура",
-    "Show Keyboard": "Показать клавиатуру",
+    "Show keyboard": "Показать клавиатуру",
     "Extra keys": "Дополнительные Кнопки",
     "Show Extra Keys": "Показать Дополнительные Кнопки",
     "Ctrl": "Ctrl",
-    "Toggle Ctrl": "Переключение нажатия Ctrl",
+    "Toggle Ctrl": "Зажать Ctrl",
     "Alt": "Alt",
-    "Toggle Alt": "Переключение нажатия Alt",
-    "Toggle Windows": "Переключение вкладок",
+    "Toggle Alt": "Зажать Alt",
+    "Toggle Windows": "Зажать Windows",
     "Windows": "Вкладка",
     "Send Tab": "Передать нажатие Tab",
     "Tab": "Tab",
@@ -42,13 +42,13 @@
     "Clear": "Очистить",
     "Fullscreen": "Во весь экран",
     "Settings": "Настройки",
-    "Shared Mode": "Общий режим",
+    "Shared mode": "Общий режим",
     "View Only": "Только Просмотр",
-    "Clip to Window": "В окно",
-    "Scaling Mode:": "Масштаб:",
+    "Clip to window": "В окно",
+    "Scaling mode:": "Масштаб:",
     "None": "Нет",
-    "Local Scaling": "Локльный масштаб",
-    "Remote Resizing": "Удаленная перенастройка размера",
+    "Local scaling": "Локальный масштаб",
+    "Remote resizing": "Удаленная перенастройка размера",
     "Advanced": "Дополнительно",
     "Quality:": "Качество",
     "Compression level:": "Уровень Сжатия",
@@ -58,9 +58,9 @@
     "Host:": "Сервер:",
     "Port:": "Порт:",
     "Path:": "Путь:",
-    "Automatic Reconnect": "Автоматическое переподключение",
-    "Reconnect Delay (ms):": "Задержка переподключения (мс):",
-    "Show Dot when No Cursor": "Показать точку вместо курсора",
+    "Automatic reconnect": "Автоматическое переподключение",
+    "Reconnect delay (ms):": "Задержка переподключения (мс):",
+    "Show dot when no cursor": "Показать точку вместо курсора",
     "Logging:": "Лог:",
     "Version:": "Версия",
     "Disconnect": "Отключение",
diff --git a/systemvm/agent/noVNC/app/locale/sv.json b/systemvm/agent/noVNC/app/locale/sv.json
index 91dff9e4da7..934c6fb16fe 100644
--- a/systemvm/agent/noVNC/app/locale/sv.json
+++ b/systemvm/agent/noVNC/app/locale/sv.json
@@ -1,10 +1,10 @@
 {
-    "HTTPS is required for full functionality": "HTTPS krävs för full funktionalitet",
+    "Running without HTTPS is not recommended, crashes or other issues are likely.": "Det är ej rekommenderat att köra utan HTTPS, krascher och andra problem är troliga.",
     "Connecting...": "Ansluter...",
     "Disconnecting...": "Kopplar ner...",
     "Reconnecting...": "Återansluter...",
     "Internal error": "Internt fel",
-    "Must set host": "Du måste specifiera en värd",
+    "Failed to connect to server: ": "Misslyckades att ansluta till servern: ",
     "Connected (encrypted) to ": "Ansluten (krypterat) till ",
     "Connected (unencrypted) to ": "Ansluten (okrypterat) till ",
     "Something went wrong, connection is closed": "Något gick fel, anslutningen avslutades",
@@ -16,11 +16,11 @@
     "noVNC encountered an error:": "noVNC stötte på ett problem:",
     "Hide/Show the control bar": "Göm/Visa kontrollbaren",
     "Drag": "Dra",
-    "Move/Drag Viewport": "Flytta/Dra Vyn",
+    "Move/Drag viewport": "Flytta/Dra vyn",
     "Keyboard": "Tangentbord",
-    "Show Keyboard": "Visa Tangentbord",
+    "Show keyboard": "Visa tangentbord",
     "Extra keys": "Extraknappar",
-    "Show Extra Keys": "Visa Extraknappar",
+    "Show extra keys": "Visa extraknappar",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Växla Ctrl",
     "Alt": "Alt",
@@ -41,15 +41,15 @@
     "Reset": "Återställ",
     "Clipboard": "Urklipp",
     "Edit clipboard content in the textarea below.": "Redigera urklippets innehåll i fältet nedan.",
-    "Full Screen": "Fullskärm",
+    "Full screen": "Fullskärm",
     "Settings": "Inställningar",
-    "Shared Mode": "Delat Läge",
-    "View Only": "Endast Visning",
-    "Clip to Window": "Begränsa till Fönster",
-    "Scaling Mode:": "Skalningsläge:",
+    "Shared mode": "Delat läge",
+    "View only": "Endast visning",
+    "Clip to window": "Begränsa till fönster",
+    "Scaling mode:": "Skalningsläge:",
     "None": "Ingen",
-    "Local Scaling": "Lokal Skalning",
-    "Remote Resizing": "Ändra Storlek",
+    "Local scaling": "Lokal skalning",
+    "Remote resizing": "Ändra storlek",
     "Advanced": "Avancerat",
     "Quality:": "Kvalitet:",
     "Compression level:": "Kompressionsnivå:",
@@ -59,9 +59,9 @@
     "Host:": "Värd:",
     "Port:": "Port:",
     "Path:": "Sökväg:",
-    "Automatic Reconnect": "Automatisk Återanslutning",
-    "Reconnect Delay (ms):": "Fördröjning (ms):",
-    "Show Dot when No Cursor": "Visa prick när ingen muspekare finns",
+    "Automatic reconnect": "Automatisk återanslutning",
+    "Reconnect delay (ms):": "Fördröjning (ms):",
+    "Show dot when no cursor": "Visa prick när ingen muspekare finns",
     "Logging:": "Loggning:",
     "Version:": "Version:",
     "Disconnect": "Koppla från",
@@ -75,6 +75,9 @@
     "Credentials": "Användaruppgifter",
     "Username:": "Användarnamn:",
     "Password:": "Lösenord:",
-    "Send Credentials": "Skicka Användaruppgifter",
-    "Cancel": "Avbryt"
+    "Send credentials": "Skicka användaruppgifter",
+    "Cancel": "Avbryt",
+    "Must set host": "Du måste specifiera en värd",
+    "HTTPS is required for full functionality": "HTTPS krävs för full funktionalitet",
+    "Clear": "Rensa"
 }
diff --git a/systemvm/agent/noVNC/app/locale/tr.json b/systemvm/agent/noVNC/app/locale/tr.json
index b92b4167252..2053c136582 100644
--- a/systemvm/agent/noVNC/app/locale/tr.json
+++ b/systemvm/agent/noVNC/app/locale/tr.json
@@ -23,7 +23,7 @@
     "Keyboard": "Klavye",
     "Show Keyboard": "Klavye Düzenini Göster",
     "Extra keys": "Ekstra tuşlar",
-    "Show Extra Keys": "Ekstra tuşları göster",
+    "Show extra keys": "Ekstra tuşları göster",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "Ctrl Değiştir ",
     "Alt": "Alt",
diff --git a/systemvm/agent/noVNC/app/locale/zh_CN.json b/systemvm/agent/noVNC/app/locale/zh_CN.json
index ee73eba31cc..84efd18e374 100644
--- a/systemvm/agent/noVNC/app/locale/zh_CN.json
+++ b/systemvm/agent/noVNC/app/locale/zh_CN.json
@@ -1,69 +1,93 @@
 {
+    "Running without HTTPS is not recommended, crashes or other issues are likely.": "不建议在没有 HTTPS 的情况下运行，可能会出现崩溃或出现其他问题。",
     "Connecting...": "连接中...",
     "Disconnecting...": "正在断开连接...",
     "Reconnecting...": "重新连接中...",
     "Internal error": "内部错误",
-    "Must set host": "请提供主机名",
-    "Connected (encrypted) to ": "已连接到（加密）",
-    "Connected (unencrypted) to ": "已连接到（未加密）",
-    "Something went wrong, connection is closed": "发生错误，连接已关闭",
+    "Must set host": "必须设置主机",
+    "Failed to connect to server: ": "无法连接到服务器：",
+    "Connected (encrypted) to ": "已连接（已加密）到",
+    "Connected (unencrypted) to ": "已连接（未加密）到",
+    "Something went wrong, connection is closed": "出了点问题，连接已关闭",
     "Failed to connect to server": "无法连接到服务器",
     "Disconnected": "已断开连接",
-    "New connection has been rejected with reason: ": "连接被拒绝，原因：",
-    "New connection has been rejected": "连接被拒绝",
-    "Password is required": "请提供密码",
+    "New connection has been rejected with reason: ": "新连接被拒绝，原因如下：",
+    "New connection has been rejected": "新连接已被拒绝",
+    "Credentials are required": "需要凭证",
     "noVNC encountered an error:": "noVNC 遇到一个错误：",
     "Hide/Show the control bar": "显示/隐藏控制栏",
-    "Move/Drag Viewport": "拖放显示范围",
-    "viewport drag": "显示范围拖放",
-    "Active Mouse Button": "启动鼠标按鍵",
-    "No mousebutton": "禁用鼠标按鍵",
-    "Left mousebutton": "鼠标左鍵",
-    "Middle mousebutton": "鼠标中鍵",
-    "Right mousebutton": "鼠标右鍵",
+    "Drag": "拖动",
+    "Move/Drag viewport": "移动/拖动窗口",
     "Keyboard": "键盘",
-    "Show Keyboard": "显示键盘",
+    "Show keyboard": "显示键盘",
     "Extra keys": "额外按键",
-    "Show Extra Keys": "显示额外按键",
+    "Show extra keys": "显示额外按键",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "切换 Ctrl",
     "Alt": "Alt",
     "Toggle Alt": "切换 Alt",
+    "Toggle Windows": "切换窗口",
+    "Windows": "窗口",
     "Send Tab": "发送 Tab 键",
     "Tab": "Tab",
     "Esc": "Esc",
     "Send Escape": "发送 Escape 键",
-    "Ctrl+Alt+Del": "Ctrl-Alt-Del",
-    "Send Ctrl-Alt-Del": "发送 Ctrl-Alt-Del 键",
-    "Shutdown/Reboot": "关机/重新启动",
-    "Shutdown/Reboot...": "关机/重新启动...",
+    "Ctrl+Alt+Del": "Ctrl+Alt+Del",
+    "Send Ctrl-Alt-Del": "发送 Ctrl+Alt+Del 键",
+    "Shutdown/Reboot": "关机/重启",
+    "Shutdown/Reboot...": "关机/重启...",
     "Power": "电源",
     "Shutdown": "关机",
-    "Reboot": "重新启动",
+    "Reboot": "重启",
     "Reset": "重置",
     "Clipboard": "剪贴板",
-    "Clear": "清除",
-    "Fullscreen": "全屏",
+    "Edit clipboard content in the textarea below.": "在下面的文本区域中编辑剪贴板内容。",
+    "Full screen": "全屏",
     "Settings": "设置",
-    "Shared Mode": "分享模式",
-    "View Only": "仅查看",
-    "Clip to Window": "限制/裁切窗口大小",
-    "Scaling Mode:": "缩放模式：",
+    "Shared mode": "分享模式",
+    "View only": "仅查看",
+    "Clip to window": "限制/裁切窗口大小",
+    "Scaling mode:": "缩放模式：",
     "None": "无",
-    "Local Scaling": "本地缩放",
-    "Remote Resizing": "远程调整大小",
+    "Local scaling": "本地缩放",
+    "Remote resizing": "远程调整大小",
     "Advanced": "高级",
+    "Quality:": "品质：",
+    "Compression level:": "压缩级别：",
     "Repeater ID:": "中继站 ID",
     "WebSocket": "WebSocket",
     "Encrypt": "加密",
     "Host:": "主机：",
     "Port:": "端口：",
     "Path:": "路径：",
-    "Automatic Reconnect": "自动重新连接",
-    "Reconnect Delay (ms):": "重新连接间隔 (ms)：",
+    "Automatic reconnect": "自动重新连接",
+    "Reconnect delay (ms):": "重新连接间隔 (ms)：",
+    "Show dot when no cursor": "无光标时显示点",
     "Logging:": "日志级别：",
-    "Disconnect": "中断连接",
+    "Version:": "版本：",
+    "Disconnect": "断开连接",
     "Connect": "连接",
+    "Server identity": "服务器身份",
+    "The server has provided the following identifying information:": "服务器提供了以下识别信息：",
+    "Fingerprint:": "指纹：",
+    "Please verify that the information is correct and press \"Approve\". Otherwise press \"Reject\".": "请核实信息是否正确，并按 “同意”，否则按 “拒绝”。",
+    "Approve": "同意",
+    "Reject": "拒绝",
+    "Credentials": "凭证",
+    "Username:": "用户名:",
     "Password:": "密码：",
-    "Cancel": "取消"
+    "Send credentials": "发送凭证",
+    "Cancel": "取消",
+    "Password is required": "请提供密码",
+    "Disconnect timeout": "超时断开",
+    "viewport drag": "窗口拖动",
+    "Active Mouse Button": "启动鼠标按键",
+    "No mousebutton": "禁用鼠标按键",
+    "Left mousebutton": "鼠标左键",
+    "Middle mousebutton": "鼠标中键",
+    "Right mousebutton": "鼠标右键",
+    "Clear": "清除",
+    "Local Downscaling": "降低本地尺寸",
+    "Local Cursor": "本地光标",
+    "Canvas not supported.": "不支持 Canvas。"
 }
diff --git a/systemvm/agent/noVNC/app/locale/zh_TW.json b/systemvm/agent/noVNC/app/locale/zh_TW.json
index b0368ceabe5..52178a40c93 100644
--- a/systemvm/agent/noVNC/app/locale/zh_TW.json
+++ b/systemvm/agent/noVNC/app/locale/zh_TW.json
@@ -14,7 +14,7 @@
     "Password is required": "請提供密碼",
     "noVNC encountered an error:": "noVNC 遇到一個錯誤：",
     "Hide/Show the control bar": "顯示/隱藏控制列",
-    "Move/Drag Viewport": "拖放顯示範圍",
+    "Move/Drag viewport": "拖放顯示範圍",
     "viewport drag": "顯示範圍拖放",
     "Active Mouse Button": "啟用滑鼠按鍵",
     "No mousebutton": "無滑鼠按鍵",
@@ -22,9 +22,9 @@
     "Middle mousebutton": "滑鼠中鍵",
     "Right mousebutton": "滑鼠右鍵",
     "Keyboard": "鍵盤",
-    "Show Keyboard": "顯示鍵盤",
+    "Show keyboard": "顯示鍵盤",
     "Extra keys": "額外按鍵",
-    "Show Extra Keys": "顯示額外按鍵",
+    "Show extra keys": "顯示額外按鍵",
     "Ctrl": "Ctrl",
     "Toggle Ctrl": "切換 Ctrl",
     "Alt": "Alt",
@@ -45,13 +45,13 @@
     "Clear": "清除",
     "Fullscreen": "全螢幕",
     "Settings": "設定",
-    "Shared Mode": "分享模式",
-    "View Only": "僅檢視",
-    "Clip to Window": "限制/裁切視窗大小",
-    "Scaling Mode:": "縮放模式：",
+    "Shared mode": "分享模式",
+    "View only": "僅檢視",
+    "Clip to window": "限制/裁切視窗大小",
+    "Scaling mode:": "縮放模式：",
     "None": "無",
-    "Local Scaling": "本機縮放",
-    "Remote Resizing": "遠端調整大小",
+    "Local scaling": "本機縮放",
+    "Remote resizing": "遠端調整大小",
     "Advanced": "進階",
     "Repeater ID:": "中繼站 ID",
     "WebSocket": "WebSocket",
@@ -59,8 +59,8 @@
     "Host:": "主機：",
     "Port:": "連接埠：",
     "Path:": "路徑：",
-    "Automatic Reconnect": "自動重新連線",
-    "Reconnect Delay (ms):": "重新連線間隔 (ms)：",
+    "Automatic reconnect": "自動重新連線",
+    "Reconnect delay (ms):": "重新連線間隔 (ms)：",
     "Logging:": "日誌級別：",
     "Disconnect": "中斷連線",
     "Connect": "連線",
diff --git a/systemvm/agent/noVNC/app/localization.js b/systemvm/agent/noVNC/app/localization.js
index 84341da6f9c..c8257fdbec3 100644
--- a/systemvm/agent/noVNC/app/localization.js
+++ b/systemvm/agent/noVNC/app/localization.js
@@ -1,13 +1,13 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2018 The noVNC Authors
+ * Copyright (C) 2018 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
  */
 
 /*
- * Localization Utilities
+ * Localization utilities
  */
 
 export class Localizer {
@@ -16,13 +16,19 @@ export class Localizer {
         this.language = 'en';
 
         // Current dictionary of translations
-        this.dictionary = undefined;
+        this._dictionary = undefined;
     }
 
     // Configure suitable language based on user preferences
-    setup(supportedLanguages) {
+    async setup(supportedLanguages, baseURL) {
         this.language = 'en'; // Default: US English
+        this._dictionary = undefined;
 
+        this._setupLanguage(supportedLanguages);
+        await this._setupDictionary(baseURL);
+    }
+
+    _setupLanguage(supportedLanguages) {
         /*
          * Navigator.languages only available in Chrome (32+) and FireFox (32+)
          * Fall back to navigator.language for other browsers
@@ -40,12 +46,6 @@ export class Localizer {
                 .replace("_", "-")
                 .split("-");
 
-            // Built-in default?
-            if ((userLang[0] === 'en') &&
-                ((userLang[1] === undefined) || (userLang[1] === 'us'))) {
-                return;
-            }
-
             // First pass: perfect match
             for (let j = 0; j < supportedLanguages.length; j++) {
                 const supLang = supportedLanguages[j]
@@ -64,7 +64,12 @@ export class Localizer {
                 return;
             }
 
-            // Second pass: fallback
+            // Second pass: English fallback
+            if (userLang[0] === 'en') {
+                return;
+            }
+
+            // Third pass pass: other fallback
             for (let j = 0;j < supportedLanguages.length;j++) {
                 const supLang = supportedLanguages[j]
                     .toLowerCase()
@@ -84,10 +89,32 @@ export class Localizer {
         }
     }
 
+    async _setupDictionary(baseURL) {
+        if (baseURL) {
+            if (!baseURL.endsWith("/")) {
+                baseURL = baseURL + "/";
+            }
+        } else {
+            baseURL = "";
+        }
+
+        if (this.language === "en") {
+            return;
+        }
+
+        let response = await fetch(baseURL + this.language + ".json");
+        if (!response.ok) {
+            throw Error("" + response.status + " " + response.statusText);
+        }
+
+        this._dictionary = await response.json();
+    }
+
     // Retrieve localised text
     get(id) {
-        if (typeof this.dictionary !== 'undefined' && this.dictionary[id]) {
-            return this.dictionary[id];
+        if (typeof this._dictionary !== 'undefined' &&
+            this._dictionary[id]) {
+            return this._dictionary[id];
         } else {
             return id;
         }
diff --git a/systemvm/agent/noVNC/app/styles/base.css b/systemvm/agent/noVNC/app/styles/base.css
index 86411c63df9..ca04307b5b7 100644
--- a/systemvm/agent/noVNC/app/styles/base.css
+++ b/systemvm/agent/noVNC/app/styles/base.css
@@ -1,6 +1,6 @@
 /*
  * noVNC base CSS
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
  * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
  */
@@ -30,30 +30,31 @@
  */
 
 :root {
-  font-family: sans-serif;
+    font-family: sans-serif;
+    line-height: 1.6;
 }
 
 body {
-  margin:0;
-  padding:0;
-  /*Background image with light grey curve.*/
-  background-color:#494949;
-  background-repeat:no-repeat;
-  background-position:right bottom;
-  height:100%;
-  touch-action: none;
+    margin:0;
+    padding:0;
+    /*Background image with light grey curve.*/
+    background-color:#494949;
+    background-repeat:no-repeat;
+    background-position:right bottom;
+    height:100%;
+    touch-action: none;
 }
 
 html {
-  height:100%;
+    height:100%;
 }
 
 .noVNC_only_touch.noVNC_hidden {
-  display: none;
+    display: none;
 }
 
 .noVNC_disabled {
-  color: rgb(128, 128, 128);
+    color: var(--novnc-grey);
 }
 
 /* ----------------------------------------
@@ -62,33 +63,33 @@ html {
  */
 
 .noVNC_spinner {
-  position: relative;
+    position: relative;
 }
 .noVNC_spinner, .noVNC_spinner::before, .noVNC_spinner::after {
-  width: 10px;
-  height: 10px;
-  border-radius: 2px;
-  box-shadow: -60px 10px 0 rgba(255, 255, 255, 0);
-  animation: noVNC_spinner 1.0s linear infinite;
+    width: 10px;
+    height: 10px;
+    border-radius: 2px;
+    box-shadow: -60px 10px 0 rgba(255, 255, 255, 0);
+    animation: noVNC_spinner 1.0s linear infinite;
 }
 .noVNC_spinner::before {
-  content: "";
-  position: absolute;
-  left: 0px;
-  top: 0px;
-  animation-delay: -0.1s;
+    content: "";
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    animation-delay: -0.1s;
 }
 .noVNC_spinner::after {
-  content: "";
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  animation-delay: 0.1s;
+    content: "";
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    animation-delay: 0.1s;
 }
 @keyframes noVNC_spinner {
-  0% { box-shadow: -60px 10px 0 rgba(255, 255, 255, 0); width: 20px; }
-  25% { box-shadow: 20px 10px 0 rgba(255, 255, 255, 1); width: 10px; }
-  50% { box-shadow: 60px 10px 0 rgba(255, 255, 255, 0); width: 10px; }
+    0% { box-shadow: -60px 10px 0 rgba(255, 255, 255, 0); width: 20px; }
+    25% { box-shadow: 20px 10px 0 rgba(255, 255, 255, 1); width: 10px; }
+    50% { box-shadow: 60px 10px 0 rgba(255, 255, 255, 0); width: 10px; }
 }
 
 /* ----------------------------------------
@@ -97,39 +98,39 @@ html {
  */
 
 .noVNC_center {
-  /*
-   * This is a workaround because webkit misrenders transforms and
-   * uses non-integer coordinates, resulting in blurry content.
-   * Ideally we'd use "top: 50%; transform: translateY(-50%);" on
-   * the objects instead.
-   */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  pointer-events: none;
+    /*
+     * This is a workaround because webkit misrenders transforms and
+     * uses non-integer coordinates, resulting in blurry content.
+     * Ideally we'd use "top: 50%; transform: translateY(-50%);" on
+     * the objects instead.
+     */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
 }
 .noVNC_center > * {
-  pointer-events: auto;
+    pointer-events: auto;
 }
 .noVNC_vcenter {
-  display: flex !important;
-  flex-direction: column;
-  justify-content: center;
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  margin: 0 !important;
-  padding: 0 !important;
-  pointer-events: none;
+    display: flex !important;
+    flex-direction: column;
+    justify-content: center;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    margin: 0 !important;
+    padding: 0 !important;
+    pointer-events: none;
 }
 .noVNC_vcenter > * {
-  pointer-events: auto;
+    pointer-events: auto;
 }
 
 /* ----------------------------------------
@@ -138,7 +139,7 @@ html {
  */
 
 .noVNC_connect_layer {
-  z-index: 60;
+    z-index: 60;
 }
 
 /* ----------------------------------------
@@ -147,396 +148,404 @@ html {
  */
 
 #noVNC_fallback_error {
-  z-index: 1000;
-  visibility: hidden;
-  /* Put a dark background in front of everything but the error,
-     and don't let mouse events pass through */
-  background: rgba(0, 0, 0, 0.8);
-  pointer-events: all;
+    z-index: 1000;
+    visibility: hidden;
+    /* Put a dark background in front of everything but the error,
+       and don't let mouse events pass through */
+    background: rgba(0, 0, 0, 0.8);
+    pointer-events: all;
 }
 #noVNC_fallback_error.noVNC_open {
-  visibility: visible;
+    visibility: visible;
 }
 
 #noVNC_fallback_error > div {
-  max-width: calc(100vw - 30px - 30px);
-  max-height: calc(100vh - 30px - 30px);
-  overflow: auto;
+    max-width: calc(100vw - 30px - 30px);
+    max-height: calc(100vh - 30px - 30px);
+    overflow: auto;
 
-  padding: 15px;
+    padding: 15px;
 
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  transform: translateY(-50px);
-  opacity: 0;
+    transform: translateY(-50px);
+    opacity: 0;
 
-  text-align: center;
-  font-weight: bold;
-  color: #fff;
+    text-align: center;
+    font-weight: bold;
+    color: #fff;
 
-  border-radius: 10px;
-  box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
-  background: rgba(200,55,55,0.8);
+    border-radius: 12px;
+    box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
+    background: rgba(200,55,55,0.8);
 }
 #noVNC_fallback_error.noVNC_open > div {
-  transform: translateY(0);
-  opacity: 1;
+    transform: translateY(0);
+    opacity: 1;
 }
 
 #noVNC_fallback_errormsg {
-  font-weight: normal;
+    font-weight: normal;
 }
 
 #noVNC_fallback_errormsg .noVNC_message {
-  display: inline-block;
-  text-align: left;
-  font-family: monospace;
-  white-space: pre-wrap;
+    display: inline-block;
+    text-align: left;
+    font-family: monospace;
+    white-space: pre-wrap;
 }
 
 #noVNC_fallback_error .noVNC_location {
-  font-style: italic;
-  font-size: 0.8em;
-  color: rgba(255, 255, 255, 0.8);
+    font-style: italic;
+    font-size: 0.8em;
+    color: rgba(255, 255, 255, 0.8);
 }
 
 #noVNC_fallback_error .noVNC_stack {
-  padding: 10px;
-  margin: 10px;
-  font-size: 0.8em;
-  text-align: left;
-  font-family: monospace;
-  white-space: pre;
-  border: 1px solid rgba(0, 0, 0, 0.5);
-  background: rgba(0, 0, 0, 0.2);
-  overflow: auto;
+    padding: 10px;
+    margin: 10px;
+    font-size: 0.8em;
+    text-align: left;
+    font-family: monospace;
+    white-space: pre;
+    border: 1px solid rgba(0, 0, 0, 0.5);
+    background: rgba(0, 0, 0, 0.2);
+    overflow: auto;
 }
 
 /* ----------------------------------------
- * Control Bar
+ * Control bar
  * ----------------------------------------
  */
 
 #noVNC_control_bar_anchor {
-  /* The anchor is needed to get z-stacking to work */
-  position: fixed;
-  z-index: 10;
+    /* The anchor is needed to get z-stacking to work */
+    position: fixed;
+    z-index: 10;
 
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  /* Edge misrenders animations without this */
-  transform: translateX(0);
+    /* Edge misrenders animations wihthout this */
+    transform: translateX(0);
 }
 :root.noVNC_connected #noVNC_control_bar_anchor.noVNC_idle {
-  opacity: 0.8;
+    opacity: 0.8;
 }
 #noVNC_control_bar_anchor.noVNC_right {
-  left: auto;
-  right: 0;
+    left: auto;
+    right: 0;
 }
 
 #noVNC_control_bar {
-  position: relative;
-  left: -100%;
+    position: relative;
+    left: -100%;
 
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  background-color: rgb(110, 132, 163);
-  border-radius: 0 10px 10px 0;
+    background-color: var(--novnc-blue);
+    border-radius: 0 12px 12px 0;
 
-  user-select: none;
-  -webkit-user-select: none;
-  -webkit-touch-callout: none; /* Disable iOS image long-press popup */
+    user-select: none;
+    -webkit-user-select: none;
+    -webkit-touch-callout: none; /* Disable iOS image long-press popup */
 }
 #noVNC_control_bar.noVNC_open {
-  box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
-  left: 0;
+    box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
+    left: 0;
 }
 #noVNC_control_bar::before {
-  /* This extra element is to get a proper shadow */
-  content: "";
-  position: absolute;
-  z-index: -1;
-  height: 100%;
-  width: 30px;
-  left: -30px;
-  transition: box-shadow 0.5s ease-in-out;
+    /* This extra element is to get a proper shadow */
+    content: "";
+    position: absolute;
+    z-index: -1;
+    height: 100%;
+    width: 30px;
+    left: -30px;
+    transition: box-shadow 0.5s ease-in-out;
 }
 #noVNC_control_bar.noVNC_open::before {
-  box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
 }
 .noVNC_right #noVNC_control_bar {
-  left: 100%;
-  border-radius: 10px 0 0 10px;
+    left: 100%;
+    border-radius: 12px 0 0 12px;
 }
 .noVNC_right #noVNC_control_bar.noVNC_open {
-  left: 0;
+    left: 0;
 }
 .noVNC_right #noVNC_control_bar::before {
-  visibility: hidden;
+    visibility: hidden;
 }
 
 #noVNC_control_bar_handle {
-  position: absolute;
-  left: -15px;
-  top: 0;
-  transform: translateY(35px);
-  width: calc(100% + 30px);
-  height: 50px;
-  z-index: -1;
-  cursor: pointer;
-  border-radius: 5px;
-  background-color: rgb(83, 99, 122);
-  background-image: url("../images/handle_bg.png");
-  background-repeat: no-repeat;
-  background-position: right;
-  box-shadow: 3px 3px 0px rgba(0, 0, 0, 0.5);
+    position: absolute;
+    left: -15px;
+    top: 0;
+    transform: translateY(35px);
+    width: calc(100% + 30px);
+    height: 50px;
+    z-index: -1;
+    cursor: pointer;
+    border-radius: 6px;
+    background-color: var(--novnc-darkblue);
+    background-image: url("../images/handle_bg.png");
+    background-repeat: no-repeat;
+    background-position: right;
+    box-shadow: 3px 3px 0px rgba(0, 0, 0, 0.5);
 }
 #noVNC_control_bar_handle:after {
-  content: "";
-  transition: transform 0.5s ease-in-out;
-  background: url("../images/handle.png");
-  position: absolute;
-  top: 22px; /* (50px-6px)/2 */
-  right: 5px;
-  width: 5px;
-  height: 6px;
+    content: "";
+    transition: transform 0.5s ease-in-out;
+    background: url("../images/handle.png");
+    position: absolute;
+    top: 22px; /* (50px-6px)/2 */
+    right: 5px;
+    width: 5px;
+    height: 6px;
 }
 #noVNC_control_bar.noVNC_open #noVNC_control_bar_handle:after {
-  transform: translateX(1px) rotate(180deg);
+    transform: translateX(1px) rotate(180deg);
 }
 :root:not(.noVNC_connected) #noVNC_control_bar_handle {
-  display: none;
+    display: none;
 }
 .noVNC_right #noVNC_control_bar_handle {
-  background-position: left;
+    background-position: left;
 }
 .noVNC_right #noVNC_control_bar_handle:after {
-  left: 5px;
-  right: 0;
-  transform: translateX(1px) rotate(180deg);
+    left: 5px;
+    right: 0;
+    transform: translateX(1px) rotate(180deg);
 }
 .noVNC_right #noVNC_control_bar.noVNC_open #noVNC_control_bar_handle:after {
-  transform: none;
+    transform: none;
 }
 /* Larger touch area for the handle, used when a touch screen is available */
 #noVNC_control_bar_handle div {
-  position: absolute;
-  right: -35px;
-  top: 0;
-  width: 50px;
-  height: 100%;
-  display: none;
+    position: absolute;
+    right: -35px;
+    top: 0;
+    width: 50px;
+    height: 100%;
+    display: none;
 }
 @media (any-pointer: coarse) {
-  #noVNC_control_bar_handle div {
-    display: initial;
-  }
+    #noVNC_control_bar_handle div {
+        display: initial;
+    }
 }
 .noVNC_right #noVNC_control_bar_handle div {
-  left: -35px;
-  right: auto;
+    left: -35px;
+    right: auto;
 }
 
 #noVNC_control_bar > .noVNC_scroll {
-  max-height: 100vh; /* Chrome is buggy with 100% */
-  overflow-x: hidden;
-  overflow-y: auto;
-  padding: 0 10px;
+    max-height: 100vh; /* Chrome is buggy with 100% */
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding: 0 10px;
 }
 
 #noVNC_control_bar > .noVNC_scroll > * {
-  display: block;
-  margin: 10px auto;
+    display: block;
+    margin: 10px auto;
 }
 
 /* Control bar hint */
 #noVNC_hint_anchor {
-  position: fixed;
-  right: -50px;
-  left: auto;
+    position: fixed;
+    right: -50px;
+    left: auto;
 }
 #noVNC_control_bar_anchor.noVNC_right + #noVNC_hint_anchor {
-  left: -50px;
-  right: auto;
+    left: -50px;
+    right: auto;
 }
 #noVNC_control_bar_hint {
-  position: relative;
-  transform: scale(0);
-  width: 100px;
-  height: 50%;
-  max-height: 600px;
+    position: relative;
+    transform: scale(0);
+    width: 100px;
+    height: 50%;
+    max-height: 600px;
 
-  visibility: hidden;
-  opacity: 0;
-  transition: 0.2s ease-in-out;
-  background: transparent;
-  box-shadow: 0 0 10px black, inset 0 0 10px 10px rgba(110, 132, 163, 0.8);
-  border-radius: 10px;
-  transition-delay: 0s;
+    visibility: hidden;
+    opacity: 0;
+    transition: 0.2s ease-in-out;
+    background: transparent;
+    box-shadow: 0 0 10px black, inset 0 0 10px 10px var(--novnc-darkblue);
+    border-radius: 12px;
+    transition-delay: 0s;
 }
 #noVNC_control_bar_hint.noVNC_active {
-  visibility: visible;
-  opacity: 1;
-  transition-delay: 0.2s;
-  transform: scale(1);
+    visibility: visible;
+    opacity: 1;
+    transition-delay: 0.2s;
+    transform: scale(1);
 }
 #noVNC_control_bar_hint.noVNC_notransition {
-  transition: none !important;
+    transition: none !important;
 }
 
 /* Control bar buttons */
 #noVNC_control_bar .noVNC_button {
-  padding: 4px 4px;
-  vertical-align: middle;
-  border:1px solid rgba(255, 255, 255, 0.2);
-  border-radius: 6px;
-  background-color: transparent;
-  background-image: unset; /* we don't want the gradiant from input.css */
+    min-width: 24px;
+    padding: 4px 4px;
+    vertical-align: middle;
+    border:1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 6px;
+    background-color: transparent;
 }
 #noVNC_control_bar .noVNC_button.noVNC_selected {
-  border-color: rgba(0, 0, 0, 0.8);
-  background-color: rgba(0, 0, 0, 0.5);
-}
-#noVNC_control_bar .noVNC_button.noVNC_selected:not(:disabled):hover {
-  border-color: rgba(0, 0, 0, 0.4);
-  background-color: rgba(0, 0, 0, 0.2);
-}
-#noVNC_control_bar .noVNC_button:not(:disabled):hover {
-  background-color: rgba(255, 255, 255, 0.2);
-}
-#noVNC_control_bar .noVNC_button:not(:disabled):active {
-  padding-top: 5px;
-  padding-bottom: 3px;
-}
-#noVNC_control_bar .noVNC_button.noVNC_hidden {
-  display: none !important;
-}
-
-/* Android browsers don't properly update hover state if touch events are
- * intercepted, like they are when clicking on the remote screen. */
-@media (any-pointer: coarse) {
-  #noVNC_control_bar .noVNC_button:not(:disabled):hover {
-    background-color: transparent;
-  }
-  #noVNC_control_bar .noVNC_button.noVNC_selected:not(:disabled):hover {
     border-color: rgba(0, 0, 0, 0.8);
     background-color: rgba(0, 0, 0, 0.5);
-  }
 }
-
+#noVNC_control_bar .noVNC_button.noVNC_hidden {
+    display: none !important;
+}
 
 /* Panels */
 .noVNC_panel {
-  transform: translateX(25px);
+    transform: translateX(25px);
 
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  box-sizing: border-box; /* so max-width don't have to care about padding */
-  max-width: calc(100vw - 75px - 25px); /* minus left and right margins */
-  max-height: 100vh; /* Chrome is buggy with 100% */
-  overflow-x: hidden;
-  overflow-y: auto;
+    box-sizing: border-box; /* so max-width don't have to care about padding */
+    max-width: calc(100vw - 75px - 25px); /* minus left and right margins */
+    max-height: 100vh; /* Chrome is buggy with 100% */
+    overflow-x: hidden;
+    overflow-y: auto;
 
-  visibility: hidden;
-  opacity: 0;
+    visibility: hidden;
+    opacity: 0;
 
-  padding: 15px;
+    padding: 15px;
 
-  background: #fff;
-  border-radius: 10px;
-  color: #000;
-  border: 2px solid #E0E0E0;
-  box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
+    background: #fff;
+    border-radius: 12px;
+    color: #000;
+    border: 2px solid #E0E0E0;
+    box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
 }
 .noVNC_panel.noVNC_open {
-  visibility: visible;
-  opacity: 1;
-  transform: translateX(75px);
+    visibility: visible;
+    opacity: 1;
+    transform: translateX(75px);
 }
 .noVNC_right .noVNC_vcenter {
-  left: auto;
-  right: 0;
+    left: auto;
+    right: 0;
 }
 .noVNC_right .noVNC_panel {
-  transform: translateX(-25px);
+    transform: translateX(-25px);
 }
 .noVNC_right .noVNC_panel.noVNC_open {
-  transform: translateX(-75px);
+    transform: translateX(-75px);
 }
 
 .noVNC_panel > * {
-  display: block;
-  margin: 10px auto;
+    display: block;
+    margin: 10px auto;
 }
 .noVNC_panel > *:first-child {
-  margin-top: 0 !important;
+    margin-top: 0 !important;
 }
 .noVNC_panel > *:last-child {
-  margin-bottom: 0 !important;
+    margin-bottom: 0 !important;
 }
 
 .noVNC_panel hr {
-  border: none;
-  border-top: 1px solid rgb(192, 192, 192);
+    border: none;
+    border-top: 1px solid var(--novnc-lightgrey);
+    width: 100%; /* <hr> inside a flexbox will otherwise be 0px wide */
 }
 
 .noVNC_panel label {
-  display: block;
-  white-space: nowrap;
-  margin: 5px;
+    display: block;
+    white-space: nowrap;
+    margin: 5px;
+}
+@media (max-width: 540px) {
+    /* Allow wrapping on small screens */
+    .noVNC_panel label {
+        white-space: unset;
+    }
 }
 
 .noVNC_panel li {
-  margin: 5px;
+    margin: 5px;
+}
+
+.noVNC_panel button,
+.noVNC_panel select,
+.noVNC_panel textarea,
+.noVNC_panel input:not([type=checkbox]):not([type=radio]) {
+    margin-left: 6px;
+    /* Prevent inputs in panels from being too wide */
+    max-width: calc(100% - 6px - var(--input-xpadding) * 2);
 }
 
 .noVNC_panel .noVNC_heading {
-  background-color: rgb(110, 132, 163);
-  border-radius: 5px;
-  padding: 5px;
-  /* Compensate for padding in image */
-  padding-right: 8px;
-  color: white;
-  font-size: 20px;
-  white-space: nowrap;
+    background-color: var(--novnc-blue);
+    border-radius: 6px;
+    padding: 5px 8px;
+    /* Compensate for padding in image */
+    padding-right: 11px;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    color: white;
+    font-size: 20px;
+    font-weight: bold;
+    white-space: nowrap;
 }
 .noVNC_panel .noVNC_heading img {
-  vertical-align: bottom;
+    vertical-align: bottom;
 }
 
-.noVNC_submit {
-  float: right;
+.noVNC_panel form {
+    display: flex;
+    flex-direction: column;
+    gap: 12px
+}
+
+.noVNC_panel .button_row {
+    margin-top: 10px;
+    display: flex;
+    gap: 10px;
+    justify-content: space-between;
+}
+.noVNC_panel .button_row *:only-child {
+    margin-left: auto; /* Align single buttons to the right */
 }
 
 /* Expanders */
 .noVNC_expander {
-  cursor: pointer;
+    cursor: pointer;
 }
 .noVNC_expander::before {
-  content: url("../images/expander.png");
-  display: inline-block;
-  margin-right: 5px;
-  transition: 0.2s ease-in-out;
+    content: url("../images/expander.png");
+    display: inline-block;
+    margin-right: 5px;
+    transition: 0.2s ease-in-out;
 }
 .noVNC_expander.noVNC_open::before {
-  transform: rotateZ(90deg);
+    transform: rotateZ(90deg);
 }
 .noVNC_expander ~ * {
-  margin: 5px;
-  margin-left: 10px;
-  padding: 5px;
-  background: rgba(0, 0, 0, 0.05);
-  border-radius: 5px;
+    margin: 5px;
+    margin-left: 10px;
+    padding: 5px;
+    background: rgba(0, 0, 0, 0.04);
+    border-radius: 6px;
 }
 .noVNC_expander:not(.noVNC_open) ~ * {
-  display: none;
+    display: none;
 }
 
 /* Control bar content */
 
 #noVNC_control_bar .noVNC_logo {
-  font-size: 13px;
+    font-size: 13px;
 }
 
 .noVNC_logo + hr {
@@ -546,63 +555,63 @@ html {
 }
 
 :root:not(.noVNC_connected) #noVNC_view_drag_button {
-  display: none;
+    display: none;
 }
 
 /* noVNC Touch Device only buttons */
 :root:not(.noVNC_connected) #noVNC_mobile_buttons {
-  display: none;
+    display: none;
 }
 @media not all and (any-pointer: coarse) {
-  /* FIXME: The button for the virtual keyboard is the only button in this
-            group of "mobile buttons". It is bad to assume that no touch
-            devices have physical keyboards available. Hopefully we can get
-            a media query for this:
-            https://github.com/w3c/csswg-drafts/issues/3871 */
-  :root.noVNC_connected #noVNC_mobile_buttons {
-    display: none;
-  }
+    /* FIXME: The button for the virtual keyboard is the only button in this
+              group of "mobile buttons". It is bad to assume that no touch
+              devices have physical keyboards available. Hopefully we can get
+              a media query for this:
+              https://github.com/w3c/csswg-drafts/issues/3871 */
+    :root.noVNC_connected #noVNC_mobile_buttons {
+        display: none;
+    }
 }
 
 /* Extra manual keys */
 :root:not(.noVNC_connected) #noVNC_toggle_extra_keys_button {
-  display: none;
+    display: none;
 }
 
 #noVNC_modifiers {
-  background-color: rgb(92, 92, 92);
-  border: none;
-  padding: 10px;
+    background-color: var(--novnc-darkgrey);
+    border: none;
+    padding: 10px;
 }
 
 /* Shutdown/Reboot */
 :root:not(.noVNC_connected) #noVNC_power_button {
-  display: none;
+    display: none;
 }
 #noVNC_power {
 }
 #noVNC_power_buttons {
-  display: none;
+    display: none;
 }
 
 #noVNC_power input[type=button] {
-  width: 100%;
+    width: 100%;
 }
 
 /* Clipboard */
 :root:not(.noVNC_connected) #noVNC_clipboard_button {
-  display: none;
+    display: none;
 }
 #noVNC_clipboard_text {
-  width: 360px;
-  min-width: 150px;
-  height: 160px;
-  min-height: 70px;
+    width: 360px;
+    min-width: 150px;
+    height: 160px;
+    min-height: 70px;
 
-  box-sizing: border-box;
-  max-width: 100%;
-  /* minus approximate height of title, height of subtitle, and margin */
-  max-height: calc(100vh - 10em - 25px);
+    box-sizing: border-box;
+    max-width: 100%;
+    /* minus approximate height of title, height of subtitle, and margin */
+    max-height: calc(100vh - 10em - 25px);
 }
 
 :root:not(.noVNC_connected) #noVNC_fullscreen_button {
@@ -613,299 +622,295 @@ html {
 #noVNC_settings {
 }
 #noVNC_settings ul {
-  list-style: none;
-  padding: 0px;
+    list-style: none;
+    padding: 0px;
 }
 #noVNC_setting_port {
-  width: 80px;
+    width: 80px;
 }
 #noVNC_setting_path {
-  width: 100px;
+    width: 100px;
 }
 
 /* Version */
 
 .noVNC_version_wrapper {
-  font-size: small;
+    font-size: small;
 }
 
 .noVNC_version {
-  margin-left: 1rem;
+    margin-left: 1rem;
 }
 
-/* Connection Controls */
+/* Connection controls */
 :root:not(.noVNC_connected) #noVNC_disconnect_button {
-  display: none;
+    display: none;
 }
 
 /* ----------------------------------------
- * Status Dialog
+ * Status dialog
  * ----------------------------------------
  */
 
 #noVNC_status {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  z-index: 100;
-  transform: translateY(-100%);
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 100;
+    transform: translateY(-100%);
 
-  cursor: pointer;
+    cursor: pointer;
 
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  visibility: hidden;
-  opacity: 0;
+    visibility: hidden;
+    opacity: 0;
 
-  padding: 5px;
+    padding: 5px;
 
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-content: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-content: center;
 
-  line-height: 25px;
-  word-wrap: break-word;
-  color: #fff;
+    line-height: 1.6;
+    word-wrap: break-word;
+    color: #fff;
 
-  border-bottom: 1px solid rgba(0, 0, 0, 0.9);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.9);
 }
 #noVNC_status.noVNC_open {
-  transform: translateY(0);
-  visibility: visible;
-  opacity: 1;
+    transform: translateY(0);
+    visibility: visible;
+    opacity: 1;
 }
 
 #noVNC_status::before {
-  content: "";
-  display: inline-block;
-  width: 25px;
-  height: 25px;
-  margin-right: 5px;
+    content: "";
+    display: inline-block;
+    width: 25px;
+    height: 25px;
+    margin-right: 5px;
 }
 
 #noVNC_status.noVNC_status_normal {
-  background: rgba(128,128,128,0.9);
+    background: rgba(128,128,128,0.9);
 }
 #noVNC_status.noVNC_status_normal::before {
-  content: url("../images/info.png") " ";
+    content: url("../images/info.png") " ";
 }
 #noVNC_status.noVNC_status_error {
-  background: rgba(200,55,55,0.9);
+    background: rgba(200,55,55,0.9);
 }
 #noVNC_status.noVNC_status_error::before {
-  content: url("../images/error.png") " ";
+    content: url("../images/error.png") " ";
 }
 #noVNC_status.noVNC_status_warn {
-  background: rgba(180,180,30,0.9);
+    background: rgba(180,180,30,0.9);
 }
 #noVNC_status.noVNC_status_warn::before {
-  content: url("../images/warning.png") " ";
+    content: url("../images/warning.png") " ";
 }
 #noVNC_status.noVNC_status_tls_success {
-  background: rgba(6, 199, 38, 0.9);
+    background: rgba(6, 199, 38, 0.9);
 }
 #noVNC_status.noVNC_status_tls_success::before {
-  content: url("../images/connect.png") " ";
+    content: url("../images/connect.png") " ";
 }
 
 /* ----------------------------------------
- * Connect Dialog
+ * Connect dialog
  * ----------------------------------------
  */
 
 #noVNC_connect_dlg {
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  transform: scale(0, 0);
-  visibility: hidden;
-  opacity: 0;
+    transform: scale(0, 0);
+    visibility: hidden;
+    opacity: 0;
 }
 #noVNC_connect_dlg.noVNC_open {
-  transform: scale(1, 1);
-  visibility: visible;
-  opacity: 1;
+    transform: scale(1, 1);
+    visibility: visible;
+    opacity: 1;
 }
 #noVNC_connect_dlg .noVNC_logo {
-  transition: 0.5s ease-in-out;
-  padding: 10px;
-  margin-bottom: 10px;
+    transition: 0.5s ease-in-out;
+    padding: 10px;
+    margin-bottom: 10px;
 
-  font-size: 80px;
-  text-align: center;
+    font-size: 80px;
+    text-align: center;
 
-  border-radius: 5px;
+    border-radius: 6px;
 }
 @media (max-width: 440px) {
-  #noVNC_connect_dlg {
-    max-width: calc(100vw - 100px);
-  }
-  #noVNC_connect_dlg .noVNC_logo {
-    font-size: calc(25vw - 30px);
-  }
+    #noVNC_connect_dlg {
+        max-width: calc(100vw - 100px);
+    }
+    #noVNC_connect_dlg .noVNC_logo {
+        font-size: calc(25vw - 30px);
+    }
 }
 #noVNC_connect_dlg div {
-  padding: 12px;
+    padding: 18px;
 
-  background-color: rgb(110, 132, 163);
-  border-radius: 12px;
-  text-align: center;
-  font-size: 20px;
+    background-color: var(--novnc-darkgrey);
+    border-radius: 12px;
+    text-align: center;
+    font-size: 20px;
 
-  box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
+    box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
 }
 #noVNC_connect_button {
-  width: 100%;
-  padding: 5px 30px;
+    width: 100%;
+    padding: 6px 30px;
+    cursor: pointer;
+    border-color: transparent;
+    border-radius: 12px;
+    background-color: var(--novnc-blue);
+    color: white;
 
-  cursor: pointer;
-
-  border-color: rgb(83, 99, 122);
-  border-radius: 5px;
-
-  background: linear-gradient(to top, rgb(110, 132, 163), rgb(99, 119, 147));
-  color: white;
-
-  /* This avoids it jumping around when :active */
-  vertical-align: middle;
-}
-#noVNC_connect_button:hover {
-  background: linear-gradient(to top, rgb(110, 132, 163), rgb(105, 125, 155));
+    display: flex;
+    justify-content: center;
+    place-items: center;
+    gap: 4px;
 }
 
 #noVNC_connect_button img {
-  vertical-align: bottom;
-  height: 1.3em;
+    vertical-align: bottom;
+    height: 1.3em;
 }
 
 /* ----------------------------------------
- * Server verification Dialog
+ * Server verification dialog
  * ----------------------------------------
  */
 
 #noVNC_verify_server_dlg {
-  position: relative;
+    position: relative;
 
-  transform: translateY(-50px);
+    transform: translateY(-50px);
 }
 #noVNC_verify_server_dlg.noVNC_open {
-  transform: translateY(0);
+    transform: translateY(0);
 }
 #noVNC_fingerprint_block {
-  margin: 10px;
+    margin: 10px;
 }
 
 /* ----------------------------------------
- * Password Dialog
+ * Password dialog
  * ----------------------------------------
  */
 
 #noVNC_credentials_dlg {
-  position: relative;
+    position: relative;
 
-  transform: translateY(-50px);
+    transform: translateY(-50px);
 }
 #noVNC_credentials_dlg.noVNC_open {
-  transform: translateY(0);
+    transform: translateY(0);
 }
 #noVNC_username_block.noVNC_hidden,
 #noVNC_password_block.noVNC_hidden {
-  display: none;
+    display: none;
 }
 
 
 /* ----------------------------------------
- * Main Area
+ * Main area
  * ----------------------------------------
  */
 
 /* Transition screen */
 #noVNC_transition {
-  transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
 
-  display: flex;
-  opacity: 0;
-  visibility: hidden;
+    display: flex;
+    opacity: 0;
+    visibility: hidden;
 
-  position: fixed;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
 
-  color: white;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 50;
+    color: white;
+    background: rgba(0, 0, 0, 0.5);
+    z-index: 50;
 
-  /*display: flex;*/
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
+    /*display: flex;*/
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
 }
 :root.noVNC_loading #noVNC_transition,
 :root.noVNC_connecting #noVNC_transition,
 :root.noVNC_disconnecting #noVNC_transition,
 :root.noVNC_reconnecting #noVNC_transition {
-  opacity: 1;
-  visibility: visible;
+    opacity: 1;
+    visibility: visible;
 }
 :root:not(.noVNC_reconnecting) #noVNC_cancel_reconnect_button {
-  display: none;
+    display: none;
 }
 #noVNC_transition_text {
-  font-size: 1.5em;
+    font-size: 1.5em;
 }
 
 /* Main container */
 #noVNC_container {
-  width: 100%;
-  height: 100%;
-  background-color: #313131;
-  border-bottom-right-radius: 800px 600px;
-  /*border-top-left-radius: 800px 600px;*/
+    width: 100%;
+    height: 100%;
+    background-color: #313131;
+    border-bottom-right-radius: 800px 600px;
+    /*border-top-left-radius: 800px 600px;*/
 
-  /* If selection isn't disabled, long-pressing stuff in the sidebar
-     can accidentally select the container or the canvas. This can
-     happen when attempting to move the handle. */
-  user-select: none;
-  -webkit-user-select: none;
+    /* If selection isn't disabled, long-pressing stuff in the sidebar
+       can accidentally select the container or the canvas. This can
+       happen when attempting to move the handle. */
+    user-select: none;
+    -webkit-user-select: none;
 }
 
 #noVNC_keyboardinput {
-  width: 1px;
-  height: 1px;
-  background-color: #fff;
-  color: #fff;
-  border: 0;
-  position: absolute;
-  left: -40px;
-  z-index: -1;
-  ime-mode: disabled;
+    width: 1px;
+    height: 1px;
+    background-color: #fff;
+    color: #fff;
+    border: 0;
+    position: absolute;
+    left: -40px;
+    z-index: -1;
+    ime-mode: disabled;
 }
 
 /*Default noVNC logo.*/
 /* From: http://fonts.googleapis.com/css?family=Orbitron:700 */
 @font-face {
-  font-family: 'Orbitron';
-  font-style: normal;
-  font-weight: 700;
-  src: local('?'), url('Orbitron700.woff') format('woff'),
-                   url('Orbitron700.ttf') format('truetype');
+    font-family: 'Orbitron';
+    font-style: normal;
+    font-weight: 700;
+    src: local('?'), url('Orbitron700.woff') format('woff'),
+                     url('Orbitron700.ttf') format('truetype');
 }
 
 .noVNC_logo {
-  color:yellow;
-  font-family: 'Orbitron', 'OrbitronTTF', sans-serif;
-  line-height:90%;
-  text-shadow: 0.1em 0.1em 0 black;
+    color: var(--novnc-yellow);
+    font-family: 'Orbitron', 'OrbitronTTF', sans-serif;
+    line-height: 0.9;
+    text-shadow: 0.1em 0.1em 0 black;
 }
 .noVNC_logo span{
-  color:green;
+    color: var(--novnc-green);
 }
 
 #noVNC_bell {
-  display: none;
+    display: none;
 }
 
 /* ----------------------------------------
@@ -914,19 +919,19 @@ html {
  */
 
 @media screen and (max-width: 640px){
-  #noVNC_logo {
-    font-size: 150px;
-  }
+    #noVNC_logo {
+        font-size: 150px;
+    }
 }
 
 @media screen and (min-width: 321px) and (max-width: 480px) {
-  #noVNC_logo {
-    font-size: 110px;
-  }
+    #noVNC_logo {
+        font-size: 110px;
+    }
 }
 
 @media screen and (max-width: 320px) {
-  #noVNC_logo {
-    font-size: 90px;
-  }
+    #noVNC_logo {
+        font-size: 90px;
+    }
 }
diff --git a/systemvm/agent/noVNC/app/styles/constants.css b/systemvm/agent/noVNC/app/styles/constants.css
new file mode 100644
index 00000000000..1123a3efcfc
--- /dev/null
+++ b/systemvm/agent/noVNC/app/styles/constants.css
@@ -0,0 +1,30 @@
+/*
+ * noVNC general CSS constant variables
+ * Copyright (C) 2025 The noVNC authors
+ * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
+ * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
+ */
+
+/* ---------- COLORS ----------- */
+
+:root {
+    --novnc-grey: rgb(128, 128, 128);
+    --novnc-lightgrey: rgb(192, 192, 192);
+    --novnc-darkgrey: rgb(92, 92, 92);
+
+    /* Transparent to make button colors adapt to the background */
+    --novnc-buttongrey: rgba(192, 192, 192, 0.5);
+
+    --novnc-blue: rgb(110, 132, 163);
+    --novnc-lightblue: rgb(74, 144, 217);
+    --novnc-darkblue: rgb(83, 99, 122);
+
+    --novnc-green: rgb(0, 128, 0);
+    --novnc-yellow: rgb(255, 255, 0);
+}
+
+/* ------ MISC PROPERTIES ------ */
+
+:root {
+    --input-xpadding: 1em;
+}
diff --git a/systemvm/agent/noVNC/app/styles/input.css b/systemvm/agent/noVNC/app/styles/input.css
index eaf083c7e17..8273d70ad52 100644
--- a/systemvm/agent/noVNC/app/styles/input.css
+++ b/systemvm/agent/noVNC/app/styles/input.css
@@ -1,32 +1,170 @@
 /*
  * noVNC general input element CSS
- * Copyright (C) 2022 The noVNC Authors
+ * Copyright (C) 2025 The noVNC authors
  * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
  * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
  */
 
-/*
- * Common for all inputs
- */
-input, input::file-selector-button, button, select, textarea {
-  /* Respect standard font settings */
-  font: inherit;
+/* ------- SHARED BETWEEN INPUT ELEMENTS -------- */
 
-  /* Disable default rendering */
-  appearance: none;
-  background: none;
+input,
+textarea,
+button,
+select,
+input::file-selector-button {
+    padding: 0.5em var(--input-xpadding);
+    border-radius: 6px;
+    appearance: none;
+    text-overflow: ellipsis;
 
-  padding: 5px;
-  border: 1px solid rgb(192, 192, 192);
-  border-radius: 5px;
-  color: black;
-  --bg-gradient: linear-gradient(to top, rgb(255, 255, 255) 80%, rgb(240, 240, 240));
-  background-image: var(--bg-gradient);
+    /* Respect standard font settings */
+    font: inherit;
+    line-height: 1.6;
+}
+input:disabled,
+textarea:disabled,
+button:disabled,
+select:disabled,
+label[disabled] {
+    opacity: 0.4;
 }
 
-/*
- * Buttons
- */
+input:focus-visible,
+textarea:focus-visible,
+button:focus-visible,
+select:focus-visible,
+input:focus-visible::file-selector-button {
+    outline: 2px solid var(--novnc-lightblue);
+    outline-offset: 1px;
+}
+
+/* ------- TEXT INPUT -------- */
+
+input:not([type]),
+input[type=date],
+input[type=datetime-local],
+input[type=email],
+input[type=month],
+input[type=number],
+input[type=password],
+input[type=search],
+input[type=tel],
+input[type=text],
+input[type=time],
+input[type=url],
+input[type=week],
+textarea {
+    border: 1px solid var(--novnc-lightgrey);
+    /* Account for borders on text inputs, buttons dont have borders */
+    padding: calc(0.5em - 1px) var(--input-xpadding);
+}
+input:not([type]):focus-visible,
+input[type=date]:focus-visible,
+input[type=datetime-local]:focus-visible,
+input[type=email]:focus-visible,
+input[type=month]:focus-visible,
+input[type=number]:focus-visible,
+input[type=password]:focus-visible,
+input[type=search]:focus-visible,
+input[type=tel]:focus-visible,
+input[type=text]:focus-visible,
+input[type=time]:focus-visible,
+input[type=url]:focus-visible,
+input[type=week]:focus-visible,
+textarea:focus-visible {
+    outline-offset: -1px;
+}
+
+textarea {
+    margin: unset; /* Remove Firefox's built in margin */
+    /* Prevent layout from shifting when scrollbars show */
+    scrollbar-gutter: stable;
+    /* Make textareas show at minimum one line. This does not work when
+       using box-sizing border-box, in which case, vertical padding and
+       border width needs to be taken into account. */
+    min-height: 1lh;
+    vertical-align: baseline; /* Firefox gives "text-bottom" by default */
+}
+
+/* ------- NUMBER PICKERS ------- */
+
+/* We can't style the number spinner buttons:
+   https://github.com/w3c/csswg-drafts/issues/8777 */
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    /* Get rid of increase/decrease buttons in WebKit */
+    appearance: none;
+}
+input[type=number] {
+    /* Get rid of increase/decrease buttons in Firefox */
+    appearance: textfield;
+}
+
+/* ------- BUTTON ACTIVATIONS -------- */
+
+/* A color overlay that depends on the activation level. The level can then be
+   set for different states on an element, for example hover and click on a
+   <button>. */
+input, button, select, option,
+input::file-selector-button,
+.button-activations {
+    --button-activation-level: 0;
+    /* Note that CSS variables aren't functions, beware when inheriting */
+    --button-activation-alpha: calc(0.08 * var(--button-activation-level));
+    /* FIXME: We want the image() function instead of the linear-gradient()
+              function below. But it's not supported in the browsers yet. */
+    --button-activation-overlay:
+        linear-gradient(rgba(0, 0, 0, var(--button-activation-alpha))
+        100%, transparent);
+    --button-activation-overlay-light:
+        linear-gradient(rgba(255, 255, 255, calc(0.23 * var(--button-activation-level)))
+        100%, transparent);
+}
+.button-activations {
+    background-image: var(--button-activation-overlay);
+
+    /* Disable Chrome's touch tap highlight to avoid conflicts with overlay */
+    -webkit-tap-highlight-color: transparent;
+}
+/* When we want the light overlay on activations instead.
+   This is best used on elements with darker backgrounds. */
+.button-activations.light-overlay {
+    background-image: var(--button-activation-overlay-light);
+    /* Can't use the normal blend mode since that gives washed out colors. */
+    /* FIXME: For elements with these activation overlays we'd like only
+              the luminosity to change. The proprty "background-blend-mode" set
+              to "luminosity" sounds good, but it doesn't work as intended,
+              see: https://bugzilla.mozilla.org/show_bug.cgi?id=1806417 */
+    background-blend-mode: overlay;
+}
+
+input:hover, button:hover, select:hover, option:hover,
+input::file-selector-button:hover,
+.button-activations:hover {
+    --button-activation-level: 1;
+}
+/* Unfortunately we have to disable the :hover effect on touch devices,
+   otherwise the style lingers after tapping the button. */
+@media (any-pointer: coarse) {
+    input:hover, button:hover, select:hover, option:hover,
+    input::file-selector-button:hover,
+    .button-activations:hover {
+        --button-activation-level: 0;
+    }
+}
+input:active, button:active, select:active, option:active,
+input::file-selector-button:active,
+.button-activations:active {
+    --button-activation-level: 2;
+}
+input:disabled, button:disabled, select:disabled, select:disabled option,
+input:disabled::file-selector-button,
+.button-activations:disabled {
+    --button-activation-level: 0;
+}
+
+/* ------- BUTTONS -------- */
+
 input[type=button],
 input[type=color],
 input[type=image],
@@ -35,226 +173,15 @@ input[type=submit],
 input::file-selector-button,
 button,
 select {
-  border-bottom-width: 2px;
-
-  /* This avoids it jumping around when :active */
-  vertical-align: middle;
-  margin-top: 0;
-
-  padding-left: 20px;
-  padding-right: 20px;
-
-  /* Disable Chrome's touch tap highlight */
-  -webkit-tap-highlight-color: transparent;
-}
-
-/*
- * Select dropdowns
- */
-select {
-  --select-arrow: url('data:image/svg+xml;utf8, \
-      <svg width="8" height="6" version="1.1" viewBox="0 0 8 6" \
-           xmlns="http://www.w3.org/2000/svg"> \
-          <path d="m6.5 1.5 -2.5 3 -2.5 -3 5 0" stroke-width="3" \
-                stroke="rgb(31,31,31)" fill="none" \
-                stroke-linecap="round" stroke-linejoin="round" /> \
-      </svg>');
-  background-image: var(--select-arrow), var(--bg-gradient);
-  background-position: calc(100% - 7px), left top;
-  background-repeat: no-repeat;
-  padding-right: calc(2*7px + 8px);
-  padding-left: 7px;
-}
-/* FIXME: :active isn't set when the <select> is opened in Firefox:
-          https://bugzilla.mozilla.org/show_bug.cgi?id=1805406 */
-select:active {
-  /* Rotated arrow */
-  background-image: url('data:image/svg+xml;utf8, \
-      <svg width="8" height="6" version="1.1" viewBox="0 0 8 6" \
-           xmlns="http://www.w3.org/2000/svg" transform="rotate(180)" > \
-          <path d="m6.5 1.5 -2.5 3 -2.5 -3 5 0" stroke-width="3" \
-                stroke="rgb(31,31,31)" fill="none" \
-                stroke-linecap="round" stroke-linejoin="round" /> \
-      </svg>'), var(--bg-gradient);
-}
-option {
-  color: black;
-  background: white;
-}
-
-/*
- * Checkboxes
- */
-input[type=checkbox] {
-  background-color: white;
-  background-image: unset;
-  border: 1px solid dimgrey;
-  border-radius: 3px;
-  width: 13px;
-  height: 13px;
-  padding: 0;
-  margin-right: 6px;
-  vertical-align: bottom;
-  transition: 0.2s background-color linear;
-}
-input[type=checkbox]:checked {
-  background-color: rgb(110, 132, 163);
-  border-color: rgb(110, 132, 163);
-}
-input[type=checkbox]:checked::after {
-  content: "";
-  display: block; /* width & height doesn't work on inline elements */
-  position: relative;
-  top: 0;
-  left: 3px;
-  width: 3px;
-  height: 7px;
-  border: 1px solid white;
-  border-width: 0 2px 2px 0;
-  transform: rotate(40deg);
-}
-
-/*
- * Radiobuttons
- */
-input[type=radio] {
-  border-radius: 50%;
-  border: 1px solid dimgrey;
-  width: 12px;
-  height: 12px;
-  padding: 0;
-  margin-right: 6px;
-  transition: 0.2s border linear;
-}
-input[type=radio]:checked {
-  border: 6px solid rgb(110, 132, 163);
-}
-
-/*
- * Range sliders
- */
-input[type=range] {
-  border: unset;
-  border-radius: 3px;
-  height: 20px;
-  padding: 0;
-  background: transparent;
-}
-/* -webkit-slider.. & -moz-range.. cant be in selector lists:
-   https://bugs.chromium.org/p/chromium/issues/detail?id=1154623 */
-input[type=range]::-webkit-slider-runnable-track {
-  background-color: rgb(110, 132, 163);
-  height: 6px;
-  border-radius: 3px;
-}
-input[type=range]::-moz-range-track {
-  background-color: rgb(110, 132, 163);
-  height: 6px;
-  border-radius: 3px;
-}
-input[type=range]::-webkit-slider-thumb {
-  appearance: none;
-  width: 18px;
-  height: 20px;
-  border-radius: 5px;
-  background-color: white;
-  border: 1px solid dimgray;
-  margin-top: -7px;
-}
-input[type=range]::-moz-range-thumb {
-  appearance: none;
-  width: 18px;
-  height: 20px;
-  border-radius: 5px;
-  background-color: white;
-  border: 1px solid dimgray;
-  margin-top: -7px;
-}
-
-/*
- * File choosers
- */
-input[type=file] {
-  background-image: none;
-  border: none;
-}
-input::file-selector-button {
-  margin-right: 6px;
-}
-
-/*
- * Hover
- */
-input[type=button]:hover,
-input[type=color]:hover,
-input[type=image]:hover,
-input[type=reset]:hover,
-input[type=submit]:hover,
-input::file-selector-button:hover,
-button:hover {
-  background-image: linear-gradient(to top, rgb(255, 255, 255), rgb(250, 250, 250));
-}
-select:hover {
-  background-image: var(--select-arrow),
-    linear-gradient(to top, rgb(255, 255, 255), rgb(250, 250, 250));
-  background-position: calc(100% - 7px), left top;
-  background-repeat: no-repeat;
-}
-@media (any-pointer: coarse) {
-  /* We don't want a hover style after touch input */
-  input[type=button]:hover,
-  input[type=color]:hover,
-  input[type=image]:hover,
-  input[type=reset]:hover,
-  input[type=submit]:hover,
-  input::file-selector-button:hover,
-  button:hover {
-    background-image: var(--bg-gradient);
-  }
-  select:hover {
-    background-image: var(--select-arrow), var(--bg-gradient);
-  }
-}
-
-/*
- * Active (clicked)
- */
-input[type=button]:active,
-input[type=color]:active,
-input[type=image]:active,
-input[type=reset]:active,
-input[type=submit]:active,
-input::file-selector-button:active,
-button:active,
-select:active {
-  border-bottom-width: 1px;
-  margin-top: 1px;
-}
-
-/*
- * Focus (tab)
- */
-input:focus-visible,
-input:focus-visible::file-selector-button,
-button:focus-visible,
-select:focus-visible,
-textarea:focus-visible {
-  outline: 2px solid rgb(74, 144, 217);
-  outline-offset: 1px;
-}
-input[type=file]:focus-visible {
-  outline: none; /* We outline the button instead of the entire element */
-}
-
-/*
- * Disabled
- */
-input:disabled,
-input:disabled::file-selector-button,
-button:disabled,
-select:disabled,
-textarea:disabled {
-  opacity: 0.4;
+    min-width: 8em;
+    border: none;
+    color: black;
+    font-weight: bold;
+    background-color: var(--novnc-buttongrey);
+    background-image: var(--button-activation-overlay);
+    cursor: pointer;
+    /* Disable Chrome's touch tap highlight */
+    -webkit-tap-highlight-color: transparent;
 }
 input[type=button]:disabled,
 input[type=color]:disabled,
@@ -264,18 +191,438 @@ input[type=submit]:disabled,
 input:disabled::file-selector-button,
 button:disabled,
 select:disabled {
-  background-image: var(--bg-gradient);
-  border-bottom-width: 2px;
-  margin-top: 0;
+    /* See Firefox bug:
+       https://bugzilla.mozilla.org/show_bug.cgi?id=1798304 */
+    cursor: default;
 }
-input[type=file]:disabled {
-  background-image: none;
+
+input[type=button],
+input[type=color],
+input[type=reset],
+input[type=submit] {
+    /* Workaround for text-overflow bugs in Firefox and Chromium:
+        https://bugzilla.mozilla.org/show_bug.cgi?id=1800077
+        https://bugs.chromium.org/p/chromium/issues/detail?id=1383144 */
+    overflow: clip;
+}
+
+/* ------- COLOR PICKERS ------- */
+
+input[type=color] {
+    min-width: unset;
+    box-sizing: content-box;
+    width: 1.4em;
+    height: 1.4em;
+}
+input[type=color]::-webkit-color-swatch-wrapper {
+    padding: 0;
+}
+/* -webkit-color-swatch & -moz-color-swatch cant be in a selector list:
+   https://bugs.chromium.org/p/chromium/issues/detail?id=1154623 */
+input[type=color]::-webkit-color-swatch {
+    border: none;
+    border-radius: 6px;
+}
+input[type=color]::-moz-color-swatch {
+    border: none;
+    border-radius: 6px;
+}
+
+/* -- SHARED BETWEEN CHECKBOXES, RADIOBUTTONS AND THE TOGGLE CLASS -- */
+
+input[type=radio],
+input[type=checkbox] {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    background-color: var(--novnc-buttongrey);
+    background-image: var(--button-activation-overlay);
+    /* Disable Chrome's touch tap highlight to avoid conflicts with overlay */
+    -webkit-tap-highlight-color: transparent;
+    width: 16px;
+    --checkradio-height: 16px;
+    height: var(--checkradio-height);
+    padding: 0;
+    margin: 0 6px 0 0;
+    /* Don't have transitions for outline in order to be consistent
+       with other elements */
+    transition: all 0.2s, outline-color 0s, outline-offset 0s;
+
+    /* A transparent outline in order to work around a graphical clipping issue
+       in WebKit. See bug: https://bugs.webkit.org/show_bug.cgi?id=256003 */
+    outline: 1px solid transparent;
+    position: relative; /* Since ::before & ::after are absolute positioned */
+
+    /* We want to align with the middle of capital letters, this requires
+       a workaround. The default behavior is to align the bottom of the element
+       on top of the text baseline, this is too far up.
+       We want to push the element down half the difference in height between
+       it and a capital X. In our font, the height of a capital "X" is 0.698em.
+     */
+    vertical-align: calc(0px - (var(--checkradio-height) - 0.698em) / 2);
+    /* FIXME: Could write 1cap instead of 0.698em, but it's only supported in
+              Firefox as of 2023 */
+    /* FIXME: We probably want to use round() here, see bug 8148 */
+}
+input[type=radio]:focus-visible,
+input[type=checkbox]:focus-visible {
+    outline-color: var(--novnc-lightblue);
+}
+input[type=checkbox]::before,
+input[type=checkbox]:not(.toggle)::after,
+input[type=radio]::before,
+input[type=radio]::after {
+    content: "";
+    display: block; /* width & height doesn't work on inline elements */
+    transition: inherit;
+    /* Let's prevent the pseudo-elements from taking up layout space so that
+       the ::before and ::after pseudo-elements can be in the same place. This
+       is also required for vertical-align: baseline to work like we want it to
+       on radio/checkboxes. If the pseudo-elements take up layout space, the
+       baseline of text inside them will be used instead. */
+    position: absolute;
+}
+input[type=checkbox]:not(.toggle)::after,
+input[type=radio]::after {
+    width: 10px;
+    height: 2px;
+    background-color: transparent;
+    border-radius: 2px;
+}
+
+/* ------- CHECKBOXES ------- */
+
+input[type=checkbox]:not(.toggle) {
+    border-radius: 4px;
+}
+input[type=checkbox]:not(.toggle):checked,
+input[type=checkbox]:not(.toggle):indeterminate {
+    background-color: var(--novnc-blue);
+    background-image: var(--button-activation-overlay-light);
+    background-blend-mode: overlay;
+}
+input[type=checkbox]:not(.toggle)::before {
+    width: 25%;
+    height: 55%;
+    border-style: solid;
+    border-color: transparent;
+    border-width: 0 2px 2px 0;
+    border-radius: 1px;
+    transform: translateY(-1px) rotate(35deg);
+}
+input[type=checkbox]:not(.toggle):checked::before {
+    border-color: white;
+}
+input[type=checkbox]:not(.toggle):indeterminate::after {
+    background-color: white;
+}
+
+/* ------- RADIO BUTTONS ------- */
+
+input[type=radio] {
+    border-radius: 50%;
+    border: 1px solid transparent; /* To ensure a smooth transition */
+}
+input[type=radio]:checked {
+    border: 4px solid var(--novnc-blue);
+    background-color: white;
+    /* button-activation-overlay should be removed from the radio
+       element to not interfere with button-activation-overlay-light
+       that is set on the ::before element. */
+    background-image: none;
+}
+input[type=radio]::before {
+    width: inherit;
+    height: inherit;
+    border-radius: inherit;
+    /* We can achieve the highlight overlay effect on border colors by
+       setting button-activation-overlay-light on an element that stays
+       on top (z-axis) of the element with a border. */
+    background-image: var(--button-activation-overlay-light);
+    mix-blend-mode: overlay;
+    opacity: 0;
+}
+input[type=radio]:checked::before {
+    opacity: 1;
+}
+input[type=radio]:indeterminate::after {
+    background-color: black;
+}
+
+/* ------- TOGGLE SWITCHES ------- */
+
+/* These are meant to be used instead of checkboxes in some cases. If all of
+   the following critera are true you should use a toggle switch:
+
+    * The choice is a simple ON/OFF or ENABLE/DISABLE
+    * The choice doesn't give the feeling of "I agree" or "I confirm"
+    * There are not multiple related & grouped options
+ */
+
+input[type=checkbox].toggle {
+    display: inline-block;
+    --checkradio-height: 18px; /* Height value used in calc, see above */
+    width: 31px;
+    cursor: pointer;
+    user-select: none;
+    -webkit-user-select: none;
+    border-radius: 9px;
+}
+input[type=checkbox].toggle:disabled {
+    cursor: default;
+}
+input[type=checkbox].toggle:indeterminate {
+    background-color: var(--novnc-buttongrey);
+    background-image: var(--button-activation-overlay);
+}
+input[type=checkbox].toggle:checked {
+    background-color: var(--novnc-blue);
+    background-image: var(--button-activation-overlay-light);
+    background-blend-mode: overlay;
+}
+input[type=checkbox].toggle::before {
+    --circle-diameter: 10px;
+    --circle-offset: 4px;
+    width: var(--circle-diameter);
+    height: var(--circle-diameter);
+    top: var(--circle-offset);
+    left: var(--circle-offset);
+    background: white;
+    border-radius: 6px;
+}
+input[type=checkbox].toggle:checked::before {
+    left: calc(100% - var(--circle-offset) - var(--circle-diameter));
+}
+input[type=checkbox].toggle:indeterminate::before {
+    left: calc(50% - var(--circle-diameter) / 2);
+}
+
+/* ------- RANGE SLIDERS ------- */
+
+input[type=range] {
+    border: unset;
+    border-radius: 8px;
+    height: 15px;
+    padding: 0;
+    background: transparent;
+    /* Needed to get properly rounded corners on -moz-range-progress
+       when the thumb is all the way to the right. Without overflow
+       hidden, the pointy edges of the progress track shows to the
+       right of the thumb. */
+    overflow: hidden;
+}
+@supports selector(::-webkit-slider-thumb) {
+    input[type=range] {
+        /* Needs a fixed width to match clip-path */
+        width: 125px;
+        /* overflow: hidden is not ideal for hiding the left part of the box
+           shadow of -webkit-slider-thumb since it doesn't match the smaller
+           border-radius of the progress track. The below clip-path has two
+           circular sides to make the ends of the track have correctly rounded
+           corners. The clip path shape looks something like this:
+
+                  +-------------------------------+
+              /---|                               |---\
+             |                                         |
+              \---|                               |---/
+                  +-------------------------------+
+
+           The larger middle part of the clip path is made to have room for the
+           thumb. By using margins on the track, we prevent the thumb from
+           touching the ends of the track.
+         */
+        clip-path: path(' \
+         M 4.5 3 \
+         L 4.5 0 \
+         L 120.5 0 \
+         L 120.5 3 \
+         A 1 1 0 0 1 120.5 12 \
+         L 120.5 15 \
+         L 4.5 15 \
+         L 4.5 12 \
+         A 1 1 0 0 1 4.5 3 \
+        ');
+    }
+}
+input[type=range]:hover {
+    cursor: grab;
+}
+input[type=range]:active {
+    cursor: grabbing;
+}
+input[type=range]:disabled {
+    cursor: default;
+}
+input[type=range]:focus-visible {
+    clip-path: none; /* Otherwise it hides the outline */
+}
+/* -webkit-slider.. & -moz-range.. cant be in selector lists:
+   https://bugs.chromium.org/p/chromium/issues/detail?id=1154623 */
+input[type=range]::-webkit-slider-runnable-track {
+    background-color: var(--novnc-buttongrey);
+    height: 7px;
+    border-radius: 4px;
+    margin: 0 3px;
+}
+input[type=range]::-moz-range-track {
+    background-color: var(--novnc-buttongrey);
+    height: 7px;
+    border-radius: 4px;
+}
+input[type=range]::-moz-range-progress {
+    background-color: var(--novnc-blue);
+    height: 9px;
+    /* Needs rounded corners only on the left side. Otherwise the rounding of
+       the progress track starts before the thumb, when the thumb is close to
+       the left edge. */
+    border-radius: 5px 0 0 5px;
+}
+input[type=range]::-webkit-slider-thumb {
+    appearance: none;
+    width: 15px;
+    height: 15px;
+    border-radius: 50%;
+    background-color: white;
+    background-image: var(--button-activation-overlay);
+    /* Disable Chrome's touch tap highlight to avoid conflicts with overlay */
+    -webkit-tap-highlight-color: transparent;
+    border: 3px solid var(--novnc-blue);
+    margin-top: -4px; /* (track height / 2) - (thumb height /2) */
+
+    /* Since there is no way to style the left part of the range track in
+       webkit, we add a large shadow (1000px wide) to the left of the thumb and
+       then crop it with a clip-path shaped like this:
+                              ___
+        +-------------------/     \
+        |      progress     |Thumb|
+        +-------------------\ ___ /
+
+        The large left part of the shadow is clipped by another clip-path on on
+        the main range input element. */
+    /* FIXME: We can remove the box shadow workaround when this is standardized:
+              https://github.com/w3c/csswg-drafts/issues/4410 */
+
+    box-shadow: calc(-100vw - 8px) 0 0 100vw var(--novnc-blue);
+    clip-path: path(' \
+     M -1000 3 \
+     L 3 3 \
+     L 15 7.5 \
+     A 1 1 0 0 1 0 7.5 \
+     A 1 1 0 0 1 15 7.5 \
+     L 3 12 \
+     L -1000 12 Z \
+    ');
+}
+input[type=range]::-moz-range-thumb {
+    appearance: none;
+    width: 15px;
+    height: 15px;
+    border-radius: 50%;
+    box-sizing: border-box;
+    background-color: white;
+    background-image: var(--button-activation-overlay);
+    border: 3px solid var(--novnc-blue);
+    margin-top: -7px;
+}
+
+/* ------- FILE CHOOSERS ------- */
+
+input[type=file] {
+    background-image: none;
+    border: none;
+}
+input::file-selector-button {
+    margin-right: 6px;
+}
+input[type=file]:focus-visible {
+    outline: none; /* We outline the button instead of the entire element */
+}
+
+/* ------- SELECT BUTTONS ------- */
+
+select {
+    --select-arrow: url('data:image/svg+xml;utf8, \
+        <svg width="11" height="6" version="1.1" viewBox="0 0 11 6" \
+             xmlns="http://www.w3.org/2000/svg"> \
+            <path d="m10.5.5-5 5-5-5" fill="none" \
+                  stroke="black" stroke-width="1.5" \
+                  stroke-linecap="round" stroke-linejoin="round"/> \
+        </svg>');
+
+    /* FIXME: A bug in Firefox, requires a workaround for the background:
+              https://bugzilla.mozilla.org/show_bug.cgi?id=1810958 */
+    /* The dropdown list will show the select element's background above and
+       below the options in Firefox. We want the entire dropdown to be white. */
+    background-color: white;
+    /* However, we don't want the select element to actually show a white
+       background, so let's place a gradient above it with the color we want. */
+    --grey-background: linear-gradient(var(--novnc-buttongrey) 100%,
+                                       transparent);
+    background-image:
+        var(--select-arrow),
+        var(--button-activation-overlay),
+        var(--grey-background);
+    background-position: calc(100% - var(--input-xpadding)), left top, left top;
+    background-repeat: no-repeat;
+    padding-right: calc(2*var(--input-xpadding) + 11px);
+    overflow: auto;
+}
+/* FIXME: :active isn't set when the <select> is opened in Firefox:
+          https://bugzilla.mozilla.org/show_bug.cgi?id=1805406 */
+select:active {
+    /* Rotated arrow */
+    background-image: url('data:image/svg+xml;utf8, \
+        <svg width="11" height="6" version="1.1" viewBox="0 0 11 6" \
+             xmlns="http://www.w3.org/2000/svg" transform="rotate(180)"> \
+            <path d="m10.5.5-5 5-5-5" fill="none" \
+                  stroke="black" stroke-width="1.5" \
+                  stroke-linecap="round" stroke-linejoin="round"/> \
+        </svg>'),
+        var(--button-activation-overlay),
+        var(--grey-background);
 }
 select:disabled {
-  background-image: var(--select-arrow), var(--bg-gradient);
+    background-image:
+        var(--select-arrow),
+        var(--grey-background);
 }
-input[type=image]:disabled {
-  /* See Firefox bug:
-     https://bugzilla.mozilla.org/show_bug.cgi?id=1798304 */
-  cursor: default;
+/* Note that styling for <option> doesn't work in all browsers
+   since its often drawn directly by the OS. We are generally very
+   limited in what we can change here. */
+option {
+    /* Prevent Chrome from inheriting background-color from the <select> */
+    background-color: white;
+    color: black;
+    font-weight: normal;
+    background-image: var(--button-activation-overlay);
+}
+option:checked {
+    background-color: var(--novnc-lightgrey);
+}
+/* Change the look when the <select> isn't used as a dropdown. When "size"
+   or "multiple" are set, these elements behaves more like lists. */
+select[size]:not([size="1"]), select[multiple] {
+    background-color: white;
+    background-image: unset; /* Don't show the arrow and other gradients */
+    border: 1px solid var(--novnc-lightgrey);
+    padding: 0;
+    font-weight: normal; /* Without this, options get bold font in WebKit. */
+
+    /* As an exception to the "list"-look, multi-selects in Chrome on Android,
+       and Safari on iOS, are unfortunately designed to be shown as a single
+       line. We can mitigate this inconsistency by at least fixing the height
+       here. By setting a min-height that matches other input elements, it
+       doesn't look too much out of place:
+         (1px border * 2) + (6.5px padding * 2) + 24px line-height = 39px */
+    min-height: 39px;
+}
+select[size]:not([size="1"]):focus-visible,
+select[multiple]:focus-visible {
+    /* Text input style focus-visible highlight */
+    outline-offset: -1px;
+}
+select[size]:not([size="1"]) option, select[multiple] option {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding: 4px var(--input-xpadding);
 }
diff --git a/systemvm/agent/noVNC/app/ui.js b/systemvm/agent/noVNC/app/ui.js
index e99d763d60c..75f2eb03f71 100644
--- a/systemvm/agent/noVNC/app/ui.js
+++ b/systemvm/agent/noVNC/app/ui.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -20,8 +20,12 @@ import * as WebUtil from "./webutil.js";
 
 const PAGE_TITLE = "noVNC";
 
+const LINGUAS = ["cs", "de", "el", "es", "fr", "it", "ja", "ko", "nl", "pl", "pt_BR", "ru", "sv", "tr", "zh_CN", "zh_TW"];
+
 const UI = {
 
+    customSettings: {},
+
     connected: false,
     desktopName: "",
 
@@ -41,23 +45,33 @@ const UI = {
     inhibitReconnect: true,
     reconnectCallback: null,
     reconnectPassword: null,
-
     fullScreen: false,
 
-    prime() {
-        return WebUtil.initSettings().then(() => {
-            if (document.readyState === "interactive" || document.readyState === "complete") {
-                return UI.start();
-            }
+    async start(options={}) {
+        UI.customSettings = options.settings || {};
+        if (UI.customSettings.defaults === undefined) {
+            UI.customSettings.defaults = {};
+        }
+        if (UI.customSettings.mandatory === undefined) {
+            UI.customSettings.mandatory = {};
+        }
 
-            return new Promise((resolve, reject) => {
-                document.addEventListener('DOMContentLoaded', () => UI.start().then(resolve).catch(reject));
+        // Set up translations
+        try {
+            await l10n.setup(LINGUAS, "app/locale/");
+        } catch (err) {
+            Log.Error("Failed to load translations: " + err);
+        }
+
+        // Initialize setting storage
+        await WebUtil.initSettings();
+
+        // Wait for the page to load
+        if (document.readyState !== "interactive" && document.readyState !== "complete") {
+            await new Promise((resolve, reject) => {
+                document.addEventListener('DOMContentLoaded', resolve);
             });
-        });
-    },
-
-    // Render default UI and initialize settings menu
-    start() {
+        }
 
         UI.initSettings();
 
@@ -68,26 +82,24 @@ const UI = {
         // insecure context
         if (!window.isSecureContext) {
             // FIXME: This gets hidden when connecting
-            UI.showStatus(_("HTTPS is required for full functionality"), 'error');
+            UI.showStatus(_("Running without HTTPS is not recommended, crashes or other issues are likely."), 'error');
         }
 
         // Try to fetch version number
-        fetch('./package.json')
-            .then((response) => {
-                if (!response.ok) {
-                    throw Error("" + response.status + " " + response.statusText);
-                }
-                return response.json();
-            })
-            .then((packageInfo) => {
-                Array.from(document.getElementsByClassName('noVNC_version')).forEach(el => el.innerText = packageInfo.version);
-            })
-            .catch((err) => {
-                Log.Error("Couldn't fetch package.json: " + err);
-                Array.from(document.getElementsByClassName('noVNC_version_wrapper'))
-                    .concat(Array.from(document.getElementsByClassName('noVNC_version_separator')))
-                    .forEach(el => el.style.display = 'none');
-            });
+        try {
+            let response = await fetch('./package.json');
+            if (!response.ok) {
+                throw Error("" + response.status + " " + response.statusText);
+            }
+
+            let packageInfo = await response.json();
+            Array.from(document.getElementsByClassName('noVNC_version')).forEach(el => el.innerText = packageInfo.version);
+        } catch (err) {
+            Log.Error("Couldn't fetch package.json: " + err);
+            Array.from(document.getElementsByClassName('noVNC_version_wrapper'))
+                .concat(Array.from(document.getElementsByClassName('noVNC_version_separator')))
+                .forEach(el => el.style.display = 'none');
+        }
 
         // Adapt the interface for touch screen devices
         if (isTouchDevice) {
@@ -122,7 +134,7 @@ const UI = {
 
         document.documentElement.classList.remove("noVNC_loading");
 
-        let autoconnect = WebUtil.getConfigVar('autoconnect', false);
+        let autoconnect = UI.getSetting('autoconnect');
         if (autoconnect === 'true' || autoconnect == '1') {
             autoconnect = true;
             UI.connect();
@@ -131,8 +143,6 @@ const UI = {
             // Show the connect panel on first load unless autoconnecting
             UI.openConnectPanel();
         }
-
-        return Promise.resolve(UI.rfb);
     },
 
     initFullscreen() {
@@ -160,6 +170,8 @@ const UI = {
         UI.initSetting('logging', 'warn');
         UI.updateLogging();
 
+        UI.setupSettingLabels();
+
         // if port == 80 (or 443) then it won't be present and should be
         // set manually
         let port = window.location.port;
@@ -177,19 +189,20 @@ const UI = {
         UI.initSetting('port', port);
         UI.initSetting('token', window.location.token);
         UI.initSetting('encrypt', (window.location.protocol === "https:"));
+        UI.initSetting('password');
+        UI.initSetting('autoconnect', false);
         UI.initSetting('view_clip', false);
         UI.initSetting('resize', 'off');
         UI.initSetting('quality', 6);
         UI.initSetting('compression', 2);
         UI.initSetting('shared', true);
+        UI.initSetting('bell', 'on');
         UI.initSetting('view_only', false);
         UI.initSetting('show_dot', false);
         UI.initSetting('path', 'websockify');
         UI.initSetting('repeaterID', '');
         UI.initSetting('reconnect', false);
         UI.initSetting('reconnect_delay', 5000);
-
-        UI.setupSettingLabels();
     },
     // Adds a link to the label elements on the corresponding input elements
     setupSettingLabels() {
@@ -767,6 +780,10 @@ const UI = {
 
     // Initial page load read/initialization of settings
     initSetting(name, defVal) {
+        // Has the user overridden the default value?
+        if (name in UI.customSettings.defaults) {
+            defVal = UI.customSettings.defaults[name];
+        }
         // Check Query string followed by cookie
         let val = WebUtil.getConfigVar(name);
         if (val === null) {
@@ -774,6 +791,11 @@ const UI = {
         }
         WebUtil.setSetting(name, val);
         UI.updateSetting(name);
+        // Has the user forced a value?
+        if (name in UI.customSettings.mandatory) {
+            val = UI.customSettings.mandatory[name];
+            UI.forceSetting(name, val);
+        }
         return val;
     },
 
@@ -792,9 +814,12 @@ const UI = {
         let value = UI.getSetting(name);
 
         const ctrl = document.getElementById('noVNC_setting_' + name);
+        if (ctrl === null) {
+            return;
+        }
+
         if (ctrl.type === 'checkbox') {
             ctrl.checked = value;
-
         } else if (typeof ctrl.options !== 'undefined') {
             for (let i = 0; i < ctrl.options.length; i += 1) {
                 if (ctrl.options[i].value === value) {
@@ -827,7 +852,8 @@ const UI = {
     getSetting(name) {
         const ctrl = document.getElementById('noVNC_setting_' + name);
         let val = WebUtil.readSetting(name);
-        if (typeof val !== 'undefined' && val !== null && ctrl.type === 'checkbox') {
+        if (typeof val !== 'undefined' && val !== null &&
+            ctrl !== null && ctrl.type === 'checkbox') {
             if (val.toString().toLowerCase() in {'0': 1, 'no': 1, 'false': 1}) {
                 val = false;
             } else {
@@ -842,14 +868,22 @@ const UI = {
     // disable the labels that belong to disabled input elements.
     disableSetting(name) {
         const ctrl = document.getElementById('noVNC_setting_' + name);
-        ctrl.disabled = true;
-        ctrl.label.classList.add('noVNC_disabled');
+        if (ctrl !== null) {
+            ctrl.disabled = true;
+            if (ctrl.label !== undefined) {
+                ctrl.label.classList.add('noVNC_disabled');
+            }
+        }
     },
 
     enableSetting(name) {
         const ctrl = document.getElementById('noVNC_setting_' + name);
-        ctrl.disabled = false;
-        ctrl.label.classList.remove('noVNC_disabled');
+        if (ctrl !== null) {
+            ctrl.disabled = false;
+            if (ctrl.label !== undefined) {
+                ctrl.label.classList.remove('noVNC_disabled');
+            }
+        }
     },
 
 /* ------^-------
@@ -1040,7 +1074,7 @@ const UI = {
         const extra = UI.getSetting('extra');
 
         if (typeof password === 'undefined') {
-            password = WebUtil.getConfigVar('password');
+            password = UI.getSetting('password');
             UI.reconnectPassword = password;
         }
 
@@ -1050,36 +1084,55 @@ const UI = {
 
         UI.hideStatus();
 
-        if (!host) {
-            Log.Error("Can't connect when host is: " + host);
-            UI.showStatus(_("Must set host"), 'error');
-            return;
-        }
-
         UI.closeConnectPanel();
 
         UI.updateVisualState('connecting');
 
         let url;
 
-        url = UI.getSetting('encrypt') ? 'wss' : 'ws';
+        if (host) {
+            url = new URL("https://" + host);
 
-        url += '://' + host;
-        if (port) {
-            url += ':' + port;
+            url.protocol = UI.getSetting('encrypt') ? 'wss:' : 'ws:';
+            if (port) {
+                url.port = port;
+            }
+
+            // "./" is needed to force URL() to interpret the path-variable as
+            // a path and not as an URL. This is relevant if for example path
+            // starts with more than one "/", in which case it would be
+            // interpreted as a host name instead.
+            url = new URL("./" + path, url);
+        } else {
+            // Current (May 2024) browsers support relative WebSocket
+            // URLs natively, but we need to support older browsers for
+            // some time.
+            url = new URL(path, location.href);
+            url.protocol = (window.location.protocol === "https:") ? 'wss:' : 'ws:';
         }
-        url += '/' + path;
-        url += '?token=' + token;
+
+        url.href += '/' + path;
+        url.href += '?token=' + token;
 
         if (extra) {
-            url += '&extra=' + extra
+            url.href += '&extra=' + extra
+        }
+
+
+        try {
+            UI.rfb = new RFB(document.getElementById('noVNC_container'),
+                             url.href,
+                             { shared: UI.getSetting('shared'),
+                               repeaterID: UI.getSetting('repeaterID'),
+                               language: WebUtil.getConfigVar('language'),
+                               credentials: { password: password } });
+        } catch (exc) {
+            Log.Error("Failed to connect to server: " + exc);
+            UI.updateVisualState('disconnected');
+            UI.showStatus(_("Failed to connect to server: ") + exc, 'error');
+            return;
         }
 
-        UI.rfb = new RFB(document.getElementById('noVNC_container'), url,
-                         { shared: UI.getSetting('shared'),
-                           repeaterID: UI.getSetting('repeaterID'),
-                           language: WebUtil.getConfigVar('language'),
-                           credentials: { password: password } });
         UI.rfb.addEventListener("connect", UI.connectFinished);
         UI.rfb.addEventListener("disconnect", UI.disconnectFinished);
         UI.rfb.addEventListener("serververification", UI.serverVerify);
@@ -1758,7 +1811,7 @@ const UI = {
     },
 
     bell(e) {
-        if (WebUtil.getConfigVar('bell', 'on') === 'on') {
+        if (UI.getSetting('bell') === 'on') {
             const promise = document.getElementById('noVNC_bell').play();
             // The standards disagree on the return value here
             if (promise) {
@@ -1789,22 +1842,4 @@ const UI = {
  */
 };
 
-// Set up translations
-const LINGUAS = ["cs", "de", "el", "es", "fr", "it", "ja", "ko", "nl", "pl", "pt_BR", "ru", "sv", "tr", "zh_CN", "zh_TW"];
-l10n.setup(LINGUAS);
-if (l10n.language === "en" || l10n.dictionary !== undefined) {
-    UI.prime();
-} else {
-    fetch('app/locale/' + l10n.language + '.json')
-        .then((response) => {
-            if (!response.ok) {
-                throw Error("" + response.status + " " + response.statusText);
-            }
-            return response.json();
-        })
-        .then((translations) => { l10n.dictionary = translations; })
-        .catch(err => Log.Error("Failed to load translations: " + err))
-        .then(UI.prime);
-}
-
 export default UI;
diff --git a/systemvm/agent/noVNC/app/webutil.js b/systemvm/agent/noVNC/app/webutil.js
index 7ab5aa170a2..a8aabf16009 100644
--- a/systemvm/agent/noVNC/app/webutil.js
+++ b/systemvm/agent/noVNC/app/webutil.js
@@ -1,21 +1,21 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
  */
 
-import { initLogging as mainInitLogging } from '../core/util/logging.js';
+import * as Log from '../core/util/logging.js';
 
 // init log level reading the logging HTTP param
 export function initLogging(level) {
     "use strict";
     if (typeof level !== "undefined") {
-        mainInitLogging(level);
+        Log.initLogging(level);
     } else {
         const param = document.location.href.match(/logging=([A-Za-z0-9._-]*)/);
-        mainInitLogging(param || undefined);
+        Log.initLogging(param || undefined);
     }
 }
 
@@ -25,14 +25,14 @@ export function initLogging(level) {
 //
 // For privacy (Using a hastag #, the parameters will not be sent to the server)
 // the url can be requested in the following way:
-// https://www.example.com#myqueryparam=myvalue&password=secreatvalue
+// https://www.example.com#myqueryparam=myvalue&password=secretvalue
 //
-// Even Mixing public and non public parameters will work:
-// https://www.example.com?nonsecretparam=example.com#password=secreatvalue
+// Even mixing public and non public parameters will work:
+// https://www.example.com?nonsecretparam=example.com#password=secretvalue
 export function getQueryVar(name, defVal) {
     "use strict";
     const re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
-          match = ''.concat(document.location.href, window.location.hash).match(re);
+          match = document.location.href.match(re);
     if (typeof defVal === 'undefined') { defVal = null; }
 
     if (match) {
@@ -138,13 +138,22 @@ export function writeSetting(name, value) {
     "use strict";
     if (settings[name] === value) return;
     settings[name] = value;
+    if (window.chrome && window.chrome.storage) {
+        window.chrome.storage.sync.set(settings);
+    } else {
+        localStorageSet(name, value);
+    }
 }
 
 export function readSetting(name, defaultValue) {
     "use strict";
     let value;
-    value = settings[name];
-
+    if ((name in settings) || (window.chrome && window.chrome.storage)) {
+        value = settings[name];
+    } else {
+        value = localStorageGet(name);
+        settings[name] = value;
+    }
     if (typeof value === "undefined") {
         value = null;
     }
@@ -164,4 +173,73 @@ export function eraseSetting(name) {
     // between this delete and the next read, it could lead to an unexpected
     // value change.
     delete settings[name];
+    if (window.chrome && window.chrome.storage) {
+        window.chrome.storage.sync.remove(name);
+    } else {
+        localStorageRemove(name);
+    }
+}
+
+let loggedMsgs = [];
+function logOnce(msg, level = "warn") {
+    if (!loggedMsgs.includes(msg)) {
+        switch (level) {
+            case "error":
+                Log.Error(msg);
+                break;
+            case "warn":
+                Log.Warn(msg);
+                break;
+            case "debug":
+                Log.Debug(msg);
+                break;
+            default:
+                Log.Info(msg);
+        }
+        loggedMsgs.push(msg);
+    }
+}
+
+let cookiesMsg = "Couldn't access noVNC settings, are cookies disabled?";
+
+function localStorageGet(name) {
+    let r;
+    try {
+        r = localStorage.getItem(name);
+    } catch (e) {
+        if (e instanceof DOMException) {
+            logOnce(cookiesMsg);
+            logOnce("'localStorage.getItem(" + name + ")' failed: " + e,
+                    "debug");
+        } else {
+            throw e;
+        }
+    }
+    return r;
+}
+function localStorageSet(name, value) {
+    try {
+        localStorage.setItem(name, value);
+    } catch (e) {
+        if (e instanceof DOMException) {
+            logOnce(cookiesMsg);
+            logOnce("'localStorage.setItem(" + name + "," + value +
+                    ")' failed: " + e, "debug");
+        } else {
+            throw e;
+        }
+    }
+}
+function localStorageRemove(name) {
+    try {
+        localStorage.removeItem(name);
+    } catch (e) {
+        if (e instanceof DOMException) {
+            logOnce(cookiesMsg);
+            logOnce("'localStorage.removeItem(" + name + ")' failed: " + e,
+                    "debug");
+        } else {
+            throw e;
+        }
+    }
 }
diff --git a/systemvm/agent/noVNC/core/crypto/aes.js b/systemvm/agent/noVNC/core/crypto/aes.js
new file mode 100644
index 00000000000..e6aaea7c2f4
--- /dev/null
+++ b/systemvm/agent/noVNC/core/crypto/aes.js
@@ -0,0 +1,178 @@
+export class AESECBCipher {
+    constructor() {
+        this._key = null;
+    }
+
+    get algorithm() {
+        return { name: "AES-ECB" };
+    }
+
+    static async importKey(key, _algorithm, extractable, keyUsages) {
+        const cipher = new AESECBCipher;
+        await cipher._importKey(key, extractable, keyUsages);
+        return cipher;
+    }
+
+    async _importKey(key, extractable, keyUsages) {
+        this._key = await window.crypto.subtle.importKey(
+            "raw", key, {name: "AES-CBC"}, extractable, keyUsages);
+    }
+
+    async encrypt(_algorithm, plaintext) {
+        const x = new Uint8Array(plaintext);
+        if (x.length % 16 !== 0 || this._key === null) {
+            return null;
+        }
+        const n = x.length / 16;
+        for (let i = 0; i < n; i++) {
+            const y = new Uint8Array(await window.crypto.subtle.encrypt({
+                name: "AES-CBC",
+                iv: new Uint8Array(16),
+            }, this._key, x.slice(i * 16, i * 16 + 16))).slice(0, 16);
+            x.set(y, i * 16);
+        }
+        return x;
+    }
+}
+
+export class AESEAXCipher {
+    constructor() {
+        this._rawKey = null;
+        this._ctrKey = null;
+        this._cbcKey = null;
+        this._zeroBlock = new Uint8Array(16);
+        this._prefixBlock0 = this._zeroBlock;
+        this._prefixBlock1 = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+        this._prefixBlock2 = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]);
+    }
+
+    get algorithm() {
+        return { name: "AES-EAX" };
+    }
+
+    async _encryptBlock(block) {
+        const encrypted = await window.crypto.subtle.encrypt({
+            name: "AES-CBC",
+            iv: this._zeroBlock,
+        }, this._cbcKey, block);
+        return new Uint8Array(encrypted).slice(0, 16);
+    }
+
+    async _initCMAC() {
+        const k1 = await this._encryptBlock(this._zeroBlock);
+        const k2 = new Uint8Array(16);
+        const v = k1[0] >>> 6;
+        for (let i = 0; i < 15; i++) {
+            k2[i] = (k1[i + 1] >> 6) | (k1[i] << 2);
+            k1[i] = (k1[i + 1] >> 7) | (k1[i] << 1);
+        }
+        const lut = [0x0, 0x87, 0x0e, 0x89];
+        k2[14] ^= v >>> 1;
+        k2[15] = (k1[15] << 2) ^ lut[v];
+        k1[15] = (k1[15] << 1) ^ lut[v >> 1];
+        this._k1 = k1;
+        this._k2 = k2;
+    }
+
+    async _encryptCTR(data, counter) {
+        const encrypted = await window.crypto.subtle.encrypt({
+            name: "AES-CTR",
+            counter: counter,
+            length: 128
+        }, this._ctrKey, data);
+        return new Uint8Array(encrypted);
+    }
+
+    async _decryptCTR(data, counter) {
+        const decrypted = await window.crypto.subtle.decrypt({
+            name: "AES-CTR",
+            counter: counter,
+            length: 128
+        }, this._ctrKey, data);
+        return new Uint8Array(decrypted);
+    }
+
+    async _computeCMAC(data, prefixBlock) {
+        if (prefixBlock.length !== 16) {
+            return null;
+        }
+        const n = Math.floor(data.length / 16);
+        const m = Math.ceil(data.length / 16);
+        const r = data.length - n * 16;
+        const cbcData = new Uint8Array((m + 1) * 16);
+        cbcData.set(prefixBlock);
+        cbcData.set(data, 16);
+        if (r === 0) {
+            for (let i = 0; i < 16; i++) {
+                cbcData[n * 16 + i] ^= this._k1[i];
+            }
+        } else {
+            cbcData[(n + 1) * 16 + r] = 0x80;
+            for (let i = 0; i < 16; i++) {
+                cbcData[(n + 1) * 16 + i] ^= this._k2[i];
+            }
+        }
+        let cbcEncrypted = await window.crypto.subtle.encrypt({
+            name: "AES-CBC",
+            iv: this._zeroBlock,
+        }, this._cbcKey, cbcData);
+
+        cbcEncrypted = new Uint8Array(cbcEncrypted);
+        const mac = cbcEncrypted.slice(cbcEncrypted.length - 32, cbcEncrypted.length - 16);
+        return mac;
+    }
+
+    static async importKey(key, _algorithm, _extractable, _keyUsages) {
+        const cipher = new AESEAXCipher;
+        await cipher._importKey(key);
+        return cipher;
+    }
+
+    async _importKey(key) {
+        this._rawKey = key;
+        this._ctrKey = await window.crypto.subtle.importKey(
+            "raw", key, {name: "AES-CTR"}, false, ["encrypt", "decrypt"]);
+        this._cbcKey = await window.crypto.subtle.importKey(
+            "raw", key, {name: "AES-CBC"}, false, ["encrypt"]);
+        await this._initCMAC();
+    }
+
+    async encrypt(algorithm, message) {
+        const ad = algorithm.additionalData;
+        const nonce = algorithm.iv;
+        const nCMAC = await this._computeCMAC(nonce, this._prefixBlock0);
+        const encrypted = await this._encryptCTR(message, nCMAC);
+        const adCMAC = await this._computeCMAC(ad, this._prefixBlock1);
+        const mac = await this._computeCMAC(encrypted, this._prefixBlock2);
+        for (let i = 0; i < 16; i++) {
+            mac[i] ^= nCMAC[i] ^ adCMAC[i];
+        }
+        const res = new Uint8Array(16 + encrypted.length);
+        res.set(encrypted);
+        res.set(mac, encrypted.length);
+        return res;
+    }
+
+    async decrypt(algorithm, data) {
+        const encrypted = data.slice(0, data.length - 16);
+        const ad = algorithm.additionalData;
+        const nonce = algorithm.iv;
+        const mac = data.slice(data.length - 16);
+        const nCMAC = await this._computeCMAC(nonce, this._prefixBlock0);
+        const adCMAC = await this._computeCMAC(ad, this._prefixBlock1);
+        const computedMac = await this._computeCMAC(encrypted, this._prefixBlock2);
+        for (let i = 0; i < 16; i++) {
+            computedMac[i] ^= nCMAC[i] ^ adCMAC[i];
+        }
+        if (computedMac.length !== mac.length) {
+            return null;
+        }
+        for (let i = 0; i < mac.length; i++) {
+            if (computedMac[i] !== mac[i]) {
+                return null;
+            }
+        }
+        const res = await this._decryptCTR(encrypted, nCMAC);
+        return res;
+    }
+}
diff --git a/systemvm/agent/noVNC/core/crypto/bigint.js b/systemvm/agent/noVNC/core/crypto/bigint.js
new file mode 100644
index 00000000000..d34432650e7
--- /dev/null
+++ b/systemvm/agent/noVNC/core/crypto/bigint.js
@@ -0,0 +1,34 @@
+export function modPow(b, e, m) {
+    let r = 1n;
+    b = b % m;
+    while (e > 0n) {
+        if ((e & 1n) === 1n) {
+            r = (r * b) % m;
+        }
+        e = e >> 1n;
+        b = (b * b) % m;
+    }
+    return r;
+}
+
+export function bigIntToU8Array(bigint, padLength=0) {
+    let hex = bigint.toString(16);
+    if (padLength === 0) {
+        padLength = Math.ceil(hex.length / 2);
+    }
+    hex = hex.padStart(padLength * 2, '0');
+    const length = hex.length / 2;
+    const arr = new Uint8Array(length);
+    for (let i = 0; i < length; i++) {
+        arr[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+    }
+    return arr;
+}
+
+export function u8ArrayToBigInt(arr) {
+    let hex = '0x';
+    for (let i = 0; i < arr.length; i++) {
+        hex += arr[i].toString(16).padStart(2, '0');
+    }
+    return BigInt(hex);
+}
diff --git a/systemvm/agent/noVNC/core/crypto/crypto.js b/systemvm/agent/noVNC/core/crypto/crypto.js
new file mode 100644
index 00000000000..cc17da22855
--- /dev/null
+++ b/systemvm/agent/noVNC/core/crypto/crypto.js
@@ -0,0 +1,90 @@
+import { AESECBCipher, AESEAXCipher } from "./aes.js";
+import { DESCBCCipher, DESECBCipher } from "./des.js";
+import { RSACipher } from "./rsa.js";
+import { DHCipher } from "./dh.js";
+import { MD5 } from "./md5.js";
+
+// A single interface for the cryptographic algorithms not supported by SubtleCrypto.
+// Both synchronous and asynchronous implmentations are allowed.
+class LegacyCrypto {
+    constructor() {
+        this._algorithms = {
+            "AES-ECB": AESECBCipher,
+            "AES-EAX": AESEAXCipher,
+            "DES-ECB": DESECBCipher,
+            "DES-CBC": DESCBCCipher,
+            "RSA-PKCS1-v1_5": RSACipher,
+            "DH": DHCipher,
+            "MD5": MD5,
+        };
+    }
+
+    encrypt(algorithm, key, data) {
+        if (key.algorithm.name !== algorithm.name) {
+            throw new Error("algorithm does not match");
+        }
+        if (typeof key.encrypt !== "function") {
+            throw new Error("key does not support encryption");
+        }
+        return key.encrypt(algorithm, data);
+    }
+
+    decrypt(algorithm, key, data) {
+        if (key.algorithm.name !== algorithm.name) {
+            throw new Error("algorithm does not match");
+        }
+        if (typeof key.decrypt !== "function") {
+            throw new Error("key does not support encryption");
+        }
+        return key.decrypt(algorithm, data);
+    }
+
+    importKey(format, keyData, algorithm, extractable, keyUsages) {
+        if (format !== "raw") {
+            throw new Error("key format is not supported");
+        }
+        const alg = this._algorithms[algorithm.name];
+        if (typeof alg === "undefined" || typeof alg.importKey !== "function") {
+            throw new Error("algorithm is not supported");
+        }
+        return alg.importKey(keyData, algorithm, extractable, keyUsages);
+    }
+
+    generateKey(algorithm, extractable, keyUsages) {
+        const alg = this._algorithms[algorithm.name];
+        if (typeof alg === "undefined" || typeof alg.generateKey !== "function") {
+            throw new Error("algorithm is not supported");
+        }
+        return alg.generateKey(algorithm, extractable, keyUsages);
+    }
+
+    exportKey(format, key) {
+        if (format !== "raw") {
+            throw new Error("key format is not supported");
+        }
+        if (typeof key.exportKey !== "function") {
+            throw new Error("key does not support exportKey");
+        }
+        return key.exportKey();
+    }
+
+    digest(algorithm, data) {
+        const alg = this._algorithms[algorithm];
+        if (typeof alg !== "function") {
+            throw new Error("algorithm is not supported");
+        }
+        return alg(data);
+    }
+
+    deriveBits(algorithm, key, length) {
+        if (key.algorithm.name !== algorithm.name) {
+            throw new Error("algorithm does not match");
+        }
+        if (typeof key.deriveBits !== "function") {
+            throw new Error("key does not support deriveBits");
+        }
+        return key.deriveBits(algorithm, length);
+    }
+}
+
+export default new LegacyCrypto;
diff --git a/systemvm/agent/noVNC/core/des.js b/systemvm/agent/noVNC/core/crypto/des.js
similarity index 87%
rename from systemvm/agent/noVNC/core/des.js
rename to systemvm/agent/noVNC/core/crypto/des.js
index ba1ebde013c..8dab31fb43d 100644
--- a/systemvm/agent/noVNC/core/des.js
+++ b/systemvm/agent/noVNC/core/crypto/des.js
@@ -128,7 +128,7 @@ const SP8 = [b|f,z|e,a|z,c|f,b|z,b|f,z|d,b|z,a|d,c|z,c|f,a|e,c|e,a|f,z|e,z|d,
 
 /* eslint-enable comma-spacing */
 
-export default class DES {
+class DES {
     constructor(password) {
         this.keys = [];
 
@@ -258,9 +258,73 @@ export default class DES {
         }
         return b;
     }
+}
 
-    // Encrypt 16 bytes of text using passwd as key
-    encrypt(t) {
-        return this.enc8(t.slice(0, 8)).concat(this.enc8(t.slice(8, 16)));
+export class DESECBCipher {
+    constructor() {
+        this._cipher = null;
+    }
+
+    get algorithm() {
+        return { name: "DES-ECB" };
+    }
+
+    static importKey(key, _algorithm, _extractable, _keyUsages) {
+        const cipher = new DESECBCipher;
+        cipher._importKey(key);
+        return cipher;
+    }
+
+    _importKey(key, _extractable, _keyUsages) {
+        this._cipher = new DES(key);
+    }
+
+    encrypt(_algorithm, plaintext) {
+        const x = new Uint8Array(plaintext);
+        if (x.length % 8 !== 0 || this._cipher === null) {
+            return null;
+        }
+        const n = x.length / 8;
+        for (let i = 0; i < n; i++) {
+            x.set(this._cipher.enc8(x.slice(i * 8, i * 8 + 8)), i * 8);
+        }
+        return x;
+    }
+}
+
+export class DESCBCCipher {
+    constructor() {
+        this._cipher = null;
+    }
+
+    get algorithm() {
+        return { name: "DES-CBC" };
+    }
+
+    static importKey(key, _algorithm, _extractable, _keyUsages) {
+        const cipher = new DESCBCCipher;
+        cipher._importKey(key);
+        return cipher;
+    }
+
+    _importKey(key) {
+        this._cipher = new DES(key);
+    }
+
+    encrypt(algorithm, plaintext) {
+        const x = new Uint8Array(plaintext);
+        let y = new Uint8Array(algorithm.iv);
+        if (x.length % 8 !== 0 || this._cipher === null) {
+            return null;
+        }
+        const n = x.length / 8;
+        for (let i = 0; i < n; i++) {
+            for (let j = 0; j < 8; j++) {
+                y[j] ^= plaintext[i * 8 + j];
+            }
+            y = this._cipher.enc8(y);
+            x.set(y, i * 8);
+        }
+        return x;
     }
 }
diff --git a/systemvm/agent/noVNC/core/crypto/dh.js b/systemvm/agent/noVNC/core/crypto/dh.js
new file mode 100644
index 00000000000..bd705d9bf1d
--- /dev/null
+++ b/systemvm/agent/noVNC/core/crypto/dh.js
@@ -0,0 +1,55 @@
+import { modPow, bigIntToU8Array, u8ArrayToBigInt } from "./bigint.js";
+
+class DHPublicKey {
+    constructor(key) {
+        this._key = key;
+    }
+
+    get algorithm() {
+        return { name: "DH" };
+    }
+
+    exportKey() {
+        return this._key;
+    }
+}
+
+export class DHCipher {
+    constructor() {
+        this._g = null;
+        this._p = null;
+        this._gBigInt = null;
+        this._pBigInt = null;
+        this._privateKey = null;
+    }
+
+    get algorithm() {
+        return { name: "DH" };
+    }
+
+    static generateKey(algorithm, _extractable) {
+        const cipher = new DHCipher;
+        cipher._generateKey(algorithm);
+        return { privateKey: cipher, publicKey: new DHPublicKey(cipher._publicKey) };
+    }
+
+    _generateKey(algorithm) {
+        const g = algorithm.g;
+        const p = algorithm.p;
+        this._keyBytes = p.length;
+        this._gBigInt = u8ArrayToBigInt(g);
+        this._pBigInt = u8ArrayToBigInt(p);
+        this._privateKey = window.crypto.getRandomValues(new Uint8Array(this._keyBytes));
+        this._privateKeyBigInt = u8ArrayToBigInt(this._privateKey);
+        this._publicKey = bigIntToU8Array(modPow(
+            this._gBigInt, this._privateKeyBigInt, this._pBigInt), this._keyBytes);
+    }
+
+    deriveBits(algorithm, length) {
+        const bytes = Math.ceil(length / 8);
+        const pkey = new Uint8Array(algorithm.public);
+        const len = bytes > this._keyBytes ? bytes : this._keyBytes;
+        const secret = modPow(u8ArrayToBigInt(pkey), this._privateKeyBigInt, this._pBigInt);
+        return bigIntToU8Array(secret, len).slice(0, len);
+    }
+}
diff --git a/systemvm/agent/noVNC/core/util/md5.js b/systemvm/agent/noVNC/core/crypto/md5.js
similarity index 93%
rename from systemvm/agent/noVNC/core/util/md5.js
rename to systemvm/agent/noVNC/core/crypto/md5.js
index 3834916c3e9..b01ba6fd04b 100644
--- a/systemvm/agent/noVNC/core/util/md5.js
+++ b/systemvm/agent/noVNC/core/crypto/md5.js
@@ -1,18 +1,21 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2021 The noVNC Authors
+ * Copyright (C) 2021 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
  */
 
 /*
- * Performs MD5 hashing on a string of binary characters, returns an array of bytes
+ * Performs MD5 hashing on an array of bytes, returns an array of bytes
  */
 
-export function MD5(d) {
-    let r = M(V(Y(X(d), 8 * d.length)));
-    return r;
+export async function MD5(d) {
+    let s = "";
+    for (let i = 0; i < d.length; i++) {
+        s += String.fromCharCode(d[i]);
+    }
+    return M(V(Y(X(s), 8 * s.length)));
 }
 
 function M(d) {
diff --git a/systemvm/agent/noVNC/core/crypto/rsa.js b/systemvm/agent/noVNC/core/crypto/rsa.js
new file mode 100644
index 00000000000..68e8e869f91
--- /dev/null
+++ b/systemvm/agent/noVNC/core/crypto/rsa.js
@@ -0,0 +1,132 @@
+import Base64 from "../base64.js";
+import { modPow, bigIntToU8Array, u8ArrayToBigInt } from "./bigint.js";
+
+export class RSACipher {
+    constructor() {
+        this._keyLength = 0;
+        this._keyBytes = 0;
+        this._n = null;
+        this._e = null;
+        this._d = null;
+        this._nBigInt = null;
+        this._eBigInt = null;
+        this._dBigInt = null;
+        this._extractable = false;
+    }
+
+    get algorithm() {
+        return { name: "RSA-PKCS1-v1_5" };
+    }
+
+    _base64urlDecode(data) {
+        data = data.replace(/-/g, "+").replace(/_/g, "/");
+        data = data.padEnd(Math.ceil(data.length / 4) * 4, "=");
+        return Base64.decode(data);
+    }
+
+    _padArray(arr, length) {
+        const res = new Uint8Array(length);
+        res.set(arr, length - arr.length);
+        return res;
+    }
+
+    static async generateKey(algorithm, extractable, _keyUsages) {
+        const cipher = new RSACipher;
+        await cipher._generateKey(algorithm, extractable);
+        return { privateKey: cipher };
+    }
+
+    async _generateKey(algorithm, extractable) {
+        this._keyLength = algorithm.modulusLength;
+        this._keyBytes = Math.ceil(this._keyLength / 8);
+        const key = await window.crypto.subtle.generateKey(
+            {
+                name: "RSA-OAEP",
+                modulusLength: algorithm.modulusLength,
+                publicExponent: algorithm.publicExponent,
+                hash: {name: "SHA-256"},
+            },
+            true, ["encrypt", "decrypt"]);
+        const privateKey = await window.crypto.subtle.exportKey("jwk", key.privateKey);
+        this._n = this._padArray(this._base64urlDecode(privateKey.n), this._keyBytes);
+        this._nBigInt = u8ArrayToBigInt(this._n);
+        this._e = this._padArray(this._base64urlDecode(privateKey.e), this._keyBytes);
+        this._eBigInt = u8ArrayToBigInt(this._e);
+        this._d = this._padArray(this._base64urlDecode(privateKey.d), this._keyBytes);
+        this._dBigInt = u8ArrayToBigInt(this._d);
+        this._extractable = extractable;
+    }
+
+    static async importKey(key, _algorithm, extractable, keyUsages) {
+        if (keyUsages.length !== 1 || keyUsages[0] !== "encrypt") {
+            throw new Error("only support importing RSA public key");
+        }
+        const cipher = new RSACipher;
+        await cipher._importKey(key, extractable);
+        return cipher;
+    }
+
+    async _importKey(key, extractable) {
+        const n = key.n;
+        const e = key.e;
+        if (n.length !== e.length) {
+            throw new Error("the sizes of modulus and public exponent do not match");
+        }
+        this._keyBytes = n.length;
+        this._keyLength = this._keyBytes * 8;
+        this._n = new Uint8Array(this._keyBytes);
+        this._e = new Uint8Array(this._keyBytes);
+        this._n.set(n);
+        this._e.set(e);
+        this._nBigInt = u8ArrayToBigInt(this._n);
+        this._eBigInt = u8ArrayToBigInt(this._e);
+        this._extractable = extractable;
+    }
+
+    async encrypt(_algorithm, message) {
+        if (message.length > this._keyBytes - 11) {
+            return null;
+        }
+        const ps = new Uint8Array(this._keyBytes - message.length - 3);
+        window.crypto.getRandomValues(ps);
+        for (let i = 0; i < ps.length; i++) {
+            ps[i] = Math.floor(ps[i] * 254 / 255 + 1);
+        }
+        const em = new Uint8Array(this._keyBytes);
+        em[1] = 0x02;
+        em.set(ps, 2);
+        em.set(message, ps.length + 3);
+        const emBigInt = u8ArrayToBigInt(em);
+        const c = modPow(emBigInt, this._eBigInt, this._nBigInt);
+        return bigIntToU8Array(c, this._keyBytes);
+    }
+
+    async decrypt(_algorithm, message) {
+        if (message.length !== this._keyBytes) {
+            return null;
+        }
+        const msgBigInt = u8ArrayToBigInt(message);
+        const emBigInt = modPow(msgBigInt, this._dBigInt, this._nBigInt);
+        const em = bigIntToU8Array(emBigInt, this._keyBytes);
+        if (em[0] !== 0x00 || em[1] !== 0x02) {
+            return null;
+        }
+        let i = 2;
+        for (; i < em.length; i++) {
+            if (em[i] === 0x00) {
+                break;
+            }
+        }
+        if (i === em.length) {
+            return null;
+        }
+        return em.slice(i + 1, em.length);
+    }
+
+    async exportKey() {
+        if (!this._extractable) {
+            throw new Error("key is not extractable");
+        }
+        return { n: this._n, e: this._e, d: this._d };
+    }
+}
diff --git a/systemvm/agent/noVNC/core/decoders/copyrect.js b/systemvm/agent/noVNC/core/decoders/copyrect.js
index 9e6391a1733..3c7e0d5dc9e 100644
--- a/systemvm/agent/noVNC/core/decoders/copyrect.js
+++ b/systemvm/agent/noVNC/core/decoders/copyrect.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/decoders/h264.js b/systemvm/agent/noVNC/core/decoders/h264.js
new file mode 100644
index 00000000000..a508b674181
--- /dev/null
+++ b/systemvm/agent/noVNC/core/decoders/h264.js
@@ -0,0 +1,321 @@
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2024 The noVNC authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ *
+ */
+
+import * as Log from '../util/logging.js';
+
+export class H264Parser {
+    constructor(data) {
+        this._data = data;
+        this._index = 0;
+        this.profileIdc = null;
+        this.constraintSet = null;
+        this.levelIdc = null;
+    }
+
+    _getStartSequenceLen(index) {
+        let data = this._data;
+        if (data[index + 0] == 0 && data[index + 1] == 0 && data[index + 2] == 0 && data[index + 3] == 1) {
+            return 4;
+        }
+        if (data[index + 0] == 0 && data[index + 1] == 0 && data[index + 2] == 1) {
+            return 3;
+        }
+        return 0;
+    }
+
+    _indexOfNextNalUnit(index) {
+        let data = this._data;
+        for (let i = index; i < data.length; ++i) {
+            if (this._getStartSequenceLen(i) != 0) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    _parseSps(index) {
+        this.profileIdc = this._data[index];
+        this.constraintSet = this._data[index + 1];
+        this.levelIdc = this._data[index + 2];
+    }
+
+    _parseNalUnit(index) {
+        const firstByte = this._data[index];
+        if (firstByte & 0x80) {
+            throw new Error('H264 parsing sanity check failed, forbidden zero bit is set');
+        }
+        const unitType = firstByte & 0x1f;
+
+        switch (unitType) {
+            case 1: // coded slice, non-idr
+                return { slice: true };
+            case 5: // coded slice, idr
+                return { slice: true, key: true };
+            case 6: // sei
+                return {};
+            case 7: // sps
+                this._parseSps(index + 1);
+                return {};
+            case 8: // pps
+                return {};
+            default:
+                Log.Warn("Unhandled unit type: ", unitType);
+                break;
+        }
+        return {};
+    }
+
+    parse() {
+        const startIndex = this._index;
+        let isKey = false;
+
+        while (this._index < this._data.length) {
+            const startSequenceLen = this._getStartSequenceLen(this._index);
+            if (startSequenceLen == 0) {
+                throw new Error('Invalid start sequence in bit stream');
+            }
+
+            const { slice, key } = this._parseNalUnit(this._index + startSequenceLen);
+
+            let nextIndex = this._indexOfNextNalUnit(this._index + startSequenceLen);
+            if (nextIndex == -1) {
+                this._index = this._data.length;
+            } else {
+                this._index = nextIndex;
+            }
+
+            if (key) {
+                isKey = true;
+            }
+            if (slice) {
+                break;
+            }
+        }
+
+        if (startIndex === this._index) {
+            return null;
+        }
+
+        return {
+            frame: this._data.subarray(startIndex, this._index),
+            key: isKey,
+        };
+    }
+}
+
+export class H264Context {
+    constructor(width, height) {
+        this.lastUsed = 0;
+        this._width = width;
+        this._height = height;
+        this._profileIdc = null;
+        this._constraintSet = null;
+        this._levelIdc = null;
+        this._decoder = null;
+        this._pendingFrames = [];
+    }
+
+    _handleFrame(frame) {
+        let pending = this._pendingFrames.shift();
+        if (pending === undefined) {
+            throw new Error("Pending frame queue empty when receiving frame from decoder");
+        }
+
+        if (pending.timestamp != frame.timestamp) {
+            throw new Error("Video frame timestamp mismatch. Expected " +
+                frame.timestamp + " but but got " + pending.timestamp);
+        }
+
+        pending.frame = frame;
+        pending.ready = true;
+        pending.resolve();
+
+        if (!pending.keep) {
+            frame.close();
+        }
+    }
+
+    _handleError(e) {
+        throw new Error("Failed to decode frame: " + e.message);
+    }
+
+    _configureDecoder(profileIdc, constraintSet, levelIdc) {
+        if (this._decoder === null || this._decoder.state === 'closed') {
+            this._decoder = new VideoDecoder({
+                output: frame => this._handleFrame(frame),
+                error: e => this._handleError(e),
+            });
+        }
+        const codec = 'avc1.' +
+            profileIdc.toString(16).padStart(2, '0') +
+            constraintSet.toString(16).padStart(2, '0') +
+            levelIdc.toString(16).padStart(2, '0');
+        this._decoder.configure({
+            codec: codec,
+            codedWidth: this._width,
+            codedHeight: this._height,
+            optimizeForLatency: true,
+        });
+    }
+
+    _preparePendingFrame(timestamp) {
+        let pending = {
+            timestamp: timestamp,
+            promise: null,
+            resolve: null,
+            frame: null,
+            ready: false,
+            keep: false,
+        };
+        pending.promise = new Promise((resolve) => {
+            pending.resolve = resolve;
+        });
+        this._pendingFrames.push(pending);
+
+        return pending;
+    }
+
+    decode(payload) {
+        let parser = new H264Parser(payload);
+        let result = null;
+
+        // Ideally, this timestamp should come from the server, but we'll just
+        // approximate it instead.
+        let timestamp = Math.round(window.performance.now() * 1e3);
+
+        while (true) {
+            let encodedFrame = parser.parse();
+            if (encodedFrame === null) {
+                break;
+            }
+
+            if (parser.profileIdc !== null) {
+                self._profileIdc = parser.profileIdc;
+                self._constraintSet = parser.constraintSet;
+                self._levelIdc = parser.levelIdc;
+            }
+
+            if (this._decoder === null || this._decoder.state !== 'configured') {
+                if (!encodedFrame.key) {
+                    Log.Warn("Missing key frame. Can't decode until one arrives");
+                    continue;
+                }
+                if (self._profileIdc === null) {
+                    Log.Warn('Cannot config decoder. Have not received SPS and PPS yet.');
+                    continue;
+                }
+                this._configureDecoder(self._profileIdc, self._constraintSet,
+                                       self._levelIdc);
+            }
+
+            result = this._preparePendingFrame(timestamp);
+
+            const chunk = new EncodedVideoChunk({
+                timestamp: timestamp,
+                type: encodedFrame.key ? 'key' : 'delta',
+                data: encodedFrame.frame,
+            });
+
+            try {
+                this._decoder.decode(chunk);
+            } catch (e) {
+                Log.Warn("Failed to decode:", e);
+            }
+        }
+
+        // We only keep last frame of each payload
+        if (result !== null) {
+            result.keep = true;
+        }
+
+        return result;
+    }
+}
+
+export default class H264Decoder {
+    constructor() {
+        this._tick = 0;
+        this._contexts = {};
+    }
+
+    _contextId(x, y, width, height) {
+        return [x, y, width, height].join(',');
+    }
+
+    _findOldestContextId() {
+        let oldestTick = Number.MAX_VALUE;
+        let oldestKey = undefined;
+        for (const [key, value] of Object.entries(this._contexts)) {
+            if (value.lastUsed < oldestTick) {
+                oldestTick = value.lastUsed;
+                oldestKey = key;
+            }
+        }
+        return oldestKey;
+    }
+
+    _createContext(x, y, width, height) {
+        const maxContexts = 64;
+        if (Object.keys(this._contexts).length >= maxContexts) {
+            let oldestContextId = this._findOldestContextId();
+            delete this._contexts[oldestContextId];
+        }
+        let context = new H264Context(width, height);
+        this._contexts[this._contextId(x, y, width, height)] = context;
+        return context;
+    }
+
+    _getContext(x, y, width, height) {
+        let context = this._contexts[this._contextId(x, y, width, height)];
+        return context !== undefined ? context : this._createContext(x, y, width, height);
+    }
+
+    _resetContext(x, y, width, height) {
+        delete this._contexts[this._contextId(x, y, width, height)];
+    }
+
+    _resetAllContexts() {
+        this._contexts = {};
+    }
+
+    decodeRect(x, y, width, height, sock, display, depth) {
+        const resetContextFlag = 1;
+        const resetAllContextsFlag = 2;
+
+        if (sock.rQwait("h264 header", 8)) {
+            return false;
+        }
+
+        const length = sock.rQshift32();
+        const flags = sock.rQshift32();
+
+        if (sock.rQwait("h264 payload", length, 8)) {
+            return false;
+        }
+
+        if (flags & resetAllContextsFlag) {
+            this._resetAllContexts();
+        } else if (flags & resetContextFlag) {
+            this._resetContext(x, y, width, height);
+        }
+
+        let context = this._getContext(x, y, width, height);
+        context.lastUsed = this._tick++;
+
+        if (length !== 0) {
+            let payload = sock.rQshiftBytes(length, false);
+            let frame = context.decode(payload);
+            if (frame !== null) {
+                display.videoFrame(x, y, width, height, frame);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/systemvm/agent/noVNC/core/decoders/hextile.js b/systemvm/agent/noVNC/core/decoders/hextile.js
index ac21eff03db..db0792bd434 100644
--- a/systemvm/agent/noVNC/core/decoders/hextile.js
+++ b/systemvm/agent/noVNC/core/decoders/hextile.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -31,10 +31,7 @@ export default class HextileDecoder {
                 return false;
             }
 
-            let rQ = sock.rQ;
-            let rQi = sock.rQi;
-
-            let subencoding = rQ[rQi];  // Peek
+            let subencoding = sock.rQpeek8();
             if (subencoding > 30) {  // Raw
                 throw new Error("Illegal hextile subencoding (subencoding: " +
                             subencoding + ")");
@@ -65,7 +62,7 @@ export default class HextileDecoder {
                         return false;
                     }
 
-                    let subrects = rQ[rQi + bytes - 1];  // Peek
+                    let subrects = sock.rQpeekBytes(bytes).at(-1);
                     if (subencoding & 0x10) {  // SubrectsColoured
                         bytes += subrects * (4 + 2);
                     } else {
@@ -79,7 +76,7 @@ export default class HextileDecoder {
             }
 
             // We know the encoding and have a whole tile
-            rQi++;
+            sock.rQshift8();
             if (subencoding === 0) {
                 if (this._lastsubencoding & 0x01) {
                     // Weird: ignore blanks are RAW
@@ -89,42 +86,36 @@ export default class HextileDecoder {
                 }
             } else if (subencoding & 0x01) {  // Raw
                 let pixels = tw * th;
+                let data = sock.rQshiftBytes(pixels * 4, false);
                 // Max sure the image is fully opaque
                 for (let i = 0;i <  pixels;i++) {
-                    rQ[rQi + i * 4 + 3] = 255;
+                    data[i * 4 + 3] = 255;
                 }
-                display.blitImage(tx, ty, tw, th, rQ, rQi);
-                rQi += bytes - 1;
+                display.blitImage(tx, ty, tw, th, data, 0);
             } else {
                 if (subencoding & 0x02) {  // Background
-                    this._background = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
-                    rQi += 4;
+                    this._background = new Uint8Array(sock.rQshiftBytes(4));
                 }
                 if (subencoding & 0x04) {  // Foreground
-                    this._foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
-                    rQi += 4;
+                    this._foreground = new Uint8Array(sock.rQshiftBytes(4));
                 }
 
                 this._startTile(tx, ty, tw, th, this._background);
                 if (subencoding & 0x08) {  // AnySubrects
-                    let subrects = rQ[rQi];
-                    rQi++;
+                    let subrects = sock.rQshift8();
 
                     for (let s = 0; s < subrects; s++) {
                         let color;
                         if (subencoding & 0x10) {  // SubrectsColoured
-                            color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
-                            rQi += 4;
+                            color = sock.rQshiftBytes(4);
                         } else {
                             color = this._foreground;
                         }
-                        const xy = rQ[rQi];
-                        rQi++;
+                        const xy = sock.rQshift8();
                         const sx = (xy >> 4);
                         const sy = (xy & 0x0f);
 
-                        const wh = rQ[rQi];
-                        rQi++;
+                        const wh = sock.rQshift8();
                         const sw = (wh >> 4) + 1;
                         const sh = (wh & 0x0f) + 1;
 
@@ -133,7 +124,6 @@ export default class HextileDecoder {
                 }
                 this._finishTile(display);
             }
-            sock.rQi = rQi;
             this._lastsubencoding = subencoding;
             this._tiles--;
         }
diff --git a/systemvm/agent/noVNC/core/decoders/jpeg.js b/systemvm/agent/noVNC/core/decoders/jpeg.js
index e1f2bdf875c..5fd1e0564fd 100644
--- a/systemvm/agent/noVNC/core/decoders/jpeg.js
+++ b/systemvm/agent/noVNC/core/decoders/jpeg.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -11,131 +11,136 @@ export default class JPEGDecoder {
     constructor() {
         // RealVNC will reuse the quantization tables
         // and Huffman tables, so we need to cache them.
-        this._quantTables = [];
-        this._huffmanTables = [];
         this._cachedQuantTables = [];
         this._cachedHuffmanTables = [];
 
-        this._jpegLength = 0;
         this._segments = [];
     }
 
     decodeRect(x, y, width, height, sock, display, depth) {
         // A rect of JPEG encodings is simply a JPEG file
-        if (!this._parseJPEG(sock.rQslice(0))) {
-            return false;
-        }
-        const data = sock.rQshiftBytes(this._jpegLength);
-        if (this._quantTables.length != 0 && this._huffmanTables.length != 0) {
-            // If there are quantization tables and Huffman tables in the JPEG
-            // image, we can directly render it.
-            display.imageRect(x, y, width, height, "image/jpeg", data);
-            return true;
-        } else {
-            // Otherwise we need to insert cached tables.
-            const sofIndex = this._segments.findIndex(
-                x => x[1] == 0xC0 || x[1] == 0xC2
-            );
-            if (sofIndex == -1) {
-                throw new Error("Illegal JPEG image without SOF");
-            }
-            let segments = this._segments.slice(0, sofIndex);
-            segments = segments.concat(this._quantTables.length ?
-                this._quantTables :
-                this._cachedQuantTables);
-            segments.push(this._segments[sofIndex]);
-            segments = segments.concat(this._huffmanTables.length ?
-                this._huffmanTables :
-                this._cachedHuffmanTables,
-                                       this._segments.slice(sofIndex + 1));
-            let length = 0;
-            for (let i = 0; i < segments.length; i++) {
-                length += segments[i].length;
-            }
-            const data = new Uint8Array(length);
-            length = 0;
-            for (let i = 0; i < segments.length; i++) {
-                data.set(segments[i], length);
-                length += segments[i].length;
-            }
-            display.imageRect(x, y, width, height, "image/jpeg", data);
-            return true;
-        }
-    }
-
-    _parseJPEG(buffer) {
-        if (this._quantTables.length != 0) {
-            this._cachedQuantTables = this._quantTables;
-        }
-        if (this._huffmanTables.length != 0) {
-            this._cachedHuffmanTables = this._huffmanTables;
-        }
-        this._quantTables = [];
-        this._huffmanTables = [];
-        this._segments = [];
-        let i = 0;
-        let bufferLength = buffer.length;
         while (true) {
-            let j = i;
-            if (j + 2 > bufferLength) {
+            let segment = this._readSegment(sock);
+            if (segment === null) {
                 return false;
             }
-            if (buffer[j] != 0xFF) {
-                throw new Error("Illegal JPEG marker received (byte: " +
-                                   buffer[j] + ")");
-            }
-            const type = buffer[j+1];
-            j += 2;
-            if (type == 0xD9) {
-                this._jpegLength = j;
-                this._segments.push(buffer.slice(i, j));
-                return true;
-            } else if (type == 0xDA) {
-                // start of scan
-                let hasFoundEndOfScan = false;
-                for (let k = j + 3; k + 1 < bufferLength; k++) {
-                    if (buffer[k] == 0xFF && buffer[k+1] != 0x00 &&
-                        !(buffer[k+1] >= 0xD0 && buffer[k+1] <= 0xD7)) {
-                        j = k;
-                        hasFoundEndOfScan = true;
-                        break;
-                    }
-                }
-                if (!hasFoundEndOfScan) {
-                    return false;
-                }
-                this._segments.push(buffer.slice(i, j));
-                i = j;
-                continue;
-            } else if (type >= 0xD0 && type < 0xD9 || type == 0x01) {
-                // No length after marker
-                this._segments.push(buffer.slice(i, j));
-                i = j;
-                continue;
-            }
-            if (j + 2 > bufferLength) {
-                return false;
-            }
-            const length = (buffer[j] << 8) + buffer[j+1] - 2;
-            if (length < 0) {
-                throw new Error("Illegal JPEG length received (length: " +
-                                   length + ")");
-            }
-            j += 2;
-            if (j + length > bufferLength) {
-                return false;
-            }
-            j += length;
-            const segment = buffer.slice(i, j);
-            if (type == 0xC4) {
-                // Huffman tables
-                this._huffmanTables.push(segment);
-            } else if (type == 0xDB) {
-                // Quantization tables
-                this._quantTables.push(segment);
-            }
             this._segments.push(segment);
-            i = j;
+            // End of image?
+            if (segment[1] === 0xD9) {
+                break;
+            }
         }
+
+        let huffmanTables = [];
+        let quantTables = [];
+        for (let segment of this._segments) {
+            let type = segment[1];
+            if (type === 0xC4) {
+                // Huffman tables
+                huffmanTables.push(segment);
+            } else if (type === 0xDB) {
+                // Quantization tables
+                quantTables.push(segment);
+            }
+        }
+
+        const sofIndex = this._segments.findIndex(
+            x => x[1] == 0xC0 || x[1] == 0xC2
+        );
+        if (sofIndex == -1) {
+            throw new Error("Illegal JPEG image without SOF");
+        }
+
+        if (quantTables.length === 0) {
+            this._segments.splice(sofIndex+1, 0,
+                                  ...this._cachedQuantTables);
+        }
+        if (huffmanTables.length === 0) {
+            this._segments.splice(sofIndex+1, 0,
+                                  ...this._cachedHuffmanTables);
+        }
+
+        let length = 0;
+        for (let segment of this._segments) {
+            length += segment.length;
+        }
+
+        let data = new Uint8Array(length);
+        length = 0;
+        for (let segment of this._segments) {
+            data.set(segment, length);
+            length += segment.length;
+        }
+
+        display.imageRect(x, y, width, height, "image/jpeg", data);
+
+        if (huffmanTables.length !== 0) {
+            this._cachedHuffmanTables = huffmanTables;
+        }
+        if (quantTables.length !== 0) {
+            this._cachedQuantTables = quantTables;
+        }
+
+        this._segments = [];
+
+        return true;
+    }
+
+    _readSegment(sock) {
+        if (sock.rQwait("JPEG", 2)) {
+            return null;
+        }
+
+        let marker = sock.rQshift8();
+        if (marker != 0xFF) {
+            throw new Error("Illegal JPEG marker received (byte: " +
+                               marker + ")");
+        }
+        let type = sock.rQshift8();
+        if (type >= 0xD0 && type <= 0xD9 || type == 0x01) {
+            // No length after marker
+            return new Uint8Array([marker, type]);
+        }
+
+        if (sock.rQwait("JPEG", 2, 2)) {
+            return null;
+        }
+
+        let length = sock.rQshift16();
+        if (length < 2) {
+            throw new Error("Illegal JPEG length received (length: " +
+                               length + ")");
+        }
+
+        if (sock.rQwait("JPEG", length-2, 4)) {
+            return null;
+        }
+
+        let extra = 0;
+        if (type === 0xDA) {
+            // start of scan
+            extra += 2;
+            while (true) {
+                if (sock.rQwait("JPEG", length-2+extra, 4)) {
+                    return null;
+                }
+                let data = sock.rQpeekBytes(length-2+extra, false);
+                if (data.at(-2) === 0xFF && data.at(-1) !== 0x00 &&
+                    !(data.at(-1) >= 0xD0 && data.at(-1) <= 0xD7)) {
+                    extra -= 2;
+                    break;
+                }
+                extra++;
+            }
+        }
+
+        let segment = new Uint8Array(2 + length + extra);
+        segment[0] = marker;
+        segment[1] = type;
+        segment[2] = length >> 8;
+        segment[3] = length;
+        segment.set(sock.rQshiftBytes(length-2+extra, false), 4);
+
+        return segment;
     }
 }
diff --git a/systemvm/agent/noVNC/core/decoders/raw.js b/systemvm/agent/noVNC/core/decoders/raw.js
index d08f7ba9500..bd5d20445e8 100644
--- a/systemvm/agent/noVNC/core/decoders/raw.js
+++ b/systemvm/agent/noVNC/core/decoders/raw.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -24,41 +24,34 @@ export default class RawDecoder {
         const pixelSize = depth == 8 ? 1 : 4;
         const bytesPerLine = width * pixelSize;
 
-        if (sock.rQwait("RAW", bytesPerLine)) {
-            return false;
-        }
-
-        const curY = y + (height - this._lines);
-        const currHeight = Math.min(this._lines,
-                                    Math.floor(sock.rQlen / bytesPerLine));
-        const pixels = width * currHeight;
-
-        let data = sock.rQ;
-        let index = sock.rQi;
-
-        // Convert data if needed
-        if (depth == 8) {
-            const newdata = new Uint8Array(pixels * 4);
-            for (let i = 0; i < pixels; i++) {
-                newdata[i * 4 + 0] = ((data[index + i] >> 0) & 0x3) * 255 / 3;
-                newdata[i * 4 + 1] = ((data[index + i] >> 2) & 0x3) * 255 / 3;
-                newdata[i * 4 + 2] = ((data[index + i] >> 4) & 0x3) * 255 / 3;
-                newdata[i * 4 + 3] = 255;
+        while (this._lines > 0) {
+            if (sock.rQwait("RAW", bytesPerLine)) {
+                return false;
             }
-            data = newdata;
-            index = 0;
-        }
 
-        // Max sure the image is fully opaque
-        for (let i = 0; i < pixels; i++) {
-            data[index + i * 4 + 3] = 255;
-        }
+            const curY = y + (height - this._lines);
 
-        display.blitImage(x, curY, width, currHeight, data, index);
-        sock.rQskipBytes(currHeight * bytesPerLine);
-        this._lines -= currHeight;
-        if (this._lines > 0) {
-            return false;
+            let data = sock.rQshiftBytes(bytesPerLine, false);
+
+            // Convert data if needed
+            if (depth == 8) {
+                const newdata = new Uint8Array(width * 4);
+                for (let i = 0; i < width; i++) {
+                    newdata[i * 4 + 0] = ((data[i] >> 0) & 0x3) * 255 / 3;
+                    newdata[i * 4 + 1] = ((data[i] >> 2) & 0x3) * 255 / 3;
+                    newdata[i * 4 + 2] = ((data[i] >> 4) & 0x3) * 255 / 3;
+                    newdata[i * 4 + 3] = 255;
+                }
+                data = newdata;
+            }
+
+            // Max sure the image is fully opaque
+            for (let i = 0; i < width; i++) {
+                data[i * 4 + 3] = 255;
+            }
+
+            display.blitImage(x, curY, width, 1, data, 0);
+            this._lines--;
         }
 
         return true;
diff --git a/systemvm/agent/noVNC/core/decoders/rre.js b/systemvm/agent/noVNC/core/decoders/rre.js
index 6219369d6b8..a5fea7c46b5 100644
--- a/systemvm/agent/noVNC/core/decoders/rre.js
+++ b/systemvm/agent/noVNC/core/decoders/rre.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/decoders/tight.js b/systemvm/agent/noVNC/core/decoders/tight.js
index 7952707c5e6..1a145d4e5d6 100644
--- a/systemvm/agent/noVNC/core/decoders/tight.js
+++ b/systemvm/agent/noVNC/core/decoders/tight.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * (c) 2012 Michael Tinglof, Joe Balaz, Les Piech (Mercuri.ca)
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
@@ -76,12 +76,8 @@ export default class TightDecoder {
             return false;
         }
 
-        const rQi = sock.rQi;
-        const rQ = sock.rQ;
-
-        display.fillRect(x, y, width, height,
-                         [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2]], false);
-        sock.rQskipBytes(3);
+        let pixel = sock.rQshiftBytes(3);
+        display.fillRect(x, y, width, height, pixel, false);
 
         return true;
     }
@@ -289,7 +285,73 @@ export default class TightDecoder {
     }
 
     _gradientFilter(streamId, x, y, width, height, sock, display, depth) {
-        throw new Error("Gradient filter not implemented");
+        // assume the TPIXEL is 3 bytes long
+        const uncompressedSize = width * height * 3;
+        let data;
+
+        if (uncompressedSize === 0) {
+            return true;
+        }
+
+        if (uncompressedSize < 12) {
+            if (sock.rQwait("TIGHT", uncompressedSize)) {
+                return false;
+            }
+
+            data = sock.rQshiftBytes(uncompressedSize);
+        } else {
+            data = this._readData(sock);
+            if (data === null) {
+                return false;
+            }
+
+            this._zlibs[streamId].setInput(data);
+            data = this._zlibs[streamId].inflate(uncompressedSize);
+            this._zlibs[streamId].setInput(null);
+        }
+
+        let rgbx = new Uint8Array(4 * width * height);
+
+        let rgbxIndex = 0, dataIndex = 0;
+        let left = new Uint8Array(3);
+        for (let x = 0; x < width; x++) {
+            for (let c = 0; c < 3; c++) {
+                const prediction = left[c];
+                const value = data[dataIndex++] + prediction;
+                rgbx[rgbxIndex++] = value;
+                left[c] = value;
+            }
+            rgbx[rgbxIndex++] = 255;
+        }
+
+        let upperIndex = 0;
+        let upper = new Uint8Array(3),
+            upperleft = new Uint8Array(3);
+        for (let y = 1; y < height; y++) {
+            left.fill(0);
+            upperleft.fill(0);
+            for (let x = 0; x < width; x++) {
+                for (let c = 0; c < 3; c++) {
+                    upper[c] = rgbx[upperIndex++];
+                    let prediction = left[c] + upper[c] - upperleft[c];
+                    if (prediction < 0) {
+                        prediction = 0;
+                    } else if (prediction > 255) {
+                        prediction = 255;
+                    }
+                    const value = data[dataIndex++] + prediction;
+                    rgbx[rgbxIndex++] = value;
+                    upperleft[c] = upper[c];
+                    left[c] = value;
+                }
+                rgbx[rgbxIndex++] = 255;
+                upperIndex++;
+            }
+        }
+
+        display.blitImage(x, y, width, height, rgbx, 0, false);
+
+        return true;
     }
 
     _readData(sock) {
@@ -316,7 +378,7 @@ export default class TightDecoder {
             return null;
         }
 
-        let data = sock.rQshiftBytes(this._len);
+        let data = sock.rQshiftBytes(this._len, false);
         this._len = 0;
 
         return data;
diff --git a/systemvm/agent/noVNC/core/decoders/tightpng.js b/systemvm/agent/noVNC/core/decoders/tightpng.js
index 82f492de8db..cf1df6ba147 100644
--- a/systemvm/agent/noVNC/core/decoders/tightpng.js
+++ b/systemvm/agent/noVNC/core/decoders/tightpng.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/decoders/zlib.js b/systemvm/agent/noVNC/core/decoders/zlib.js
new file mode 100644
index 00000000000..a876908b61a
--- /dev/null
+++ b/systemvm/agent/noVNC/core/decoders/zlib.js
@@ -0,0 +1,51 @@
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2024 The noVNC authors
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ *
+ */
+
+import Inflator from "../inflator.js";
+
+export default class ZlibDecoder {
+    constructor() {
+        this._zlib = new Inflator();
+        this._length = 0;
+    }
+
+    decodeRect(x, y, width, height, sock, display, depth) {
+        if ((width === 0) || (height === 0)) {
+            return true;
+        }
+
+        if (this._length === 0) {
+            if (sock.rQwait("ZLIB", 4)) {
+                return false;
+            }
+
+            this._length = sock.rQshift32();
+        }
+
+        if (sock.rQwait("ZLIB", this._length)) {
+            return false;
+        }
+
+        let data = new Uint8Array(sock.rQshiftBytes(this._length, false));
+        this._length = 0;
+
+        this._zlib.setInput(data);
+        data = this._zlib.inflate(width * height * 4);
+        this._zlib.setInput(null);
+
+        // Max sure the image is fully opaque
+        for (let i = 0; i < width * height; i++) {
+            data[i * 4 + 3] = 255;
+        }
+
+        display.blitImage(x, y, width, height, data, 0);
+
+        return true;
+    }
+}
diff --git a/systemvm/agent/noVNC/core/decoders/zrle.js b/systemvm/agent/noVNC/core/decoders/zrle.js
index 97fbd58e7a1..ef1726f691b 100644
--- a/systemvm/agent/noVNC/core/decoders/zrle.js
+++ b/systemvm/agent/noVNC/core/decoders/zrle.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2021 The noVNC Authors
+ * Copyright (C) 2021 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -32,7 +32,7 @@ export default class ZRLEDecoder {
             return false;
         }
 
-        const data = sock.rQshiftBytes(this._length);
+        const data = sock.rQshiftBytes(this._length, false);
 
         this._inflator.setInput(data);
 
diff --git a/systemvm/agent/noVNC/core/deflator.js b/systemvm/agent/noVNC/core/deflator.js
index fe2a8f7036b..af24009e1f3 100644
--- a/systemvm/agent/noVNC/core/deflator.js
+++ b/systemvm/agent/noVNC/core/deflator.js
@@ -1,13 +1,13 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
  */
 
 import { deflateInit, deflate } from "../vendor/pako/lib/zlib/deflate.js";
-import { Z_FULL_FLUSH } from "../vendor/pako/lib/zlib/deflate.js";
+import { Z_FULL_FLUSH, Z_DEFAULT_COMPRESSION } from "../vendor/pako/lib/zlib/deflate.js";
 import ZStream from "../vendor/pako/lib/zlib/zstream.js";
 
 export default class Deflator {
@@ -15,9 +15,8 @@ export default class Deflator {
         this.strm = new ZStream();
         this.chunkSize = 1024 * 10 * 10;
         this.outputBuffer = new Uint8Array(this.chunkSize);
-        this.windowBits = 5;
 
-        deflateInit(this.strm, this.windowBits);
+        deflateInit(this.strm, Z_DEFAULT_COMPRESSION);
     }
 
     deflate(inData) {
diff --git a/systemvm/agent/noVNC/core/display.js b/systemvm/agent/noVNC/core/display.js
index b9c8d213845..12ecb15ebdd 100644
--- a/systemvm/agent/noVNC/core/display.js
+++ b/systemvm/agent/noVNC/core/display.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -15,7 +15,7 @@ export default class Display {
         this._drawCtx = null;
 
         this._renderQ = [];  // queue drawing actions for in-oder rendering
-        this._flushing = false;
+        this._flushPromise = null;
 
         // the full frame buffer (logical canvas) size
         this._fbWidth = 0;
@@ -61,10 +61,6 @@ export default class Display {
 
         this._scale = 1.0;
         this._clipViewport = false;
-
-        // ===== EVENT HANDLERS =====
-
-        this.onflush = () => {}; // A flush request has finished
     }
 
     // ===== PROPERTIES =====
@@ -306,9 +302,14 @@ export default class Display {
 
     flush() {
         if (this._renderQ.length === 0) {
-            this.onflush();
+            return Promise.resolve();
         } else {
-            this._flushing = true;
+            if (this._flushPromise === null) {
+                this._flushPromise = new Promise((resolve) => {
+                    this._flushResolve = resolve;
+                });
+            }
+            return this._flushPromise;
         }
     }
 
@@ -379,6 +380,17 @@ export default class Display {
         });
     }
 
+    videoFrame(x, y, width, height, frame) {
+        this._renderQPush({
+            'type': 'frame',
+            'frame': frame,
+            'x': x,
+            'y': y,
+            'width': width,
+            'height': height
+        });
+    }
+
     blitImage(x, y, width, height, arr, offset, fromQueue) {
         if (this._renderQ.length !== 0 && !fromQueue) {
             // NB(directxman12): it's technically more performant here to use preallocated arrays,
@@ -405,9 +417,16 @@ export default class Display {
         }
     }
 
-    drawImage(img, x, y) {
-        this._drawCtx.drawImage(img, x, y);
-        this._damage(x, y, img.width, img.height);
+    drawImage(img, ...args) {
+        this._drawCtx.drawImage(img, ...args);
+
+        if (args.length <= 4) {
+            const [x, y] = args;
+            this._damage(x, y, img.width, img.height);
+        } else {
+            const [,, sw, sh, dx, dy] = args;
+            this._damage(dx, dy, sw, sh);
+        }
     }
 
     autoscale(containerWidth, containerHeight) {
@@ -510,6 +529,35 @@ export default class Display {
                         ready = false;
                     }
                     break;
+                case 'frame':
+                    if (a.frame.ready) {
+                        // The encoded frame may be larger than the rect due to
+                        // limitations of the encoder, so we need to crop the
+                        // frame.
+                        let frame = a.frame.frame;
+                        if (frame.codedWidth < a.width || frame.codedHeight < a.height) {
+                            Log.Warn("Decoded video frame does not cover its full rectangle area. Expecting at least " +
+                                      a.width + "x" + a.height + " but got " +
+                                      frame.codedWidth + "x" + frame.codedHeight);
+                        }
+                        const sx = 0;
+                        const sy = 0;
+                        const sw = a.width;
+                        const sh = a.height;
+                        const dx = a.x;
+                        const dy = a.y;
+                        const dw = sw;
+                        const dh = sh;
+                        this.drawImage(frame, sx, sy, sw, sh, dx, dy, dw, dh);
+                        frame.close();
+                    } else {
+                        let display = this;
+                        a.frame.promise.then(() => {
+                            display._scanRenderQ();
+                        });
+                        ready = false;
+                    }
+                    break;
             }
 
             if (ready) {
@@ -517,9 +565,11 @@ export default class Display {
             }
         }
 
-        if (this._renderQ.length === 0 && this._flushing) {
-            this._flushing = false;
-            this.onflush();
+        if (this._renderQ.length === 0 &&
+            this._flushPromise !== null) {
+            this._flushResolve();
+            this._flushPromise = null;
+            this._flushResolve = null;
         }
     }
 }
diff --git a/systemvm/agent/noVNC/core/encodings.js b/systemvm/agent/noVNC/core/encodings.js
index 2041b6e0212..7afcb17fcc0 100644
--- a/systemvm/agent/noVNC/core/encodings.js
+++ b/systemvm/agent/noVNC/core/encodings.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -11,10 +11,12 @@ export const encodings = {
     encodingCopyRect: 1,
     encodingRRE: 2,
     encodingHextile: 5,
+    encodingZlib: 6,
     encodingTight: 7,
     encodingZRLE: 16,
     encodingTightPNG: -260,
     encodingJPEG: 21,
+    encodingH264: 50,
 
     pseudoEncodingQualityLevel9: -23,
     pseudoEncodingQualityLevel0: -32,
@@ -22,11 +24,13 @@ export const encodings = {
     pseudoEncodingLastRect: -224,
     pseudoEncodingCursor: -239,
     pseudoEncodingQEMUExtendedKeyEvent: -258,
+    pseudoEncodingQEMULedEvent: -261,
     pseudoEncodingDesktopName: -307,
     pseudoEncodingExtendedDesktopSize: -308,
     pseudoEncodingXvp: -309,
     pseudoEncodingFence: -312,
     pseudoEncodingContinuousUpdates: -313,
+    pseudoEncodingExtendedMouseButtons: -316,
     pseudoEncodingCompressLevel9: -247,
     pseudoEncodingCompressLevel0: -256,
     pseudoEncodingVMwareCursor: 0x574d5664,
@@ -39,10 +43,12 @@ export function encodingName(num) {
         case encodings.encodingCopyRect: return "CopyRect";
         case encodings.encodingRRE:      return "RRE";
         case encodings.encodingHextile:  return "Hextile";
+        case encodings.encodingZlib:     return "Zlib";
         case encodings.encodingTight:    return "Tight";
         case encodings.encodingZRLE:     return "ZRLE";
         case encodings.encodingTightPNG: return "TightPNG";
         case encodings.encodingJPEG:     return "JPEG";
+        case encodings.encodingH264:     return "H.264";
         default:                         return "[unknown encoding " + num + "]";
     }
 }
diff --git a/systemvm/agent/noVNC/core/inflator.js b/systemvm/agent/noVNC/core/inflator.js
index 4b337607b03..7ef47f13f65 100644
--- a/systemvm/agent/noVNC/core/inflator.js
+++ b/systemvm/agent/noVNC/core/inflator.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -14,9 +14,8 @@ export default class Inflate {
         this.strm = new ZStream();
         this.chunkSize = 1024 * 10 * 10;
         this.strm.output = new Uint8Array(this.chunkSize);
-        this.windowBits = 5;
 
-        inflateInit(this.strm, this.windowBits);
+        inflateInit(this.strm);
     }
 
     setInput(data) {
diff --git a/systemvm/agent/noVNC/core/input/domkeytable.js b/systemvm/agent/noVNC/core/input/domkeytable.js
index f79aeadfa47..9e599f74882 100644
--- a/systemvm/agent/noVNC/core/input/domkeytable.js
+++ b/systemvm/agent/noVNC/core/input/domkeytable.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2018 The noVNC Authors
+ * Copyright (C) 2018 The noVNC authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/systemvm/agent/noVNC/core/input/fixedkeys.js b/systemvm/agent/noVNC/core/input/fixedkeys.js
index 4d09f2f7e08..6a9221580af 100644
--- a/systemvm/agent/noVNC/core/input/fixedkeys.js
+++ b/systemvm/agent/noVNC/core/input/fixedkeys.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2018 The noVNC Authors
+ * Copyright (C) 2018 The noVNC authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/systemvm/agent/noVNC/core/input/gesturehandler.js b/systemvm/agent/noVNC/core/input/gesturehandler.js
index 6fa72d2aac5..b072e01db8d 100644
--- a/systemvm/agent/noVNC/core/input/gesturehandler.js
+++ b/systemvm/agent/noVNC/core/input/gesturehandler.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/input/keyboard.js b/systemvm/agent/noVNC/core/input/keyboard.js
index ddb5ce0994d..3cc89174de3 100644
--- a/systemvm/agent/noVNC/core/input/keyboard.js
+++ b/systemvm/agent/noVNC/core/input/keyboard.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
@@ -36,7 +36,7 @@ export default class Keyboard {
 
     // ===== PRIVATE METHODS =====
 
-    _sendKeyEvent(keysym, code, down) {
+    _sendKeyEvent(keysym, code, down, numlock = null, capslock = null) {
         if (down) {
             this._keyDownList[code] = keysym;
         } else {
@@ -48,8 +48,9 @@ export default class Keyboard {
         }
 
         Log.Debug("onkeyevent " + (down ? "down" : "up") +
-                  ", keysym: " + keysym, ", code: " + code);
-        this.onkeyevent(keysym, code, down);
+                  ", keysym: " + keysym, ", code: " + code +
+                  ", numlock: " + numlock + ", capslock: " + capslock);
+        this.onkeyevent(keysym, code, down, numlock, capslock);
     }
 
     _getKeyCode(e) {
@@ -86,6 +87,14 @@ export default class Keyboard {
     _handleKeyDown(e) {
         const code = this._getKeyCode(e);
         let keysym = KeyboardUtil.getKeysym(e);
+        let numlock = e.getModifierState('NumLock');
+        let capslock = e.getModifierState('CapsLock');
+
+        // getModifierState for NumLock is not supported on mac and ios and always returns false.
+        // Set to null to indicate unknown/unsupported instead.
+        if (browser.isMac() || browser.isIOS()) {
+            numlock = null;
+        }
 
         // Windows doesn't have a proper AltGr, but handles it using
         // fake Ctrl+Alt. However the remote end might not be Windows,
@@ -107,7 +116,7 @@ export default class Keyboard {
                 //        key to "AltGraph".
                 keysym = KeyTable.XK_ISO_Level3_Shift;
             } else {
-                this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
+                this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true, numlock, capslock);
             }
         }
 
@@ -118,8 +127,8 @@ export default class Keyboard {
                 // If it's a virtual keyboard then it should be
                 // sufficient to just send press and release right
                 // after each other
-                this._sendKeyEvent(keysym, code, true);
-                this._sendKeyEvent(keysym, code, false);
+                this._sendKeyEvent(keysym, code, true, numlock, capslock);
+                this._sendKeyEvent(keysym, code, false, numlock, capslock);
             }
 
             stopEvent(e);
@@ -157,8 +166,8 @@ export default class Keyboard {
         // while meta is held down
         if ((browser.isMac() || browser.isIOS()) &&
             (e.metaKey && code !== 'MetaLeft' && code !== 'MetaRight')) {
-            this._sendKeyEvent(keysym, code, true);
-            this._sendKeyEvent(keysym, code, false);
+            this._sendKeyEvent(keysym, code, true, numlock, capslock);
+            this._sendKeyEvent(keysym, code, false, numlock, capslock);
             stopEvent(e);
             return;
         }
@@ -168,8 +177,8 @@ export default class Keyboard {
         // which toggles on each press, but not on release. So pretend
         // it was a quick press and release of the button.
         if ((browser.isMac() || browser.isIOS()) && (code === 'CapsLock')) {
-            this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true);
-            this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false);
+            this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true, numlock, capslock);
+            this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false, numlock, capslock);
             stopEvent(e);
             return;
         }
@@ -182,8 +191,8 @@ export default class Keyboard {
                             KeyTable.XK_Hiragana,
                             KeyTable.XK_Romaji ];
         if (browser.isWindows() && jpBadKeys.includes(keysym)) {
-            this._sendKeyEvent(keysym, code, true);
-            this._sendKeyEvent(keysym, code, false);
+            this._sendKeyEvent(keysym, code, true, numlock, capslock);
+            this._sendKeyEvent(keysym, code, false, numlock, capslock);
             stopEvent(e);
             return;
         }
@@ -194,12 +203,12 @@ export default class Keyboard {
         if ((code === "ControlLeft") && browser.isWindows() &&
             !("ControlLeft" in this._keyDownList)) {
             this._altGrArmed = true;
-            this._altGrTimeout = setTimeout(this._handleAltGrTimeout.bind(this), 100);
+            this._altGrTimeout = setTimeout(this._interruptAltGrSequence.bind(this), 100);
             this._altGrCtrlTime = e.timeStamp;
             return;
         }
 
-        this._sendKeyEvent(keysym, code, true);
+        this._sendKeyEvent(keysym, code, true, numlock, capslock);
     }
 
     _handleKeyUp(e) {
@@ -209,11 +218,7 @@ export default class Keyboard {
 
         // We can't get a release in the middle of an AltGr sequence, so
         // abort that detection
-        if (this._altGrArmed) {
-            this._altGrArmed = false;
-            clearTimeout(this._altGrTimeout);
-            this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
-        }
+        this._interruptAltGrSequence();
 
         // See comment in _handleKeyDown()
         if ((browser.isMac() || browser.isIOS()) && (code === 'CapsLock')) {
@@ -240,14 +245,20 @@ export default class Keyboard {
         }
     }
 
-    _handleAltGrTimeout() {
-        this._altGrArmed = false;
-        clearTimeout(this._altGrTimeout);
-        this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
+    _interruptAltGrSequence() {
+        if (this._altGrArmed) {
+            this._altGrArmed = false;
+            clearTimeout(this._altGrTimeout);
+            this._sendKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
+        }
     }
 
     _allKeysUp() {
         Log.Debug(">> Keyboard.allKeysUp");
+
+        // Prevent control key being processed after losing focus.
+        this._interruptAltGrSequence();
+
         for (let code in this._keyDownList) {
             this._sendKeyEvent(this._keyDownList[code], code, false);
         }
diff --git a/systemvm/agent/noVNC/core/input/util.js b/systemvm/agent/noVNC/core/input/util.js
index 58f84e5587f..36b69817651 100644
--- a/systemvm/agent/noVNC/core/input/util.js
+++ b/systemvm/agent/noVNC/core/input/util.js
@@ -67,7 +67,7 @@ export function getKeycode(evt) {
 // Get 'KeyboardEvent.key', handling legacy browsers
 export function getKey(evt) {
     // Are we getting a proper key value?
-    if (evt.key !== undefined) {
+    if ((evt.key !== undefined) && (evt.key !== 'Unidentified')) {
         // Mozilla isn't fully in sync with the spec yet
         switch (evt.key) {
             case 'OS': return 'Meta';
diff --git a/systemvm/agent/noVNC/core/input/vkeys.js b/systemvm/agent/noVNC/core/input/vkeys.js
index dacc3580947..d848337a7a7 100644
--- a/systemvm/agent/noVNC/core/input/vkeys.js
+++ b/systemvm/agent/noVNC/core/input/vkeys.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2018 The noVNC Authors
+ * Copyright (C) 2018 The noVNC authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/systemvm/agent/noVNC/core/ra2.js b/systemvm/agent/noVNC/core/ra2.js
index d038608967b..d330b848d24 100644
--- a/systemvm/agent/noVNC/core/ra2.js
+++ b/systemvm/agent/noVNC/core/ra2.js
@@ -1,146 +1,25 @@
-import Base64 from './base64.js';
 import { encodeUTF8 } from './util/strings.js';
 import EventTargetMixin from './util/eventtarget.js';
+import legacyCrypto from './crypto/crypto.js';
 
-export class AESEAXCipher {
+class RA2Cipher {
     constructor() {
-        this._rawKey = null;
-        this._ctrKey = null;
-        this._cbcKey = null;
-        this._zeroBlock = new Uint8Array(16);
-        this._prefixBlock0 = this._zeroBlock;
-        this._prefixBlock1 = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
-        this._prefixBlock2 = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]);
-    }
-
-    async _encryptBlock(block) {
-        const encrypted = await window.crypto.subtle.encrypt({
-            name: "AES-CBC",
-            iv: this._zeroBlock,
-        }, this._cbcKey, block);
-        return new Uint8Array(encrypted).slice(0, 16);
-    }
-
-    async _initCMAC() {
-        const k1 = await this._encryptBlock(this._zeroBlock);
-        const k2 = new Uint8Array(16);
-        const v = k1[0] >>> 6;
-        for (let i = 0; i < 15; i++) {
-            k2[i] = (k1[i + 1] >> 6) | (k1[i] << 2);
-            k1[i] = (k1[i + 1] >> 7) | (k1[i] << 1);
-        }
-        const lut = [0x0, 0x87, 0x0e, 0x89];
-        k2[14] ^= v >>> 1;
-        k2[15] = (k1[15] << 2) ^ lut[v];
-        k1[15] = (k1[15] << 1) ^ lut[v >> 1];
-        this._k1 = k1;
-        this._k2 = k2;
-    }
-
-    async _encryptCTR(data, counter) {
-        const encrypted = await window.crypto.subtle.encrypt({
-            "name": "AES-CTR",
-            counter: counter,
-            length: 128
-        }, this._ctrKey, data);
-        return new Uint8Array(encrypted);
-    }
-
-    async _decryptCTR(data, counter) {
-        const decrypted = await window.crypto.subtle.decrypt({
-            "name": "AES-CTR",
-            counter: counter,
-            length: 128
-        }, this._ctrKey, data);
-        return new Uint8Array(decrypted);
-    }
-
-    async _computeCMAC(data, prefixBlock) {
-        if (prefixBlock.length !== 16) {
-            return null;
-        }
-        const n = Math.floor(data.length / 16);
-        const m = Math.ceil(data.length / 16);
-        const r = data.length - n * 16;
-        const cbcData = new Uint8Array((m + 1) * 16);
-        cbcData.set(prefixBlock);
-        cbcData.set(data, 16);
-        if (r === 0) {
-            for (let i = 0; i < 16; i++) {
-                cbcData[n * 16 + i] ^= this._k1[i];
-            }
-        } else {
-            cbcData[(n + 1) * 16 + r] = 0x80;
-            for (let i = 0; i < 16; i++) {
-                cbcData[(n + 1) * 16 + i] ^= this._k2[i];
-            }
-        }
-        let cbcEncrypted = await window.crypto.subtle.encrypt({
-            name: "AES-CBC",
-            iv: this._zeroBlock,
-        }, this._cbcKey, cbcData);
-
-        cbcEncrypted = new Uint8Array(cbcEncrypted);
-        const mac = cbcEncrypted.slice(cbcEncrypted.length - 32, cbcEncrypted.length - 16);
-        return mac;
-    }
-
-    async setKey(key) {
-        this._rawKey = key;
-        this._ctrKey = await window.crypto.subtle.importKey(
-            "raw", key, {"name": "AES-CTR"}, false, ["encrypt", "decrypt"]);
-        this._cbcKey = await window.crypto.subtle.importKey(
-            "raw", key, {"name": "AES-CBC"}, false, ["encrypt", "decrypt"]);
-        await this._initCMAC();
-    }
-
-    async encrypt(message, associatedData, nonce) {
-        const nCMAC = await this._computeCMAC(nonce, this._prefixBlock0);
-        const encrypted = await this._encryptCTR(message, nCMAC);
-        const adCMAC = await this._computeCMAC(associatedData, this._prefixBlock1);
-        const mac = await this._computeCMAC(encrypted, this._prefixBlock2);
-        for (let i = 0; i < 16; i++) {
-            mac[i] ^= nCMAC[i] ^ adCMAC[i];
-        }
-        const res = new Uint8Array(16 + encrypted.length);
-        res.set(encrypted);
-        res.set(mac, encrypted.length);
-        return res;
-    }
-
-    async decrypt(encrypted, associatedData, nonce, mac) {
-        const nCMAC = await this._computeCMAC(nonce, this._prefixBlock0);
-        const adCMAC = await this._computeCMAC(associatedData, this._prefixBlock1);
-        const computedMac = await this._computeCMAC(encrypted, this._prefixBlock2);
-        for (let i = 0; i < 16; i++) {
-            computedMac[i] ^= nCMAC[i] ^ adCMAC[i];
-        }
-        if (computedMac.length !== mac.length) {
-            return null;
-        }
-        for (let i = 0; i < mac.length; i++) {
-            if (computedMac[i] !== mac[i]) {
-                return null;
-            }
-        }
-        const res = await this._decryptCTR(encrypted, nCMAC);
-        return res;
-    }
-}
-
-export class RA2Cipher {
-    constructor() {
-        this._cipher = new AESEAXCipher();
+        this._cipher = null;
         this._counter = new Uint8Array(16);
     }
 
     async setKey(key) {
-        await this._cipher.setKey(key);
+        this._cipher = await legacyCrypto.importKey(
+            "raw", key, { name: "AES-EAX" }, false, ["encrypt, decrypt"]);
     }
 
     async makeMessage(message) {
         const ad = new Uint8Array([(message.length & 0xff00) >>> 8, message.length & 0xff]);
-        const encrypted = await this._cipher.encrypt(message, ad, this._counter);
+        const encrypted = await legacyCrypto.encrypt({
+            name: "AES-EAX",
+            iv: this._counter,
+            additionalData: ad,
+        }, this._cipher, message);
         for (let i = 0; i < 16 && this._counter[i]++ === 255; i++);
         const res = new Uint8Array(message.length + 2 + 16);
         res.set(ad);
@@ -148,164 +27,18 @@ export class RA2Cipher {
         return res;
     }
 
-    async receiveMessage(length, encrypted, mac) {
+    async receiveMessage(length, encrypted) {
         const ad = new Uint8Array([(length & 0xff00) >>> 8, length & 0xff]);
-        const res = await this._cipher.decrypt(encrypted, ad, this._counter, mac);
+        const res = await legacyCrypto.decrypt({
+            name: "AES-EAX",
+            iv: this._counter,
+            additionalData: ad,
+        }, this._cipher, encrypted);
         for (let i = 0; i < 16 && this._counter[i]++ === 255; i++);
         return res;
     }
 }
 
-export class RSACipher {
-    constructor(keyLength) {
-        this._key = null;
-        this._keyLength = keyLength;
-        this._keyBytes = Math.ceil(keyLength / 8);
-        this._n = null;
-        this._e = null;
-        this._d = null;
-        this._nBigInt = null;
-        this._eBigInt = null;
-        this._dBigInt = null;
-    }
-
-    _base64urlDecode(data) {
-        data = data.replace(/-/g, "+").replace(/_/g, "/");
-        data = data.padEnd(Math.ceil(data.length / 4) * 4, "=");
-        return Base64.decode(data);
-    }
-
-    _u8ArrayToBigInt(arr) {
-        let hex = '0x';
-        for (let i = 0; i < arr.length; i++) {
-            hex += arr[i].toString(16).padStart(2, '0');
-        }
-        return BigInt(hex);
-    }
-
-    _padArray(arr, length) {
-        const res = new Uint8Array(length);
-        res.set(arr, length - arr.length);
-        return res;
-    }
-
-    _bigIntToU8Array(bigint, padLength=0) {
-        let hex = bigint.toString(16);
-        if (padLength === 0) {
-            padLength = Math.ceil(hex.length / 2) * 2;
-        }
-        hex = hex.padStart(padLength * 2, '0');
-        const length = hex.length / 2;
-        const arr = new Uint8Array(length);
-        for (let i = 0; i < length; i++) {
-            arr[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-        }
-        return arr;
-    }
-
-    _modPow(b, e, m) {
-        if (m === 1n) {
-            return 0;
-        }
-        let r = 1n;
-        b = b % m;
-        while (e > 0) {
-            if (e % 2n === 1n) {
-                r = (r * b) % m;
-            }
-            e = e / 2n;
-            b = (b * b) % m;
-        }
-        return r;
-    }
-
-    async generateKey() {
-        this._key = await window.crypto.subtle.generateKey(
-            {
-                name: "RSA-OAEP",
-                modulusLength: this._keyLength,
-                publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
-                hash: {name: "SHA-256"},
-            },
-            true, ["encrypt", "decrypt"]);
-        const privateKey = await window.crypto.subtle.exportKey("jwk", this._key.privateKey);
-        this._n = this._padArray(this._base64urlDecode(privateKey.n), this._keyBytes);
-        this._nBigInt = this._u8ArrayToBigInt(this._n);
-        this._e = this._padArray(this._base64urlDecode(privateKey.e), this._keyBytes);
-        this._eBigInt = this._u8ArrayToBigInt(this._e);
-        this._d = this._padArray(this._base64urlDecode(privateKey.d), this._keyBytes);
-        this._dBigInt = this._u8ArrayToBigInt(this._d);
-    }
-
-    setPublicKey(n, e) {
-        if (n.length !== this._keyBytes || e.length !== this._keyBytes) {
-            return;
-        }
-        this._n = new Uint8Array(this._keyBytes);
-        this._e = new Uint8Array(this._keyBytes);
-        this._n.set(n);
-        this._e.set(e);
-        this._nBigInt = this._u8ArrayToBigInt(this._n);
-        this._eBigInt = this._u8ArrayToBigInt(this._e);
-    }
-
-    encrypt(message) {
-        if (message.length > this._keyBytes - 11) {
-            return null;
-        }
-        const ps = new Uint8Array(this._keyBytes - message.length - 3);
-        window.crypto.getRandomValues(ps);
-        for (let i = 0; i < ps.length; i++) {
-            ps[i] = Math.floor(ps[i] * 254 / 255 + 1);
-        }
-        const em = new Uint8Array(this._keyBytes);
-        em[1] = 0x02;
-        em.set(ps, 2);
-        em.set(message, ps.length + 3);
-        const emBigInt = this._u8ArrayToBigInt(em);
-        const c = this._modPow(emBigInt, this._eBigInt, this._nBigInt);
-        return this._bigIntToU8Array(c, this._keyBytes);
-    }
-
-    decrypt(message) {
-        if (message.length !== this._keyBytes) {
-            return null;
-        }
-        const msgBigInt = this._u8ArrayToBigInt(message);
-        const emBigInt = this._modPow(msgBigInt, this._dBigInt, this._nBigInt);
-        const em = this._bigIntToU8Array(emBigInt, this._keyBytes);
-        if (em[0] !== 0x00 || em[1] !== 0x02) {
-            return null;
-        }
-        let i = 2;
-        for (; i < em.length; i++) {
-            if (em[i] === 0x00) {
-                break;
-            }
-        }
-        if (i === em.length) {
-            return null;
-        }
-        return em.slice(i + 1, em.length);
-    }
-
-    get keyLength() {
-        return this._keyLength;
-    }
-
-    get n() {
-        return this._n;
-    }
-
-    get e() {
-        return this._e;
-    }
-
-    get d() {
-        return this._d;
-    }
-}
-
 export default class RSAAESAuthenticationState extends EventTargetMixin {
     constructor(sock, getCredentials) {
         super();
@@ -406,7 +139,7 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         this._hasStarted = true;
         // 1: Receive server public key
         await this._waitSockAsync(4);
-        const serverKeyLengthBuffer = this._sock.rQslice(0, 4);
+        const serverKeyLengthBuffer = this._sock.rQpeekBytes(4);
         const serverKeyLength = this._sock.rQshift32();
         if (serverKeyLength < 1024) {
             throw new Error("RA2: server public key is too short: " + serverKeyLength);
@@ -417,26 +150,31 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         await this._waitSockAsync(serverKeyBytes * 2);
         const serverN = this._sock.rQshiftBytes(serverKeyBytes);
         const serverE = this._sock.rQshiftBytes(serverKeyBytes);
-        const serverRSACipher = new RSACipher(serverKeyLength);
-        serverRSACipher.setPublicKey(serverN, serverE);
+        const serverRSACipher = await legacyCrypto.importKey(
+            "raw", { n: serverN, e: serverE }, { name: "RSA-PKCS1-v1_5" }, false, ["encrypt"]);
         const serverPublickey = new Uint8Array(4 + serverKeyBytes * 2);
         serverPublickey.set(serverKeyLengthBuffer);
         serverPublickey.set(serverN, 4);
         serverPublickey.set(serverE, 4 + serverKeyBytes);
 
         // verify server public key
+        let approveKey = this._waitApproveKeyAsync();
         this.dispatchEvent(new CustomEvent("serververification", {
             detail: { type: "RSA", publickey: serverPublickey }
         }));
-        await this._waitApproveKeyAsync();
+        await approveKey;
 
         // 2: Send client public key
         const clientKeyLength = 2048;
         const clientKeyBytes = Math.ceil(clientKeyLength / 8);
-        const clientRSACipher = new RSACipher(clientKeyLength);
-        await clientRSACipher.generateKey();
-        const clientN = clientRSACipher.n;
-        const clientE = clientRSACipher.e;
+        const clientRSACipher = (await legacyCrypto.generateKey({
+            name: "RSA-PKCS1-v1_5",
+            modulusLength: clientKeyLength,
+            publicExponent: new Uint8Array([1, 0, 1]),
+        }, true, ["encrypt"])).privateKey;
+        const clientExportedRSAKey = await legacyCrypto.exportKey("raw", clientRSACipher);
+        const clientN = clientExportedRSAKey.n;
+        const clientE = clientExportedRSAKey.e;
         const clientPublicKey = new Uint8Array(4 + clientKeyBytes * 2);
         clientPublicKey[0] = (clientKeyLength & 0xff000000) >>> 24;
         clientPublicKey[1] = (clientKeyLength & 0xff0000) >>> 16;
@@ -444,17 +182,20 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         clientPublicKey[3] = clientKeyLength & 0xff;
         clientPublicKey.set(clientN, 4);
         clientPublicKey.set(clientE, 4 + clientKeyBytes);
-        this._sock.send(clientPublicKey);
+        this._sock.sQpushBytes(clientPublicKey);
+        this._sock.flush();
 
         // 3: Send client random
         const clientRandom = new Uint8Array(16);
         window.crypto.getRandomValues(clientRandom);
-        const clientEncryptedRandom = serverRSACipher.encrypt(clientRandom);
+        const clientEncryptedRandom = await legacyCrypto.encrypt(
+            { name: "RSA-PKCS1-v1_5" }, serverRSACipher, clientRandom);
         const clientRandomMessage = new Uint8Array(2 + serverKeyBytes);
         clientRandomMessage[0] = (serverKeyBytes & 0xff00) >>> 8;
         clientRandomMessage[1] = serverKeyBytes & 0xff;
         clientRandomMessage.set(clientEncryptedRandom, 2);
-        this._sock.send(clientRandomMessage);
+        this._sock.sQpushBytes(clientRandomMessage);
+        this._sock.flush();
 
         // 4: Receive server random
         await this._waitSockAsync(2);
@@ -462,7 +203,8 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
             throw new Error("RA2: wrong encrypted message length");
         }
         const serverEncryptedRandom = this._sock.rQshiftBytes(clientKeyBytes);
-        const serverRandom = clientRSACipher.decrypt(serverEncryptedRandom);
+        const serverRandom = await legacyCrypto.decrypt(
+            { name: "RSA-PKCS1-v1_5" }, clientRSACipher, serverEncryptedRandom);
         if (serverRandom === null || serverRandom.length !== 16) {
             throw new Error("RA2: corrupted server encrypted random");
         }
@@ -494,13 +236,14 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         clientHash = await window.crypto.subtle.digest("SHA-1", clientHash);
         serverHash = new Uint8Array(serverHash);
         clientHash = new Uint8Array(clientHash);
-        this._sock.send(await clientCipher.makeMessage(clientHash));
+        this._sock.sQpushBytes(await clientCipher.makeMessage(clientHash));
+        this._sock.flush();
         await this._waitSockAsync(2 + 20 + 16);
         if (this._sock.rQshift16() !== 20) {
             throw new Error("RA2: wrong server hash");
         }
         const serverHashReceived = await serverCipher.receiveMessage(
-            20, this._sock.rQshiftBytes(20), this._sock.rQshiftBytes(16));
+            20, this._sock.rQshiftBytes(20 + 16));
         if (serverHashReceived === null) {
             throw new Error("RA2: failed to authenticate the message");
         }
@@ -516,11 +259,12 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
             throw new Error("RA2: wrong subtype");
         }
         let subtype = (await serverCipher.receiveMessage(
-            1, this._sock.rQshiftBytes(1), this._sock.rQshiftBytes(16)));
+            1, this._sock.rQshiftBytes(1 + 16)));
         if (subtype === null) {
             throw new Error("RA2: failed to authenticate the message");
         }
         subtype = subtype[0];
+        let waitCredentials = this._waitCredentialsAsync(subtype);
         if (subtype === 1) {
             if (this._getCredentials().username === undefined ||
                 this._getCredentials().password === undefined) {
@@ -537,7 +281,7 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         } else {
             throw new Error("RA2: wrong subtype");
         }
-        await this._waitCredentialsAsync(subtype);
+        await waitCredentials;
         let username;
         if (subtype === 1) {
             username = encodeUTF8(this._getCredentials().username).slice(0, 255);
@@ -554,7 +298,8 @@ export default class RSAAESAuthenticationState extends EventTargetMixin {
         for (let i = 0; i < password.length; i++) {
             credentials[username.length + 2 + i] = password.charCodeAt(i);
         }
-        this._sock.send(await clientCipher.makeMessage(credentials));
+        this._sock.sQpushBytes(await clientCipher.makeMessage(credentials));
+        this._sock.flush();
     }
 
     get hasStarted() {
diff --git a/systemvm/agent/noVNC/core/rfb.js b/systemvm/agent/noVNC/core/rfb.js
index 228340a2dec..8faa993d425 100644
--- a/systemvm/agent/noVNC/core/rfb.js
+++ b/systemvm/agent/noVNC/core/rfb.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -10,7 +10,7 @@
 import { toUnsigned32bit, toSigned32bit } from './util/int.js';
 import * as Log from './util/logging.js';
 import { encodeUTF8, decodeUTF8 } from './util/strings.js';
-import { dragThreshold } from './util/browser.js';
+import { dragThreshold, supportsWebCodecsH264Decode } from './util/browser.js';
 import { clientToElement } from './util/element.js';
 import { setCapture } from './util/events.js';
 import EventTargetMixin from './util/eventtarget.js';
@@ -21,22 +21,23 @@ import Keyboard from "./input/keyboard.js";
 import GestureHandler from "./input/gesturehandler.js";
 import Cursor from "./util/cursor.js";
 import Websock from "./websock.js";
-import DES from "./des.js";
 import KeyTable from "./input/keysym.js";
 import USKeyTable from "./input/uskeysym.js";
 import XtScancode from "./input/xtscancodes.js";
 import { encodings } from "./encodings.js";
 import RSAAESAuthenticationState from "./ra2.js";
-import { MD5 } from "./util/md5.js";
+import legacyCrypto from "./crypto/crypto.js";
 
 import RawDecoder from "./decoders/raw.js";
 import CopyRectDecoder from "./decoders/copyrect.js";
 import RREDecoder from "./decoders/rre.js";
 import HextileDecoder from "./decoders/hextile.js";
+import ZlibDecoder from './decoders/zlib.js';
 import TightDecoder from "./decoders/tight.js";
 import TightPNGDecoder from "./decoders/tightpng.js";
 import ZRLEDecoder from "./decoders/zrle.js";
 import JPEGDecoder from "./decoders/jpeg.js";
+import H264Decoder from "./decoders/h264.js";
 import SCANCODES_JP from "../keymaps/keymap-ja-atset1.js"
 
 // How many seconds to wait for a disconnect to finish
@@ -157,9 +158,13 @@ export default class RFB extends EventTargetMixin {
         this._supportsSetDesktopSize = false;
         this._screenID = 0;
         this._screenFlags = 0;
+        this._pendingRemoteResize = false;
+        this._lastResize = 0;
 
         this._qemuExtKeyEventSupported = false;
 
+        this._extendedPointerEventSupported = false;
+
         this._clipboardText = null;
         this._clipboardServerCapabilitiesActions = {};
         this._clipboardServerCapabilitiesFormats = {};
@@ -258,10 +263,12 @@ export default class RFB extends EventTargetMixin {
         this._decoders[encodings.encodingCopyRect] = new CopyRectDecoder();
         this._decoders[encodings.encodingRRE] = new RREDecoder();
         this._decoders[encodings.encodingHextile] = new HextileDecoder();
+        this._decoders[encodings.encodingZlib] = new ZlibDecoder();
         this._decoders[encodings.encodingTight] = new TightDecoder();
         this._decoders[encodings.encodingTightPNG] = new TightPNGDecoder();
         this._decoders[encodings.encodingZRLE] = new ZRLEDecoder();
         this._decoders[encodings.encodingJPEG] = new JPEGDecoder();
+        this._decoders[encodings.encodingH264] = new H264Decoder();
 
         // NB: nothing that needs explicit teardown should be done
         // before this point, since this can throw an exception
@@ -271,10 +278,11 @@ export default class RFB extends EventTargetMixin {
             Log.Error("Display exception: " + exc);
             throw exc;
         }
-        this._display.onflush = this._onFlush.bind(this);
 
         this._keyboard = new Keyboard(this._canvas);
         this._keyboard.onkeyevent = this._handleKeyEvent.bind(this);
+        this._remoteCapsLock = null; // Null indicates unknown or irrelevant
+        this._remoteNumLock = null;
 
         this._gestures = new GestureHandler();
 
@@ -795,6 +803,7 @@ export default class RFB extends EventTargetMixin {
             currentHeight == this._expectedClientHeight;
     }
 
+    // Handle browser window resizes
     _handleResize() {
         // Don't change anything if the client size is already as expected
         if (this._clientHasExpectedSize()) {
@@ -805,17 +814,12 @@ export default class RFB extends EventTargetMixin {
         window.requestAnimationFrame(() => {
             this._updateClip();
             this._updateScale();
+            this._saveExpectedClientSize();
         });
 
-        if (this._resizeSession) {
-            // Request changing the resolution of the remote display to
-            // the size of the local browser viewport.
-
-            // In order to not send multiple requests before the browser-resize
-            // is finished we wait 0.5 seconds before sending the request.
-            clearTimeout(this._resizeTimeout);
-            this._resizeTimeout = setTimeout(this._requestRemoteResize.bind(this), 500);
-        }
+        // Request changing the resolution of the remote display to
+        // the size of the local browser viewport.
+        this._requestRemoteResize();
     }
 
     // Update state of clipping in Display object, and make sure the
@@ -865,16 +869,39 @@ export default class RFB extends EventTargetMixin {
     // Requests a change of remote desktop size. This message is an extension
     // and may only be sent if we have received an ExtendedDesktopSize message
     _requestRemoteResize() {
-        clearTimeout(this._resizeTimeout);
-        this._resizeTimeout = null;
-
-        if (!this._resizeSession || this._viewOnly ||
-            !this._supportsSetDesktopSize) {
+        if (!this._resizeSession) {
+            return;
+        }
+        if (this._viewOnly) {
+            return;
+        }
+        if (!this._supportsSetDesktopSize) {
             return;
         }
 
+        // Rate limit to one pending resize at a time
+        if (this._pendingRemoteResize) {
+            return;
+        }
+
+        // And no more than once every 100ms
+        if ((Date.now() - this._lastResize) < 100) {
+            clearTimeout(this._resizeTimeout);
+            this._resizeTimeout = setTimeout(this._requestRemoteResize.bind(this),
+                                             100 - (Date.now() - this._lastResize));
+            return;
+        }
+        this._resizeTimeout = null;
+
         const size = this._screenSize();
 
+        // Do we actually change anything?
+        if (size.w === this._fbWidth && size.h === this._fbHeight) {
+            return;
+        }
+
+        this._pendingRemoteResize = true;
+        this._lastResize = Date.now();
         RFB.messages.setDesktopSize(this._sock,
                                     Math.floor(size.w), Math.floor(size.h),
                                     this._screenID, this._screenFlags);
@@ -1039,7 +1066,7 @@ export default class RFB extends EventTargetMixin {
     }
 
     _handleMessage() {
-        if (this._sock.rQlen === 0) {
+        if (this._sock.rQwait("message", 1)) {
             Log.Warn("handleMessage called on an empty receive queue");
             return;
         }
@@ -1056,7 +1083,7 @@ export default class RFB extends EventTargetMixin {
                     if (!this._normalMsg()) {
                         break;
                     }
-                    if (this._sock.rQlen === 0) {
+                    if (this._sock.rQwait("message", 1)) {
                         break;
                     }
                 }
@@ -1074,10 +1101,68 @@ export default class RFB extends EventTargetMixin {
         }
     }
 
-    _handleKeyEvent(keysym, code, down) {
+    _handleKeyEvent(keysym, code, down, numlock, capslock) {
+        // If remote state of capslock is known, and it doesn't match the local led state of
+        // the keyboard, we send a capslock keypress first to bring it into sync.
+        // If we just pressed CapsLock, or we toggled it remotely due to it being out of sync
+        // we clear the remote state so that we don't send duplicate or spurious fixes,
+        // since it may take some time to receive the new remote CapsLock state.
+        if (code == 'CapsLock' && down) {
+            this._remoteCapsLock = null;
+        }
+        if (this._remoteCapsLock !== null && capslock !== null && this._remoteCapsLock !== capslock && down) {
+            Log.Debug("Fixing remote caps lock");
+
+            this.sendKey(KeyTable.XK_Caps_Lock, 'CapsLock', true);
+            this.sendKey(KeyTable.XK_Caps_Lock, 'CapsLock', false);
+            // We clear the remote capsLock state when we do this to prevent issues with doing this twice
+            // before we receive an update of the the remote state.
+            this._remoteCapsLock = null;
+        }
+
+        // Logic for numlock is exactly the same.
+        if (code == 'NumLock' && down) {
+            this._remoteNumLock = null;
+        }
+        if (this._remoteNumLock !== null && numlock !== null && this._remoteNumLock !== numlock && down) {
+            Log.Debug("Fixing remote num lock");
+            this.sendKey(KeyTable.XK_Num_Lock, 'NumLock', true);
+            this.sendKey(KeyTable.XK_Num_Lock, 'NumLock', false);
+            this._remoteNumLock = null;
+        }
         this.sendKey(keysym, code, down);
     }
 
+    static _convertButtonMask(buttons) {
+        /* The bits in MouseEvent.buttons property correspond
+         * to the following mouse buttons:
+         *     0: Left
+         *     1: Right
+         *     2: Middle
+         *     3: Back
+         *     4: Forward
+         *
+         * These bits needs to be converted to what they are defined as
+         * in the RFB protocol.
+         */
+
+        const buttonMaskMap = {
+            0: 1 << 0, // Left
+            1: 1 << 2, // Right
+            2: 1 << 1, // Middle
+            3: 1 << 7, // Back
+            4: 1 << 8, // Forward
+        };
+
+        let bmask = 0;
+        for (let i = 0; i < 5; i++) {
+            if (buttons & (1 << i)) {
+                bmask |= buttonMaskMap[i];
+            }
+        }
+        return bmask;
+    }
+
     _handleMouse(ev) {
         /*
          * We don't check connection status or viewOnly here as the
@@ -1107,80 +1192,75 @@ export default class RFB extends EventTargetMixin {
         let pos = clientToElement(ev.clientX, ev.clientY,
                                   this._canvas);
 
+        let bmask = RFB._convertButtonMask(ev.buttons);
+
+        let down = ev.type == 'mousedown';
         switch (ev.type) {
             case 'mousedown':
-                setCapture(this._canvas);
-                this._handleMouseButton(pos.x, pos.y,
-                                        true, 1 << ev.button);
-                break;
             case 'mouseup':
-                this._handleMouseButton(pos.x, pos.y,
-                                        false, 1 << ev.button);
+                if (this.dragViewport) {
+                    if (down && !this._viewportDragging) {
+                        this._viewportDragging = true;
+                        this._viewportDragPos = {'x': pos.x, 'y': pos.y};
+                        this._viewportHasMoved = false;
+
+                        this._flushMouseMoveTimer(pos.x, pos.y);
+
+                        // Skip sending mouse events, instead save the current
+                        // mouse mask so we can send it later.
+                        this._mouseButtonMask = bmask;
+                        break;
+                    } else {
+                        this._viewportDragging = false;
+
+                        // If we actually performed a drag then we are done
+                        // here and should not send any mouse events
+                        if (this._viewportHasMoved) {
+                            this._mouseButtonMask = bmask;
+                            break;
+                        }
+                        // Otherwise we treat this as a mouse click event.
+                        // Send the previously saved button mask, followed
+                        // by the current button mask at the end of this
+                        // function.
+                        this._sendMouse(pos.x, pos.y,  this._mouseButtonMask);
+                    }
+                }
+                if (down) {
+                    setCapture(this._canvas);
+                }
+                this._handleMouseButton(pos.x, pos.y, bmask);
                 break;
             case 'mousemove':
+                if (this._viewportDragging) {
+                    const deltaX = this._viewportDragPos.x - pos.x;
+                    const deltaY = this._viewportDragPos.y - pos.y;
+
+                    if (this._viewportHasMoved || (Math.abs(deltaX) > dragThreshold ||
+                                                   Math.abs(deltaY) > dragThreshold)) {
+                        this._viewportHasMoved = true;
+
+                        this._viewportDragPos = {'x': pos.x, 'y': pos.y};
+                        this._display.viewportChangePos(deltaX, deltaY);
+                    }
+
+                    // Skip sending mouse events
+                    break;
+                }
                 this._handleMouseMove(pos.x, pos.y);
                 break;
         }
     }
 
-    _handleMouseButton(x, y, down, bmask) {
-        if (this.dragViewport) {
-            if (down && !this._viewportDragging) {
-                this._viewportDragging = true;
-                this._viewportDragPos = {'x': x, 'y': y};
-                this._viewportHasMoved = false;
-
-                // Skip sending mouse events
-                return;
-            } else {
-                this._viewportDragging = false;
-
-                // If we actually performed a drag then we are done
-                // here and should not send any mouse events
-                if (this._viewportHasMoved) {
-                    return;
-                }
-
-                // Otherwise we treat this as a mouse click event.
-                // Send the button down event here, as the button up
-                // event is sent at the end of this function.
-                this._sendMouse(x, y, bmask);
-            }
-        }
-
+    _handleMouseButton(x, y, bmask) {
         // Flush waiting move event first
-        if (this._mouseMoveTimer !== null) {
-            clearTimeout(this._mouseMoveTimer);
-            this._mouseMoveTimer = null;
-            this._sendMouse(x, y, this._mouseButtonMask);
-        }
-
-        if (down) {
-            this._mouseButtonMask |= bmask;
-        } else {
-            this._mouseButtonMask &= ~bmask;
-        }
+        this._flushMouseMoveTimer(x, y);
 
+        this._mouseButtonMask = bmask;
         this._sendMouse(x, y, this._mouseButtonMask);
     }
 
     _handleMouseMove(x, y) {
-        if (this._viewportDragging) {
-            const deltaX = this._viewportDragPos.x - x;
-            const deltaY = this._viewportDragPos.y - y;
-
-            if (this._viewportHasMoved || (Math.abs(deltaX) > dragThreshold ||
-                                           Math.abs(deltaY) > dragThreshold)) {
-                this._viewportHasMoved = true;
-
-                this._viewportDragPos = {'x': x, 'y': y};
-                this._display.viewportChangePos(deltaX, deltaY);
-            }
-
-            // Skip sending mouse events
-            return;
-        }
-
         this._mousePos = { 'x': x, 'y': y };
 
         // Limit many mouse move events to one every MOUSE_MOVE_DELAY ms
@@ -1210,8 +1290,20 @@ export default class RFB extends EventTargetMixin {
         if (this._rfbConnectionState !== 'connected') { return; }
         if (this._viewOnly) { return; } // View only, skip mouse events
 
-        RFB.messages.pointerEvent(this._sock, this._display.absX(x),
-                                  this._display.absY(y), mask);
+        // Highest bit in mask is never sent to the server
+        if (mask & 0x8000) {
+            throw new Error("Illegal mouse button mask (mask: " + mask + ")");
+        }
+
+        let extendedMouseButtons = mask & 0x7f80;
+
+        if (this._extendedPointerEventSupported && extendedMouseButtons) {
+            RFB.messages.extendedPointerEvent(this._sock, this._display.absX(x),
+                                              this._display.absY(y), mask);
+        } else {
+            RFB.messages.pointerEvent(this._sock, this._display.absX(x),
+                                      this._display.absY(y), mask);
+        }
     }
 
     _handleWheel(ev) {
@@ -1224,6 +1316,7 @@ export default class RFB extends EventTargetMixin {
         let pos = clientToElement(ev.clientX, ev.clientY,
                                   this._canvas);
 
+        let bmask = RFB._convertButtonMask(ev.buttons);
         let dX = ev.deltaX;
         let dY = ev.deltaY;
 
@@ -1243,26 +1336,27 @@ export default class RFB extends EventTargetMixin {
         this._accumulatedWheelDeltaX += dX;
         this._accumulatedWheelDeltaY += dY;
 
+
         // Generate a mouse wheel step event when the accumulated delta
         // for one of the axes is large enough.
         if (Math.abs(this._accumulatedWheelDeltaX) >= WHEEL_STEP) {
             if (this._accumulatedWheelDeltaX < 0) {
-                this._handleMouseButton(pos.x, pos.y, true, 1 << 5);
-                this._handleMouseButton(pos.x, pos.y, false, 1 << 5);
+                this._handleMouseButton(pos.x, pos.y, bmask | 1 << 5);
+                this._handleMouseButton(pos.x, pos.y, bmask);
             } else if (this._accumulatedWheelDeltaX > 0) {
-                this._handleMouseButton(pos.x, pos.y, true, 1 << 6);
-                this._handleMouseButton(pos.x, pos.y, false, 1 << 6);
+                this._handleMouseButton(pos.x, pos.y, bmask | 1 << 6);
+                this._handleMouseButton(pos.x, pos.y, bmask);
             }
 
             this._accumulatedWheelDeltaX = 0;
         }
         if (Math.abs(this._accumulatedWheelDeltaY) >= WHEEL_STEP) {
             if (this._accumulatedWheelDeltaY < 0) {
-                this._handleMouseButton(pos.x, pos.y, true, 1 << 3);
-                this._handleMouseButton(pos.x, pos.y, false, 1 << 3);
+                this._handleMouseButton(pos.x, pos.y, bmask | 1 << 3);
+                this._handleMouseButton(pos.x, pos.y, bmask);
             } else if (this._accumulatedWheelDeltaY > 0) {
-                this._handleMouseButton(pos.x, pos.y, true, 1 << 4);
-                this._handleMouseButton(pos.x, pos.y, false, 1 << 4);
+                this._handleMouseButton(pos.x, pos.y, bmask | 1 << 4);
+                this._handleMouseButton(pos.x, pos.y, bmask);
             }
 
             this._accumulatedWheelDeltaY = 0;
@@ -1301,8 +1395,8 @@ export default class RFB extends EventTargetMixin {
         this._gestureLastTapTime = Date.now();
 
         this._fakeMouseMove(this._gestureFirstDoubleTapEv, pos.x, pos.y);
-        this._handleMouseButton(pos.x, pos.y, true, bmask);
-        this._handleMouseButton(pos.x, pos.y, false, bmask);
+        this._handleMouseButton(pos.x, pos.y, bmask);
+        this._handleMouseButton(pos.x, pos.y, 0x0);
     }
 
     _handleGesture(ev) {
@@ -1323,14 +1417,27 @@ export default class RFB extends EventTargetMixin {
                         this._handleTapEvent(ev, 0x2);
                         break;
                     case 'drag':
-                        this._fakeMouseMove(ev, pos.x, pos.y);
-                        this._handleMouseButton(pos.x, pos.y, true, 0x1);
+                        if (this.dragViewport) {
+                            this._viewportHasMoved = false;
+                            this._viewportDragging = true;
+                            this._viewportDragPos = {'x': pos.x, 'y': pos.y};
+                        } else {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                            this._handleMouseButton(pos.x, pos.y, 0x1);
+                        }
                         break;
                     case 'longpress':
-                        this._fakeMouseMove(ev, pos.x, pos.y);
-                        this._handleMouseButton(pos.x, pos.y, true, 0x4);
+                        if (this.dragViewport) {
+                            // If dragViewport is true, we need to wait to see
+                            // if we have dragged outside the threshold before
+                            // sending any events to the server.
+                            this._viewportHasMoved = false;
+                            this._viewportDragPos = {'x': pos.x, 'y': pos.y};
+                        } else {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                            this._handleMouseButton(pos.x, pos.y, 0x4);
+                        }
                         break;
-
                     case 'twodrag':
                         this._gestureLastMagnitudeX = ev.detail.magnitudeX;
                         this._gestureLastMagnitudeY = ev.detail.magnitudeY;
@@ -1352,7 +1459,21 @@ export default class RFB extends EventTargetMixin {
                         break;
                     case 'drag':
                     case 'longpress':
-                        this._fakeMouseMove(ev, pos.x, pos.y);
+                        if (this.dragViewport) {
+                            this._viewportDragging = true;
+                            const deltaX = this._viewportDragPos.x - pos.x;
+                            const deltaY = this._viewportDragPos.y - pos.y;
+
+                            if (this._viewportHasMoved || (Math.abs(deltaX) > dragThreshold ||
+                                                           Math.abs(deltaY) > dragThreshold)) {
+                                this._viewportHasMoved = true;
+
+                                this._viewportDragPos = {'x': pos.x, 'y': pos.y};
+                                this._display.viewportChangePos(deltaX, deltaY);
+                            }
+                        } else {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                        }
                         break;
                     case 'twodrag':
                         // Always scroll in the same position.
@@ -1360,23 +1481,23 @@ export default class RFB extends EventTargetMixin {
                         // every update.
                         this._fakeMouseMove(ev, pos.x, pos.y);
                         while ((ev.detail.magnitudeY - this._gestureLastMagnitudeY) > GESTURE_SCRLSENS) {
-                            this._handleMouseButton(pos.x, pos.y, true, 0x8);
-                            this._handleMouseButton(pos.x, pos.y, false, 0x8);
+                            this._handleMouseButton(pos.x, pos.y, 0x8);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
                             this._gestureLastMagnitudeY += GESTURE_SCRLSENS;
                         }
                         while ((ev.detail.magnitudeY - this._gestureLastMagnitudeY) < -GESTURE_SCRLSENS) {
-                            this._handleMouseButton(pos.x, pos.y, true, 0x10);
-                            this._handleMouseButton(pos.x, pos.y, false, 0x10);
+                            this._handleMouseButton(pos.x, pos.y, 0x10);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
                             this._gestureLastMagnitudeY -= GESTURE_SCRLSENS;
                         }
                         while ((ev.detail.magnitudeX - this._gestureLastMagnitudeX) > GESTURE_SCRLSENS) {
-                            this._handleMouseButton(pos.x, pos.y, true, 0x20);
-                            this._handleMouseButton(pos.x, pos.y, false, 0x20);
+                            this._handleMouseButton(pos.x, pos.y, 0x20);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
                             this._gestureLastMagnitudeX += GESTURE_SCRLSENS;
                         }
                         while ((ev.detail.magnitudeX - this._gestureLastMagnitudeX) < -GESTURE_SCRLSENS) {
-                            this._handleMouseButton(pos.x, pos.y, true, 0x40);
-                            this._handleMouseButton(pos.x, pos.y, false, 0x40);
+                            this._handleMouseButton(pos.x, pos.y, 0x40);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
                             this._gestureLastMagnitudeX -= GESTURE_SCRLSENS;
                         }
                         break;
@@ -1389,13 +1510,13 @@ export default class RFB extends EventTargetMixin {
                         if (Math.abs(magnitude - this._gestureLastMagnitudeX) > GESTURE_ZOOMSENS) {
                             this._handleKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true);
                             while ((magnitude - this._gestureLastMagnitudeX) > GESTURE_ZOOMSENS) {
-                                this._handleMouseButton(pos.x, pos.y, true, 0x8);
-                                this._handleMouseButton(pos.x, pos.y, false, 0x8);
+                                this._handleMouseButton(pos.x, pos.y, 0x8);
+                                this._handleMouseButton(pos.x, pos.y, 0x0);
                                 this._gestureLastMagnitudeX += GESTURE_ZOOMSENS;
                             }
                             while ((magnitude -  this._gestureLastMagnitudeX) < -GESTURE_ZOOMSENS) {
-                                this._handleMouseButton(pos.x, pos.y, true, 0x10);
-                                this._handleMouseButton(pos.x, pos.y, false, 0x10);
+                                this._handleMouseButton(pos.x, pos.y, 0x10);
+                                this._handleMouseButton(pos.x, pos.y, 0x0);
                                 this._gestureLastMagnitudeX -= GESTURE_ZOOMSENS;
                             }
                         }
@@ -1413,19 +1534,47 @@ export default class RFB extends EventTargetMixin {
                     case 'twodrag':
                         break;
                     case 'drag':
-                        this._fakeMouseMove(ev, pos.x, pos.y);
-                        this._handleMouseButton(pos.x, pos.y, false, 0x1);
+                        if (this.dragViewport) {
+                            this._viewportDragging = false;
+                        } else {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
+                        }
                         break;
                     case 'longpress':
-                        this._fakeMouseMove(ev, pos.x, pos.y);
-                        this._handleMouseButton(pos.x, pos.y, false, 0x4);
+                        if (this._viewportHasMoved) {
+                            // We don't want to send any events if we have moved
+                            // our viewport
+                            break;
+                        }
+
+                        if (this.dragViewport && !this._viewportHasMoved) {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                            // If dragViewport is true, we need to wait to see
+                            // if we have dragged outside the threshold before
+                            // sending any events to the server.
+                            this._handleMouseButton(pos.x, pos.y, 0x4);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
+                            this._viewportDragging = false;
+                        } else {
+                            this._fakeMouseMove(ev, pos.x, pos.y);
+                            this._handleMouseButton(pos.x, pos.y, 0x0);
+                        }
                         break;
                 }
                 break;
         }
     }
 
-    // Message Handlers
+    _flushMouseMoveTimer(x, y) {
+        if (this._mouseMoveTimer !== null) {
+            clearTimeout(this._mouseMoveTimer);
+            this._mouseMoveTimer = null;
+            this._sendMouse(x, y, this._mouseButtonMask);
+        }
+    }
+
+    // Message handlers
 
     _negotiateProtocolVersion() {
         if (this._sock.rQwait("version", 12)) {
@@ -1462,7 +1611,8 @@ export default class RFB extends EventTargetMixin {
             while (repeaterID.length < 250) {
                 repeaterID += "\0";
             }
-            this._sock.sendString(repeaterID);
+            this._sock.sQpushString(repeaterID);
+            this._sock.flush();
             return true;
         }
 
@@ -1472,7 +1622,8 @@ export default class RFB extends EventTargetMixin {
 
         const cversion = "00" + parseInt(this._rfbVersion, 10) +
                        ".00" + ((this._rfbVersion * 10) % 10);
-        this._sock.sendString("RFB " + cversion + "\n");
+        this._sock.sQpushString("RFB " + cversion + "\n");
+        this._sock.flush();
         Log.Debug('Sent ProtocolVersion: ' + cversion);
 
         this._rfbInitState = 'Security';
@@ -1524,7 +1675,8 @@ export default class RFB extends EventTargetMixin {
                 return this._fail("Unsupported security types (types: " + types + ")");
             }
 
-            this._sock.send([this._rfbAuthScheme]);
+            this._sock.sQpush8(this._rfbAuthScheme);
+            this._sock.flush();
         } else {
             // Server decides
             if (this._sock.rQwait("security scheme", 4)) { return false; }
@@ -1586,12 +1738,15 @@ export default class RFB extends EventTargetMixin {
             return false;
         }
 
-        const xvpAuthStr = String.fromCharCode(this._rfbCredentials.username.length) +
-                           String.fromCharCode(this._rfbCredentials.target.length) +
-                           this._rfbCredentials.username +
-                           this._rfbCredentials.target;
-        this._sock.sendString(xvpAuthStr);
+        this._sock.sQpush8(this._rfbCredentials.username.length);
+        this._sock.sQpush8(this._rfbCredentials.target.length);
+        this._sock.sQpushString(this._rfbCredentials.username);
+        this._sock.sQpushString(this._rfbCredentials.target);
+
+        this._sock.flush();
+
         this._rfbAuthScheme = securityTypeVNCAuth;
+
         return this._negotiateAuthentication();
     }
 
@@ -1609,7 +1764,9 @@ export default class RFB extends EventTargetMixin {
                 return this._fail("Unsupported VeNCrypt version " + major + "." + minor);
             }
 
-            this._sock.send([0, 2]);
+            this._sock.sQpush8(0);
+            this._sock.sQpush8(2);
+            this._sock.flush();
             this._rfbVeNCryptState = 1;
         }
 
@@ -1668,12 +1825,10 @@ export default class RFB extends EventTargetMixin {
                 return this._fail("Unsupported security types (types: " + subtypes + ")");
             }
 
-            this._sock.send([this._rfbAuthScheme >> 24,
-                             this._rfbAuthScheme >> 16,
-                             this._rfbAuthScheme >> 8,
-                             this._rfbAuthScheme]);
+            this._sock.sQpush32(this._rfbAuthScheme);
+            this._sock.flush();
 
-            this._rfbVeNCryptState == 4;
+            this._rfbVeNCryptState = 4;
             return true;
         }
     }
@@ -1690,20 +1845,11 @@ export default class RFB extends EventTargetMixin {
         const user = encodeUTF8(this._rfbCredentials.username);
         const pass = encodeUTF8(this._rfbCredentials.password);
 
-        this._sock.send([
-            (user.length >> 24) & 0xFF,
-            (user.length >> 16) & 0xFF,
-            (user.length >> 8) & 0xFF,
-            user.length & 0xFF
-        ]);
-        this._sock.send([
-            (pass.length >> 24) & 0xFF,
-            (pass.length >> 16) & 0xFF,
-            (pass.length >> 8) & 0xFF,
-            pass.length & 0xFF
-        ]);
-        this._sock.sendString(user);
-        this._sock.sendString(pass);
+        this._sock.sQpush32(user.length);
+        this._sock.sQpush32(pass.length);
+        this._sock.sQpushString(user);
+        this._sock.sQpushString(pass);
+        this._sock.flush();
 
         this._rfbInitState = "SecurityResult";
         return true;
@@ -1722,7 +1868,8 @@ export default class RFB extends EventTargetMixin {
         // TODO(directxman12): make genDES not require an Array
         const challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16));
         const response = RFB.genDES(this._rfbCredentials.password, challenge);
-        this._sock.send(response);
+        this._sock.sQpushBytes(response);
+        this._sock.flush();
         this._rfbInitState = "SecurityResult";
         return true;
     }
@@ -1740,8 +1887,9 @@ export default class RFB extends EventTargetMixin {
         if (this._rfbCredentials.ardPublicKey != undefined &&
             this._rfbCredentials.ardCredentials != undefined) {
             // if the async web crypto is done return the results
-            this._sock.send(this._rfbCredentials.ardCredentials);
-            this._sock.send(this._rfbCredentials.ardPublicKey);
+            this._sock.sQpushBytes(this._rfbCredentials.ardCredentials);
+            this._sock.sQpushBytes(this._rfbCredentials.ardPublicKey);
+            this._sock.flush();
             this._rfbCredentials.ardCredentials = null;
             this._rfbCredentials.ardPublicKey = null;
             this._rfbInitState = "SecurityResult";
@@ -1760,77 +1908,35 @@ export default class RFB extends EventTargetMixin {
         let prime = this._sock.rQshiftBytes(keyLength);  // predetermined prime modulus
         let serverPublicKey = this._sock.rQshiftBytes(keyLength); // other party's public key
 
-        let clientPrivateKey = window.crypto.getRandomValues(new Uint8Array(keyLength));
-        let padding = Array.from(window.crypto.getRandomValues(new Uint8Array(64)), byte => String.fromCharCode(65+byte%26)).join('');
-
-        this._negotiateARDAuthAsync(generator, keyLength, prime, serverPublicKey, clientPrivateKey, padding);
+        let clientKey = legacyCrypto.generateKey(
+            { name: "DH", g: generator, p: prime }, false, ["deriveBits"]);
+        this._negotiateARDAuthAsync(keyLength, serverPublicKey, clientKey);
 
         return false;
     }
 
-    _modPow(base, exponent, modulus) {
+    async _negotiateARDAuthAsync(keyLength, serverPublicKey, clientKey) {
+        const clientPublicKey = legacyCrypto.exportKey("raw", clientKey.publicKey);
+        const sharedKey = legacyCrypto.deriveBits(
+            { name: "DH", public: serverPublicKey }, clientKey.privateKey, keyLength * 8);
 
-        let baseHex = "0x"+Array.from(base, byte => ('0' + (byte & 0xFF).toString(16)).slice(-2)).join('');
-        let exponentHex = "0x"+Array.from(exponent, byte => ('0' + (byte & 0xFF).toString(16)).slice(-2)).join('');
-        let modulusHex = "0x"+Array.from(modulus, byte => ('0' + (byte & 0xFF).toString(16)).slice(-2)).join('');
+        const username = encodeUTF8(this._rfbCredentials.username).substring(0, 63);
+        const password = encodeUTF8(this._rfbCredentials.password).substring(0, 63);
 
-        let b = BigInt(baseHex);
-        let e = BigInt(exponentHex);
-        let m = BigInt(modulusHex);
-        let r = 1n;
-        b = b % m;
-        while (e > 0) {
-            if (e % 2n === 1n) {
-                r = (r * b) % m;
-            }
-            e = e / 2n;
-            b = (b * b) % m;
+        const credentials = window.crypto.getRandomValues(new Uint8Array(128));
+        for (let i = 0; i < username.length; i++) {
+            credentials[i] = username.charCodeAt(i);
         }
-        let hexResult = r.toString(16);
-
-        while (hexResult.length/2<exponent.length || (hexResult.length%2 != 0)) {
-            hexResult = "0"+hexResult;
+        credentials[username.length] = 0;
+        for (let i = 0; i < password.length; i++) {
+            credentials[64 + i] = password.charCodeAt(i);
         }
+        credentials[64 + password.length] = 0;
 
-        let bytesResult = [];
-        for (let c = 0; c < hexResult.length; c += 2) {
-            bytesResult.push(parseInt(hexResult.substr(c, 2), 16));
-        }
-        return bytesResult;
-    }
-
-    async _aesEcbEncrypt(string, key) {
-        // perform AES-ECB blocks
-        let keyString = Array.from(key, byte => String.fromCharCode(byte)).join('');
-        let aesKey = await window.crypto.subtle.importKey("raw", MD5(keyString), {name: "AES-CBC"}, false, ["encrypt"]);
-        let data = new Uint8Array(string.length);
-        for (let i = 0; i < string.length; ++i) {
-            data[i] = string.charCodeAt(i);
-        }
-        let encrypted = new Uint8Array(data.length);
-        for (let i=0;i<data.length;i+=16) {
-            let block = data.slice(i, i+16);
-            let encryptedBlock = await window.crypto.subtle.encrypt({name: "AES-CBC", iv: block},
-                                                                    aesKey, new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
-            );
-            encrypted.set((new Uint8Array(encryptedBlock)).slice(0, 16), i);
-        }
-        return encrypted;
-    }
-
-    async _negotiateARDAuthAsync(generator, keyLength, prime, serverPublicKey, clientPrivateKey, padding) {
-        // calculate the DH keys
-        let clientPublicKey = this._modPow(generator, clientPrivateKey, prime);
-        let sharedKey = this._modPow(serverPublicKey, clientPrivateKey, prime);
-
-        let username = encodeUTF8(this._rfbCredentials.username).substring(0, 63);
-        let password = encodeUTF8(this._rfbCredentials.password).substring(0, 63);
-
-        let paddedUsername = username + '\0' + padding.substring(0, 63);
-        let paddedPassword = password + '\0' + padding.substring(0, 63);
-        let credentials = paddedUsername.substring(0, 64) + paddedPassword.substring(0, 64);
-
-        let encrypted = await this._aesEcbEncrypt(credentials, sharedKey);
+        const key = await legacyCrypto.digest("MD5", sharedKey);
+        const cipher = await legacyCrypto.importKey(
+            "raw", key, { name: "AES-ECB" }, false, ["encrypt"]);
+        const encrypted = await legacyCrypto.encrypt({ name: "AES-ECB" }, cipher, credentials);
 
         this._rfbCredentials.ardCredentials = encrypted;
         this._rfbCredentials.ardPublicKey = clientPublicKey;
@@ -1847,10 +1953,12 @@ export default class RFB extends EventTargetMixin {
             return false;
         }
 
-        this._sock.send([0, 0, 0, this._rfbCredentials.username.length]);
-        this._sock.send([0, 0, 0, this._rfbCredentials.password.length]);
-        this._sock.sendString(this._rfbCredentials.username);
-        this._sock.sendString(this._rfbCredentials.password);
+        this._sock.sQpush32(this._rfbCredentials.username.length);
+        this._sock.sQpush32(this._rfbCredentials.password.length);
+        this._sock.sQpushString(this._rfbCredentials.username);
+        this._sock.sQpushString(this._rfbCredentials.password);
+        this._sock.flush();
+
         this._rfbInitState = "SecurityResult";
         return true;
     }
@@ -1888,7 +1996,8 @@ export default class RFB extends EventTargetMixin {
                                   "vendor or signature");
             }
             Log.Debug("Selected tunnel type: " + clientSupportedTunnelTypes[0]);
-            this._sock.send([0, 0, 0, 0]);  // use NOTUNNEL
+            this._sock.sQpush32(0); // use NOTUNNEL
+            this._sock.flush();
             return false; // wait until we receive the sub auth count to continue
         } else {
             return this._fail("Server wanted tunnels, but doesn't support " +
@@ -1938,7 +2047,8 @@ export default class RFB extends EventTargetMixin {
 
         for (let authType in clientSupportedTypes) {
             if (serverSupportedTypes.indexOf(authType) != -1) {
-                this._sock.send([0, 0, 0, clientSupportedTypes[authType]]);
+                this._sock.sQpush32(clientSupportedTypes[authType]);
+                this._sock.flush();
                 Log.Debug("Selected authentication type: " + authType);
 
                 switch (authType) {
@@ -1984,8 +2094,8 @@ export default class RFB extends EventTargetMixin {
                     if (e.message !== "disconnect normally") {
                         this._fail(e.message);
                     }
-                }).then(() => {
-                    this.dispatchEvent(new CustomEvent('securityresult'));
+                })
+                .then(() => {
                     this._rfbInitState = "SecurityResult";
                     return true;
                 }).finally(() => {
@@ -2013,15 +2123,15 @@ export default class RFB extends EventTargetMixin {
         const g = this._sock.rQshiftBytes(8);
         const p = this._sock.rQshiftBytes(8);
         const A = this._sock.rQshiftBytes(8);
-        const b = window.crypto.getRandomValues(new Uint8Array(8));
-        const B = new Uint8Array(this._modPow(g, b, p));
-        const secret = new Uint8Array(this._modPow(A, b, p));
+        const dhKey = legacyCrypto.generateKey({ name: "DH", g: g, p: p }, true, ["deriveBits"]);
+        const B = legacyCrypto.exportKey("raw", dhKey.publicKey);
+        const secret = legacyCrypto.deriveBits({ name: "DH", public: A }, dhKey.privateKey, 64);
 
-        const des = new DES(secret);
+        const key = legacyCrypto.importKey("raw", secret, { name: "DES-CBC" }, false, ["encrypt"]);
         const username = encodeUTF8(this._rfbCredentials.username).substring(0, 255);
         const password = encodeUTF8(this._rfbCredentials.password).substring(0, 63);
-        const usernameBytes = new Uint8Array(256);
-        const passwordBytes = new Uint8Array(64);
+        let usernameBytes = new Uint8Array(256);
+        let passwordBytes = new Uint8Array(64);
         window.crypto.getRandomValues(usernameBytes);
         window.crypto.getRandomValues(passwordBytes);
         for (let i = 0; i < username.length; i++) {
@@ -2032,36 +2142,26 @@ export default class RFB extends EventTargetMixin {
             passwordBytes[i] = password.charCodeAt(i);
         }
         passwordBytes[password.length] = 0;
-        let x = new Uint8Array(secret);
-        for (let i = 0; i < 32; i++) {
-            for (let j = 0; j < 8; j++) {
-                x[j] ^= usernameBytes[i * 8 + j];
-            }
-            x = des.enc8(x);
-            usernameBytes.set(x, i * 8);
-        }
-        x = new Uint8Array(secret);
-        for (let i = 0; i < 8; i++) {
-            for (let j = 0; j < 8; j++) {
-                x[j] ^= passwordBytes[i * 8 + j];
-            }
-            x = des.enc8(x);
-            passwordBytes.set(x, i * 8);
-        }
-        this._sock.send(B);
-        this._sock.send(usernameBytes);
-        this._sock.send(passwordBytes);
+        usernameBytes = legacyCrypto.encrypt({ name: "DES-CBC", iv: secret }, key, usernameBytes);
+        passwordBytes = legacyCrypto.encrypt({ name: "DES-CBC", iv: secret }, key, passwordBytes);
+        this._sock.sQpushBytes(B);
+        this._sock.sQpushBytes(usernameBytes);
+        this._sock.sQpushBytes(passwordBytes);
+        this._sock.flush();
         this._rfbInitState = "SecurityResult";
         return true;
     }
 
     _negotiateAuthentication() {
         switch (this._rfbAuthScheme) {
-            // Let CloudStack handle the authentication (RFB 3.8 requires the client to select the auth scheme)
             case securityTypeNone:
             case securityTypeVNCAuth:
             case securityTypeVeNCrypt:
-                this._rfbInitState = 'SecurityResult';
+                if (this._rfbVersion >= 3.8) {
+                    this._rfbInitState = 'SecurityResult';
+                } else {
+                    this._rfbInitState = 'ClientInitialisation';
+                }
                 return true;
 
             case securityTypeXVP:
@@ -2070,9 +2170,15 @@ export default class RFB extends EventTargetMixin {
             case securityTypeARD:
                 return this._negotiateARDAuth();
 
+            case securityTypeVNCAuth:
+                return this._negotiateStdVNCAuth();
+
             case securityTypeTight:
                 return this._negotiateTightAuth();
 
+            case securityTypeVeNCrypt:
+                return this._negotiateVeNCryptAuth();
+
             case securityTypePlain:
                 return this._negotiatePlainAuth();
 
@@ -2092,13 +2198,6 @@ export default class RFB extends EventTargetMixin {
     }
 
     _handleSecurityResult() {
-        // There is no security choice, and hence no security result
-        // until RFB 3.7
-        if (this._rfbVersion < 3.7) {
-            this._rfbInitState = 'ClientInitialisation';
-            return true;
-        }
-
         if (this._sock.rQwait('VNC auth response ', 4)) { return false; }
 
         const status = this._sock.rQshift32();
@@ -2218,12 +2317,16 @@ export default class RFB extends EventTargetMixin {
         encs.push(encodings.encodingCopyRect);
         // Only supported with full depth support
         if (this._fbDepth == 24) {
+            if (supportsWebCodecsH264Decode) {
+                encs.push(encodings.encodingH264);
+            }
             encs.push(encodings.encodingTight);
             encs.push(encodings.encodingTightPNG);
             encs.push(encodings.encodingZRLE);
             encs.push(encodings.encodingJPEG);
             encs.push(encodings.encodingHextile);
             encs.push(encodings.encodingRRE);
+            encs.push(encodings.encodingZlib);
         }
         encs.push(encodings.encodingRaw);
 
@@ -2234,12 +2337,14 @@ export default class RFB extends EventTargetMixin {
         encs.push(encodings.pseudoEncodingDesktopSize);
         encs.push(encodings.pseudoEncodingLastRect);
         encs.push(encodings.pseudoEncodingQEMUExtendedKeyEvent);
+        encs.push(encodings.pseudoEncodingQEMULedEvent);
         encs.push(encodings.pseudoEncodingExtendedDesktopSize);
         encs.push(encodings.pseudoEncodingXvp);
         encs.push(encodings.pseudoEncodingFence);
         encs.push(encodings.pseudoEncodingContinuousUpdates);
         encs.push(encodings.pseudoEncodingDesktopName);
         encs.push(encodings.pseudoEncodingExtendedClipboard);
+        encs.push(encodings.pseudoEncodingExtendedMouseButtons);
 
         if (this._fbDepth == 24) {
             encs.push(encodings.pseudoEncodingVMwareCursor);
@@ -2275,7 +2380,8 @@ export default class RFB extends EventTargetMixin {
                 return this._handleSecurityReason();
 
             case 'ClientInitialisation':
-                this._sock.send([this._shared ? 1 : 0]); // ClientInitialisation
+                this._sock.sQpush8(this._shared ? 1 : 0); // ClientInitialisation
+                this._sock.flush();
                 this._rfbInitState = 'ServerInitialisation';
                 return true;
 
@@ -2457,7 +2563,7 @@ export default class RFB extends EventTargetMixin {
                         textData = textData.slice(0, -1);
                     }
 
-                    textData = textData.replace("\r\n", "\n");
+                    textData = textData.replaceAll("\r\n", "\n");
 
                     this.dispatchEvent(new CustomEvent(
                         "clipboard",
@@ -2520,7 +2626,7 @@ export default class RFB extends EventTargetMixin {
 
         switch (xvpMsg) {
             case 0:  // XVP_FAIL
-                Log.Error("XVP Operation Failed");
+                Log.Error("XVP operation failed");
                 break;
             case 1:  // XVP_INIT
                 this._rfbXvpVer = xvpVer;
@@ -2588,19 +2694,11 @@ export default class RFB extends EventTargetMixin {
 
             default:
                 this._fail("Unexpected server message (type " + msgType + ")");
-                Log.Debug("sock.rQslice(0, 30): " + this._sock.rQslice(0, 30));
+                Log.Debug("sock.rQpeekBytes(30): " + this._sock.rQpeekBytes(30));
                 return true;
         }
     }
 
-    _onFlush() {
-        this._flushing = false;
-        // Resume processing
-        if (this._sock.rQlen > 0) {
-            this._handleMessage();
-        }
-    }
-
     _framebufferUpdate() {
         if (this._FBU.rects === 0) {
             if (this._sock.rQwait("FBU header", 3, 1)) { return false; }
@@ -2611,7 +2709,14 @@ export default class RFB extends EventTargetMixin {
             // to avoid building up an excessive queue
             if (this._display.pending()) {
                 this._flushing = true;
-                this._display.flush();
+                this._display.flush()
+                    .then(() => {
+                        this._flushing = false;
+                        // Resume processing
+                        if (!this._sock.rQwait("message", 1)) {
+                            this._handleMessage();
+                        }
+                    });
                 return false;
             }
         }
@@ -2621,13 +2726,13 @@ export default class RFB extends EventTargetMixin {
                 if (this._sock.rQwait("rect header", 12)) { return false; }
                 /* New FramebufferUpdate */
 
-                const hdr = this._sock.rQshiftBytes(12);
-                this._FBU.x        = (hdr[0] << 8) + hdr[1];
-                this._FBU.y        = (hdr[2] << 8) + hdr[3];
-                this._FBU.width    = (hdr[4] << 8) + hdr[5];
-                this._FBU.height   = (hdr[6] << 8) + hdr[7];
-                this._FBU.encoding = parseInt((hdr[8] << 24) + (hdr[9] << 16) +
-                                              (hdr[10] << 8) + hdr[11], 10);
+                this._FBU.x = this._sock.rQshift16();
+                this._FBU.y = this._sock.rQshift16();
+                this._FBU.width = this._sock.rQshift16();
+                this._FBU.height = this._sock.rQshift16();
+                this._FBU.encoding = this._sock.rQshift32();
+                /* Encodings are signed */
+                this._FBU.encoding >>= 0;
             }
 
             if (!this._handleRect()) {
@@ -2669,6 +2774,13 @@ export default class RFB extends EventTargetMixin {
             case encodings.pseudoEncodingExtendedDesktopSize:
                 return this._handleExtendedDesktopSize();
 
+            case encodings.pseudoEncodingExtendedMouseButtons:
+                this._extendedPointerEventSupported = true;
+                return true;
+
+            case encodings.pseudoEncodingQEMULedEvent:
+                return this._handleLedEvent();
+
             default:
                 return this._handleDataRect();
         }
@@ -2846,6 +2958,21 @@ export default class RFB extends EventTargetMixin {
         return true;
     }
 
+    _handleLedEvent() {
+        if (this._sock.rQwait("LED status", 1)) {
+            return false;
+        }
+
+        let data = this._sock.rQshift8();
+        // ScrollLock state can be retrieved with data & 1. This is currently not needed.
+        let numLock = data & 2 ? true : false;
+        let capsLock = data & 4 ? true : false;
+        this._remoteCapsLock = capsLock;
+        this._remoteNumLock = numLock;
+
+        return true;
+    }
+
     _handleExtendedDesktopSize() {
         if (this._sock.rQwait("ExtendedDesktopSize", 4)) {
             return false;
@@ -2861,26 +2988,18 @@ export default class RFB extends EventTargetMixin {
         const firstUpdate = !this._supportsSetDesktopSize;
         this._supportsSetDesktopSize = true;
 
-        // Normally we only apply the current resize mode after a
-        // window resize event. However there is no such trigger on the
-        // initial connect. And we don't know if the server supports
-        // resizing until we've gotten here.
-        if (firstUpdate) {
-            this._requestRemoteResize();
-        }
-
         this._sock.rQskipBytes(1);  // number-of-screens
         this._sock.rQskipBytes(3);  // padding
 
         for (let i = 0; i < numberOfScreens; i += 1) {
             // Save the id and flags of the first screen
             if (i === 0) {
-                this._screenID = this._sock.rQshiftBytes(4);    // id
-                this._sock.rQskipBytes(2);                       // x-position
-                this._sock.rQskipBytes(2);                       // y-position
-                this._sock.rQskipBytes(2);                       // width
-                this._sock.rQskipBytes(2);                       // height
-                this._screenFlags = this._sock.rQshiftBytes(4); // flags
+                this._screenID = this._sock.rQshift32();    // id
+                this._sock.rQskipBytes(2);                  // x-position
+                this._sock.rQskipBytes(2);                  // y-position
+                this._sock.rQskipBytes(2);                  // width
+                this._sock.rQskipBytes(2);                  // height
+                this._screenFlags = this._sock.rQshift32(); // flags
             } else {
                 this._sock.rQskipBytes(16);
             }
@@ -2894,6 +3013,10 @@ export default class RFB extends EventTargetMixin {
          *  2 - another client requested the resize
          */
 
+        if (this._FBU.x === 1) {
+            this._pendingRemoteResize = false;
+        }
+
         // We need to handle errors when we requested the resize.
         if (this._FBU.x === 1 && this._FBU.y !== 0) {
             let msg = "";
@@ -2918,6 +3041,20 @@ export default class RFB extends EventTargetMixin {
             this._resize(this._FBU.width, this._FBU.height);
         }
 
+        // Normally we only apply the current resize mode after a
+        // window resize event. However there is no such trigger on the
+        // initial connect. And we don't know if the server supports
+        // resizing until we've gotten here.
+        if (firstUpdate) {
+            this._requestRemoteResize();
+        }
+
+        if (this._FBU.x === 1 && this._FBU.y === 0) {
+            // We might have resized again whilst waiting for the
+            // previous request, so check if we are in sync
+            this._requestRemoteResize();
+        }
+
         return true;
     }
 
@@ -2947,6 +3084,7 @@ export default class RFB extends EventTargetMixin {
                                              this._fbWidth, this._fbHeight);
     }
 
+    // Handle resize-messages from the server
     _resize(width, height) {
         this._fbWidth = width;
         this._fbHeight = height;
@@ -3013,28 +3151,22 @@ export default class RFB extends EventTargetMixin {
 
     static genDES(password, challenge) {
         const passwordChars = password.split('').map(c => c.charCodeAt(0));
-        return (new DES(passwordChars)).encrypt(challenge);
+        const key = legacyCrypto.importKey(
+            "raw", passwordChars, { name: "DES-ECB" }, false, ["encrypt"]);
+        return legacyCrypto.encrypt({ name: "DES-ECB" }, key, challenge);
     }
 }
 
 // Class Methods
 RFB.messages = {
     keyEvent(sock, keysym, down) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(4); // msg-type
+        sock.sQpush8(down);
 
-        buff[offset] = 4;  // msg-type
-        buff[offset + 1] = down;
+        sock.sQpush16(0);
 
-        buff[offset + 2] = 0;
-        buff[offset + 3] = 0;
+        sock.sQpush32(keysym);
 
-        buff[offset + 4] = (keysym >> 24);
-        buff[offset + 5] = (keysym >> 16);
-        buff[offset + 6] = (keysym >> 8);
-        buff[offset + 7] = keysym;
-
-        sock._sQlen += 8;
         sock.flush();
     },
 
@@ -3048,28 +3180,17 @@ RFB.messages = {
             return xtScanCode;
         }
 
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(255); // msg-type
+        sock.sQpush8(0); // sub msg-type
 
-        buff[offset] = 255; // msg-type
-        buff[offset + 1] = 0; // sub msg-type
+        sock.sQpush16(down);
 
-        buff[offset + 2] = (down >> 8);
-        buff[offset + 3] = down;
-
-        buff[offset + 4] = (keysym >> 24);
-        buff[offset + 5] = (keysym >> 16);
-        buff[offset + 6] = (keysym >> 8);
-        buff[offset + 7] = keysym;
+        sock.sQpush32(keysym);
 
         const RFBkeycode = getRFBkeycode(keycode);
 
-        buff[offset + 8] = (RFBkeycode >> 24);
-        buff[offset + 9] = (RFBkeycode >> 16);
-        buff[offset + 10] = (RFBkeycode >> 8);
-        buff[offset + 11] = RFBkeycode;
+        sock.sQpush32(RFBkeycode);
 
-        sock._sQlen += 12;
         sock.flush();
     },
 
@@ -3094,20 +3215,38 @@ RFB.messages = {
     },
 
     pointerEvent(sock, x, y, mask) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(5); // msg-type
 
-        buff[offset] = 5; // msg-type
+        // Marker bit must be set to 0, otherwise the server might
+        // confuse the marker bit with the highest bit in a normal
+        // PointerEvent message.
+        mask = mask & 0x7f;
+        sock.sQpush8(mask);
 
-        buff[offset + 1] = mask;
+        sock.sQpush16(x);
+        sock.sQpush16(y);
 
-        buff[offset + 2] = x >> 8;
-        buff[offset + 3] = x;
+        sock.flush();
+    },
 
-        buff[offset + 4] = y >> 8;
-        buff[offset + 5] = y;
+    extendedPointerEvent(sock, x, y, mask) {
+        sock.sQpush8(5); // msg-type
+
+        let higherBits = (mask >> 7) & 0xff;
+
+        // Bits 2-7 are reserved
+        if (higherBits & 0xfc) {
+            throw new Error("Invalid mouse button mask: " + mask);
+        }
+
+        let lowerBits = mask & 0x7f;
+        lowerBits |= 0x80; // Set marker bit to 1
+
+        sock.sQpush8(lowerBits);
+        sock.sQpush16(x);
+        sock.sQpush16(y);
+        sock.sQpush8(higherBits);
 
-        sock._sQlen += 6;
         sock.flush();
     },
 
@@ -3207,14 +3346,11 @@ RFB.messages = {
     },
 
     clientCutText(sock, data, extended = false) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(6); // msg-type
 
-        buff[offset] = 6; // msg-type
-
-        buff[offset + 1] = 0; // padding
-        buff[offset + 2] = 0; // padding
-        buff[offset + 3] = 0; // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
 
         let length;
         if (extended) {
@@ -3223,121 +3359,63 @@ RFB.messages = {
             length = data.length;
         }
 
-        buff[offset + 4] = length >> 24;
-        buff[offset + 5] = length >> 16;
-        buff[offset + 6] = length >> 8;
-        buff[offset + 7] = length;
-
-        sock._sQlen += 8;
-
-        // We have to keep track of from where in the data we begin creating the
-        // buffer for the flush in the next iteration.
-        let dataOffset = 0;
-
-        let remaining = data.length;
-        while (remaining > 0) {
-
-            let flushSize = Math.min(remaining, (sock._sQbufferSize - sock._sQlen));
-            for (let i = 0; i < flushSize; i++) {
-                buff[sock._sQlen + i] = data[dataOffset + i];
-            }
-
-            sock._sQlen += flushSize;
-            sock.flush();
-
-            remaining -= flushSize;
-            dataOffset += flushSize;
-        }
-
+        sock.sQpush32(length);
+        sock.sQpushBytes(data);
+        sock.flush();
     },
 
     setDesktopSize(sock, width, height, id, flags) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(251); // msg-type
 
-        buff[offset] = 251;              // msg-type
-        buff[offset + 1] = 0;            // padding
-        buff[offset + 2] = width >> 8;   // width
-        buff[offset + 3] = width;
-        buff[offset + 4] = height >> 8;  // height
-        buff[offset + 5] = height;
+        sock.sQpush8(0); // padding
 
-        buff[offset + 6] = 1;            // number-of-screens
-        buff[offset + 7] = 0;            // padding
+        sock.sQpush16(width);
+        sock.sQpush16(height);
+
+        sock.sQpush8(1); // number-of-screens
+
+        sock.sQpush8(0); // padding
 
         // screen array
-        buff[offset + 8] = id >> 24;     // id
-        buff[offset + 9] = id >> 16;
-        buff[offset + 10] = id >> 8;
-        buff[offset + 11] = id;
-        buff[offset + 12] = 0;           // x-position
-        buff[offset + 13] = 0;
-        buff[offset + 14] = 0;           // y-position
-        buff[offset + 15] = 0;
-        buff[offset + 16] = width >> 8;  // width
-        buff[offset + 17] = width;
-        buff[offset + 18] = height >> 8; // height
-        buff[offset + 19] = height;
-        buff[offset + 20] = flags >> 24; // flags
-        buff[offset + 21] = flags >> 16;
-        buff[offset + 22] = flags >> 8;
-        buff[offset + 23] = flags;
+        sock.sQpush32(id);
+        sock.sQpush16(0); // x-position
+        sock.sQpush16(0); // y-position
+        sock.sQpush16(width);
+        sock.sQpush16(height);
+        sock.sQpush32(flags);
 
-        sock._sQlen += 24;
         sock.flush();
     },
 
     clientFence(sock, flags, payload) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(248); // msg-type
 
-        buff[offset] = 248; // msg-type
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
 
-        buff[offset + 1] = 0; // padding
-        buff[offset + 2] = 0; // padding
-        buff[offset + 3] = 0; // padding
+        sock.sQpush32(flags);
 
-        buff[offset + 4] = flags >> 24; // flags
-        buff[offset + 5] = flags >> 16;
-        buff[offset + 6] = flags >> 8;
-        buff[offset + 7] = flags;
+        sock.sQpush8(payload.length);
+        sock.sQpushString(payload);
 
-        const n = payload.length;
-
-        buff[offset + 8] = n; // length
-
-        for (let i = 0; i < n; i++) {
-            buff[offset + 9 + i] = payload.charCodeAt(i);
-        }
-
-        sock._sQlen += 9 + n;
         sock.flush();
     },
 
     enableContinuousUpdates(sock, enable, x, y, width, height) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(150); // msg-type
 
-        buff[offset] = 150;             // msg-type
-        buff[offset + 1] = enable;      // enable-flag
+        sock.sQpush8(enable);
 
-        buff[offset + 2] = x >> 8;      // x
-        buff[offset + 3] = x;
-        buff[offset + 4] = y >> 8;      // y
-        buff[offset + 5] = y;
-        buff[offset + 6] = width >> 8;  // width
-        buff[offset + 7] = width;
-        buff[offset + 8] = height >> 8; // height
-        buff[offset + 9] = height;
+        sock.sQpush16(x);
+        sock.sQpush16(y);
+        sock.sQpush16(width);
+        sock.sQpush16(height);
 
-        sock._sQlen += 10;
         sock.flush();
     },
 
     pixelFormat(sock, depth, trueColor) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
-
         let bpp;
 
         if (depth > 16) {
@@ -3350,100 +3428,69 @@ RFB.messages = {
 
         const bits = Math.floor(depth/3);
 
-        buff[offset] = 0;  // msg-type
+        sock.sQpush8(0); // msg-type
 
-        buff[offset + 1] = 0; // padding
-        buff[offset + 2] = 0; // padding
-        buff[offset + 3] = 0; // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
 
-        buff[offset + 4] = bpp;                 // bits-per-pixel
-        buff[offset + 5] = depth;               // depth
-        buff[offset + 6] = 0;                   // little-endian
-        buff[offset + 7] = trueColor ? 1 : 0;  // true-color
+        sock.sQpush8(bpp);
+        sock.sQpush8(depth);
+        sock.sQpush8(0); // little-endian
+        sock.sQpush8(trueColor ? 1 : 0);
 
-        buff[offset + 8] = 0;    // red-max
-        buff[offset + 9] = (1 << bits) - 1;  // red-max
+        sock.sQpush16((1 << bits) - 1); // red-max
+        sock.sQpush16((1 << bits) - 1); // green-max
+        sock.sQpush16((1 << bits) - 1); // blue-max
 
-        buff[offset + 10] = 0;   // green-max
-        buff[offset + 11] = (1 << bits) - 1; // green-max
+        sock.sQpush8(bits * 0); // red-shift
+        sock.sQpush8(bits * 1); // green-shift
+        sock.sQpush8(bits * 2); // blue-shift
 
-        buff[offset + 12] = 0;   // blue-max
-        buff[offset + 13] = (1 << bits) - 1; // blue-max
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
+        sock.sQpush8(0); // padding
 
-        buff[offset + 14] = bits * 0; // red-shift
-        buff[offset + 15] = bits * 1; // green-shift
-        buff[offset + 16] = bits * 2; // blue-shift
-
-        buff[offset + 17] = 0;   // padding
-        buff[offset + 18] = 0;   // padding
-        buff[offset + 19] = 0;   // padding
-
-        sock._sQlen += 20;
         sock.flush();
     },
 
     clientEncodings(sock, encodings) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(2); // msg-type
 
-        buff[offset] = 2; // msg-type
-        buff[offset + 1] = 0; // padding
+        sock.sQpush8(0); // padding
 
-        buff[offset + 2] = encodings.length >> 8;
-        buff[offset + 3] = encodings.length;
-
-        let j = offset + 4;
+        sock.sQpush16(encodings.length);
         for (let i = 0; i < encodings.length; i++) {
-            const enc = encodings[i];
-            buff[j] = enc >> 24;
-            buff[j + 1] = enc >> 16;
-            buff[j + 2] = enc >> 8;
-            buff[j + 3] = enc;
-
-            j += 4;
+            sock.sQpush32(encodings[i]);
         }
 
-        sock._sQlen += j - offset;
         sock.flush();
     },
 
     fbUpdateRequest(sock, incremental, x, y, w, h) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
-
         if (typeof(x) === "undefined") { x = 0; }
         if (typeof(y) === "undefined") { y = 0; }
 
-        buff[offset] = 3;  // msg-type
-        buff[offset + 1] = incremental ? 1 : 0;
+        sock.sQpush8(3); // msg-type
 
-        buff[offset + 2] = (x >> 8) & 0xFF;
-        buff[offset + 3] = x & 0xFF;
+        sock.sQpush8(incremental ? 1 : 0);
 
-        buff[offset + 4] = (y >> 8) & 0xFF;
-        buff[offset + 5] = y & 0xFF;
+        sock.sQpush16(x);
+        sock.sQpush16(y);
+        sock.sQpush16(w);
+        sock.sQpush16(h);
 
-        buff[offset + 6] = (w >> 8) & 0xFF;
-        buff[offset + 7] = w & 0xFF;
-
-        buff[offset + 8] = (h >> 8) & 0xFF;
-        buff[offset + 9] = h & 0xFF;
-
-        sock._sQlen += 10;
         sock.flush();
     },
 
     xvpOp(sock, ver, op) {
-        const buff = sock._sQ;
-        const offset = sock._sQlen;
+        sock.sQpush8(250); // msg-type
 
-        buff[offset] = 250; // msg-type
-        buff[offset + 1] = 0; // padding
+        sock.sQpush8(0); // padding
 
-        buff[offset + 2] = ver;
-        buff[offset + 3] = op;
+        sock.sQpush8(ver);
+        sock.sQpush8(op);
 
-        sock._sQlen += 4;
         sock.flush();
     }
 };
diff --git a/systemvm/agent/noVNC/core/util/browser.js b/systemvm/agent/noVNC/core/util/browser.js
index bbc9f5c1ebe..fc1b77f9eb9 100644
--- a/systemvm/agent/noVNC/core/util/browser.js
+++ b/systemvm/agent/noVNC/core/util/browser.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
@@ -9,10 +9,11 @@
  */
 
 import * as Log from './logging.js';
+import Base64 from '../base64.js';
 
 // Touch detection
 export let isTouchDevice = ('ontouchstart' in document.documentElement) ||
-                                 // requried for Chrome debugger
+                                 // required for Chrome debugger
                                  (document.ontouchstart !== undefined) ||
                                  // required for MS Surface
                                  (navigator.maxTouchPoints > 0) ||
@@ -70,6 +71,86 @@ try {
 }
 export const hasScrollbarGutter = _hasScrollbarGutter;
 
+export let supportsWebCodecsH264Decode = false;
+
+async function _checkWebCodecsH264DecodeSupport() {
+    if (!('VideoDecoder' in window)) {
+        return false;
+    }
+
+    // We'll need to make do with some placeholders here
+    const config = {
+        codec: 'avc1.42401f',
+        codedWidth: 1920,
+        codedHeight: 1080,
+        optimizeForLatency: true,
+    };
+
+    let support = await VideoDecoder.isConfigSupported(config);
+    if (!support.supported) {
+        return false;
+    }
+
+    // Firefox incorrectly reports supports for H.264 under some
+    // circumstances, so we need to actually test a real frame
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1932392
+
+    const data = new Uint8Array(Base64.decode(
+        'AAAAAWdCwBTZnpuAgICgAAADACAAAAZB4oVNAAAAAWjJYyyAAAABBgX//4Hc' +
+        'Rem95tlIt5Ys2CDZI+7veDI2NCAtIGNvcmUgMTY0IHIzMTA4IDMxZTE5Zjkg' +
+        'LSBILjI2NC9NUEVHLTQgQVZDIGNvZGVjIC0gQ29weWxlZnQgMjAwMy0yMDIz' +
+        'IC0gaHR0cDovL3d3dy52aWRlb2xhbi5vcmcveDI2NC5odG1sIC0gb3B0aW9u' +
+        'czogY2FiYWM9MCByZWY9NSBkZWJsb2NrPTE6MDowIGFuYWx5c2U9MHgxOjB4' +
+        'MTExIG1lPWhleCBzdWJtZT04IHBzeT0xIHBzeV9yZD0xLjAwOjAuMDAgbWl4' +
+        'ZWRfcmVmPTEgbWVfcmFuZ2U9MTYgY2hyb21hX21lPTEgdHJlbGxpcz0yIDh4' +
+        'OGRjdD0wIGNxbT0wIGRlYWR6b25lPTIxLDExIGZhc3RfcHNraXA9MSBjaHJv' +
+        'bWFfcXBfb2Zmc2V0PS0yIHRocmVhZHM9MSBsb29rYWhlYWRfdGhyZWFkcz0x' +
+        'IHNsaWNlZF90aHJlYWRzPTAgbnI9MCBkZWNpbWF0ZT0xIGludGVybGFjZWQ9' +
+        'MCBibHVyYXlfY29tcGF0PTAgY29uc3RyYWluZWRfaW50cmE9MCBiZnJhbWVz' +
+        'PTAgd2VpZ2h0cD0wIGtleWludD1pbmZpbml0ZSBrZXlpbnRfbWluPTI1IHNj' +
+        'ZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NTAgcmM9' +
+        'YWJyIG1idHJlZT0xIGJpdHJhdGU9NDAwIHJhdGV0b2w9MS4wIHFjb21wPTAu' +
+        'NjAgcXBtaW49MCBxcG1heD02OSBxcHN0ZXA9NCBpcF9yYXRpbz0xLjQwIGFx' +
+        'PTE6MS4wMACAAAABZYiEBrxmKAAPVccAAS044AA5DRJMnkycJk4TPw=='));
+
+    let gotframe = false;
+    let error = null;
+
+    let decoder = new VideoDecoder({
+        output: (frame) => { gotframe = true; },
+        error: (e) => { error = e; },
+    });
+    let chunk = new EncodedVideoChunk({
+        timestamp: 0,
+        type: 'key',
+        data: data,
+    });
+
+    decoder.configure(config);
+    decoder.decode(chunk);
+    try {
+        await decoder.flush();
+    } catch (e) {
+        // Firefox incorrectly throws an exception here
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1932566
+        error = e;
+    }
+
+    // Firefox fails to deliver the error on Windows, so we need to
+    // check if we got a frame instead
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1932579
+    if (!gotframe) {
+        return false;
+    }
+
+    if (error !== null) {
+        return false;
+    }
+
+    return true;
+}
+supportsWebCodecsH264Decode = await _checkWebCodecsH264DecodeSupport();
+
 /*
  * The functions for detection of platforms and browsers below are exported
  * but the use of these should be minimized as much as possible.
diff --git a/systemvm/agent/noVNC/core/util/cursor.js b/systemvm/agent/noVNC/core/util/cursor.js
index 3000cf0e6b0..6d689e7d5a3 100644
--- a/systemvm/agent/noVNC/core/util/cursor.js
+++ b/systemvm/agent/noVNC/core/util/cursor.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
@@ -69,7 +69,9 @@ export default class Cursor {
             this._target.removeEventListener('mousemove', this._eventHandlers.mousemove, options);
             this._target.removeEventListener('mouseup', this._eventHandlers.mouseup, options);
 
-            document.body.removeChild(this._canvas);
+            if (document.contains(this._canvas)) {
+                document.body.removeChild(this._canvas);
+            }
         }
 
         this._target = null;
diff --git a/systemvm/agent/noVNC/core/util/element.js b/systemvm/agent/noVNC/core/util/element.js
index 466a7453e1d..17d82d58f8a 100644
--- a/systemvm/agent/noVNC/core/util/element.js
+++ b/systemvm/agent/noVNC/core/util/element.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/util/events.js b/systemvm/agent/noVNC/core/util/events.js
index eb09fe1e29b..26aa9790858 100644
--- a/systemvm/agent/noVNC/core/util/events.js
+++ b/systemvm/agent/noVNC/core/util/events.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2018 The noVNC Authors
+ * Copyright (C) 2018 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/util/eventtarget.js b/systemvm/agent/noVNC/core/util/eventtarget.js
index a21aa5494d8..547bf5fa28d 100644
--- a/systemvm/agent/noVNC/core/util/eventtarget.js
+++ b/systemvm/agent/noVNC/core/util/eventtarget.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/util/int.js b/systemvm/agent/noVNC/core/util/int.js
index 001f40f2ab5..303ddc5fd3d 100644
--- a/systemvm/agent/noVNC/core/util/int.js
+++ b/systemvm/agent/noVNC/core/util/int.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2020 The noVNC Authors
+ * Copyright (C) 2020 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/util/logging.js b/systemvm/agent/noVNC/core/util/logging.js
index fe449e93515..0db083856e7 100644
--- a/systemvm/agent/noVNC/core/util/logging.js
+++ b/systemvm/agent/noVNC/core/util/logging.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/util/strings.js b/systemvm/agent/noVNC/core/util/strings.js
index 3dd4b29fb02..432b0a9d297 100644
--- a/systemvm/agent/noVNC/core/util/strings.js
+++ b/systemvm/agent/noVNC/core/util/strings.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/systemvm/agent/noVNC/core/websock.js b/systemvm/agent/noVNC/core/websock.js
index 37b33fcc585..ae17a440981 100644
--- a/systemvm/agent/noVNC/core/websock.js
+++ b/systemvm/agent/noVNC/core/websock.js
@@ -1,6 +1,6 @@
 /*
  * Websock: high-performance buffering wrapper
- * Copyright (C) 2019 The noVNC Authors
+ * Copyright (C) 2019 The noVNC authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * Websock is similar to the standard WebSocket / RTCDataChannel object
@@ -70,7 +70,7 @@ export default class Websock {
         };
     }
 
-    // Getters and Setters
+    // Getters and setters
 
     get readyState() {
         let subState;
@@ -94,27 +94,7 @@ export default class Websock {
         return "unknown";
     }
 
-    get sQ() {
-        return this._sQ;
-    }
-
-    get rQ() {
-        return this._rQ;
-    }
-
-    get rQi() {
-        return this._rQi;
-    }
-
-    set rQi(val) {
-        this._rQi = val;
-    }
-
-    // Receive Queue
-    get rQlen() {
-        return this._rQlen - this._rQi;
-    }
-
+    // Receive queue
     rQpeek8() {
         return this._rQ[this._rQi];
     }
@@ -141,42 +121,47 @@ export default class Websock {
         for (let byte = bytes - 1; byte >= 0; byte--) {
             res += this._rQ[this._rQi++] << (byte * 8);
         }
-        return res;
+        return res >>> 0;
     }
 
     rQshiftStr(len) {
-        if (typeof(len) === 'undefined') { len = this.rQlen; }
         let str = "";
         // Handle large arrays in steps to avoid long strings on the stack
         for (let i = 0; i < len; i += 4096) {
-            let part = this.rQshiftBytes(Math.min(4096, len - i));
+            let part = this.rQshiftBytes(Math.min(4096, len - i), false);
             str += String.fromCharCode.apply(null, part);
         }
         return str;
     }
 
-    rQshiftBytes(len) {
-        if (typeof(len) === 'undefined') { len = this.rQlen; }
+    rQshiftBytes(len, copy=true) {
         this._rQi += len;
-        return new Uint8Array(this._rQ.buffer, this._rQi - len, len);
+        if (copy) {
+            return this._rQ.slice(this._rQi - len, this._rQi);
+        } else {
+            return this._rQ.subarray(this._rQi - len, this._rQi);
+        }
     }
 
     rQshiftTo(target, len) {
-        if (len === undefined) { len = this.rQlen; }
         // TODO: make this just use set with views when using a ArrayBuffer to store the rQ
         target.set(new Uint8Array(this._rQ.buffer, this._rQi, len));
         this._rQi += len;
     }
 
-    rQslice(start, end = this.rQlen) {
-        return new Uint8Array(this._rQ.buffer, this._rQi + start, end - start);
+    rQpeekBytes(len, copy=true) {
+        if (copy) {
+            return this._rQ.slice(this._rQi, this._rQi + len);
+        } else {
+            return this._rQ.subarray(this._rQi, this._rQi + len);
+        }
     }
 
     // Check to see if we must wait for 'num' bytes (default to FBU.bytes)
     // to be available in the receive queue. Return true if we need to
     // wait (and possibly print a debug message), otherwise false.
     rQwait(msg, num, goback) {
-        if (this.rQlen < num) {
+        if (this._rQlen - this._rQi < num) {
             if (goback) {
                 if (this._rQi < goback) {
                     throw new Error("rQwait cannot backup " + goback + " bytes");
@@ -188,26 +173,61 @@ export default class Websock {
         return false;
     }
 
-    // Send Queue
+    // Send queue
+
+    sQpush8(num) {
+        this._sQensureSpace(1);
+        this._sQ[this._sQlen++] = num;
+    }
+
+    sQpush16(num) {
+        this._sQensureSpace(2);
+        this._sQ[this._sQlen++] = (num >> 8) & 0xff;
+        this._sQ[this._sQlen++] = (num >> 0) & 0xff;
+    }
+
+    sQpush32(num) {
+        this._sQensureSpace(4);
+        this._sQ[this._sQlen++] = (num >> 24) & 0xff;
+        this._sQ[this._sQlen++] = (num >> 16) & 0xff;
+        this._sQ[this._sQlen++] = (num >>  8) & 0xff;
+        this._sQ[this._sQlen++] = (num >>  0) & 0xff;
+    }
+
+    sQpushString(str) {
+        let bytes = str.split('').map(chr => chr.charCodeAt(0));
+        this.sQpushBytes(new Uint8Array(bytes));
+    }
+
+    sQpushBytes(bytes) {
+        for (let offset = 0;offset < bytes.length;) {
+            this._sQensureSpace(1);
+
+            let chunkSize = this._sQbufferSize - this._sQlen;
+            if (chunkSize > bytes.length - offset) {
+                chunkSize = bytes.length - offset;
+            }
+
+            this._sQ.set(bytes.subarray(offset, offset + chunkSize), this._sQlen);
+            this._sQlen += chunkSize;
+            offset += chunkSize;
+        }
+    }
 
     flush() {
         if (this._sQlen > 0 && this.readyState === 'open') {
-            this._websocket.send(this._encodeMessage());
+            this._websocket.send(new Uint8Array(this._sQ.buffer, 0, this._sQlen));
             this._sQlen = 0;
         }
     }
 
-    send(arr) {
-        this._sQ.set(arr, this._sQlen);
-        this._sQlen += arr.length;
-        this.flush();
+    _sQensureSpace(bytes) {
+        if (this._sQbufferSize - this._sQlen < bytes) {
+            this.flush();
+        }
     }
 
-    sendString(str) {
-        this.send(str.split('').map(chr => chr.charCodeAt(0)));
-    }
-
-    // Event Handlers
+    // Event handlers
     off(evt) {
         this._eventHandlers[evt] = () => {};
     }
@@ -283,17 +303,12 @@ export default class Websock {
     }
 
     // private methods
-    _encodeMessage() {
-        // Put in a binary arraybuffer
-        // according to the spec, you can send ArrayBufferViews with the send method
-        return new Uint8Array(this._sQ.buffer, 0, this._sQlen);
-    }
 
     // We want to move all the unread data to the start of the queue,
     // e.g. compacting.
     // The function also expands the receive que if needed, and for
     // performance reasons we combine these two actions to avoid
-    // unneccessary copying.
+    // unnecessary copying.
     _expandCompactRQ(minFit) {
         // if we're using less than 1/8th of the buffer even with the incoming bytes, compact in place
         // instead of resizing
@@ -309,8 +324,8 @@ export default class Websock {
         // we don't want to grow unboundedly
         if (this._rQbufferSize > MAX_RQ_GROW_SIZE) {
             this._rQbufferSize = MAX_RQ_GROW_SIZE;
-            if (this._rQbufferSize - this.rQlen < minFit) {
-                throw new Error("Receive Queue buffer exceeded " + MAX_RQ_GROW_SIZE + " bytes, and the new message could not fit");
+            if (this._rQbufferSize - (this._rQlen - this._rQi) < minFit) {
+                throw new Error("Receive queue buffer exceeded " + MAX_RQ_GROW_SIZE + " bytes, and the new message could not fit");
             }
         }
 
@@ -327,25 +342,22 @@ export default class Websock {
     }
 
     // push arraybuffer values onto the end of the receive que
-    _DecodeMessage(data) {
-        const u8 = new Uint8Array(data);
+    _recvMessage(e) {
+        if (this._rQlen == this._rQi) {
+            // All data has now been processed, this means we
+            // can reset the receive queue.
+            this._rQlen = 0;
+            this._rQi = 0;
+        }
+        const u8 = new Uint8Array(e.data);
         if (u8.length > this._rQbufferSize - this._rQlen) {
             this._expandCompactRQ(u8.length);
         }
         this._rQ.set(u8, this._rQlen);
         this._rQlen += u8.length;
-    }
 
-    _recvMessage(e) {
-        this._DecodeMessage(e.data);
-        if (this.rQlen > 0) {
+        if (this._rQlen - this._rQi > 0) {
             this._eventHandlers.message();
-            if (this._rQlen == this._rQi) {
-                // All data has now been processed, this means we
-                // can reset the receive queue.
-                this._rQlen = 0;
-                this._rQi = 0;
-            }
         } else {
             Log.Debug("Ignoring empty message");
         }
diff --git a/systemvm/agent/noVNC/defaults.json b/systemvm/agent/noVNC/defaults.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/systemvm/agent/noVNC/defaults.json
@@ -0,0 +1 @@
+{}
diff --git a/systemvm/agent/noVNC/docs/novnc_proxy.1 b/systemvm/agent/noVNC/docs/novnc_proxy.1
index 11a003b3aa5..1a844e8d24d 100644
--- a/systemvm/agent/noVNC/docs/novnc_proxy.1
+++ b/systemvm/agent/noVNC/docs/novnc_proxy.1
@@ -3,13 +3,13 @@
 .SH NAME
 novnc_proxy - noVNC proxy server
 .SH SYNOPSIS
-.B novnc_proxy [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT] [--ssl-only]
+.B novnc_proxy [--listen [HOST:]PORT] [--vnc VNC_HOST:PORT] [--cert CERT] [--ssl-only]
 
 Starts the WebSockets proxy and a mini-webserver and
 provides a cut-and-paste URL to go to.
 
-    --listen PORT         Port for proxy/webserver to listen on
-                          Default: 6080
+    --listen [HOST:]PORT  Port for proxy/webserver to listen on
+                          Default: 6080 (on all interfaces)
     --vnc VNC_HOST:PORT   VNC server host:port proxy target
                           Default: localhost:5900
     --cert CERT           Path to combined cert/key file, or just
@@ -30,7 +30,7 @@ provides a cut-and-paste URL to go to.
                           active connections
 
 .SH AUTHOR
-The noVNC Authors
+The noVNC authors
 https://github.com/novnc/noVNC
 
 .SH SEE ALSO
diff --git a/systemvm/agent/noVNC/mandatory.json b/systemvm/agent/noVNC/mandatory.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/systemvm/agent/noVNC/mandatory.json
@@ -0,0 +1 @@
+{}
diff --git a/systemvm/agent/noVNC/package.json b/systemvm/agent/noVNC/package.json
index 5847887f1fe..bfe16a54248 100644
--- a/systemvm/agent/noVNC/package.json
+++ b/systemvm/agent/noVNC/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@novnc/novnc",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "An HTML5 VNC client",
   "browser": "lib/rfb",
   "directories": {
@@ -14,9 +14,7 @@
     "VERSION",
     "docs/API.md",
     "docs/LIBRARY.md",
-    "docs/LICENSE*",
-    "core",
-    "vendor/pako"
+    "docs/LICENSE*"
   ],
   "scripts": {
     "lint": "eslint app core po/po2js po/xgettext-html tests utils",
@@ -39,19 +37,14 @@
   "homepage": "https://github.com/novnc/noVNC",
   "devDependencies": {
     "@babel/core": "latest",
-    "@babel/plugin-syntax-dynamic-import": "latest",
-    "@babel/plugin-transform-modules-commonjs": "latest",
     "@babel/preset-env": "latest",
-    "@babel/cli": "latest",
     "babel-plugin-import-redirect": "latest",
     "browserify": "latest",
-    "babelify": "latest",
-    "core-js": "latest",
     "chai": "latest",
     "commander": "latest",
-    "es-module-loader": "latest",
     "eslint": "latest",
     "fs-extra": "latest",
+    "globals": "latest",
     "jsdom": "latest",
     "karma": "latest",
     "karma-mocha": "latest",
@@ -62,10 +55,8 @@
     "karma-mocha-reporter": "latest",
     "karma-safari-launcher": "latest",
     "karma-script-launcher": "latest",
-    "karma-sinon-chai": "latest",
     "mocha": "latest",
-    "node-getopt": "latest",
-    "po2json": "latest",
+    "pofile": "latest",
     "sinon": "latest",
     "sinon-chai": "latest"
   },
diff --git a/systemvm/agent/noVNC/po/fr.po b/systemvm/agent/noVNC/po/fr.po
index 748a4dbed8b..a750599b8ec 100644
--- a/systemvm/agent/noVNC/po/fr.po
+++ b/systemvm/agent/noVNC/po/fr.po
@@ -1,300 +1,345 @@
 # French translations for noVNC package
 # Traductions françaises du paquet noVNC.
-# Copyright (C) 2021 The noVNC Authors
+# Copyright (C) 2021 The noVNC authors
 # This file is distributed under the same license as the noVNC package.
 # Jose <jose.matsuda@canada.ca>, 2021.
 # Lowxorx <lowxorx@lahan.fr>, 2022.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noVNC 1.2.0\n"
+"Project-Id-Version: noVNC 1.6.0\n"
 "Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2020-07-03 16:11+0200\n"
-"PO-Revision-Date: 2022-04-25 23:40+0200\n"
-"Last-Translator: Lowxorx <lowxorx@lahan.fr>\n"
+"POT-Creation-Date: 2025-02-14 10:14+0100\n"
+"PO-Revision-Date: 2025-02-17 10:04+0100\n"
+"Last-Translator: Martine & Philippe <martineke.breizh@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.5\n"
 
-#: ../app/ui.js:394
+#: ../app/ui.js:84
+msgid ""
+"Running without HTTPS is not recommended, crashes or other issues are likely."
+msgstr ""
+"Lancer sans HTTPS n'est pas recommandé, crashs ou autres problèmes en vue."
+
+#: ../app/ui.js:413
 msgid "Connecting..."
 msgstr "En cours de connexion..."
 
-#: ../app/ui.js:401
+#: ../app/ui.js:420
 msgid "Disconnecting..."
 msgstr "Déconnexion en cours..."
 
-#: ../app/ui.js:407
+#: ../app/ui.js:426
 msgid "Reconnecting..."
 msgstr "Reconnexion en cours..."
 
-#: ../app/ui.js:412
+#: ../app/ui.js:431
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: ../app/ui.js:1008
-msgid "Must set host"
-msgstr "Doit définir l'hôte"
+#: ../app/ui.js:1079
+msgid "Failed to connect to server: "
+msgstr "Échec de connexion au serveur "
 
-#: ../app/ui.js:1090
+#: ../app/ui.js:1145
 msgid "Connected (encrypted) to "
 msgstr "Connecté (chiffré) à "
 
-#: ../app/ui.js:1092
+#: ../app/ui.js:1147
 msgid "Connected (unencrypted) to "
 msgstr "Connecté (non chiffré) à "
 
-#: ../app/ui.js:1115
+#: ../app/ui.js:1170
 msgid "Something went wrong, connection is closed"
 msgstr "Quelque chose s'est mal passé, la connexion a été fermée"
 
-#: ../app/ui.js:1118
+#: ../app/ui.js:1173
 msgid "Failed to connect to server"
 msgstr "Échec de connexion au serveur"
 
-#: ../app/ui.js:1128
+#: ../app/ui.js:1185
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../app/ui.js:1143
+#: ../app/ui.js:1200
 msgid "New connection has been rejected with reason: "
 msgstr "Une nouvelle connexion a été rejetée avec motif : "
 
-#: ../app/ui.js:1146
+#: ../app/ui.js:1203
 msgid "New connection has been rejected"
 msgstr "Une nouvelle connexion a été rejetée"
 
-#: ../app/ui.js:1181
+#: ../app/ui.js:1269
 msgid "Credentials are required"
 msgstr "Les identifiants sont requis"
 
-#: ../vnc.html:74
+#: ../vnc.html:106
 msgid "noVNC encountered an error:"
 msgstr "noVNC a rencontré une erreur :"
 
-#: ../vnc.html:84
+#: ../vnc.html:116
 msgid "Hide/Show the control bar"
 msgstr "Masquer/Afficher la barre de contrôle"
 
-#: ../vnc.html:91
+#: ../vnc.html:125
 msgid "Drag"
 msgstr "Faire glisser"
 
-#: ../vnc.html:91
-msgid "Move/Drag Viewport"
-msgstr "Déplacer/faire glisser le Viewport"
+#: ../vnc.html:125
+msgid "Move/Drag viewport"
+msgstr "Déplacer la fenêtre de visualisation"
 
-#: ../vnc.html:97
+#: ../vnc.html:131
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: ../vnc.html:97
-msgid "Show Keyboard"
+#: ../vnc.html:131
+msgid "Show keyboard"
 msgstr "Afficher le clavier"
 
-#: ../vnc.html:102
+#: ../vnc.html:136
 msgid "Extra keys"
 msgstr "Touches supplémentaires"
 
-#: ../vnc.html:102
-msgid "Show Extra Keys"
+#: ../vnc.html:136
+msgid "Show extra keys"
 msgstr "Afficher les touches supplémentaires"
 
-#: ../vnc.html:107
+#: ../vnc.html:141
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: ../vnc.html:107
+#: ../vnc.html:141
 msgid "Toggle Ctrl"
 msgstr "Basculer Ctrl"
 
-#: ../vnc.html:110
+#: ../vnc.html:144
 msgid "Alt"
 msgstr "Alt"
 
-#: ../vnc.html:110
+#: ../vnc.html:144
 msgid "Toggle Alt"
 msgstr "Basculer Alt"
 
-#: ../vnc.html:113
+#: ../vnc.html:147
 msgid "Toggle Windows"
 msgstr "Basculer Windows"
 
-#: ../vnc.html:113
+#: ../vnc.html:147
 msgid "Windows"
-msgstr "Windows"
+msgstr "Fenêtre"
 
-#: ../vnc.html:116
+#: ../vnc.html:150
 msgid "Send Tab"
-msgstr "Envoyer l'onglet"
+msgstr "Envoyer Tab"
 
-#: ../vnc.html:116
+#: ../vnc.html:150
 msgid "Tab"
-msgstr "l'onglet"
+msgstr "Tabulation"
 
-#: ../vnc.html:119
+#: ../vnc.html:153
 msgid "Esc"
 msgstr "Esc"
 
-#: ../vnc.html:119
+#: ../vnc.html:153
 msgid "Send Escape"
 msgstr "Envoyer Escape"
 
-#: ../vnc.html:122
+#: ../vnc.html:156
 msgid "Ctrl+Alt+Del"
 msgstr "Ctrl+Alt+Del"
 
-#: ../vnc.html:122
+#: ../vnc.html:156
 msgid "Send Ctrl-Alt-Del"
 msgstr "Envoyer Ctrl-Alt-Del"
 
-#: ../vnc.html:129
+#: ../vnc.html:163
 msgid "Shutdown/Reboot"
 msgstr "Arrêter/Redémarrer"
 
-#: ../vnc.html:129
+#: ../vnc.html:163
 msgid "Shutdown/Reboot..."
 msgstr "Arrêter/Redémarrer..."
 
-#: ../vnc.html:135
+#: ../vnc.html:169
 msgid "Power"
 msgstr "Alimentation"
 
-#: ../vnc.html:137
+#: ../vnc.html:171
 msgid "Shutdown"
 msgstr "Arrêter"
 
-#: ../vnc.html:138
+#: ../vnc.html:172
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: ../vnc.html:139
+#: ../vnc.html:173
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: ../vnc.html:144 ../vnc.html:150
+#: ../vnc.html:178 ../vnc.html:184
 msgid "Clipboard"
 msgstr "Presse-papiers"
 
-#: ../vnc.html:154
-msgid "Clear"
-msgstr "Effacer"
+#: ../vnc.html:186
+msgid "Edit clipboard content in the textarea below."
+msgstr "Editer le contenu du presse-papier dans la zone ci-dessous."
 
-#: ../vnc.html:160
-msgid "Fullscreen"
+#: ../vnc.html:194
+msgid "Full screen"
 msgstr "Plein écran"
 
-#: ../vnc.html:165 ../vnc.html:172
+#: ../vnc.html:199 ../vnc.html:205
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../vnc.html:175
-msgid "Shared Mode"
+#: ../vnc.html:211
+msgid "Shared mode"
 msgstr "Mode partagé"
 
-#: ../vnc.html:178
-msgid "View Only"
+#: ../vnc.html:218
+msgid "View only"
 msgstr "Afficher uniquement"
 
-#: ../vnc.html:182
-msgid "Clip to Window"
-msgstr "Clip à fenêtre"
+#: ../vnc.html:226
+msgid "Clip to window"
+msgstr "Ajuster à la fenêtre"
 
-#: ../vnc.html:185
-msgid "Scaling Mode:"
+#: ../vnc.html:231
+msgid "Scaling mode:"
 msgstr "Mode mise à l'échelle :"
 
-#: ../vnc.html:187
+#: ../vnc.html:233
 msgid "None"
 msgstr "Aucun"
 
-#: ../vnc.html:188
-msgid "Local Scaling"
+#: ../vnc.html:234
+msgid "Local scaling"
 msgstr "Mise à l'échelle locale"
 
-#: ../vnc.html:189
-msgid "Remote Resizing"
+#: ../vnc.html:235
+msgid "Remote resizing"
 msgstr "Redimensionnement à distance"
 
-#: ../vnc.html:194
+#: ../vnc.html:240
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../vnc.html:197
+#: ../vnc.html:243
 msgid "Quality:"
 msgstr "Qualité :"
 
-#: ../vnc.html:201
+#: ../vnc.html:247
 msgid "Compression level:"
 msgstr "Niveau de compression :"
 
-#: ../vnc.html:206
+#: ../vnc.html:252
 msgid "Repeater ID:"
 msgstr "ID Répéteur :"
 
-#: ../vnc.html:210
+#: ../vnc.html:256
 msgid "WebSocket"
 msgstr "WebSocket"
 
-#: ../vnc.html:213
+#: ../vnc.html:261
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: ../vnc.html:216
+#: ../vnc.html:266
 msgid "Host:"
 msgstr "Hôte :"
 
-#: ../vnc.html:220
+#: ../vnc.html:270
 msgid "Port:"
 msgstr "Port :"
 
-#: ../vnc.html:224
+#: ../vnc.html:274
 msgid "Path:"
 msgstr "Chemin :"
 
-#: ../vnc.html:231
-msgid "Automatic Reconnect"
-msgstr "Reconnecter automatiquemen"
+#: ../vnc.html:283
+msgid "Automatic reconnect"
+msgstr "Reconnecter automatiquement"
 
-#: ../vnc.html:234
-msgid "Reconnect Delay (ms):"
+#: ../vnc.html:288
+msgid "Reconnect delay (ms):"
 msgstr "Délai de reconnexion (ms) :"
 
-#: ../vnc.html:239
-msgid "Show Dot when No Cursor"
+#: ../vnc.html:295
+msgid "Show dot when no cursor"
 msgstr "Afficher le point lorsqu'il n'y a pas de curseur"
 
-#: ../vnc.html:244
+#: ../vnc.html:302
 msgid "Logging:"
 msgstr "Se connecter :"
 
-#: ../vnc.html:253
+#: ../vnc.html:311
 msgid "Version:"
 msgstr "Version :"
 
-#: ../vnc.html:261
+#: ../vnc.html:319
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: ../vnc.html:280
+#: ../vnc.html:342
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../vnc.html:290
+#: ../vnc.html:351
+msgid "Server identity"
+msgstr "Identité du serveur"
+
+#: ../vnc.html:354
+msgid "The server has provided the following identifying information:"
+msgstr "Le serveur a fourni l'identification suivante :"
+
+#: ../vnc.html:357
+msgid "Fingerprint:"
+msgstr "Empreinte digitale :"
+
+#: ../vnc.html:361
+msgid ""
+"Please verify that the information is correct and press \"Approve\". "
+"Otherwise press \"Reject\"."
+msgstr ""
+"SVP, verifiez que l'information est correcte et pressez \"Accepter\". Sinon "
+"pressez \"Refuser\"."
+
+#: ../vnc.html:366
+msgid "Approve"
+msgstr "Accepter"
+
+#: ../vnc.html:367
+msgid "Reject"
+msgstr "Refuser"
+
+#: ../vnc.html:375
+msgid "Credentials"
+msgstr "Envoyer les identifiants"
+
+#: ../vnc.html:379
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: ../vnc.html:294
+#: ../vnc.html:383
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../vnc.html:298
-msgid "Send Credentials"
+#: ../vnc.html:387
+msgid "Send credentials"
 msgstr "Envoyer les identifiants"
 
-#: ../vnc.html:308
+#: ../vnc.html:396
 msgid "Cancel"
 msgstr "Annuler"
+
+#~ msgid "Must set host"
+#~ msgstr "Doit définir l'hôte"
+
+#~ msgid "Clear"
+#~ msgstr "Effacer"
diff --git a/systemvm/agent/noVNC/po/it.po b/systemvm/agent/noVNC/po/it.po
index d08ec53849d..a066bb3a415 100644
--- a/systemvm/agent/noVNC/po/it.po
+++ b/systemvm/agent/noVNC/po/it.po
@@ -1,6 +1,6 @@
 # Italian translations for noVNC
 # Traduzione italiana di noVNC
-# Copyright (C) 2022 The noVNC Authors
+# Copyright (C) 2022 The noVNC authors
 # This file is distributed under the same license as the noVNC package.
 # Fabio Fantoni <fabio.fantoni@m2r.biz>, 2022.
 #
@@ -84,7 +84,7 @@ msgid "Drag"
 msgstr ""
 
 #: ../vnc.html:78
-msgid "Move/Drag Viewport"
+msgid "Move/Drag viewport"
 msgstr ""
 
 #: ../vnc.html:84
@@ -92,7 +92,7 @@ msgid "Keyboard"
 msgstr "Tastiera"
 
 #: ../vnc.html:84
-msgid "Show Keyboard"
+msgid "Show keyboard"
 msgstr "Mostra tastiera"
 
 #: ../vnc.html:89
@@ -192,7 +192,7 @@ msgid "Settings"
 msgstr "Impostazioni"
 
 #: ../vnc.html:162
-msgid "Shared Mode"
+msgid "Shared mode"
 msgstr "Modalità condivisa"
 
 #: ../vnc.html:165
@@ -200,11 +200,11 @@ msgid "View Only"
 msgstr "Sola Visualizzazione"
 
 #: ../vnc.html:169
-msgid "Clip to Window"
+msgid "Clip to window"
 msgstr ""
 
 #: ../vnc.html:172
-msgid "Scaling Mode:"
+msgid "Scaling mode:"
 msgstr "Modalità di ridimensionamento:"
 
 #: ../vnc.html:174
diff --git a/systemvm/agent/noVNC/po/pt_BR.po b/systemvm/agent/noVNC/po/pt_BR.po
index 77951aef03a..422b94266f5 100644
--- a/systemvm/agent/noVNC/po/pt_BR.po
+++ b/systemvm/agent/noVNC/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Portuguese translations for noVNC package.
-# Copyright (C) 2021 The noVNC Authors
+# Copyright (C) 2021 The noVNC authors
 # This file is distributed under the same license as the noVNC package.
 #  <liddack@outlook.com>, 2021.
 #
@@ -83,7 +83,7 @@ msgid "Drag"
 msgstr "Arrastar"
 
 #: ../vnc.html:78
-msgid "Move/Drag Viewport"
+msgid "Move/Drag viewport"
 msgstr "Mover/arrastar a janela"
 
 #: ../vnc.html:84
@@ -91,7 +91,7 @@ msgid "Keyboard"
 msgstr "Teclado"
 
 #: ../vnc.html:84
-msgid "Show Keyboard"
+msgid "Show keyboard"
 msgstr "Mostrar teclado"
 
 #: ../vnc.html:89
@@ -99,7 +99,7 @@ msgid "Extra keys"
 msgstr "Teclas adicionais"
 
 #: ../vnc.html:89
-msgid "Show Extra Keys"
+msgid "Show extra keys"
 msgstr "Mostar teclas adicionais"
 
 #: ../vnc.html:94
@@ -191,19 +191,19 @@ msgid "Settings"
 msgstr "Configurações"
 
 #: ../vnc.html:162
-msgid "Shared Mode"
+msgid "Shared mode"
 msgstr "Modo compartilhado"
 
 #: ../vnc.html:165
-msgid "View Only"
+msgid "View only"
 msgstr "Apenas visualizar"
 
 #: ../vnc.html:169
-msgid "Clip to Window"
+msgid "Clip to window"
 msgstr "Recortar à janela"
 
 #: ../vnc.html:172
-msgid "Scaling Mode:"
+msgid "Scaling mode:"
 msgstr "Modo de dimensionamento:"
 
 #: ../vnc.html:174
@@ -211,11 +211,11 @@ msgid "None"
 msgstr "Nenhum"
 
 #: ../vnc.html:175
-msgid "Local Scaling"
+msgid "Local scaling"
 msgstr "Local"
 
 #: ../vnc.html:176
-msgid "Remote Resizing"
+msgid "Remote resizing"
 msgstr "Remoto"
 
 #: ../vnc.html:181
@@ -255,15 +255,15 @@ msgid "Path:"
 msgstr "Caminho:"
 
 #: ../vnc.html:218
-msgid "Automatic Reconnect"
+msgid "Automatic reconnect"
 msgstr "Reconexão automática"
 
 #: ../vnc.html:221
-msgid "Reconnect Delay (ms):"
+msgid "Reconnect delay (ms):"
 msgstr "Atraso da reconexão (ms)"
 
 #: ../vnc.html:226
-msgid "Show Dot when No Cursor"
+msgid "Show dot when no cursor"
 msgstr "Mostrar ponto quando não há cursor"
 
 #: ../vnc.html:231
@@ -291,7 +291,7 @@ msgid "Password:"
 msgstr "Senha:"
 
 #: ../vnc.html:285
-msgid "Send Credentials"
+msgid "Send credentials"
 msgstr "Enviar credenciais"
 
 #: ../vnc.html:295
diff --git a/systemvm/agent/noVNC/utils/convert.js b/systemvm/agent/noVNC/utils/convert.js
index aeba49d9fd5..617f4ed6511 100755
--- a/systemvm/agent/noVNC/utils/convert.js
+++ b/systemvm/agent/noVNC/utils/convert.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const path = require('path');
-const program = require('commander');
+const { program } = require('commander');
 const fs = require('fs');
 const fse = require('fs-extra');
 const babel = require('@babel/core');
diff --git a/systemvm/agent/noVNC/vnc.html b/systemvm/agent/noVNC/vnc.html
index f148d806d9c..d54e992d38d 100644
--- a/systemvm/agent/noVNC/vnc.html
+++ b/systemvm/agent/noVNC/vnc.html
@@ -4,7 +4,7 @@
 
     <!--
     noVNC example: simple example using default UI
-    Copyright (C) 2019 The noVNC Authors
+    Copyright (C) 2019 The noVNC authors
     noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
     This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
 
@@ -16,6 +16,7 @@
     <title>noVNC</title>
 
     <link rel="icon" type="image/x-icon" href="app/images/icons/novnc.ico">
+    <meta name="theme-color" content="#313131">
 
     <!-- Apple iOS Safari settings -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -36,6 +37,7 @@
     <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-ios-180.png">
 
     <!-- Stylesheets -->
+    <link rel="stylesheet" href="app/styles/constants.css">
     <link rel="stylesheet" href="app/styles/base.css">
     <link rel="stylesheet" href="app/styles/input.css">
 
@@ -45,7 +47,56 @@
     <link rel="preload" as="image" href="app/images/warning.png">
 
     <script type="module" crossorigin="anonymous" src="app/error-handler.js"></script>
-    <script type="module" crossorigin="anonymous" src="app/ui.js"></script>
+
+    <script type="module">
+        import UI from "./app/ui.js";
+        import * as Log from './core/util/logging.js';
+
+        let response;
+
+        let defaults = {};
+        let mandatory = {};
+
+        // Default settings will be loaded from defaults.json. Mandatory
+        // settings will be loaded from mandatory.json, which the user
+        // cannot change.
+
+        try {
+            response = await fetch('./defaults.json');
+            if (!response.ok) {
+                throw Error("" + response.status + " " + response.statusText);
+            }
+
+            defaults = await response.json();
+        } catch (err) {
+            Log.Error("Couldn't fetch defaults.json: " + err);
+        }
+
+        try {
+            response = await fetch('./mandatory.json');
+            if (!response.ok) {
+                throw Error("" + response.status + " " + response.statusText);
+            }
+
+            mandatory = await response.json();
+        } catch (err) {
+            Log.Error("Couldn't fetch mandatory.json: " + err);
+        }
+
+        // You can also override any defaults you need here:
+        //
+        // defaults['host'] = 'vnc.example.com';
+
+        // Or force a specific setting, preventing the user from
+        // changing it:
+        //
+        // mandatory['view_only'] = true;
+
+        // See docs/EMBEDDING.md for a list of possible settings.
+
+        UI.start({ settings: { defaults: defaults,
+                               mandatory: mandatory } });
+    </script>
 </head>
 
 <body id="body">
@@ -58,7 +109,7 @@
         </div>
     </div>
 
-    <!-- noVNC Control Bar -->
+    <!-- noVNC control bar -->
     <div id="noVNC_control_bar_anchor" class="noVNC_vcenter">
 
         <div id="noVNC_control_bar">
@@ -73,18 +124,18 @@
             <!-- Drag/Pan the viewport -->
             <input type="image" alt="Drag" src="app/images/drag.png"
                 id="noVNC_view_drag_button" class="noVNC_button noVNC_hidden"
-                title="Move/Drag Viewport">
+                title="Move/Drag viewport">
 
-            <!--noVNC Touch Device only buttons-->
+            <!--noVNC touch device only buttons-->
             <div id="noVNC_mobile_buttons" style="display: none;">
                 <input type="image" alt="Keyboard" src="app/images/keyboard.png"
-                    id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
+                    id="noVNC_keyboard_button" class="noVNC_button" title="Show keyboard">
             </div>
 
             <!-- Extra manual keys -->
             <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.png"
                 id="noVNC_toggle_extra_keys_button" class="noVNC_button"
-                title="Show Extra Keys">
+                title="Show extra keys">
             <div class="noVNC_vcenter">
             <div id="noVNC_modifiers" class="noVNC_panel">
                 <input type="image" alt="Ctrl" src="app/images/ctrl.png"
@@ -148,9 +199,9 @@
             </div>
 
             <!-- Toggle fullscreen -->
-            <input type="image" alt="Full Screen" src="app/images/fullscreen.png"
+            <input type="image" alt="Full screen" src="app/images/fullscreen.png"
                 id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
-                title="Full Screen">
+                title="Full screen">
 
             <!-- Settings -->
             <span style="display: none;">
@@ -255,10 +306,10 @@
                         </li>
                     </ul>
                 </div>
-                </div>
-            </span>
+            </div>
+            </div>
 
-            <!-- Connection Controls -->
+            <!-- Connection controls -->
             <input style="display: none;" type="image" alt="Disconnect" src="app/images/disconnect.png"
                 id="noVNC_disconnect_button" class="noVNC_button"
                 title="Disconnect">
@@ -273,7 +324,7 @@
         </div>
     </div>
 
-    <!-- Status Dialog -->
+    <!-- Status dialog -->
     <div id="noVNC_status"></div>
 
     <!-- Connect button -->
@@ -288,7 +339,7 @@
         </div>
     </div>
 
-    <!-- Server Key Verification Dialog -->
+    <!-- Server key verification dialog -->
     <div class="noVNC_center noVNC_connect_layer">
     <div id="noVNC_verify_server_dlg" class="noVNC_panel"><form>
         <div class="noVNC_heading">
@@ -298,21 +349,21 @@
             The server has provided the following identifying information:
         </div>
         <div id="noVNC_fingerprint_block">
-            <b>Fingerprint:</b>
+            Fingerprint:
             <span id="noVNC_fingerprint"></span>
         </div>
         <div>
             Please verify that the information is correct and press
             "Approve". Otherwise press "Reject".
         </div>
-        <div>
-            <input id="noVNC_approve_server_button" type="submit" value="Approve" class="noVNC_submit">
-            <input id="noVNC_reject_server_button" type="button" value="Reject" class="noVNC_submit">
+        <div class="button_row">
+            <input id="noVNC_approve_server_button" type="submit" value="Approve">
+            <input id="noVNC_reject_server_button" type="button" value="Reject">
         </div>
     </form></div>
     </div>
 
-    <!-- Password Dialog -->
+    <!-- Password dialog -->
     <div class="noVNC_center noVNC_connect_layer">
     <div id="noVNC_credentials_dlg" class="noVNC_panel"><form>
         <div class="noVNC_heading">
@@ -326,17 +377,17 @@
             <label for="noVNC_password_input">Password:</label>
             <input id="noVNC_password_input" type="password">
         </div>
-        <div>
-            <input id="noVNC_credentials_button" type="submit" value="Send Credentials" class="noVNC_submit">
+        <div class="button_row">
+            <input id="noVNC_credentials_button" type="submit" value="Send credentials">
         </div>
     </form></div>
     </div>
 
-    <!-- Transition Screens -->
+    <!-- Transition screens -->
     <div id="noVNC_transition">
         <div id="noVNC_transition_text"></div>
         <div>
-        <input type="button" id="noVNC_cancel_reconnect_button" value="Cancel" class="noVNC_submit">
+        <input type="button" id="noVNC_cancel_reconnect_button" value="Cancel">
         </div>
         <div class="noVNC_spinner"></div>
     </div>
diff --git a/systemvm/agent/noVNC/vnc_lite.html b/systemvm/agent/noVNC/vnc_lite.html
index 1eea4602222..8e6aaeabdec 100644
--- a/systemvm/agent/noVNC/vnc_lite.html
+++ b/systemvm/agent/noVNC/vnc_lite.html
@@ -7,7 +7,7 @@
 
     This is a self-contained file which doesn't import WebUtil or external CSS.
 
-    Copyright (C) 2019 The noVNC Authors
+    Copyright (C) 2019 The noVNC authors
     noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
     This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
 
@@ -87,7 +87,7 @@
         // When this function is called, the server requires
         // credentials to authenticate
         function credentialsAreRequired(e) {
-            const password = prompt("Password Required:");
+            const password = prompt("Password required:");
             rfb.sendCredentials({ password: password });
         }
 
@@ -119,20 +119,14 @@
         // query string. If the variable isn't defined in the URL
         // it returns the default value instead.
         function readQueryVariable(name, defaultValue) {
-            // A URL with a query parameter can look like this (But will most probably get logged on the http server):
+            // A URL with a query parameter can look like this:
             // https://www.example.com?myqueryparam=myvalue
             //
-            // For privacy (Using a hastag #, the parameters will not be sent to the server)
-            // the url can be requested in the following way:
-            // https://www.example.com#myqueryparam=myvalue&password=secreatvalue
-            //
-            // Even Mixing public and non public parameters will work:
-            // https://www.example.com?nonsecretparam=example.com#password=secreatvalue
-            //
             // Note that we use location.href instead of location.search
             // because Firefox < 53 has a bug w.r.t location.search
             const re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
-                  match = ''.concat(document.location.href, window.location.hash).match(re);
+                  match = document.location.href.match(re);
+
             if (typeof defaultValue === 'undefined') { defaultValue = null; }
 
             if (match) {

From 8429223782d8399fa817aca02a264670115ac7bf Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Tue, 29 Jul 2025 17:04:06 +0200
Subject: [PATCH 92/94] missing imports from merge forward

---
 .../api/command/user/userdata/RegisterUserDataCmd.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
index 2603209c540..3fc555fa51a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
@@ -21,6 +21,8 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.UserDataResponse;
 import org.apache.cloudstack.context.CallContext;

From 2bffabba7b178c3e917a705c04bca91585bc987a Mon Sep 17 00:00:00 2001
From: nvazquez <nicovazquez90@gmail.com>
Date: Tue, 29 Jul 2025 13:41:40 -0300
Subject: [PATCH 93/94] Fix unit tests after merge forward

---
 .../api/command/user/userdata/RegisterUserDataCmd.java         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
index 3fc555fa51a..4bfaeea05fd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
@@ -74,9 +74,6 @@ public class RegisterUserDataCmd extends BaseRegisterUserDataCmd {
             length = 1048576)
     private String userData;
 
-    @Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the User Data content")
-    private String params;
-
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////

From da3ba17884eeb09ac11c83ec7cfbf8e8072e552f Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 30 Jul 2025 01:32:16 +0530
Subject: [PATCH 94/94] Fix build and ui build errors in main (#11332)

* fix build error in registeruserdatacmd

* remove unused imports

* fix ui build errors
---
 .../user/userdata/RegisterUserDataCmd.java    | 50 +----------
 ui/src/views/compute/DeployVM.vue             | 90 +++++++++----------
 ui/src/views/compute/DeployVnfAppliance.vue   | 90 +++++++++----------
 .../infra/zone/ZoneWizardZoneDetailsStep.vue  |  2 +-
 4 files changed, 93 insertions(+), 139 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
index 4bfaeea05fd..185c9c05b1c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
@@ -21,8 +21,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.UserDataResponse;
 import org.apache.cloudstack.context.CallContext;
@@ -48,52 +46,8 @@ public class RegisterUserDataCmd extends BaseRegisterUserDataCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the User Data")
-    private String name;
-
-    //Owner information
-    @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the User Data. Must be used with domainId.")
-    private String accountName;
-
-    @Parameter(name = ApiConstants.DOMAIN_ID,
-            type = CommandType.UUID,
-            entityType = DomainResponse.class,
-            description = "an optional domainId for the User Data. If the account parameter is used, domainId must also be used.")
-    private Long domainId;
-
-    @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the User Data")
-    private Long projectId;
-
-    @Parameter(name = ApiConstants.USER_DATA,
-            type = CommandType.STRING,
-            required = true,
-            description = "Base64 encoded User Data content. " +
-                    "Using HTTP GET (via querystring), you can send up to 4KB of data after base64 encoding. " +
-                    "Using HTTP POST (via POST body), you can send up to 32KB of data after base64 encoding, " +
-                    "which can be increased upto 1MB using the vm.userdata.max.length setting",
-            length = 1048576)
-    private String userData;
-
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-    public String getName() {
-        return name;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public Long getDomainId() {
-        return domainId;
-    }
-
-    public Long getProjectId() {
-        return projectId;
-    }
+    @Parameter(name = ApiConstants.USER_DATA, type = CommandType.STRING, required = true, description = "User data content", length = 1048576)
+    protected String userData;
 
     public String getUserData() {
         return userData;
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 674fe89f7fa..cd248f123f1 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -2528,64 +2528,64 @@ export default {
         if (exclude && exclude.length > 0 && exclude.includes(name)) {
           return resolve(null)
         }
-      }
-      this.loading[name] = true
-      param.loading = true
-      param.opts = []
-      const options = param.options || {}
-      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
-        options.listall = true
-      }
-      postApi(param.list, options).then((response) => {
-        param.loading = false
-        _.map(response, (responseItem, responseKey) => {
-          if (Object.keys(responseItem).length === 0) {
-            this.rowCount[name] = 0
-            this.options[name] = []
-            return
-          }
-          if (!responseKey.includes('response')) {
-            return
-          }
-          _.map(responseItem, (response, key) => {
-            if (key === 'count') {
-              this.rowCount[name] = response
+        this.loading[name] = true
+        param.loading = true
+        param.opts = []
+        const options = param.options || {}
+        if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
+          options.listall = true
+        }
+        postAPI(param.list, options).then((response) => {
+          param.loading = false
+          _.map(response, (responseItem, responseKey) => {
+            if (Object.keys(responseItem).length === 0) {
+              this.rowCount[name] = 0
+              this.options[name] = []
               return
             }
             if (!responseKey.includes('response')) {
-              return resolve(null)
+              return
             }
             _.map(responseItem, (response, key) => {
               if (key === 'count') {
                 this.rowCount[name] = response
                 return
               }
-              param.opts = response
-              this.options[name] = response
-
-              if (name === 'hypervisors') {
-                const hypervisorFromResponse = response[0] && response[0].name ? response[0].name : null
-                this.dataPreFill.hypervisor = hypervisorFromResponse
-                this.form.hypervisor = hypervisorFromResponse
+              if (!responseKey.includes('response')) {
+                return resolve(null)
               }
+              _.map(responseItem, (response, key) => {
+                if (key === 'count') {
+                  this.rowCount[name] = response
+                  return
+                }
+                param.opts = response
+                this.options[name] = response
 
-              if (param.field) {
-                this.fillValue(param.field)
+                if (name === 'hypervisors') {
+                  const hypervisorFromResponse = response[0] && response[0].name ? response[0].name : null
+                  this.dataPreFill.hypervisor = hypervisorFromResponse
+                  this.form.hypervisor = hypervisorFromResponse
+                }
+
+                if (param.field) {
+                  this.fillValue(param.field)
+                }
+              })
+
+              if (name === 'zones') {
+                let zoneid = ''
+                if (this.$route.query.zoneid) {
+                  zoneid = this.$route.query.zoneid
+                } else if (this.options.zones.length === 1) {
+                  zoneid = this.options.zones[0].id
+                }
+                if (zoneid) {
+                  this.form.zoneid = zoneid
+                  this.onSelectZoneId(zoneid)
+                }
               }
             })
-
-            if (name === 'zones') {
-              let zoneid = ''
-              if (this.$route.query.zoneid) {
-                zoneid = this.$route.query.zoneid
-              } else if (this.options.zones.length === 1) {
-                zoneid = this.options.zones[0].id
-              }
-              if (zoneid) {
-                this.form.zoneid = zoneid
-                this.onSelectZoneId(zoneid)
-              }
-            }
           })
           resolve(response)
         }).catch(function (error) {
diff --git a/ui/src/views/compute/DeployVnfAppliance.vue b/ui/src/views/compute/DeployVnfAppliance.vue
index fd5a04d9b70..cf8677a2c61 100644
--- a/ui/src/views/compute/DeployVnfAppliance.vue
+++ b/ui/src/views/compute/DeployVnfAppliance.vue
@@ -2472,64 +2472,64 @@ export default {
         if (exclude && exclude.length > 0 && exclude.includes(name)) {
           return resolve(null)
         }
-      }
-      this.loading[name] = true
-      param.loading = true
-      param.opts = []
-      const options = param.options || {}
-      if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
-        options.listall = true
-      }
-      postApi(param.list, options).then((response) => {
-        param.loading = false
-        _.map(response, (responseItem, responseKey) => {
-          if (Object.keys(responseItem).length === 0) {
-            this.rowCount[name] = 0
-            this.options[name] = []
-            return
-          }
-          if (!responseKey.includes('response')) {
-            return
-          }
-          _.map(responseItem, (response, key) => {
-            if (key === 'count') {
-              this.rowCount[name] = response
+        this.loading[name] = true
+        param.loading = true
+        param.opts = []
+        const options = param.options || {}
+        if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'hypervisors'].includes(name)) {
+          options.listall = true
+        }
+        postAPI(param.list, options).then((response) => {
+          param.loading = false
+          _.map(response, (responseItem, responseKey) => {
+            if (Object.keys(responseItem).length === 0) {
+              this.rowCount[name] = 0
+              this.options[name] = []
               return
             }
             if (!responseKey.includes('response')) {
-              return resolve(null)
+              return
             }
             _.map(responseItem, (response, key) => {
               if (key === 'count') {
                 this.rowCount[name] = response
                 return
               }
-              param.opts = response
-              this.options[name] = response
-
-              if (name === 'hypervisors') {
-                const hypervisorFromResponse = response[0] && response[0].name ? response[0].name : null
-                this.dataPreFill.hypervisor = hypervisorFromResponse
-                this.form.hypervisor = hypervisorFromResponse
+              if (!responseKey.includes('response')) {
+                return resolve(null)
               }
+              _.map(responseItem, (response, key) => {
+                if (key === 'count') {
+                  this.rowCount[name] = response
+                  return
+                }
+                param.opts = response
+                this.options[name] = response
 
-              if (param.field) {
-                this.fillValue(param.field)
+                if (name === 'hypervisors') {
+                  const hypervisorFromResponse = response[0] && response[0].name ? response[0].name : null
+                  this.dataPreFill.hypervisor = hypervisorFromResponse
+                  this.form.hypervisor = hypervisorFromResponse
+                }
+
+                if (param.field) {
+                  this.fillValue(param.field)
+                }
+              })
+
+              if (name === 'zones') {
+                let zoneid = ''
+                if (this.$route.query.zoneid) {
+                  zoneid = this.$route.query.zoneid
+                } else if (this.options.zones.length === 1) {
+                  zoneid = this.options.zones[0].id
+                }
+                if (zoneid) {
+                  this.form.zoneid = zoneid
+                  this.onSelectZoneId(zoneid)
+                }
               }
             })
-
-            if (name === 'zones') {
-              let zoneid = ''
-              if (this.$route.query.zoneid) {
-                zoneid = this.$route.query.zoneid
-              } else if (this.options.zones.length === 1) {
-                zoneid = this.options.zones[0].id
-              }
-              if (zoneid) {
-                this.form.zoneid = zoneid
-                this.onSelectZoneId(zoneid)
-              }
-            }
           })
           resolve(response)
         }).catch(function (error) {
diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
index 5e5b635733b..f007142fca3 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
@@ -470,7 +470,7 @@ export default {
       })
     },
     fetchDomainAccounts (domainid) {
-      api('listAccounts', {
+      getAPI('listAccounts', {
         domainid: domainid
       }).then(response => {
         // Clean up the selected account from a previous domain