This is an automated email from the ASF dual-hosted git repository. andrijapanicsb pushed a commit to branch kvm-systemvm-template-dynamic-scaling in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit db45d931d067efd8c377e2ec5c371896403b634b Author: Andrija Panic <[email protected]> AuthorDate: Sun Nov 15 12:32:17 2026 +0100 KVM: also mark SystemVM templates registered before the upgrade as dynamically scalable An operator can register the new SystemVM template by hand before upgrading. The upgrade SQL runs while it is still a user template, so it does not set the flag. Set it when such a KVM template is turned into a SystemVM template. Templates that already are SystemVM templates keep their flag, so a later upgrade does not undo an operator's choice. --- .../upgrade/SystemVmTemplateRegistration.java | 7 +++++ .../upgrade/SystemVmTemplateRegistrationTest.java | 33 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) 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 af1313cd493..a9e6c91b07c 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java @@ -1058,6 +1058,13 @@ public class SystemVmTemplateRegistration { protected void updateRegisteredTemplateDetails(Long templateId, MetadataTemplateDetails templateDetails, Long zoneId) { VMTemplateVO templateVO = vmTemplateDao.findById(templateId); + // A KVM template registered by hand before the upgrade becomes a SystemVM template only here, after the + // upgrade SQL has marked the existing KVM SystemVM templates as dynamically scalable. Templates that are + // already SystemVM templates keep their flag, so an operator who turned it off keeps it off. + if (!Storage.TemplateType.SYSTEM.equals(templateVO.getTemplateType()) + && Hypervisor.HypervisorType.KVM.equals(templateDetails.getHypervisorType())) { + templateVO.setDynamicallyScalable(true); + } templateVO.setTemplateType(Storage.TemplateType.SYSTEM); GuestOSVO guestOS = guestOSDao.findOneByDisplayName(templateDetails.getGuestOs()); if (guestOS != null) { 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 34476792c66..79a9f6cf36a 100644 --- a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java +++ b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java @@ -1694,4 +1694,37 @@ public class SystemVmTemplateRegistrationTest { when(vmTemplateDao.persist(any(VMTemplateVO.class))).thenAnswer(invocation -> invocation.getArgument(0)); return systemVmTemplateRegistration.createTemplateObjectInDB(details); } + + @Test + public void updateRegisteredTemplateDetails_PreRegisteredKvmTemplateBecomesDynamicallyScalable() { + VMTemplateVO template = updateRegisteredTemplate(Storage.TemplateType.USER, Hypervisor.HypervisorType.KVM); + assertEquals(Storage.TemplateType.SYSTEM, template.getTemplateType()); + assertTrue(template.isDynamicallyScalable()); + } + + @Test + public void updateRegisteredTemplateDetails_KvmSystemTemplateKeepsItsFlag() { + assertFalse(updateRegisteredTemplate(Storage.TemplateType.SYSTEM, Hypervisor.HypervisorType.KVM).isDynamicallyScalable()); + } + + @Test + public void updateRegisteredTemplateDetails_PreRegisteredOtherHypervisorTemplateIsNotDynamicallyScalable() { + assertFalse(updateRegisteredTemplate(Storage.TemplateType.USER, Hypervisor.HypervisorType.VMware).isDynamicallyScalable()); + } + + private VMTemplateVO updateRegisteredTemplate(Storage.TemplateType currentType, Hypervisor.HypervisorType hypervisorType) { + long templateId = 1L; + VMTemplateVO template = new VMTemplateVO(); + template.setTemplateType(currentType); + template.setDynamicallyScalable(false); + SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails = + Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class); + when(templateDetails.getHypervisorType()).thenReturn(hypervisorType); + when(vmTemplateDao.findById(templateId)).thenReturn(template); + when(vmTemplateDao.update(template.getId(), template)).thenReturn(true); + doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId, hypervisorType); + doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(any(), any(), any()); + systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, templateDetails, null); + return template; + } }
