From 14d08a965721850d8e7ff68361159df93af248bc Mon Sep 17 00:00:00 2001 From: Ross Hayden Date: Thu, 27 Apr 2017 18:13:46 -0500 Subject: [PATCH] Expanded tests of RFC1918 and RFC6598 validation code. --- .../test/java/com/cloud/utils/net/NetUtilsTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java index 490d0df4eb0..7da1c751e76 100644 --- a/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java @@ -301,9 +301,15 @@ public class NetUtilsTest { @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