Added additional checks to confirm if IP Range contains taken addresses. Added logic to update op_dc_ip_address_alloc table. Also bried cleanup

Author: kioie

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDao.java

@@ -41,6 +41,8 @@ public interface DataCenterIpAddressDao extends GenericDao<DataCenterIpAddressVO
 
     List<DataCenterIpAddressVO> listByPodIdDcId(long podId, long dcId);
 
+    List<DataCenterIpAddressVO> listIpAddressUsage(final long podId, final long dcId, final boolean onlyListAllocated);
+
     int countIPs(long podId, long dcId, boolean onlyCountAllocated);
 
     int countIPs(long dcId, boolean onlyCountAllocated);

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java

@@ -290,6 +290,20 @@ public int countIpAddressUsage(final String ipAddress, final long podId, final l
         return result.size();
     }
 
+    @Override
+    public List<DataCenterIpAddressVO> listIpAddressUsage(final long podId, final long dcId, final boolean onlyListAllocated) {
+        SearchCriteria<DataCenterIpAddressVO> sc = createSearchCriteria();
+
+        if(onlyListAllocated) {
+            sc.addAnd("takenAt", SearchCriteria.Op.NNULL);
+        }
+
+        sc.addAnd("podId", SearchCriteria.Op.EQ, podId);
+        sc.addAnd("dataCenterId", SearchCriteria.Op.EQ, dcId);
+
+        return listBy(sc);
+    }
+
     public DataCenterIpAddressDaoImpl() {
         super();
 

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -1404,7 +1404,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
 
     @Override
     public Pod editPod(final UpdatePodCmd cmd) {
-        return editPod(cmd.getId(), cmd.getPodName(), null, null, cmd.getGateway(), cmd.getNetmask(), cmd.getAllocationState());
+        return editPod(cmd.getId(), cmd.getPodName(), cmd.getStartIp(), cmd.getEndIp(), cmd.getGateway(), cmd.getNetmask(), cmd.getAllocationState());
     }
 
     @Override
@@ -1502,10 +1502,33 @@ public Pod editPod(final long id, String name, String startIp, String endIp, Str
         // Check if the IP range overlaps with the public ip.
         checkOverlapPublicIpRange(zoneId, startIp, endIp);
 
+        // Check if the gateway is in the CIDR subnet
+        if (!NetUtils.getCidrSubNet(gateway, cidrSize).equalsIgnoreCase(NetUtils.getCidrSubNet(cidrAddress, cidrSize))) {
+            throw new InvalidParameterValueException("The gateway is not in the CIDR subnet.");
+        }
+
         if (NetUtils.ipRangesOverlap(startIp, endIp, gateway, gateway)) {
             throw new InvalidParameterValueException("The gateway shouldn't overlap start/end ip addresses");
         }
 
+        checkIpRangeContainsTakenAddresses(pod,startIp,endIp);
+
+        long newStartIPLong = NetUtils.ip2Long(startIp);
+        long newEndIPLong = NetUtils.ip2Long(endIp);
+        long currentStartIPLong = NetUtils.ip2Long(currentStartIP);
+        long currentEndIPLong = NetUtils.ip2Long(currentEndIP);
+
+        List<Long> currentIPRange = new ArrayList<>();
+        List<Long> newIPRange = new ArrayList<>();
+        while (newStartIPLong<=newEndIPLong){
+            newIPRange.add(newStartIPLong);
+            newStartIPLong++;
+        }
+        while (currentStartIPLong<=currentEndIPLong){
+            currentIPRange.add(currentStartIPLong);
+            currentStartIPLong++;
+        }
+
         try {
             final String allocationStateStrFinal = allocationStateStr;
             final String nameFinal = name;
@@ -1522,15 +1545,28 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                     pod.setGateway(gatewayFinal);
                     pod.setCidrAddress(getCidrAddress(cidr));
                     pod.setCidrSize(getCidrSize(cidr));
-                    pod.setDescription(pod.getDescription().replaceFirst(currentEndIP, newEndIP).replaceFirst(currentStartIP,
-                            newStartIP));
+                    pod.setDescription(pod.getDescription().replace(currentStartIP+"-", newStartIP+"-").replace(currentEndIP,
+                            newEndIP));
 
                     Grouping.AllocationState allocationState = null;
                     if (allocationStateStrFinal != null && !allocationStateStrFinal.isEmpty()) {
                         allocationState = Grouping.AllocationState.valueOf(allocationStateStrFinal);
                         pod.setAllocationState(allocationState);
                     }
-
+                    List<Long> iPAddressesToAdd = new ArrayList(newIPRange);
+                    iPAddressesToAdd.removeAll(currentIPRange);
+                    if (iPAddressesToAdd.size()>0){
+                        for(Long startIP : iPAddressesToAdd){
+                            _zoneDao.addPrivateIpAddress(zoneId, pod.getId(), NetUtils.long2Ip(startIP), NetUtils.long2Ip(startIP), false, null);
+                        }
+                    }else {
+                        currentIPRange.removeAll(newIPRange);
+                        if(currentIPRange.size()>0){
+                            for (Long startIP: currentIPRange){
+                                _privateIpAddressDao.deleteIpAddressByPodDc(NetUtils.long2Ip(startIP),pod.getId(),zoneId);
+                            }
+                        }
+                    }
                     _podDao.update(id, pod);
                 }
             });
@@ -1542,6 +1578,28 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
         return pod;
     }
 
+    private void checkIpRangeContainsTakenAddresses(final HostPodVO pod,final String startIp, final String endIp ){
+        final List<DataCenterIpAddressVO> takenIps = _privateIpAddressDao.listIpAddressUsage(pod.getId(),pod.getDataCenterId(),true);
+        List<Long> newIPRange = new ArrayList<>();
+        List<Long> takenIpsList = new ArrayList<>();
+
+        long newStartIPLong = NetUtils.ip2Long(startIp);
+        long newEndIPLong = NetUtils.ip2Long(endIp);
+
+        while (newStartIPLong<=newEndIPLong){
+            newIPRange.add(newStartIPLong);
+            newStartIPLong++;
+        }
+        for (int i=0;i<takenIps.size();i++){
+            takenIpsList.add(NetUtils.ip2Long(takenIps.get(i).getIpAddress()));
+        }
+
+        if(!newIPRange.containsAll(takenIpsList)){
+            throw new InvalidParameterValueException("The IP range does not contain some IP addresses that have "
+                    + "already been taken. Please adjust your IP range to include all IP addresses already taken.");
+        }
+    }
+
     @Override
     public Pod createPod(final long zoneId, final String name, final String startIp, final String endIp, final String gateway, final String netmask, String allocationState) {
         // Check if the gateway is a valid IP address