CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only

Sheng Yang · Sheng Yang · commit a0762bc4a777 · 2013-02-21T18:02:50.000-08:00
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -568,6 +568,9 @@ public boolean isIP6AddressAvailableInNetwork(long networkId) {
     @Override
     public boolean isIP6AddressAvailableInVlan(long vlanId) {
     	VlanVO vlan = _vlanDao.findById(vlanId);
+    	if (vlan.getIp6Range() == null) {
+    		return false;
+    	}
     	long existedCount = _ipv6Dao.countExistedIpsInVlan(vlanId);
     	BigInteger existedInt = BigInteger.valueOf(existedCount);
     	BigInteger rangeInt = NetUtils.countIp6InRange(vlan.getIp6Range());
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1192,6 +1192,9 @@ private static BigInteger convertIPv6AddressToBigInteger(IPv6Address addr) {
 	
 	// Can cover 127 bits
 	public static BigInteger countIp6InRange(String ip6Range) {
+		if (ip6Range == null) {
+			return null;
+		}
     	String[] ips = ip6Range.split("-");
     	String startIp = ips[0];
     	String endIp = ips[0];
@@ -1214,6 +1217,9 @@ public static BigInteger countIp6InRange(String ip6Range) {
 	}
 
 	public static boolean isIp6InRange(String ip6, String ip6Range) {
+		if (ip6Range == null) {
+			return false;
+		}
     	String[] ips = ip6Range.split("-");
     	String startIp = ips[0];
     	String endIp = null;
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -122,5 +122,10 @@ public void testIpv6() {
     	assertTrue(NetUtils.isIp6InNetwork("1234:5678::1", "1234:5678::/64"));
     	assertTrue(NetUtils.isIp6InNetwork("1234:5678::ffff:ffff:ffff:ffff", "1234:5678::/64"));
     	assertTrue(NetUtils.isIp6InNetwork("1234:5678::", "1234:5678::/64"));
+    	//Test isIp6InRange
+    	assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::1-1234:5678:abcd::1"));
+    	assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::2-1234:5678:abcd::1"));
+    	assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", null));
+    	assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678::1-1234:5679::1"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,5 +122,10 @@ public void testIpv6() {`
`122`	`122`	`assertTrue(NetUtils.isIp6InNetwork("1234:5678::1", "1234:5678::/64"));`
`123`	`123`	`assertTrue(NetUtils.isIp6InNetwork("1234:5678::ffff:ffff:ffff:ffff", "1234:5678::/64"));`
`124`	`124`	`assertTrue(NetUtils.isIp6InNetwork("1234:5678::", "1234:5678::/64"));`
	`125`	`+ //Test isIp6InRange`
	`126`	`+ assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::1-1234:5678:abcd::1"));`
	`127`	`+ assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::2-1234:5678:abcd::1"));`
	`128`	`+ assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", null));`
	`129`	`+ assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678::1-1234:5679::1"));`
`125`	`130`	`}`
`126`	`131`	`}`