You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/19 14:15:24 UTC
[3/4] git commit: updated refs/heads/master to 2d9566e
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 <ts...@apache.org>
(cherry picked from commit a4d902fc9b48e963d5987965207e3745e1728741)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae2ee950
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae2ee950
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae2ee950
Branch: refs/heads/master
Commit: ae2ee950698fda135be61f78e8afe18d7c00a212
Parents: 3771e8a
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Jul 19 15:30:24 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Jul 19 17:44:52 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/ae2ee950/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/ae2ee950/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: