[WIP] Allow CIDR update for the shared network when the network IPs are not in use (i.e. IPs not allocated to any instances)

engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java

@@ -34,6 +34,8 @@ public interface NicDao extends GenericDao<NicVO, Long> {
 
     List<NicVO> listByNetworkId(long networkId);
 
+    List<NicVO> listNonDeallocatedByNetworkId(long networkId);
+
     NicVO findByNtwkIdAndInstanceId(long networkId, long instanceId);
 
     NicVO findByInstanceIdAndNetworkIdIncludingRemoved(long networkId, long instanceId);

engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java

@@ -151,6 +151,14 @@
         return listBy(sc);
     }
 
+    @Override
+    public List<NicVO> listNonDeallocatedByNetworkId(long networkId) {
+        SearchCriteria<NicVO> sc = NonReleasedSearch.create();
+        sc.setParameters("network", networkId);
+        sc.setParameters("state", Nic.State.Deallocating);
+        return listBy(sc);
+    }
+
     @Override
     public NicVO findByNtwkIdAndInstanceId(long networkId, long instanceId) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();

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

@@ -3090,8 +3090,8 @@
             if (dc.getNetworkType() == NetworkType.Basic) {
                 throw new InvalidParameterValueException("Guest VM CIDR can't be specified for zone with " + NetworkType.Basic + " networking");
             }
-            if (network.getGuestType() != GuestType.Isolated) {
-                throw new InvalidParameterValueException("Can only allow IP Reservation in networks with guest type " + GuestType.Isolated);
+            if (network.getGuestType() != GuestType.Isolated && network.getGuestType() != GuestType.Shared) {
+                throw new InvalidParameterValueException("Can only allow IP Reservation in networks with guest types: " + GuestType.Isolated + " or " + GuestType.Shared);
             }
             if (networkOfferingChanged) {
                 throw new InvalidParameterValueException("Cannot specify this network offering change and guestVmCidr at same time. Specify only one.");
@@ -3111,34 +3111,57 @@
             // But in case networkCidr is a non null value (IP reservation already exists), it implies network cidr is networkCidr
             if (networkCidr != null) {
                 if (!NetUtils.isNetworkAWithinNetworkB(guestVmCidr, networkCidr)) {
-                    throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR  should be a subset of network CIDR : " + networkCidr);
+                    throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR: " + networkCidr);
                 }
             } else {
                 if (!NetUtils.isNetworkAWithinNetworkB(guestVmCidr, network.getCidr())) {
-                    throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR  should be a subset of network CIDR :  " + network.getCidr());
+                    throw new InvalidParameterValueException("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR: " + network.getCidr());
                 }
             }
 
             // This check makes sure there are no active IPs existing outside the guestVmCidr in the network
             String[] guestVmCidrPair = guestVmCidr.split("\\/");
             Long size = Long.valueOf(guestVmCidrPair[1]);
-            List<NicVO> nicsPresent = _nicDao.listByNetworkId(networkId);
-
             String cidrIpRange[] = NetUtils.getIpRangeFromCidr(guestVmCidrPair[0], size);
             s_logger.info("The start IP of the specified guest vm cidr is: " + cidrIpRange[0] + " and end IP is: " + cidrIpRange[1]);
             long startIp = NetUtils.ip2Long(cidrIpRange[0]);
             long endIp = NetUtils.ip2Long(cidrIpRange[1]);
             long range = endIp - startIp + 1;
             s_logger.info("The specified guest vm cidr has " + range + " IPs");
 
-            for (NicVO nic : nicsPresent) {
+            List<NicVO> nonDellocatedNicsPresent = _nicDao.listNonDeallocatedByNetworkId(networkId);
+            if (network.getGuestType() == GuestType.Shared) {
+                if (CollectionUtils.isNotEmpty(nonDellocatedNicsPresent)) {
+                    throw new InvalidParameterValueException("IPs are in use, cannot apply reservation");
+                }
+                List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(networkId);
+                if (CollectionUtils.isNotEmpty(vlans)) {
+                    for (VlanVO vlan : vlans) {
+                        if (vlan == null) {
+                            continue;
+                        }
+                        String vlanIpRange = vlan.getIpRange();
+                        if (vlanIpRange == null) {
+                            continue;
+                        }
+                        String[] vlanRange = vlanIpRange.split("-");
+                        String vlanStartIP = vlanRange[0];
+                        String vlanEndIP = vlanRange[1];
+                        if (!NetUtils.isIpWithInCidrRange(vlanStartIP, guestVmCidr) || !NetUtils.isIpWithInCidrRange(vlanEndIP, guestVmCidr)) {
+                            throw new InvalidParameterValueException(String.format("CIDR doesn't include the IP range %s, cannot apply reservation", vlanIpRange));
+                        }
+                    }
+                }
+            }
+
+            for (NicVO nic : nonDellocatedNicsPresent) {
                 if (nic.getIPv4Address() == null) {
                     continue;
                 }
                 long nicIp = NetUtils.ip2Long(nic.getIPv4Address());
                 //check if nic IP is outside the guest vm cidr
                 if ((nicIp < startIp || nicIp > endIp) && nic.getState() != Nic.State.Deallocating) {
-                    throw new InvalidParameterValueException("Active IPs like " + nic.getIPv4Address() + " exist outside the Guest VM CIDR. Cannot apply reservation ");
+                    throw new InvalidParameterValueException("Active IPs like " + nic.getIPv4Address() + " exist outside the Guest VM CIDR. Cannot apply reservation");
                 }
             }