cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 31f0e34
Date Wed, 12 Jun 2013 13:24:27 GMT
Updated Branches:
  refs/heads/master 75d446ccf -> 31f0e3453


CLOUDSTACK-2963 Build failure due to validateIpRange test failure

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31f0e345
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31f0e345
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31f0e345

Branch: refs/heads/master
Commit: 31f0e3453993ea24fab2d2c4ff938c867d23c74c
Parents: 75d446c
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Wed Jun 12 18:05:47 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Wed Jun 12 18:48:46 2013 +0530

----------------------------------------------------------------------
 server/test/com/cloud/configuration/ValidateIpRangeTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31f0e345/server/test/com/cloud/configuration/ValidateIpRangeTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/configuration/ValidateIpRangeTest.java b/server/test/com/cloud/configuration/ValidateIpRangeTest.java
index a083cc6..ca9ef11 100644
--- a/server/test/com/cloud/configuration/ValidateIpRangeTest.java
+++ b/server/test/com/cloud/configuration/ValidateIpRangeTest.java
@@ -50,20 +50,20 @@ public class ValidateIpRangeTest {
 
     @Test
     public void SameSubnetTest() {
-        Pair<Boolean,Pair<String,String>> sameSubnet=configurationMgr.validateIpRange("10.147.33.104",
"10.147.33.105", "10.147.33.1", "255.255.255.128", vlanVOList, true, false, null, null, null,
null,network);
+        Pair<Boolean,Pair<String,String>> sameSubnet = configurationMgr.validateIpRange("10.147.33.104",
"10.147.33.105", "10.147.33.1", "255.255.255.128", vlanVOList, true, false, null, null, null,
null,network);
         Assert.assertTrue(sameSubnet.first());
     }
 
     @Test
     public void NewSubnetTest() {
-        Pair<Boolean,Pair<String,String>> sameSubnet= configurationMgr.validateIpRange("10.147.33.140",
"10.147.33.145", "10.147.33.129", "255.255.255.191", vlanVOList, true, false, null, null,
null, null,network);
+        Pair<Boolean,Pair<String,String>> sameSubnet = configurationMgr.validateIpRange("10.147.33.140",
"10.147.33.145", "10.147.33.130", "255.255.255.192", vlanVOList, true, false, null, null,
null, null,network);
         Assert.assertTrue(!sameSubnet.first());
     }
 
     @Test
     public void SuperSetTest() {
         try {
-            configurationMgr.validateIpRange("10.147.33.10", "10.147.33.20", "10.147.33.21",
"255.255.255.127", vlanVOList, true, false, null, null, null, null,network);
+            configurationMgr.validateIpRange("10.147.33.10", "10.147.33.20", "10.147.33.21",
"255.255.255.0", vlanVOList, true, false, null, null, null, null,network);
         } catch (Exception e) {
             junit.framework.Assert.assertTrue(e.getMessage().contains("superset"));
         }


Mime
View raw message