cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [4/4] git commit: updated refs/heads/4.2 to 19bdef0
Date Fri, 19 Jul 2013 12:15:52 GMT
CLOUDSTACK-3655: RvR fails with unexpected state

The guestcidr is no longer specified directly. Use the netmask and
gateway combination to create custom cidr network

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/4.2
Commit: 62bf8082f40a641b1899eefefa37512a5285e90e
Parents: a98c0f5
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Jul 19 15:30:24 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Jul 19 17:45:38 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_redundant_router.py | 11 ++++++-----
 tools/marvin/marvin/integration/lib/base.py         |  4 +---
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62bf8082/test/integration/component/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router.py b/test/integration/component/test_redundant_router.py
index 5f7b1ca..82400f1 100644
--- a/test/integration/component/test_redundant_router.py
+++ b/test/integration/component/test_redundant_router.py
@@ -478,7 +478,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
         self._cleanup.insert(0, self.account)
         return
 
-    @attr(tags=["advanced", "advancedns", "ssh"])
+    @attr(tags=["advanced", "advancedns"])
     def test_createRvRNetwork(self):
         """Test create network with non-default guest cidr with redundant routers
         """
@@ -507,7 +507,8 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
                                 domainid=self.account.domainid,
                                 networkofferingid=self.network_offering.id,
                                 zoneid=self.zone.id,
-                                guestcidr=' 192.168.2.0/23'
+                                netmask='255.255.254.0',
+                                gateway='192.168.2.1'
                                 )
         self.debug("Created network with ID: %s" % network.id)
 
@@ -537,7 +538,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
         self.assertEqual(
                          nw_response.cidr,
                          '192.168.2.0/23',
-                         "Guest cidr should be 192.168.2.0/23"
+                         "Guest cidr should be 192.168.2.0/23 but is %s" % nw_response.cidr
                          )
 
         self.debug("Listing routers for network: %s" % network.name)
@@ -992,7 +993,7 @@ class TestRvRRedundancy(cloudstackTestCase):
 
     @attr(tags=["advanced", "advancedns", "ssh"])
     def test_stopMasterRvR(self):
-        """Test stop MASTER RVR
+        """Test stop master RVR
         """
 
         # Steps to validate
@@ -1116,7 +1117,7 @@ class TestRvRRedundancy(cloudstackTestCase):
 
     @attr(tags=["advanced", "advancedns", "ssh"])
     def test_stopBackupRvR(self):
-        """Test stop BACKUP RVR
+        """Test stop backup RVR
         """
 
         # Steps to validate

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62bf8082/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 161d03c..8b35127 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -1803,7 +1803,7 @@ class Network:
     def create(cls, apiclient, services, accountid=None, domainid=None,
                networkofferingid=None, projectid=None,
                subdomainaccess=None, zoneid=None,
-               gateway=None, netmask=None, vpcid=None, aclid=None, guestcidr=None):
+               gateway=None, netmask=None, vpcid=None, aclid=None):
         """Create Network for account"""
         cmd = createNetwork.createNetworkCmd()
         cmd.name = services["name"]
@@ -1845,8 +1845,6 @@ class Network:
             cmd.domainid = domainid
         if projectid:
             cmd.projectid = projectid
-        if guestcidr:
-            cmd.guestcidr = guestcidr
         if vpcid:
             cmd.vpcid = vpcid
         if aclid:


Mime
View raw message