Address comments

Author: vishesh92

plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorDiscoverer.java

@@ -18,10 +18,11 @@
 
 import java.net.URI;
 import java.net.URLDecoder;
-import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import javax.inject.Inject;
@@ -46,10 +47,9 @@
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 
 public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
 
@@ -64,6 +64,8 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
     @Inject
     MockAgentManager _mockAgentMgr = null;
     @Inject
+    TemplateService templateService;
+    @Inject
     MockStorageManager _mockStorageMgr = null;
 
     /**
@@ -194,21 +196,12 @@ private Map<AgentResourceBase, Map<String, String>> createAgentResources(Map<Str
     @Override
     public void postDiscovery(List<HostVO> hosts, long msId) {
 
+        Set<Long> dcIds = new HashSet<>();
         for (HostVO h : hosts) {
-            associateTemplatesToZone(h.getId(), h.getDataCenterId());
+            dcIds.add(h.getDataCenterId());
         }
-    }
-
-    private void associateTemplatesToZone(long hostId, long dcId) {
-        VMTemplateZoneVO tmpltZone;
-
-        List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
-        for (VMTemplateVO vt : crossZoneTemplates) {
-            tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
-            if (tmpltZone == null) {
-                VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
-                _vmTemplateZoneDao.persist(vmTemplateZone);
-            }
+        for (Long dcId : dcIds) {
+            templateService.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -4230,8 +4230,6 @@ private void duplicateCacheStoreRecordsToRegionStore(long storeId) {
     }
 
     private void associateCrosszoneTemplatesToZone(Long zoneId) {
-        VMTemplateZoneVO tmpltZone;
-
         List<Long> dcIds = new ArrayList<>();
         if (zoneId != null) {
             dcIds.add(zoneId);
@@ -4244,15 +4242,8 @@ private void associateCrosszoneTemplatesToZone(Long zoneId) {
             }
         }
 
-        List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
-        for (VMTemplateVO vt : crossZoneTemplates) {
-            for (Long dcId : dcIds) {
-                tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
-                if (tmpltZone == null) {
-                    VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
-                    _vmTemplateZoneDao.persist(vmTemplateZone);
-                }
-            }
+        for (Long dcId : dcIds) {
+            _imageSrv.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java

@@ -20,11 +20,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
-import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -37,14 +38,13 @@
 import com.cloud.resource.Discoverer;
 import com.cloud.resource.DiscovererBase;
 import com.cloud.resource.ServerResource;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.resource.DummySecondaryStorageResource;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.net.NfsUtils;
 import com.cloud.utils.script.Script;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
 
 /**
  * SecondaryStorageDiscoverer is used to discover secondary
@@ -65,6 +65,8 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov
     @Inject
     protected VMTemplateDao _vmTemplateDao = null;
     @Inject
+    protected TemplateService templateService;
+    @Inject
     protected AgentManager _agentMgr = null;
 
     protected SecondaryStorageDiscoverer() {
@@ -285,22 +287,12 @@ public void postDiscovery(List<HostVO> hosts, long msId) {
                 _agentMgr.agentStatusTransitTo(h, Event.AgentDisconnected, msId);
             }
         }
+        Set<Long> dcIds = new HashSet<>();
         for (HostVO h : hosts) {
-            associateTemplatesToZone(h.getId(), h.getDataCenterId());
+            dcIds.add(h.getDataCenterId());
         }
-
-    }
-
-    private void associateTemplatesToZone(long hostId, long dcId) {
-        VMTemplateZoneVO tmpltZone;
-
-        List<VMTemplateVO> crossZoneTemplates = _vmTemplateDao.listAllCrossZoneTemplates();
-        for (VMTemplateVO vt : crossZoneTemplates) {
-            tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId());
-            if (tmpltZone == null) {
-                VMTemplateZoneVO vmTemplateZone = new VMTemplateZoneVO(dcId, vt.getId(), new Date());
-                _vmTemplateZoneDao.persist(vmTemplateZone);
-            }
+        for (Long dcId : dcIds) {
+            templateService.associateCrossZoneTemplatesToZone(dcId);
         }
     }
 }