Expanded tests of RFC1918 and RFC6598 validation code.

Author: Ross Hayden

utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java

@@ -301,9 +301,15 @@ public void testSameIsolationId() {
 
     @Test
     public void testValidateGuestCidr() throws Exception {
-        final String guestCidr = "192.168.1.0/24";
-
-        assertTrue(NetUtils.validateGuestCidr(guestCidr));
+        final String[] validCidrs = {"10.1.1.1/16", "172.16.1.0/16", "192.168.1.0/24", "100.64.1.0/24"};
+        final String[] invalidCidrs = {"172.33.1.0/16", "100.128.1.0/10"};
+ 
+        for (String cidr: validCidrs) {
+            assertTrue(NetUtils.validateGuestCidr(cidr));
+        }
+        for (String cidr: invalidCidrs) {
+            assertFalse(NetUtils.validateGuestCidr(cidr));
+        }
     }
 
     @Test