etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ffc8f62ed4 into 9bbd32a8ef

This commit is contained in:
Abhishek Kumar 2026-03-09 13:14:43 +00:00 committed by GitHub
parent 9bbd32a8ef ffc8f62ed4
commit 6ca3856d54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
View File

@ -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,

14
engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
View File

@ -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