From 0f754531ad7aa2fbbf4d0f2d87b0a9ec712c8eb8 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 2 Apr 2026 17:05:39 +0200 Subject: [PATCH 1/3] engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM --- .../cloud/upgrade/SystemVmTemplateRegistration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 a6aecf477f78..dd8d7998be6d 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 void setUpdated(Date updated) { public static final List> 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.getDefault()), + new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.getDefault()), + new Pair<>(Hypervisor.HypervisorType.Hyperv, CPU.CPUArch.getDefault()), + new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.getDefault()), + new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.getDefault()) ); public static final Map NewTemplateMap = new HashMap<>(); From c0cbf79ad9d849de90611208e968d84f2b4570c7 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 2 Apr 2026 17:22:55 +0200 Subject: [PATCH 2/3] fix test failure --- .../com/cloud/upgrade/SystemVmTemplateRegistrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c2fe43c9d3c..aad8760ed77a 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 void test_parseMetadataFile_success() { templateDetails = SystemVmTemplateRegistration.NewTemplateMap.get("vmware"); assertNotNull(templateDetails); - assertNull(templateDetails.getArch()); + assertEquals(CPU.CPUArch.amd64, templateDetails.getArch()); assertEquals(Hypervisor.HypervisorType.VMware, templateDetails.getHypervisorType()); } From 57e1850676995aa3c4fff3ce27b5630fed5ace3b Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 2 Apr 2026 17:46:01 +0200 Subject: [PATCH 3/3] same code as main --- .../cloud/upgrade/SystemVmTemplateRegistration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 dd8d7998be6d..2e45d567357e 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 void setUpdated(Date updated) { public static final List> hypervisorList = Arrays.asList( new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.amd64), new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64), - new Pair<>(Hypervisor.HypervisorType.VMware, CPU.CPUArch.getDefault()), - new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.getDefault()), - new Pair<>(Hypervisor.HypervisorType.Hyperv, CPU.CPUArch.getDefault()), - new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.getDefault()), - new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.getDefault()) + 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 NewTemplateMap = new HashMap<>();