You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:38 UTC
[17/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
CLOUDSTACK-8534: Fixed import and pep8 issues in test_redundant_router_upgrades.py
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
This closes #346
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06f9ee63
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06f9ee63
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06f9ee63
Branch: refs/heads/feature/vpc-ipv6
Commit: 06f9ee63bbdedea3ebd0033b57c4d0294d6f158d
Parents: 8bf59b5
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Jun 2 15:49:36 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Tue Jun 2 15:52:11 2015 +0530
----------------------------------------------------------------------
.../component/test_redundant_router_upgrades.py | 571 ++++++++++---------
1 file changed, 290 insertions(+), 281 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06f9ee63/test/integration/component/test_redundant_router_upgrades.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_upgrades.py b/test/integration/component/test_redundant_router_upgrades.py
index 7be1eff..6a0efb0 100644
--- a/test/integration/component/test_redundant_router_upgrades.py
+++ b/test/integration/component/test_redundant_router_upgrades.py
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,121 +17,130 @@
from nose.plugins.attrib import attr
-from marvin.lib.base import *
-from marvin.lib.utils import *
-from marvin.lib.common import *
-
-#Import Local Modules
+from marvin.lib.base import (Account,
+ Router,
+ Network,
+ VirtualMachine,
+ ServiceOffering,
+ NetworkOffering)
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template)
+
+# Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.cloudstackAPI import *
+
class Services:
+
"""Test Services for customer defects
"""
def __init__(self):
self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "password",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 128,
- },
- "disk_offering": {
- "displaytext": "Small",
- "name": "Small",
- "disksize": 1
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "static_nat": {
- "startport": 22,
- "endport": 22,
- "protocol": "TCP"
- },
- "network_offering": {
- "name": 'Network offering-RVR services',
- "displaytext": 'Network off-RVR services',
- "guestiptype": 'Isolated',
- "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat',
- "traffictype": 'GUEST',
- "availability": 'Optional',
- "serviceProviderList": {
- "Vpn": 'VirtualRouter',
- "Dhcp": 'VirtualRouter',
- "Dns": 'VirtualRouter',
- "SourceNat": 'VirtualRouter',
- "PortForwarding": 'VirtualRouter',
- "Firewall": 'VirtualRouter',
- "Lb": 'VirtualRouter',
- "UserData": 'VirtualRouter',
- "StaticNat": 'VirtualRouter',
- },
- "serviceCapabilityList": {
- "SourceNat": {
- "SupportedSourceNatTypes": "peraccount",
- "RedundantRouter": "true",
- },
- "lb": {
- "SupportedLbIsolation": "dedicated"
- },
- },
- },
- "host": {
- "username": "root",
- "password": "password",
- "publicport": 22,
- },
- "network": {
- "name": "Test Network",
- "displaytext": "Test Network",
- },
- "lbrule": {
- "name": "SSH",
- "alg": "roundrobin",
- # Algorithm used for load balancing
- "privateport": 22,
- "publicport": 22,
- "openfirewall": True,
- },
- "natrule": {
- "privateport": 22,
- "publicport": 22,
- "protocol": "TCP"
- },
- "natrule_221": {
- "privateport": 22,
- "publicport": 221,
- "protocol": "TCP"
- },
- "fw_rule": {
- "startport": 1,
- "endport": 6000,
- "cidr": '55.55.0.0/11',
- # Any network (For creating FW rule)
- "protocol": 'TCP',
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "sleep": 60,
- }
+ "account": {
+ "email": "test@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended for unique
+ # username
+ "password": "password",
+ },
+ "service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 128,
+ },
+ "disk_offering": {
+ "displaytext": "Small",
+ "name": "Small",
+ "disksize": 1
+ },
+ "virtual_machine": {
+ "displayname": "Test VM",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "static_nat": {
+ "startport": 22,
+ "endport": 22,
+ "protocol": "TCP"
+ },
+ "network_offering": {
+ "name": 'Network offering-RVR services',
+ "displaytext": 'Network off-RVR services',
+ "guestiptype": 'Isolated',
+ "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat',
+ "traffictype": 'GUEST',
+ "availability": 'Optional',
+ "serviceProviderList": {
+ "Vpn": 'VirtualRouter',
+ "Dhcp": 'VirtualRouter',
+ "Dns": 'VirtualRouter',
+ "SourceNat": 'VirtualRouter',
+ "PortForwarding": 'VirtualRouter',
+ "Firewall": 'VirtualRouter',
+ "Lb": 'VirtualRouter',
+ "UserData": 'VirtualRouter',
+ "StaticNat": 'VirtualRouter',
+ },
+ "serviceCapabilityList": {
+ "SourceNat": {
+ "SupportedSourceNatTypes": "peraccount",
+ "RedundantRouter": "true",
+ },
+ "lb": {
+ "SupportedLbIsolation": "dedicated"
+ },
+ },
+ },
+ "host": {
+ "username": "root",
+ "password": "password",
+ "publicport": 22,
+ },
+ "network": {
+ "name": "Test Network",
+ "displaytext": "Test Network",
+ },
+ "lbrule": {
+ "name": "SSH",
+ "alg": "roundrobin",
+ # Algorithm used for load balancing
+ "privateport": 22,
+ "publicport": 22,
+ "openfirewall": True,
+ },
+ "natrule": {
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": "TCP"
+ },
+ "natrule_221": {
+ "privateport": 22,
+ "publicport": 221,
+ "protocol": "TCP"
+ },
+ "fw_rule": {
+ "startport": 1,
+ "endport": 6000,
+ "cidr": '55.55.0.0/11',
+ # Any network (For creating FW rule)
+ "protocol": 'TCP',
+ },
+ "ostype": 'CentOS 5.3 (64-bit)',
+ "sleep": 60,
+ }
+
class TestRvRUpgradeDowngrade(cloudstackTestCase):
@@ -145,35 +154,35 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"]
- )
+ cls.api_client,
+ cls.services["service_offering"]
+ )
cls.network_offering = NetworkOffering.create(
- cls.api_client,
- cls.services["network_offering"],
- conservemode=True
- )
+ cls.api_client,
+ cls.services["network_offering"],
+ conservemode=True
+ )
# Enable Network offering
cls.network_offering.update(cls.api_client, state='Enabled')
cls._cleanup = [
- cls.service_offering,
- cls.network_offering,
- ]
+ cls.service_offering,
+ cls.network_offering,
+ ]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -183,11 +192,11 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
self.cleanup = []
self.cleanup.insert(0, self.account)
return
@@ -222,126 +231,126 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
# 5. listRouters shows two routers Up and Running (MASTER and BACKUP)
network_offerings = NetworkOffering.list(
- self.apiclient,
- name='DefaultIsolatedNetworkOfferingWithSourceNatService',
- listall=True
- )
+ self.apiclient,
+ name='DefaultIsolatedNetworkOfferingWithSourceNatService',
+ listall=True
+ )
self.assertEqual(
- isinstance(network_offerings, list),
- True,
- "List network offering should not return empty response"
- )
+ isinstance(network_offerings, list),
+ True,
+ "List network offering should not return empty response"
+ )
network_off_vr = network_offerings[0]
# Creating network using the network offering created
self.debug("Creating network with network offering: %s" %
- network_off_vr.id)
+ network_off_vr.id)
network = Network.create(
- self.apiclient,
- self.services["network"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- networkofferingid=network_off_vr.id,
- zoneid=self.zone.id
- )
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=network_off_vr.id,
+ zoneid=self.zone.id
+ )
self.debug("Created network with ID: %s" % network.id)
networks = Network.list(
- self.apiclient,
- id=network.id,
- listall=True
- )
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
self.assertEqual(
isinstance(networks, list),
True,
"List networks should return a valid response for created network"
- )
+ )
nw_response = networks[0]
self.debug("Network state: %s" % nw_response.state)
self.assertEqual(
- nw_response.state,
- "Allocated",
- "The network should be in allocated state after creation"
- )
+ nw_response.state,
+ "Allocated",
+ "The network should be in allocated state after creation"
+ )
self.debug("Deploying VM in account: %s" % self.account.name)
# Spawn an instance in that network
virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- networkids=[str(network.id)]
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)]
+ )
self.debug("Deployed VM in the account: %s" %
- self.account.name)
+ self.account.name)
vms = VirtualMachine.list(
- self.apiclient,
- id=virtual_machine.id,
- listall=True
- )
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(vms, list),
- True,
- "List Vms should return a valid list"
- )
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
vm = vms[0]
self.assertEqual(
- vm.state,
- "Running",
- "Vm should be in running state after deployment"
- )
+ vm.state,
+ "Running",
+ "Vm should be in running state after deployment"
+ )
self.debug("Listing routers for account: %s" %
- self.account.name)
+ self.account.name)
routers = Router.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return only one router"
- )
+ isinstance(routers, list),
+ True,
+ "list router should return only one router"
+ )
self.assertEqual(
- len(routers),
- 1,
- "Length of the list router should be 1"
- )
+ len(routers),
+ 1,
+ "Length of the list router should be 1"
+ )
self.debug("Upgrading the network to RVR network offering..")
try:
network.update(
- self.apiclient,
- networkofferingid=self.network_offering.id
- )
+ self.apiclient,
+ networkofferingid=self.network_offering.id
+ )
except Exception as e:
self.fail("Failed to upgrade the network from VR to RVR: %s" % e)
self.debug("Listing routers for account: %s" %
- self.account.name)
+ self.account.name)
routers = Router.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return two routers"
- )
+ isinstance(routers, list),
+ True,
+ "list router should return two routers"
+ )
self.assertEqual(
- len(routers),
- 2,
- "Length of the list router should be 2 (MASTER & BACKUP)"
- )
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (MASTER & BACKUP)"
+ )
return
@attr(tags=["advanced", "advancedns", "ssh"], required_hardware="false")
@@ -370,124 +379,124 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
# Creating network using the network offering created
self.debug("Creating network with network offering: %s" %
- self.network_offering.id)
+ self.network_offering.id)
network = Network.create(
- self.apiclient,
- self.services["network"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- networkofferingid=self.network_offering.id,
- zoneid=self.zone.id
- )
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id
+ )
self.debug("Created network with ID: %s" % network.id)
networks = Network.list(
- self.apiclient,
- id=network.id,
- listall=True
- )
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
self.assertEqual(
isinstance(networks, list),
True,
"List networks should return a valid response for created network"
- )
+ )
nw_response = networks[0]
self.debug("Network state: %s" % nw_response.state)
self.assertEqual(
- nw_response.state,
- "Allocated",
- "The network should be in allocated state after creation"
- )
+ nw_response.state,
+ "Allocated",
+ "The network should be in allocated state after creation"
+ )
self.debug("Deploying VM in account: %s" % self.account.name)
# Spawn an instance in that network
virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- networkids=[str(network.id)]
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)]
+ )
self.debug("Deployed VM in the account: %s" %
- self.account.name)
+ self.account.name)
vms = VirtualMachine.list(
- self.apiclient,
- id=virtual_machine.id,
- listall=True
- )
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(vms, list),
- True,
- "List Vms should return a valid list"
- )
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
vm = vms[0]
self.assertEqual(
- vm.state,
- "Running",
- "Vm should be in running state after deployment"
- )
+ vm.state,
+ "Running",
+ "Vm should be in running state after deployment"
+ )
self.debug("Listing routers for account: %s" %
- self.account.name)
+ self.account.name)
routers = Router.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return two routers"
- )
+ isinstance(routers, list),
+ True,
+ "list router should return two routers"
+ )
self.assertEqual(
- len(routers),
- 2,
- "Length of the list router should be 2 (MASTER & BACKUP)"
- )
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (MASTER & BACKUP)"
+ )
network_offerings = NetworkOffering.list(
- self.apiclient,
- name='DefaultIsolatedNetworkOfferingWithSourceNatService',
- listall=True
- )
+ self.apiclient,
+ name='DefaultIsolatedNetworkOfferingWithSourceNatService',
+ listall=True
+ )
self.assertEqual(
- isinstance(network_offerings, list),
- True,
- "List network offering should not return empty response"
- )
+ isinstance(network_offerings, list),
+ True,
+ "List network offering should not return empty response"
+ )
network_off_vr = network_offerings[0]
self.debug("Upgrading the network to RVR network offering..")
try:
network.update(
- self.apiclient,
- networkofferingid=network_off_vr.id
- )
+ self.apiclient,
+ networkofferingid=network_off_vr.id
+ )
except Exception as e:
self.fail("Failed to upgrade the network from VR to RVR: %s" % e)
self.debug("Listing routers for account: %s" %
- self.account.name)
+ self.account.name)
routers = Router.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(routers, list),
- True,
- "list router should return only one router"
- )
+ isinstance(routers, list),
+ True,
+ "list router should return only one router"
+ )
self.assertEqual(
- len(routers),
- 1,
- "Length of the list router should be 1"
- )
+ len(routers),
+ 1,
+ "Length of the list router should be 1"
+ )
return