splitting out root disk size issue

Author: DaanHoogland

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

@@ -2017,9 +2017,6 @@ public boolean isNetworkAvailableInDomain(long networkId, long domainId) {
     @Override
     public Set<Long> getAvailableIps(Network network, String requestedIp) {
         if (network.getCidr() == null) {
-            if (s_logger.isDebugEnabled()) {
-                s_logger.debug(String.format("network %s[%s] has no CIDR, returning empty addrress set.", network.getName(), network.getUuid()));
-            }
             return Collections.emptySet();
         }
         String[] cidr = network.getCidr().split("/");
@@ -2029,7 +2026,7 @@ public Set<Long> getAvailableIps(Network network, String requestedIp) {
         for (String ip : ips) {
             if (requestedIp != null && requestedIp.equals(ip)) {
                 s_logger.warn("Requested ip address " + requestedIp + " is already in use in network" + network);
-                return Collections.emptySet();
+                return null;
             }
 
             usedIps.add(NetUtils.ip2Long(ip));

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -174,8 +174,6 @@
 import org.apache.log4j.Logger;
 
 import javax.inject.Inject;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -697,30 +695,9 @@ private void checkUnmanagedNicIpAndNetworkForImport(String instanceName, Unmanag
         }
         // If network is non L2, IP v4 is assigned and not set to auto-assign, check it is available for network
         if (!network.getGuestType().equals(Network.GuestType.L2) && ipAddresses != null && StringUtils.isNotEmpty(ipAddresses.getIp4Address()) && !ipAddresses.getIp4Address().equals("auto")) {
-            canIpBeUsedForNicInNetwork(nic, network, ipAddresses);
-        }
-    }
-
-    private void canIpBeUsedForNicInNetwork(UnmanagedInstanceTO.Nic nic, Network network, Network.IpAddresses ipAddresses) {
-        List<String> usedIps = networkModel.getUsedIpsInNetwork(network);
-        if (LOGGER.isDebugEnabled() && usedIps != null) {
-            String s = usedIps.stream().collect(Collectors.joining(", "));
-            LOGGER.debug(String.format("used IPs for network(ID: %s) to check against are [%s]", network.getUuid(), s));
-        }
-        for (String usedIp : usedIps) {
-            // only half witted support for ipv6 here :(
-            if (usedIp.equals(ipAddresses.getIp4Address()) || usedIp.equals(ipAddresses.getIp6Address())) {
-                throw new ServerApiException(ApiErrorCode.RESOURCE_IN_USE_ERROR, String.format("Cannot assign IP address %s to NIC(ID: %s) as it is in use in network(ID: %s)", ipAddresses.getIp4Address(), nic.getNicId(), network.getUuid()));
-            }
-        }
-        if (network.getCidr() != null) {
-            String[] cidrs = Arrays.asList(network.getCidr()).toArray(new String[0]);
-            try {
-                NetUtils.isIpInCidrList(InetAddress.getByName(ipAddresses.getIp4Address()), cidrs);
-            } catch (UnknownHostException e) {
-                String msg = String.format("request an invalid IP address during import %s, ignoring", ipAddresses.getIp4Address());
-                LOGGER.warn(msg);
-                throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, msg, e);
+            Set<Long> ips = networkModel.getAvailableIps(network, ipAddresses.getIp4Address());
+            if (CollectionUtils.isEmpty(ips) || !ips.contains(NetUtils.ip2Long(ipAddresses.getIp4Address()))) {
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("IP address %s for NIC(ID: %s) is not available in network(ID: %s)", ipAddresses.getIp4Address(), nic.getNicId(), network.getUuid()));
             }
         }
     }
@@ -1136,10 +1113,7 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
         }
         allDetails.put(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDisk.getController());
         if (cluster.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
-            long size = rootDisk.getCapacity() / Resource.ResourceType.bytesToGiB;
-            if (size <= 0) {
-                size = 1;
-            }
+            long size = (long) Math.ceil((double)rootDisk.getCapacity() / Resource.ResourceType.bytesToGiB);
             allDetails.put(VmDetailConstants.ROOT_DISK_SIZE, String.valueOf(size));
         }