Veeam: get templateId from vm instance if vm is created from ISO (apache#10705)

weizhouapache · dhslove · commit 2fd661c0f4e1 · 2025-12-08T17:44:40.000+09:00
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -695,7 +695,12 @@ private Long getImportingVMTemplate(List<VirtualDisk> virtualDisks, long zoneId,
                     updateTemplateRef(templateId, poolId, templatePath, templateSize);
                     return templateId;
                 } else {
-                    return volumeVO.getTemplateId();
+                    Long templateId = volumeVO.getTemplateId();
+                    if (templateId == null && volumeVO.getInstanceId() != null) {
+                        VMInstanceVO vmInstanceVO = vmDao.findByIdIncludingRemoved(volumeVO.getInstanceId());
+                        return vmInstanceVO.getTemplateId();
+                    }
+                    return templateId;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,12 @@ private Long getImportingVMTemplate(List<VirtualDisk> virtualDisks, long zoneId,`
`695`	`695`	`updateTemplateRef(templateId, poolId, templatePath, templateSize);`
`696`	`696`	`return templateId;`
`697`	`697`	`} else {`
`698`		`- return volumeVO.getTemplateId();`
	`698`	`+ Long templateId = volumeVO.getTemplateId();`
	`699`	`+ if (templateId == null && volumeVO.getInstanceId() != null) {`
	`700`	`+ VMInstanceVO vmInstanceVO = vmDao.findByIdIncludingRemoved(volumeVO.getInstanceId());`
	`701`	`+ return vmInstanceVO.getTemplateId();`
	`702`	`+ }`
	`703`	`+ return templateId;`
`699`	`704`	`}`
`700`	`705`	`}`
`701`	`706`	`}`