You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ab...@apache.org on 2026/04/06 11:49:12 UTC

(cloudstack) branch 4.20 updated: engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM (#12952)

This is an automated email from the ASF dual-hosted git repository.

abhisar pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 6f1aa96b4cd engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM (#12952)
6f1aa96b4cd is described below

commit 6f1aa96b4cd5e78513afeedfe2e06833ef736bda
Author: Wei Zhou <we...@apache.org>
AuthorDate: Mon Apr 6 13:49:04 2026 +0200

    engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM (#12952)
    
    * engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM
---
 .../java/com/cloud/upgrade/SystemVmTemplateRegistration.java   | 10 +++++-----
 .../com/cloud/upgrade/SystemVmTemplateRegistrationTest.java    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
index a6aecf477f7..2e45d567357 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
@@ -315,11 +315,11 @@ public class SystemVmTemplateRegistration {
     public static final List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorList = Arrays.asList(
             new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.amd64),
             new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64),
-            new Pair<>(Hypervisor.HypervisorType.VMware, null),
-            new Pair<>(Hypervisor.HypervisorType.XenServer, null),
-            new Pair<>(Hypervisor.HypervisorType.Hyperv, null),
-            new Pair<>(Hypervisor.HypervisorType.LXC, null),
-            new Pair<>(Hypervisor.HypervisorType.Ovm3, null)
+            new Pair<>(Hypervisor.HypervisorType.VMware, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.Hyperv, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.amd64)
     );
 
     public static final Map<String, MetadataTemplateDetails> NewTemplateMap = new HashMap<>();
diff --git a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
index 8c2fe43c9d3..aad8760ed77 100644
--- a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
+++ b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
@@ -155,7 +155,7 @@ public class SystemVmTemplateRegistrationTest {
         templateDetails =
                 SystemVmTemplateRegistration.NewTemplateMap.get("vmware");
         assertNotNull(templateDetails);
-        assertNull(templateDetails.getArch());
+        assertEquals(CPU.CPUArch.amd64, templateDetails.getArch());
         assertEquals(Hypervisor.HypervisorType.VMware, templateDetails.getHypervisorType());
     }