Fix VM with ISO attached migration issue

nvazquez · nvazquez · commit ab89e3f4a5d5 · 2020-03-05T01:53:18.000-03:00
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java
@@ -68,7 +68,7 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory {
     @Override
     public TemplateInfo getTemplate(long templateId, DataStore store) {
         VMTemplateVO templ = imageDataDao.findById(templateId);
-        if (store == null) {
+        if (store == null && !templ.isDirectDownload()) {
             TemplateObject tmpl = TemplateObject.getTemplate(templ, null);
             return tmpl;
         }
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -586,7 +586,7 @@ public void prepareIsoForVmProfile(VirtualMachineProfile profile, DeployDestinat
                 }
                 template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), poolId);
             } else {
-                template = _tmplFactory.getTemplate(vm.getIsoId(), DataStoreRole.Primary, dest.getDataCenter().getId());
+                template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), null);
             }
 
             if (template == null){

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory {`
`68`	`68`	`@Override`
`69`	`69`	`public TemplateInfo getTemplate(long templateId, DataStore store) {`
`70`	`70`	`VMTemplateVO templ = imageDataDao.findById(templateId);`
`71`		`- if (store == null) {`
	`71`	`+ if (store == null && !templ.isDirectDownload()) {`
`72`	`72`	`TemplateObject tmpl = TemplateObject.getTemplate(templ, null);`
`73`	`73`	`return tmpl;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ public void prepareIsoForVmProfile(VirtualMachineProfile profile, DeployDestinat`
`586`	`586`	`}`
`587`	`587`	`template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), poolId);`
`588`	`588`	`} else {`
`589`		`- template = _tmplFactory.getTemplate(vm.getIsoId(), DataStoreRole.Primary, dest.getDataCenter().getId());`
	`589`	`+ template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), null);`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`if (template == null){`