Merge pull request #566 from jschoiRR/mold-diplo-2024-main

[Mold API] 쿠버네티스 클러스터 생성시 호스트 리소스 정보 조회 메소드 추가

Author: jschoiRR

engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java

@@ -126,6 +126,8 @@ public interface ResourceManager extends ResourceService, Configurable {
 
     public List<HostVO> listAllUpAndEnabledHostsInOneZoneByHypervisor(HypervisorType type, long dcId);
 
+    public List<HostVO> listAllUpAndEnabledHostsAndRoutingTypeInOneZoneByHypervisor(HypervisorType type, long dcId);
+
     public List<HostVO> listAllUpHostsInOneZoneByHypervisor(HypervisorType type, long dcId);
 
     public List<HostVO> listAllUpAndEnabledHostsInOneZone(long dcId);

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -99,10 +99,10 @@
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
-import com.cloud.host.Host.Type;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterActionWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterDestroyWorker;
 import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterScaleWorker;
@@ -497,7 +497,7 @@ private void validateDockerRegistryParams(final String dockerRegistryUserName,
     private DeployDestination plan(final long nodesCount, final DataCenter zone, final ServiceOffering offering) throws InsufficientServerCapacityException {
         final int cpu_requested = offering.getCpu() * offering.getSpeed();
         final long ram_requested = offering.getRamSize() * 1024L * 1024L;
-        List<HostVO> hosts = resourceManager.listAllHostsInOneZoneByType(Type.Routing, zone.getId());
+        List<HostVO> hosts = resourceManager.listAllUpAndEnabledHostsAndRoutingTypeInOneZoneByHypervisor(HypervisorType.KVM, zone.getId());
         final Map<String, Pair<HostVO, Integer>> hosts_with_resevered_capacity = new ConcurrentHashMap<String, Pair<HostVO, Integer>>();
         for (HostVO h : hosts) {
             hosts_with_resevered_capacity.put(h.getUuid(), new Pair<HostVO, Integer>(h, 0));

server/src/main/java/com/cloud/api/ApiServlet.java

@@ -373,7 +373,7 @@ void processRequestInContext(final HttpServletRequest req, final HttpServletResp
             LOGGER.error("unknown exception writing api response", ex);
             auditTrailSb.append(" unknown exception writing api response");
         } finally {
-            LOGGER.info(auditTrailSb.toString());
+            LOGGER.debug(auditTrailSb.toString());
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("===END=== " + reqStr);
             }

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -3389,6 +3389,17 @@ public List<HostVO> listAllUpAndEnabledHostsInOneZoneByHypervisor(final Hypervis
         return sc.list();
     }
 
+    @Override
+    public List<HostVO> listAllUpAndEnabledHostsAndRoutingTypeInOneZoneByHypervisor(final HypervisorType type, final long dcId) {
+        final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
+        sc.and(sc.entity().getType(), Op.EQ, Host.Type.Routing);
+        sc.and(sc.entity().getHypervisorType(), Op.EQ, type);
+        sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId);
+        sc.and(sc.entity().getStatus(), Op.EQ, Status.Up);
+        sc.and(sc.entity().getResourceState(), Op.EQ, ResourceState.Enabled);
+        return sc.list();
+    }
+
     @Override
     public List<HostVO> listAllUpHostsInOneZoneByHypervisor(final HypervisorType type, final long dcId) {
         final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);

server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java

@@ -601,6 +601,12 @@ public List<HostVO> listAllUpAndEnabledHostsInOneZoneByHypervisor(final Hypervis
         return null;
     }
 
+    @Override
+    public List<HostVO> listAllUpAndEnabledHostsAndRoutingTypeInOneZoneByHypervisor(final HypervisorType type, final long dcId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
     @Override
     public List<HostVO> listAllUpHostsInOneZoneByHypervisor(final HypervisorType type, final long dcId) {
         // TODO Auto-generated method stub