(cloudstack) branch main updated: systemvmtemplate-register: correctly update existing template name in config (#12703)

[weizhou]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new e1521f139b0 systemvmtemplate-register: correctly update existing 
template name in config (#12703)
e1521f139b0 is described below

commit e1521f139b026e1459a4993b75d9425ac508956d
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Mon May 11 16:52:54 2026 +0530

    systemvmtemplate-register: correctly update existing template name in 
config (#12703)
---
 .../com/cloud/upgrade/SystemVmTemplateRegistration.java    |  2 +-
 .../cloud/upgrade/SystemVmTemplateRegistrationTest.java    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 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 292bafefbb6..2acb4138d23 100644
--- 
a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
+++ 
b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
@@ -1073,7 +1073,7 @@ public class SystemVmTemplateRegistration {
         }
         Hypervisor.HypervisorType hypervisorType = 
templateDetails.getHypervisorType();
         updateSystemVMEntries(templateId, hypervisorType);
-        updateConfigurationParams(hypervisorType, templateDetails.getName(), 
zoneId);
+        updateConfigurationParams(hypervisorType, templateVO.getName(), 
zoneId);
     }
 
     protected void updateTemplateUrlChecksumAndGuestOsId(VMTemplateVO 
templateVO,
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 8028e78c907..51db952eb61 100644
--- 
a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
+++ 
b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
@@ -570,18 +570,19 @@ public class SystemVmTemplateRegistrationTest {
         SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails =
                 
Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class);
         VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
+        String templateName = "templateName";
+        when(templateVO.getName()).thenReturn(templateName);
         GuestOSVO guestOS = Mockito.mock(GuestOSVO.class);
 
         when(templateDetails.getGuestOs()).thenReturn("Debian");
         
when(templateDetails.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
-        when(templateDetails.getName()).thenReturn("templateName");
         when(vmTemplateDao.findById(templateId)).thenReturn(templateVO);
         when(guestOSDao.findOneByDisplayName("Debian")).thenReturn(guestOS);
         when(guestOS.getId()).thenReturn(10L);
         when(vmTemplateDao.update(templateVO.getId(), 
templateVO)).thenReturn(true);
         
doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId,
 Hypervisor.HypervisorType.KVM);
         
doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
-                "templateName", zoneId);
+                templateName, zoneId);
 
         
systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, 
templateDetails, zoneId);
 
@@ -590,7 +591,7 @@ public class SystemVmTemplateRegistrationTest {
         verify(vmTemplateDao).update(templateVO.getId(), templateVO);
         verify(systemVmTemplateRegistration).updateSystemVMEntries(templateId, 
Hypervisor.HypervisorType.KVM);
         
verify(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
-                "templateName", zoneId);
+                templateName, zoneId);
     }
 
     @Test
@@ -620,16 +621,17 @@ public class SystemVmTemplateRegistrationTest {
         SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails =
                 
Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class);
         VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
+        String templateName = "templateName";
+        when(templateVO.getName()).thenReturn(templateName);
 
         when(templateDetails.getGuestOs()).thenReturn("NonExistentOS");
         
when(templateDetails.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
-        when(templateDetails.getName()).thenReturn("templateName");
         when(vmTemplateDao.findById(templateId)).thenReturn(templateVO);
         
when(guestOSDao.findOneByDisplayName("NonExistentOS")).thenReturn(null);
         when(vmTemplateDao.update(templateVO.getId(), 
templateVO)).thenReturn(true);
         
doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId,
 Hypervisor.HypervisorType.KVM);
         
doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
-                "templateName", zoneId);
+                templateName, zoneId);
 
         
systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, 
templateDetails, zoneId);
 
@@ -637,7 +639,7 @@ public class SystemVmTemplateRegistrationTest {
         verify(vmTemplateDao).update(templateVO.getId(), templateVO);
         verify(systemVmTemplateRegistration).updateSystemVMEntries(templateId, 
Hypervisor.HypervisorType.KVM);
         
verify(systemVmTemplateRegistration).updateConfigurationParams(Hypervisor.HypervisorType.KVM,
-                "templateName", zoneId);
+                templateName, zoneId);
     }
 
     @Test