Cleanup host retrieval logic

Author: Damans227

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

@@ -702,19 +702,7 @@ private DeployDestination plan(final long nodesCount, final DataCenter zone, fin
                 dedicatedHosts = dedicatedResourceDao.listByDomainId(domainId);
             }
             for (DedicatedResourceVO dedicatedResource : dedicatedHosts) {
-                if (dedicatedResource.getHostId() != null) {
-                    HostVO host = hostDao.findById(dedicatedResource.getHostId());
-                    if (host != null) {
-                        hosts.add(host);
-                    }
-                } else if (dedicatedResource.getClusterId() != null) {
-                    hosts.addAll(hostDao.findByClusterId(dedicatedResource.getClusterId()));
-                } else if (dedicatedResource.getPodId() != null) {
-                    hosts.addAll(resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, zone.getId())
-                            .stream().filter(h -> dedicatedResource.getPodId().equals(h.getPodId())).collect(Collectors.toList()));
-                } else if (dedicatedResource.getDataCenterId() != null) {
-                    hosts.addAll(resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, dedicatedResource.getDataCenterId()));
-                }
+                hosts.addAll(getHostsForDedicatedResource(dedicatedResource, zone));
                 useDedicatedHosts = true;
             }
         }
@@ -782,6 +770,23 @@ private DeployDestination plan(final long nodesCount, final DataCenter zone, fin
         throw new InsufficientServerCapacityException(msg, DataCenter.class, zone.getId());
     }
 
+    public List<HostVO> getHostsForDedicatedResource(DedicatedResourceVO dedicatedResource, DataCenter zone) {
+        if (dedicatedResource.getHostId() != null) {
+            HostVO host = hostDao.findById(dedicatedResource.getHostId());
+            return host != null ? List.of(host) : Collections.emptyList();
+        }
+        if (dedicatedResource.getClusterId() != null) {
+            return hostDao.findByClusterId(dedicatedResource.getClusterId());
+        }
+        if (dedicatedResource.getPodId() != null) {
+            return hostDao.findByPodId(dedicatedResource.getPodId(), Host.Type.Routing);
+        }
+        if (dedicatedResource.getDataCenterId() != null) {
+            return resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, dedicatedResource.getDataCenterId());
+        }
+        return Collections.emptyList();
+    }
+
     protected void setNodeTypeServiceOfferingResponse(KubernetesClusterResponse response,
                                                       KubernetesClusterNodeType nodeType,
                                                       Long offeringId) {

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

@@ -191,19 +191,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f
                 dedicatedHosts = dedicatedResourceDao.listByDomainId(domainId);
             }
             for (DedicatedResourceVO dedicatedResource : dedicatedHosts) {
-                if (dedicatedResource.getHostId() != null) {
-                    HostVO host = hostDao.findById(dedicatedResource.getHostId());
-                    if (host != null) {
-                        hosts.add(host);
-                    }
-                } else if (dedicatedResource.getClusterId() != null) {
-                    hosts.addAll(hostDao.findByClusterId(dedicatedResource.getClusterId()));
-                } else if (dedicatedResource.getPodId() != null) {
-                    hosts.addAll(resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, zone.getId())
-                            .stream().filter(h -> dedicatedResource.getPodId().equals(h.getPodId())).collect(Collectors.toList()));
-                } else if (dedicatedResource.getDataCenterId() != null) {
-                    hosts.addAll(resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, dedicatedResource.getDataCenterId()));
-                }
+                hosts.addAll(manager.getHostsForDedicatedResource(dedicatedResource, zone));
                 useDedicatedHosts = true;
             }
         }