CLOUDSTACK-1668: Fix IP conflict in VPC tier

ustcweizhou · chipchilders · commit 86a2a7504693 · 2013-03-20T00:31:52.000Z
Currently, allPossibleIps return the Ip lists which include the gateway, so we need to remove gateway ip from this list. Now, for non-VPC network it works, because NetUtils.getAllIpsFromCidr return the Ip lists which do not include the first IP of the network (like 192.168.0.1). We need too add the first IP into the returned Ip list, because it can be used for VM if it is not the gateway IP (for example, VPC networks). The corresponding patch for 4.0.1 has been posted on https://reviews.apache.org/r/9923/ Signed-off-by: Chip Childers <chip.childers@gmail.com>
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1644,6 +1644,11 @@ public Set<Long> getAvailableIps(Network network, String requestedIp) {
         if (usedIps.size() != 0) {
             allPossibleIps.removeAll(usedIps);
         }
+
+        String gateway = network.getGateway();
+        if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))
+            allPossibleIps.remove(NetUtils.ip2Long(gateway));
+
         return allPossibleIps;
     }
 
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2046,6 +2046,11 @@ protected Set<Long> getAvailableIps(Network network, String requestedIp) {
         if (usedIps.size() != 0) {
             allPossibleIps.removeAll(usedIps);
         }
+
+        String gateway = network.getGateway();
+        if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))
+            allPossibleIps.remove(NetUtils.ip2Long(gateway));
+
         return allPossibleIps;
     }
 
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -632,7 +632,7 @@ public static Set<Long> getAllIpsFromCidr(String cidr, long size) {
         Set<Long> result = new TreeSet<Long>();
         long ip = ip2Long(cidr);
         long startNetMask = ip2Long(getCidrNetmask(size));
-        long start = (ip & startNetMask) + 2;
+        long start = (ip & startNetMask) + 1;
         long end = start;
 
         end = end >> (32 - size);

Original file line number	Diff line number	Diff line change
`@@ -1644,6 +1644,11 @@ public Set<Long> getAvailableIps(Network network, String requestedIp) {`
`1644`	`1644`	`if (usedIps.size() != 0) {`
`1645`	`1645`	`allPossibleIps.removeAll(usedIps);`
`1646`	`1646`	`}`
	`1647`	`+`
	`1648`	`+ String gateway = network.getGateway();`
	`1649`	`+ if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))`
	`1650`	`+ allPossibleIps.remove(NetUtils.ip2Long(gateway));`
	`1651`	`+`
`1647`	`1652`	`return allPossibleIps;`
`1648`	`1653`	`}`
`1649`	`1654`
Original file line number	Diff line number	Diff line change
`@@ -2046,6 +2046,11 @@ protected Set<Long> getAvailableIps(Network network, String requestedIp) {`
`2046`	`2046`	`if (usedIps.size() != 0) {`
`2047`	`2047`	`allPossibleIps.removeAll(usedIps);`
`2048`	`2048`	`}`
	`2049`	`+`
	`2050`	`+ String gateway = network.getGateway();`
	`2051`	`+ if ((gateway != null) && (allPossibleIps.contains(NetUtils.ip2Long(gateway))))`
	`2052`	`+ allPossibleIps.remove(NetUtils.ip2Long(gateway));`
	`2053`	`+`
`2049`	`2054`	`return allPossibleIps;`
`2050`	`2055`	`}`
`2051`	`2056`