From fcdc99805db639f473647593fecaa2c026b4d535 Mon Sep 17 00:00:00 2001 From: Lorenzo Tanganelli Date: Thu, 18 Dec 2025 09:09:19 +0100 Subject: [PATCH 1/2] fix template id unmanaged vm --- .../org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java index 13fa2608016c..146dfd907594 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -1550,11 +1550,12 @@ private ServiceOfferingVO getServiceOfferingForImportInstance(Long serviceOfferi protected VMTemplateVO getTemplateForImportInstance(Long templateId, Hypervisor.HypervisorType hypervisorType) { VMTemplateVO template; if (templateId == null) { - template = templateDao.findByName(VM_IMPORT_DEFAULT_TEMPLATE_NAME); + String templateName = (Hypervisor.HypervisorType.KVM == hypervisorType) ? KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME : VM_IMPORT_DEFAULT_TEMPLATE_NAME; + template = templateDao.findByName(templateName); if (template == null) { template = createDefaultDummyVmImportTemplate(Hypervisor.HypervisorType.KVM == hypervisorType); if (template == null) { - throw new InvalidParameterValueException(String.format("Default VM import template with unique name: %s for hypervisor: %s cannot be created. Please use templateid parameter for import", VM_IMPORT_DEFAULT_TEMPLATE_NAME, hypervisorType.toString())); + throw new InvalidParameterValueException(String.format("Default VM import template with unique name: %s for hypervisor: %s cannot be created. Please use templateid parameter for import", templateName, hypervisorType.toString())); } } } else { From 1df4bc317b1381f8cf89666d350d55aefc49bf32 Mon Sep 17 00:00:00 2001 From: Lorenzo Tanganelli Date: Tue, 23 Dec 2025 18:34:44 +0100 Subject: [PATCH 2/2] Update == to equals Co-authored-by: dahn --- .../java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java index 146dfd907594..14c67417015c 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -1550,7 +1550,7 @@ private ServiceOfferingVO getServiceOfferingForImportInstance(Long serviceOfferi protected VMTemplateVO getTemplateForImportInstance(Long templateId, Hypervisor.HypervisorType hypervisorType) { VMTemplateVO template; if (templateId == null) { - String templateName = (Hypervisor.HypervisorType.KVM == hypervisorType) ? KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME : VM_IMPORT_DEFAULT_TEMPLATE_NAME; + String templateName = (Hypervisor.HypervisorType.KVM.equals(hypervisorType)) ? KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME : VM_IMPORT_DEFAULT_TEMPLATE_NAME; template = templateDao.findByName(templateName); if (template == null) { template = createDefaultDummyVmImportTemplate(Hypervisor.HypervisorType.KVM == hypervisorType);