Merge pull request #1945 from ustcweizhou/isNetworkAWithinNetworkB

CLOUDSTACK-9787: Fix wrong return value in NetUtils.isNetworkAWithinNetworkB

Author: karuturi

utils/src/main/java/com/cloud/utils/net/NetUtils.java

@@ -875,7 +875,7 @@ public static boolean isNetworkAWithinNetworkB(final String cidrA, final String
         Long[] cidrBLong = cidrToLong(cidrB);
 
         long shift = MAX_CIDR - cidrBLong[1];
-        return cidrALong[0] >> shift == cidrBLong[0] >> shift;
+        return (cidrALong[0] >> shift == cidrBLong[0] >> shift) && (cidrALong[1] >= cidrBLong[1]);
     }
 
     static boolean areCidrsNotEmpty(String cidrA, String cidrB) {

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

@@ -510,6 +510,19 @@ public void testIsNetworkAWithinNetworkBWithEmptyValues() {
         assertEquals(false, NetUtils.isNetworkAWithinNetworkB("", null));
     }
 
+    @Test
+    public void testIsNetworkAWithinNetworkB() {
+        assertTrue(NetUtils.isNetworkAWithinNetworkB("192.168.30.0/24", "192.168.30.0/23"));
+        assertTrue(NetUtils.isNetworkAWithinNetworkB("192.168.30.0/24", "192.168.30.0/22"));
+        assertFalse(NetUtils.isNetworkAWithinNetworkB("192.168.30.0/23", "192.168.30.0/24"));
+        assertFalse(NetUtils.isNetworkAWithinNetworkB("192.168.30.0/22", "192.168.30.0/24"));
+        assertTrue(NetUtils.isNetworkAWithinNetworkB("192.168.28.0/24", "192.168.28.0/23"));
+        assertTrue(NetUtils.isNetworkAWithinNetworkB("192.168.28.0/24", "192.168.28.0/22"));
+        assertFalse(NetUtils.isNetworkAWithinNetworkB("192.168.28.0/23", "192.168.28.0/24"));
+        assertFalse(NetUtils.isNetworkAWithinNetworkB("192.168.28.0/22", "192.168.28.0/24"));
+        assertTrue(NetUtils.isNetworkAWithinNetworkB("192.168.30.0/24", "192.168.28.0/22"));
+    }
+
     @Test
     public void testIsNetworksOverlapWithEmptyValues() {
         assertEquals(false, NetUtils.isNetworksOverlap("", null));