external planner to adhere arch, enabled clusters

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

engine/schema/src/main/java/com/cloud/dc/dao/ClusterDao.java

@@ -59,4 +59,6 @@ public interface ClusterDao extends GenericDao<ClusterVO, Long> {
     List<ClusterVO> listClustersByArchAndZoneId(long zoneId, CPU.CPUArch arch);
 
     List<String> listDistinctStorageAccessGroups(String name, String keyword);
+
+    List<Long> listEnabledClusterIdsByZoneHypervisorArch(Long zoneId, HypervisorType hypervisorType, CPU.CPUArch arch);
 }

engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

@@ -378,4 +378,28 @@ public List<String> listDistinctStorageAccessGroups(String name, String keyword)
 
         return customSearch(sc, null);
     }
+
+    @Override
+    public List<Long> listEnabledClusterIdsByZoneHypervisorArch(Long zoneId, HypervisorType hypervisorType, CPU.CPUArch arch) {
+        GenericSearchBuilder<ClusterVO, Long> sb = createSearchBuilder(Long.class);
+        sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        sb.and("allocationState", sb.entity().getAllocationState(), Op.EQ);
+        sb.and("managedState", sb.entity().getManagedState(), Op.EQ);
+        sb.and("hypervisor", sb.entity().getHypervisorType(), Op.EQ);
+        sb.and("arch", sb.entity().getArch(), Op.EQ);
+        sb.done();
+        SearchCriteria<Long> sc = sb.create();
+        sc.setParameters("allocationState", Grouping.AllocationState.Enabled);
+        sc.setParameters("allocationState", Managed.ManagedState.Managed);
+        if (zoneId != null) {
+            sc.setParameters("zoneId", zoneId);
+        }
+        if (hypervisorType != null) {
+            sc.setParameters("hypervisor", hypervisorType);
+        }
+        if (arch != null) {
+            sc.setParameters("arch", arch);
+        }
+        return customSearch(sc, null);
+    }
 }

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java

@@ -24,12 +24,12 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.extensions.dao.ExtensionDao;
 import org.apache.cloudstack.framework.extensions.dao.ExtensionResourceMapDao;
 import org.apache.cloudstack.framework.extensions.vo.ExtensionVO;
 import org.apache.commons.collections.CollectionUtils;
 
-import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
@@ -39,7 +39,6 @@
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.exception.InsufficientServerCapacityException;
-import org.apache.cloudstack.extension.ExtensionResourceMap;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
@@ -103,22 +102,24 @@ public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan pl
             }
         }
 
-        List<ClusterVO> clusters = clusterDao.listByDcHyType(vm.getDataCenterId(), HypervisorType.External.name());
+        List<Long> clusterIds = clusterDao.listEnabledClusterIdsByZoneHypervisorArch(vm.getDataCenterId(),
+                HypervisorType.External, vmProfile.getTemplate().getArch());
         List<Long> extensionClusterIds = extensionResourceMapDao.listResourceIdsByExtensionIdAndType(extensionId,
                 ExtensionResourceMap.ResourceType.Cluster);
         if (CollectionUtils.isEmpty(extensionClusterIds)) {
             logger.error("No clusters associated with {} to plan deployment of external instance {}",
                     vmProfile.getInstanceName());
             return null;
         }
-        clusters = clusters.stream()
-                .filter(c -> extensionClusterIds.contains(c.getId()))
+        clusterIds = clusterIds.stream()
+                .filter(extensionClusterIds::contains)
                 .collect(Collectors.toList());
-        logger.debug("Found {} clusters associated with {}", clusters.size(), extensionVO);
+        logger.debug("Found {} clusters associated with {}", clusterIds.size(), extensionVO);
         HostVO target = null;
         List<HostVO> hosts;
-        for (ClusterVO cluster : clusters) {
-            hosts = resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, cluster.getId(), cluster.getPodId(), cluster.getDataCenterId());
+        for (Long clusterId : clusterIds) {
+            hosts = resourceMgr.listAllUpAndEnabledHosts(Host.Type.Routing, clusterId, null,
+                    vm.getDataCenterId());
             if (hostTag != null) {
                 for (HostVO host : hosts) {
                     hostDao.loadHostTags(host);