You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/25 17:17:10 UTC
[2/3] git commit: updated refs/heads/4.3 to 8d0f49a
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f2175ccd919ee7195d69b05d5b3f3e2)
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5673c036
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5673c036
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5673c036
Branch: refs/heads/4.3
Commit: 5673c036c0307b873ebaabd39cbc319ecd0ee977
Parents: c05a007
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jun 25 17:09:19 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 25 17:12:33 2014 +0200
----------------------------------------------------------------------
.../test/com/cloud/utils/net/NetUtilsTest.java | 21 +++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5673c036/utils/test/com/cloud/utils/net/NetUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index b049516..8dac0f1 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -137,7 +137,8 @@ public class NetUtilsTest extends TestCase {
assertTrue(NetUtils.getIsolatedPvlanFromUri(uri).equals("456"));
}
- public void testIsSameIpRange() {
+ @Test
+ public void testIsValidCIDR() {
//Test to check IP Range of 2 CIDRs
String cidrFirst = "10.0.144.0/20";
String cidrSecond = "10.0.151.0/20";
@@ -145,6 +146,24 @@ public class NetUtilsTest extends TestCase {
assertTrue(NetUtils.isValidCIDR(cidrFirst));
assertTrue(NetUtils.isValidCIDR(cidrSecond));
assertTrue(NetUtils.isValidCIDR(cidrThird));
+ }
+
+ @Test
+ public void testIsValidCidrList() throws Exception {
+ String cidrFirst = "10.0.144.0/20,1.2.3.4/32,5.6.7.8/24";
+ String cidrSecond = "10.0.151.0/20,129.0.0.0/4";
+ String cidrThird = "10.0.144.0/21";
+
+ assertTrue(NetUtils.isValidCidrList(cidrFirst));
+ assertTrue(NetUtils.isValidCidrList(cidrSecond));
+ assertTrue(NetUtils.isValidCidrList(cidrThird));
+ }
+
+ @Test
+ public void testIsSameIpRange() {
+ String cidrFirst = "10.0.144.0/20";
+ String cidrSecond = "10.0.151.0/20";
+ String cidrThird = "10.0.144.0/21";
//Check for exactly same CIDRs
assertTrue(NetUtils.isSameIpRange(cidrFirst, cidrFirst));