Address comments

Author: vishesh92

engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java

@@ -18,6 +18,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.cloud.network.Network;
 import com.cloud.network.Network.GuestType;
@@ -47,11 +48,11 @@ public interface NetworkDao extends GenericDao<NetworkVO, Long>, StateDao<State,
 
     int getOtherPersistentNetworksCount(long id, String broadcastURI, boolean isPersistent);
 
-    List<NetworkVO> listByNetworkDomains(List<String> uniqueNtwkDomains);
+    List<NetworkVO> listByNetworkDomains(Set<String> uniqueNtwkDomains);
 
-    List<NetworkVO> listByNetworkDomainsAndAccountIds(List<String> uniqueNtwkDomains, List<Long> accountIds);
+    List<NetworkVO> listByNetworkDomainsAndAccountIds(Set<String> uniqueNtwkDomains, Set<Long> accountIds);
 
-    List<NetworkVO> listByNetworkDomainsAndDomainIds(List<String> uniqueNtwkDomains, List<Long> domainIds);
+    List<NetworkVO> listByNetworkDomainsAndDomainIds(Set<String> uniqueNtwkDomains, Set<Long> domainIds);
 
     /**
      * Retrieves the next available mac address in this network configuration.

engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java

@@ -436,22 +436,22 @@ public List<NetworkVO> getAllPersistentNetworksFromZone(long dataCenterId) {
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomains(List<String> uniqueNtwkDomains) {
+    public List<NetworkVO> listByNetworkDomains(Set<String> uniqueNtwkDomains) {
         SearchCriteria<NetworkVO> sc = NetworkDomainSearch.create();
         sc.setParameters("networkDomains", uniqueNtwkDomains.toArray());
         return search(sc, null);
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomainsAndAccountIds(List<String> uniqueNtwkDomains, List<Long> accountIds) {
+    public List<NetworkVO> listByNetworkDomainsAndAccountIds(Set<String> uniqueNtwkDomains, Set<Long> accountIds) {
         SearchCriteria<NetworkVO> sc = NetworkDomainSearch.create();
         sc.setParameters("networkDomains", uniqueNtwkDomains.toArray());
         sc.setParameters("accounts", accountIds.toArray());
         return search(sc, null);
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomainsAndDomainIds(List<String> uniqueNtwkDomains, List<Long> domainIds) {
+    public List<NetworkVO> listByNetworkDomainsAndDomainIds(Set<String> uniqueNtwkDomains, Set<Long> domainIds) {
         SearchCriteria<NetworkVO> sc = NetworkDomainSearch.create();
         sc.setParameters("networkDomains", uniqueNtwkDomains.toArray());
         sc.setParameters("domains", domainIds.toArray());

server/src/main/java/com/cloud/vm/UserVmManager.java

@@ -85,7 +85,8 @@ public interface UserVmManager extends UserVmService {
 
     ConfigKey<String> VmDistinctHostNameScope = new ConfigKey<>(String.class, "vm.distinct.hostname.scope", ConfigKey.CATEGORY_ADVANCED,
             "network",
-            "Scope of resources to check while checking if the hostname is unique. Possible values are global, domain, subdomain, account, network.",
+//            "Scope of resources to check while checking if the hostname is unique. Possible values are global, domain, subdomain, account, network.",
+            "Defines the scope for enforcing unique VM hostnames which determines the resource boundary within which VM hostnames must be unique. Possible values: global, domain, subdomain, account, network.",
             true, ConfigKey.Scope.Global, null, "VM distinct hostname scope", null, null, null, ConfigKey.Kind.Select,
             "global,domain,subdomain,account,network");
 

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4692,28 +4692,28 @@ protected void verifyIfHypervisorSupportsRootdiskSizeOverride(HypervisorType hyp
     }
 
     private List<NetworkVO> getNetworksWithSameNetworkDomainInDomains(List<NetworkVO> networkList, boolean checkSubDomains) {
-        List<String> uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toList());
-        List<Long> domainIdList = new ArrayList<>();
+        Set<String> uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toSet());
+        Set<Long> domainIdList = new HashSet<>();
         for (Network network : networkList) {
             domainIdList.add(network.getDomainId());
         }
-        Set<Long> finalDomainIdList = new HashSet<>(domainIdList);
+        Set<Long> finalDomainIdSet = new HashSet<>(domainIdList);
         if (checkSubDomains) {
             for (Long domainId : domainIdList) {
                 DomainVO domain = _domainDao.findById(domainId);
                 List<Long> childDomainIds = _domainDao.getDomainChildrenIds(domain.getPath());
-                finalDomainIdList.addAll(childDomainIds);
+                finalDomainIdSet.addAll(childDomainIds);
             }
         }
-        return _networkDao.listByNetworkDomainsAndDomainIds(uniqueNtwkDomains, finalDomainIdList.stream().collect(Collectors.toList()));
+        return _networkDao.listByNetworkDomainsAndDomainIds(uniqueNtwkDomains, finalDomainIdSet);
     }
 
     private List<NetworkVO> getNetworksForCheckUniqueHostName(List<NetworkVO> networkList) {
         List<NetworkVO> finalNetworkList;
-        List<String> uniqueNtwkDomains;
+        Set<String> uniqueNtwkDomains;
         switch (VmDistinctHostNameScope.value()) {
             case "global":
-                uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toList());
+                uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toSet());
                 finalNetworkList = _networkDao.listByNetworkDomains(uniqueNtwkDomains);
                 break;
             case "domain":
@@ -4723,8 +4723,8 @@ private List<NetworkVO> getNetworksForCheckUniqueHostName(List<NetworkVO> networ
                 finalNetworkList = getNetworksWithSameNetworkDomainInDomains(networkList, true);
                 break;
             case "account":
-                uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toList());
-                List<Long> accountIds = networkList.stream().map(Network::getAccountId).collect(Collectors.toList());
+                uniqueNtwkDomains = networkList.stream().map(NetworkVO::getNetworkDomain).collect(Collectors.toSet());
+                Set<Long> accountIds = networkList.stream().map(Network::getAccountId).collect(Collectors.toSet());
                 finalNetworkList = _networkDao.listByNetworkDomainsAndAccountIds(uniqueNtwkDomains, accountIds);
                 break;
             default:

server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @DB()
 public class MockNetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
@@ -266,17 +267,17 @@ public List<NetworkVO> getAllPersistentNetworksFromZone(long dataCenterId) {
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomains(List<String> uniqueNtwkDomains) {
+    public List<NetworkVO> listByNetworkDomains(Set<String> uniqueNtwkDomains) {
         return List.of();
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomainsAndAccountIds(List<String> uniqueNtwkDomains, List<Long> accountIds) {
+    public List<NetworkVO> listByNetworkDomainsAndAccountIds(Set<String> uniqueNtwkDomains, Set<Long> accountIds) {
         return List.of();
     }
 
     @Override
-    public List<NetworkVO> listByNetworkDomainsAndDomainIds(List<String> uniqueNtwkDomains, List<Long> domainIds) {
+    public List<NetworkVO> listByNetworkDomainsAndDomainIds(Set<String> uniqueNtwkDomains, Set<Long> domainIds) {
         return List.of();
     }
 }