apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3655: RvR fails with unexpected state

Browse Source 
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>
(cherry picked from commit a4d902fc9b48e963d5987965207e3745e1728741)
This commit is contained in:
Prasanna Santhanam 2013-07-19 15:30:24 +05:30
parent 3771e8a0e6
commit ae2ee95069
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/component/test_redundant_router.py
View File

@ -478,7 +478,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
self._cleanup.insert(0, self.account) self._cleanup.insert(0, self.account)
return return
@attr(tags=["advanced", "advancedns", "ssh"]) @attr(tags=["advanced", "advancedns"])
def test_createRvRNetwork(self): def test_createRvRNetwork(self):
"""Test create network with non-default guest cidr with redundant routers """Test create network with non-default guest cidr with redundant routers
""" """
@ -507,7 +507,8 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
domainid=self.account.domainid, domainid=self.account.domainid,
networkofferingid=self.network_offering.id, networkofferingid=self.network_offering.id,
zoneid=self.zone.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) self.debug("Created network with ID: %s" % network.id)
@ -537,7 +538,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
self.assertEqual( self.assertEqual(
nw_response.cidr, nw_response.cidr,
'192.168.2.0/23', '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) self.debug("Listing routers for network: %s" % network.name)
@ -992,7 +993,7 @@ class TestRvRRedundancy(cloudstackTestCase):
@attr(tags=["advanced", "advancedns", "ssh"]) @attr(tags=["advanced", "advancedns", "ssh"])
def test_stopMasterRvR(self): def test_stopMasterRvR(self):
"""Test stop MASTER RVR """Test stop master RVR
""" """
# Steps to validate # Steps to validate
@ -1116,7 +1117,7 @@ class TestRvRRedundancy(cloudstackTestCase):
@attr(tags=["advanced", "advancedns", "ssh"]) @attr(tags=["advanced", "advancedns", "ssh"])
def test_stopBackupRvR(self): def test_stopBackupRvR(self):
"""Test stop BACKUP RVR """Test stop backup RVR
""" """
# Steps to validate # Steps to validate

4
tools/marvin/marvin/integration/lib/base.py
View File

@ -1803,7 +1803,7 @@ class Network:
def create(cls, apiclient, services, accountid=None, domainid=None, def create(cls, apiclient, services, accountid=None, domainid=None,
networkofferingid=None, projectid=None, networkofferingid=None, projectid=None,
subdomainaccess=None, zoneid=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""" """Create Network for account"""
cmd = createNetwork.createNetworkCmd() cmd = createNetwork.createNetworkCmd()
cmd.name = services["name"] cmd.name = services["name"]
@ -1845,8 +1845,6 @@ class Network:
cmd.domainid = domainid cmd.domainid = domainid
if projectid: if projectid:
cmd.projectid = projectid cmd.projectid = projectid
if guestcidr:
cmd.guestcidr = guestcidr
if vpcid: if vpcid:
cmd.vpcid = vpcid cmd.vpcid = vpcid
if aclid: if aclid: