CLOUDSTACK-10102: Improvements

Author: nvazquez

engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java

@@ -313,7 +313,7 @@ private void recreateUserVmSeach(NetworkVO network) {
             SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
             nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
             nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
-            if (!network.getGuestType().equals(Network.GuestType.L2)) {
+            if (!Network.GuestType.L2.equals(network.getGuestType())) {
                 nicSearch.and().op("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
                 nicSearch.or("ip6Address", nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
                 nicSearch.cp();

server/src/com/cloud/network/NetworkModelImpl.java

@@ -21,14 +21,7 @@
 import java.security.InvalidParameterException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -1827,7 +1820,7 @@ public boolean isNetworkAvailableInDomain(long networkId, long domainId) {
     @Override
     public Set<Long> getAvailableIps(Network network, String requestedIp) {
         if (network.getCidr() == null) {
-            return null;
+            return Collections.emptySet();
         }
         String[] cidr = network.getCidr().split("/");
         List<String> ips = getUsedIpsInNetwork(network);