missing changes

Author: harikrishna-patnala

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java

@@ -660,16 +660,13 @@ private boolean searchAndCopyAcrossZones(VMTemplateVO tmplt, DataStore destStore
 
     protected TemplateObject findUsableTemplate(VMTemplateVO tmplt, List<DataStore> imageStores) {
         for (DataStore store : imageStores) {
-            TemplateObject tmpl = (TemplateObject) _templateFactory.getTemplate(tmplt.getId(), store);
-            if (tmpl == null) {
-                continue;
-            }
 
             Map<String, TemplateProp> templates = listTemplate(store);
             if (templates == null || !templates.containsKey(tmplt.getUniqueName())) {
                 continue;
             }
 
+            TemplateObject tmpl = (TemplateObject) _templateFactory.getTemplate(tmplt.getId(), store);
             if (tmpl.getInstallPath() == null) {
                 logger.debug("Template [{}] found in image store [{}] but install path is null. Skipping.",
                         tmplt.getUniqueName(), store.getName());

engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java

@@ -204,6 +204,7 @@ public void tryCopyingTemplateToImageStoreTestReturnsTrueWhenTemplateExistsInAno
         Mockito.doReturn(scopeMock).when(destStoreMock).getScope();
         Mockito.doReturn(1L).when(scopeMock).getScopeId();
         Mockito.doReturn(100L).when(tmpltMock).getId();
+        Mockito.doReturn("unique-name").when(tmpltMock).getUniqueName();
         Mockito.doReturn(List.of(sourceStoreMock)).when(dataStoreManagerMock).getImageStoresByZoneIds(1L);
         Mockito.doReturn(null).when(templateService).listTemplate(sourceStoreMock);
         Mockito.doReturn(List.of(1L, 2L)).when(_dcDao).listAllIds();
@@ -212,7 +213,8 @@ public void tryCopyingTemplateToImageStoreTestReturnsTrueWhenTemplateExistsInAno
         Mockito.doReturn(List.of(otherZoneStoreMock)).when(dataStoreManagerMock).getImageStoresByZoneIds(2L);
 
         Map<String, TemplateProp> templatesInOtherZone = new HashMap<>();
-        templatesInOtherZone.put(tmpltMock.getUniqueName(), tmpltPropMock);
+        templatesInOtherZone.put("unique-name", tmpltPropMock);
+        Mockito.doReturn(templatesInOtherZone).when(templateService).listTemplate(otherZoneStoreMock);
 
         TemplateObject sourceTmplMock = Mockito.mock(TemplateObject.class);
         Mockito.doReturn(sourceTmplMock).when(templateDataFactoryMock).getTemplate(100L, otherZoneStoreMock);
@@ -232,14 +234,16 @@ public void tryCopyingTemplateToImageStoreTestReturnsFalseWhenDestinationZoneIsM
         Mockito.doReturn(scopeMock).when(destStoreMock).getScope();
         Mockito.doReturn(1L).when(scopeMock).getScopeId();
         Mockito.doReturn(100L).when(tmpltMock).getId();
+        Mockito.doReturn("unique-name").when(tmpltMock).getUniqueName();
         Mockito.doReturn(List.of(1L, 2L)).when(_dcDao).listAllIds();
         Mockito.doReturn(List.of()).when(dataStoreManagerMock).getImageStoresByZoneIds(1L);
 
         DataStore otherZoneStoreMock = Mockito.mock(DataStore.class);
         Mockito.doReturn(List.of(otherZoneStoreMock)).when(dataStoreManagerMock).getImageStoresByZoneIds(2L);
 
         Map<String, TemplateProp> templates = new HashMap<>();
-        templates.put(tmpltMock.getUniqueName(), tmpltPropMock);
+        templates.put("unique-name", tmpltPropMock);
+        Mockito.doReturn(templates).when(templateService).listTemplate(otherZoneStoreMock);
 
         TemplateObject sourceTmplMock = Mockito.mock(TemplateObject.class);
         Mockito.doReturn(sourceTmplMock).when(templateDataFactoryMock).getTemplate(100L, otherZoneStoreMock);
@@ -257,14 +261,17 @@ public void tryCopyingTemplateToImageStoreTestReturnsTrueWhenCrossZoneCopyTaskIs
         Mockito.doReturn(scopeMock).when(destStoreMock).getScope();
         Mockito.doReturn(1L).when(scopeMock).getScopeId();
         Mockito.doReturn(100L).when(tmpltMock).getId();
+        Mockito.doReturn("unique-name").when(tmpltMock).getUniqueName();
         Mockito.doReturn(List.of(1L, 2L)).when(_dcDao).listAllIds();
         Mockito.doReturn(List.of()).when(dataStoreManagerMock).getImageStoresByZoneIds(1L);
 
         DataStore otherZoneStoreMock = Mockito.mock(DataStore.class);
         Mockito.doReturn(List.of(otherZoneStoreMock)).when(dataStoreManagerMock).getImageStoresByZoneIds(2L);
 
         Map<String, TemplateProp> templates = new HashMap<>();
-        templates.put(tmpltMock.getUniqueName(), tmpltPropMock);
+        templates.put("unique-name", tmpltPropMock);
+
+        Mockito.doReturn(templates).when(templateService).listTemplate(otherZoneStoreMock);
 
         TemplateObject sourceTmplMock = Mockito.mock(TemplateObject.class);
         Mockito.doReturn(sourceTmplMock).when(templateDataFactoryMock).getTemplate(100L, otherZoneStoreMock);
@@ -302,8 +309,6 @@ public void testFindUsableTemplateReturnsTemplateWithNonNullInstallPath() {
         Mockito.when(storeWithNullPath.getName()).thenReturn("store-null");
 
         DataStore storeWithValidPath = Mockito.mock(DataStore.class);
-        Mockito.when(storeWithValidPath.getName()).thenReturn("store-valid");
-
         TemplateObject tmplWithNullPath = Mockito.mock(TemplateObject.class);
         Mockito.when(tmplWithNullPath.getInstallPath()).thenReturn(null);