You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/02/26 12:43:45 UTC
[1/4] CLOUDSTACK-5925: Changes to regression tests as per new
get_zone, get_pod etc definitions
Repository: cloudstack
Updated Branches:
refs/heads/marvin 4a0e95cf5 -> d70ef2a27
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index d411c63..9b5af64 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -181,14 +181,13 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
# We want to fail quicker if it's failure
socket.setdefaulttimeout(60)
- cls.api_client = super(
- TestVPCNetworkLBRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkLBRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index ebeffaa..510b881 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -182,14 +182,13 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
# We want to fail quicker if it's failure
socket.setdefaulttimeout(60)
- cls.api_client = super(
- TestVPCNetworkPFRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkPFRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index 5733bf9..fa6785b 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -182,14 +182,13 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
# We want to fail quicker if it's failure
socket.setdefaulttimeout(60)
- cls.api_client = super(
- TestVPCNetworkPFRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkPFRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 36694b1..0ae0459 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -137,14 +137,13 @@ class TestVPCOffering(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCOffering,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCOffering, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index bb10bff..e7e4a8b 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -169,14 +169,13 @@ class TestVPCRoutersBasic(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(
- TestVPCRoutersBasic,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient, cls.services)
- cls.zone = get_zone(cls.apiclient, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.apiclient,
cls.zone.id,
@@ -594,15 +593,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(
- TestVPCRouterOneNetwork,
- cls
- ).getClsTestClient().getApiClient()
cls._cleanup = []
+ cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient, cls.services)
- cls.zone = get_zone(cls.apiclient, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.apiclient,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 2235983..ac3d545 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -211,14 +211,13 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMLifeCycleVPC,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleVPC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -894,14 +893,13 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMLifeCycleSharedNwVPC,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleSharedNwVPC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1698,14 +1696,13 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMLifeCycleBothIsolated,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleBothIsolated, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2033,14 +2030,13 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMLifeCycleStoppedVPCVR,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleStoppedVPCVR, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2736,14 +2732,13 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
def setUpClass(cls):
try:
- cls.api_client = super(
- TestVMLifeCycleDiffHosts,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleDiffHosts, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index ce3d9e7..b32011b 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -166,14 +166,13 @@ class TestVMDeployVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMDeployVPC,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMDeployVPC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpn_users.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
index 4306d30..9553ff4 100644
--- a/test/integration/component/test_vpn_users.py
+++ b/test/integration/component/test_vpn_users.py
@@ -19,7 +19,7 @@
"""
# Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (
Account,
@@ -94,12 +94,13 @@ class Services:
class TestVPNUsers(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestVPNUsers,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPNUsers, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
@@ -155,7 +156,7 @@ class TestVPNUsers(cloudstackTestCase):
services=self.services["virtual_machine"]
)
return
- except cloudstackAPIException as e:
+ except CloudstackAPIException as e:
self.tearDown()
raise e
[3/4] CLOUDSTACK-5925: Changes to regression tests as per new
get_zone, get_pod etc definitions
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index 7760ee1..f0b98e4 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -149,15 +149,13 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestDefaultSecurityGroupEgress,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDefaultSecurityGroupEgress, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -307,15 +305,13 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestAuthorizeIngressRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAuthorizeIngressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -465,15 +461,13 @@ class TestDefaultGroupEgress(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestDefaultGroupEgress,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDefaultGroupEgress, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -663,15 +657,13 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestDefaultGroupEgressAfterDeploy,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDefaultGroupEgressAfterDeploy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -842,15 +834,13 @@ class TestRevokeEgressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestRevokeEgressRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRevokeEgressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1125,15 +1115,13 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestInvalidAccountAuthroize,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestInvalidAccountAuthroize, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1246,15 +1234,13 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestMultipleAccountsEgressRuleNeg,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleAccountsEgressRuleNeg, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1495,15 +1481,13 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestMultipleAccountsEgressRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleAccountsEgressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1786,15 +1770,13 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestStartStopVMWithEgressRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestStartStopVMWithEgressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1993,15 +1975,13 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestInvalidParametersForEgress,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestInvalidParametersForEgress, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_eip_elb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py
index 69af404..0613c4d 100644
--- a/test/integration/component/test_eip_elb.py
+++ b/test/integration/component/test_eip_elb.py
@@ -91,11 +91,13 @@ class TestEIP(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestEIP, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestEIP, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -909,11 +911,13 @@ class TestELB(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestELB, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestELB, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_explicit_dedication.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_explicit_dedication.py b/test/integration/component/test_explicit_dedication.py
index cf7e3d0..8a23f52 100644
--- a/test/integration/component/test_explicit_dedication.py
+++ b/test/integration/component/test_explicit_dedication.py
@@ -96,12 +96,13 @@ class TestExplicitDedication(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestExplicitDedication, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestExplicitDedication, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_haproxy.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py
index 750c300..a79d34c 100644
--- a/test/integration/component/test_haproxy.py
+++ b/test/integration/component/test_haproxy.py
@@ -118,12 +118,13 @@ class TestHAProxyStickyness(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestHAProxyStickyness,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestHAProxyStickyness, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_implicit_planner.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_implicit_planner.py b/test/integration/component/test_implicit_planner.py
index a44026a..20acb0c 100644
--- a/test/integration/component/test_implicit_planner.py
+++ b/test/integration/component/test_implicit_planner.py
@@ -91,12 +91,13 @@ class TestImplicitPlanner(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestImplicitPlanner, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestImplicitPlanner, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_ip_reservation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ip_reservation.py b/test/integration/component/test_ip_reservation.py
index ae8d701..79ca409 100755
--- a/test/integration/component/test_ip_reservation.py
+++ b/test/integration/component/test_ip_reservation.py
@@ -19,7 +19,7 @@
import marvin
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
@@ -111,11 +111,13 @@ class TestIpReservation(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestIpReservation, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestIpReservation, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_memory_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_memory_limits.py b/test/integration/component/test_memory_limits.py
index dacd8cf..0e00df4 100644
--- a/test/integration/component/test_memory_limits.py
+++ b/test/integration/component/test_memory_limits.py
@@ -90,12 +90,13 @@ class TestMemoryLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMemoryLimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMemoryLimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
@@ -367,12 +368,13 @@ class TestDomainMemoryLimitsConfiguration(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDomainMemoryLimitsConfiguration,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDomainMemoryLimitsConfiguration, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_mm_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_mm_domain_limits.py b/test/integration/component/test_mm_domain_limits.py
index dbb8737..ed21942 100644
--- a/test/integration/component/test_mm_domain_limits.py
+++ b/test/integration/component/test_mm_domain_limits.py
@@ -91,12 +91,13 @@ class TestDomainMemoryLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDomainMemoryLimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDomainMemoryLimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
@@ -521,12 +522,13 @@ class TestMultipleChildDomainsMemory(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMultipleChildDomainsMemory,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleChildDomainsMemory, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_mm_max_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_mm_max_limits.py b/test/integration/component/test_mm_max_limits.py
index bb5e2f1..776d5c2 100644
--- a/test/integration/component/test_mm_max_limits.py
+++ b/test/integration/component/test_mm_max_limits.py
@@ -88,12 +88,13 @@ class TestMaxMemoryLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMaxMemoryLimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMaxMemoryLimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_mm_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_mm_project_limits.py b/test/integration/component/test_mm_project_limits.py
index 039ae1e..1228a11 100644
--- a/test/integration/component/test_mm_project_limits.py
+++ b/test/integration/component/test_mm_project_limits.py
@@ -90,12 +90,13 @@ class TestProjectsMemoryLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestProjectsMemoryLimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectsMemoryLimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_multiple_ip_ranges.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ip_ranges.py b/test/integration/component/test_multiple_ip_ranges.py
index 76dfdca..32c39f7 100644
--- a/test/integration/component/test_multiple_ip_ranges.py
+++ b/test/integration/component/test_multiple_ip_ranges.py
@@ -18,7 +18,7 @@
"""
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
@@ -78,12 +78,14 @@ class TestMultipleIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMultipleIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -296,7 +298,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
#listing vlan ip ranges with the id should through exception , if not mark the test case as failed
try:
new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
- except cloudstackAPIException as cs:
+ except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("entity does not exist")>0, msg="Failed to delete IP range")
return
@@ -387,7 +389,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding overlapped ip range")
try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- except cloudstackAPIException as cs:
+ except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("already has IPs that overlap with the new range")>0, msg="Fail:CS allowed adding overlapped ip ranges in guest cidr")
return
@@ -443,7 +445,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding ip range overlapped with two cidrs")
try:
new_vlan3 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- except cloudstackAPIException as cs:
+ except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("already has IPs that overlap with the new range")>0, msg="Fail:CS allowed adding overlapped ip ranges in guest cidr")
return
@@ -496,7 +498,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding IP range super set to existing CIDR")
try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- except cloudstackAPIException as cs:
+ except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("superset")>0, msg="Fail: CS allowed adding ip range superset to existing CIDR")
return
@@ -549,7 +551,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding ip range subset to existing cidr")
try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- except cloudstackAPIException as cs:
+ except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("subset")>0, msg="Fail: CS allowed adding ip range subset to existing CIDR")
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_netscaler_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py
index 5d87ca5..7e0403a 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -156,14 +156,13 @@ class TestAddNetScaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAddNetScaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddNetScaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = []
return
@@ -282,14 +281,13 @@ class TestInvalidParametersNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestInvalidParametersNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestInvalidParametersNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = []
return
@@ -526,14 +524,13 @@ class TestNetScalerDedicated(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerDedicated,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerDedicated, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -749,14 +746,13 @@ class TestNetScalerShared(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerShared,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerShared, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -992,14 +988,13 @@ class TestNetScalerCustomCapacity(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerCustomCapacity,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerCustomCapacity, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1265,14 +1260,13 @@ class TestNetScalerNoCapacity(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerNoCapacity,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerNoCapacity, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1539,14 +1533,13 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestGuestNetworkWithNetScaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestGuestNetworkWithNetScaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2096,14 +2089,13 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestGuestNetworkShutDown,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestGuestNetworkShutDown, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2502,14 +2494,13 @@ class TestServiceProvider(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestServiceProvider,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestServiceProvider, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2817,14 +2808,13 @@ class TestDeleteNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeleteNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 46c092e..732f0f9 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -150,14 +150,13 @@ class TestLbSourceNat(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbSourceNat,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbSourceNat, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -359,14 +358,13 @@ class TestLbOnIpWithPf(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbOnIpWithPf,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbOnIpWithPf, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -572,14 +570,13 @@ class TestPfOnIpWithLb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestPfOnIpWithLb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPfOnIpWithLb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -786,14 +783,13 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbOnNonSourceNat,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbOnNonSourceNat, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1003,14 +999,13 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestAddMultipleVmsLb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddMultipleVmsLb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1282,14 +1277,13 @@ class TestMultipleLbRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestMultipleLbRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleLbRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1601,14 +1595,13 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestMultipleLbRulesSameIp,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleLbRulesSameIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1926,14 +1919,13 @@ class TestLoadBalancingRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLoadBalancingRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLoadBalancingRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2140,14 +2132,13 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestDeleteCreateLBRule,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteCreateLBRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2269,14 +2260,13 @@ class TestVmWithLb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestVmWithLb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVmWithLb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_netscaler_lb_algo.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py
index db5db79..6eda9a3 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -26,7 +26,6 @@ from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from marvin.sshClient import SshClient
-import datetime
class Services:
@@ -117,14 +116,13 @@ class TestLbWithRoundRobin(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbWithRoundRobin,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithRoundRobin, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -330,14 +328,13 @@ class TestLbWithLeastConn(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbWithLeastConn,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithLeastConn, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -552,14 +549,13 @@ class TestLbWithSourceIp(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestLbWithSourceIp,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbWithSourceIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -768,14 +764,13 @@ class TestLbAlgoRrLc(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoRrLc,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoRrLc, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -973,14 +968,13 @@ class TestLbAlgoLcRr(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoLcRr,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoLcRr, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1175,14 +1169,13 @@ class TestLbAlgoRrSb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoRrSb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoRrSb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1380,14 +1373,13 @@ class TestLbAlgoSbRr(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoSbRr,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoSbRr, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1588,14 +1580,13 @@ class TestLbAlgoSbLc(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoSbLc,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoSbLc, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1795,14 +1786,13 @@ class TestLbAlgoLcSb(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbAlgoLcSb,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbAlgoLcSb, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_netscaler_lb_sticky.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py
index 391ccaf..c333f60 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -117,14 +117,13 @@ class TestLbStickyPolicy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(
- TestLbStickyPolicy,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLbStickyPolicy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index cc5e3a3..061beb1 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -191,14 +191,13 @@ class TestAddMultipleNetScaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAddMultipleNetScaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddMultipleNetScaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = []
return
@@ -506,14 +505,13 @@ class TestNetScalerSharedMode(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetScalerSharedMode,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetScalerSharedMode, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1051,14 +1049,13 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffDedicatedNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffDedicatedNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1217,14 +1214,13 @@ class TestNwOffNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1525,14 +1521,13 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffSToDUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffSToDUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1940,14 +1935,13 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNwOffDToSUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNwOffDToSUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2341,15 +2335,13 @@ class TestNOWithNetscaler(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNOWithNetscaler,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOWithNetscaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index e587cdd..efaa2cb 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -160,14 +160,13 @@ class TestNOVirtualRouter(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNOVirtualRouter,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOVirtualRouter, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -733,14 +732,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetworkUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetworkUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -1181,14 +1179,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
class TestNOWithOnlySourceNAT(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiclient = super(
- TestNOWithOnlySourceNAT,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNOWithOnlySourceNAT, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient, cls.services)
- cls.zone = get_zone(cls.apiclient, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.apiclient,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_non_contiguous_vlan.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_non_contiguous_vlan.py b/test/integration/component/test_non_contiguous_vlan.py
index b178d84..5315201 100644
--- a/test/integration/component/test_non_contiguous_vlan.py
+++ b/test/integration/component/test_non_contiguous_vlan.py
@@ -89,12 +89,14 @@ class TestNonContiguousVLANRanges(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestNonContiguousVLANRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNonContiguousVLANRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, pod, domain
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
+ cls.domain = get_domain(cls.api_client)
cls.service_offering = ServiceOffering.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index 2439983..352d846 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -19,7 +19,7 @@
import marvin
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
@@ -129,11 +129,13 @@ class TestPersistentNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPersistentNetworks, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPersistentNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_portable_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
index 04e1bdb..505c9cd 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -18,7 +18,7 @@
"""
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
@@ -136,13 +136,15 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestCreatePortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreatePortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -272,13 +274,15 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeletePortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeletePortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -444,13 +448,15 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestListPortablePublicIpRanges, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestListPortablePublicIpRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -568,13 +574,15 @@ class TestAssociatePublicIp(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAssociatePublicIp, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAssociatePublicIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -884,13 +892,15 @@ class TestDisassociatePublicIp(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDisassociatePublicIp, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDisassociatePublicIp, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -1134,14 +1144,16 @@ class TestDeleteAccount(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeleteAccount, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteAccount, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -1348,13 +1360,15 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPortableIpTransferAcrossNetworks, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPortableIpTransferAcrossNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services)
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index bd11e60..e19d90b 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -109,13 +109,11 @@ class TestUserProjectCreation(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestUserProjectCreation,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUserProjectCreation, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -275,13 +273,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectCreationNegative,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectCreationNegative, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Checking for prereqisits - global configs
@@ -420,13 +416,11 @@ class TestProjectInviteRequired(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteRequired,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteRequired, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
@@ -572,13 +566,11 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteRequiredTrue,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteRequiredTrue, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
@@ -725,13 +717,11 @@ class TestProjectInviteTimeout(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectInviteTimeout,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectInviteTimeout, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 3e663f8..2420e2d 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -124,13 +124,11 @@ class TestProjectLimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectLimits,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddNetScaler, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc.
@@ -502,10 +500,11 @@ class TestResourceLimitsProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResourceLimitsProject, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResourceLimitsProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -945,14 +944,12 @@ class TestMaxProjectNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestMaxProjectNetworks,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMaxProjectNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
[2/4] CLOUDSTACK-5925: Changes to regression tests as per new
get_zone, get_pod etc definitions
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 9e6e2e1..89da3e4 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -161,13 +161,11 @@ class TestOfferings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestOfferings,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestOfferings, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone and template
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -342,13 +340,11 @@ class TestNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNetwork,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNetwork, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone and template
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -550,13 +546,11 @@ class TestTemplates(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestTemplates,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplates, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -780,13 +774,11 @@ class TestSnapshots(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestSnapshots,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshots, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -928,13 +920,11 @@ class TestPublicIpAddress(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestPublicIpAddress,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPublicIpAddress, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -1213,15 +1203,12 @@ class TestSecurityGroup(cloudstackTestCase):
@classmethod
def setUpClass(cls):
+ cls.testClient = super(TestSecurityGroup, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- cls.api_client = super(
- TestSecurityGroup,
- cls
- ).getClsTestClient().getApiClient()
-
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 5b6de23..150f071 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -116,14 +116,13 @@ class TestVmUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVmUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVmUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -311,14 +310,13 @@ class TestPublicIPUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestPublicIPUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPublicIPUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -483,14 +481,13 @@ class TestVolumeUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVolumeUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVolumeUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -668,14 +665,13 @@ class TestTemplateUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestTemplateUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplateUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
template = get_template(
@@ -844,11 +840,13 @@ class TestISOUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestISOUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestISOUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id
@@ -990,14 +988,13 @@ class TestLBRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestLBRuleUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLBRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1173,14 +1170,13 @@ class TestSnapshotUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestSnapshotUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1351,14 +1347,13 @@ class TestNatRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNatRuleUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNatRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1534,14 +1529,13 @@ class TestVpnUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVpnUsage,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVpnUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index c792f0c..1c7bfbb 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -103,21 +103,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestMultipleProjectCreation,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleProjectCreation, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- # Create domains, account etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
-
configs = Configurations.list(
cls.api_client,
name='project.invite.required'
@@ -320,18 +314,14 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCrossDomainAccountAdd,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCrossDomainAccountAdd, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -454,18 +444,14 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeleteAccountWithProject,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteAccountWithProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -567,13 +553,12 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeleteDomainWithProject,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteDomainWithProject, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -708,17 +693,13 @@ class TestProjectOwners(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectOwners,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectOwners, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
configs = Configurations.list(
@@ -1136,18 +1117,14 @@ class TestProjectResources(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectResources,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectResources, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
configs = Configurations.list(
cls.api_client,
@@ -1440,18 +1417,14 @@ class TestProjectSuspendActivate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestProjectSuspendActivate,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectSuspendActivate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, domain, template etc
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
cls.template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_recurring_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_recurring_snapshots.py b/test/integration/component/test_recurring_snapshots.py
index 8cd9fde..81f3968 100644
--- a/test/integration/component/test_recurring_snapshots.py
+++ b/test/integration/component/test_recurring_snapshots.py
@@ -126,11 +126,13 @@ class TestRecurringSnapshots(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRecurringSnapshots, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRecurringSnapshots, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -402,4 +404,4 @@ class TestRecurringSnapshots(cloudstackTestCase):
self.services["recurring_snapshot"]["maxsnaps"],
"Check maximum number of recurring snapshots retained"
)
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_redundant_router_cleanups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_cleanups.py b/test/integration/component/test_redundant_router_cleanups.py
index 9d77b96..3262384 100644
--- a/test/integration/component/test_redundant_router_cleanups.py
+++ b/test/integration/component/test_redundant_router_cleanups.py
@@ -137,14 +137,13 @@ class TestRedundantRouterNetworkCleanups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRedundantRouterNetworkCleanups,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRedundantRouterNetworkCleanups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_redundant_router_services.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_services.py b/test/integration/component/test_redundant_router_services.py
index bcbe227..ab077e3 100644
--- a/test/integration/component/test_redundant_router_services.py
+++ b/test/integration/component/test_redundant_router_services.py
@@ -138,14 +138,13 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestEnableVPNOverRvR,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestEnableVPNOverRvR, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/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 c2b356c..e700c0c 100644
--- a/test/integration/component/test_redundant_router_upgrades.py
+++ b/test/integration/component/test_redundant_router_upgrades.py
@@ -137,14 +137,13 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRvRUpgradeDowngrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRvRUpgradeDowngrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_regions.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_regions.py b/test/integration/component/test_regions.py
index 2418597..edacdb3 100644
--- a/test/integration/component/test_regions.py
+++ b/test/integration/component/test_regions.py
@@ -41,7 +41,7 @@ class TestRegions(cloudstackTestCase):
def setUpClass(cls):
cls.api_client = super(TestRegions, cls).getClsTestClient().getApiClient()
cls.services = Services().services
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
cls.cleanup = []
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_regions_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_regions_accounts.py b/test/integration/component/test_regions_accounts.py
index 0057235..4ea8c78 100644
--- a/test/integration/component/test_regions_accounts.py
+++ b/test/integration/component/test_regions_accounts.py
@@ -57,7 +57,7 @@ class TestRegionsAccounts(cloudstackTestCase):
def setUpClass(cls):
cls.api_client = super(TestRegionsAccounts, cls).getClsTestClient().getApiClient()
cls.services = Services().services
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
cls.cleanup = []
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_reset_ssh_keypair.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py
index 684cb47..307e8dc 100644
--- a/test/integration/component/test_reset_ssh_keypair.py
+++ b/test/integration/component/test_reset_ssh_keypair.py
@@ -114,14 +114,13 @@ class TestResetSSHKeypair(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestResetSSHKeypair,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResetSSHKeypair, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Set Zones and disk offerings
@@ -955,14 +954,13 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestResetSSHKeyUserRights,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResetSSHKeyUserRights, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Set Zones and disk offerings
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index 8da071d..36d16cb 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -127,11 +127,13 @@ class TestResourceLimitsAccount(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResourceLimitsAccount, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResourceLimitsAccount, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -897,10 +899,11 @@ class TestResourceLimitsDomain(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestResourceLimitsDomain, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestResourceLimitsDomain, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -1354,14 +1357,12 @@ class TestMaxAccountNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestMaxAccountNetworks,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMaxAccountNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 4fbac87..f1dbc85 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -98,11 +98,13 @@ class TestRouterServices(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouterServices, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterServices, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -641,11 +643,13 @@ class TestRouterStopCreatePF(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouterStopCreatePF, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterStopCreatePF, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -853,11 +857,13 @@ class TestRouterStopCreateLB(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouterStopCreateLB, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterStopCreateLB, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1065,11 +1071,13 @@ class TestRouterStopCreateFW(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouterStopCreateFW, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterStopCreateFW, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 76765d0..f5c4727 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -117,12 +117,13 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestDefaultSecurityGroup, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDefaultSecurityGroup, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -390,12 +391,13 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestAuthorizeIngressRule, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAuthorizeIngressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -526,12 +528,13 @@ class TestRevokeIngressRule(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestRevokeIngressRule, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRevokeIngressRule, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -684,12 +687,13 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestDhcpOnlyRouter, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDhcpOnlyRouter, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -821,12 +825,13 @@ class TestdeployVMWithUserData(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestdeployVMWithUserData, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestdeployVMWithUserData, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -985,8 +990,8 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
self.services = Services().services
# Get Zone, Domain and templates
- self.domain = get_domain(self.apiclient, self.services)
- self.zone = get_zone(self.apiclient, self.services)
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = self.zone.networktype
template = get_template(
@@ -1232,8 +1237,8 @@ class TestIngressRule(cloudstackTestCase):
self.services = Services().services
# Get Zone, Domain and templates
- self.domain = get_domain(self.apiclient, self.services)
- self.zone = get_zone(self.apiclient, self.services)
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = self.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_shared_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py
index 2623f75..704508b 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -154,16 +154,13 @@ class TestSharedNetworks(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestSharedNetworks,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSharedNetworks, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
-
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_snapshot_gc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py
index 32a4067..cb4652c 100644
--- a/test/integration/component/test_snapshot_gc.py
+++ b/test/integration/component/test_snapshot_gc.py
@@ -122,11 +122,13 @@ class TestAccountSnapshotClean(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAccountSnapshotClean, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAccountSnapshotClean, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_snapshot_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py
index 180da44..ee168c3 100644
--- a/test/integration/component/test_snapshot_limits.py
+++ b/test/integration/component/test_snapshot_limits.py
@@ -123,11 +123,13 @@ class TestSnapshotLimit(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestSnapshotLimit, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotLimit, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls._cleanup = []
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 06ea112..241f21d 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -158,11 +158,13 @@ class TestSnapshots(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestSnapshots, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshots, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -910,11 +912,13 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestCreateVMSnapshotTemplate, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateVMSnapshotTemplate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -1108,11 +1112,13 @@ class TestSnapshotEvents(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestSnapshotEvents, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotEvents, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_snapshots_improvement.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index ac282d6..1acc41b 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -126,11 +126,13 @@ class TestSnapshotOnRootVolume(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestSnapshotOnRootVolume,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotOnRootVolume, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ 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,
@@ -299,13 +301,13 @@ class TestCreateSnapshot(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCreateSnapshot,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateSnapshot, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index c3be273..1b371a9 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -108,14 +108,13 @@ class TestDeployVM(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployVM,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVM, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -962,14 +961,13 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployHaEnabledVM,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployHaEnabledVM, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -1194,14 +1192,13 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRouterStateAfterDeploy,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterStateAfterDeploy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -1409,14 +1406,13 @@ class TestDeployVMBasicZone(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployVMBasicZone,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVMBasicZone, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -1477,14 +1473,13 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployVMFromTemplate,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVMFromTemplate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
# Create service, disk offerings etc
cls.service_offering = ServiceOffering.create(
@@ -1639,14 +1634,13 @@ class TestVMAccountLimit(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMAccountLimit,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMAccountLimit, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -1755,14 +1749,13 @@ class TestUploadAttachVolume(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestUploadAttachVolume,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUploadAttachVolume, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -1865,14 +1858,13 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployOnSpecificHost,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployOnSpecificHost, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_storage_motion.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py
index 22dd73a..8372647 100644
--- a/test/integration/component/test_storage_motion.py
+++ b/test/integration/component/test_storage_motion.py
@@ -89,12 +89,13 @@ class TestStorageMotion(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestStorageMotion, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestStorageMotion, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index 834ec59..b335bf5 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -174,16 +174,13 @@ class TestResourceTags(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestResourceTags,
- cls
- ).getClsTestClient().getApiClient()
- cls.services = Services().services
- # Get Zone
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.testClient = super(TestResourceTags, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
- # Create domains, account etc.
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.account = Account.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 8a168fb..ff97f10 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -118,12 +118,13 @@ class TestCreateTemplate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestCreateTemplate, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateTemplate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -277,12 +278,13 @@ class TestTemplates(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestTemplates, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplates, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
- # Get Zone, templates etc
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
#populate second zone id for iso copy
cmd = listZones.listZonesCmd()
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_update_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_update_vm.py b/test/integration/component/test_update_vm.py
index fdb0ab8..986a748 100644
--- a/test/integration/component/test_update_vm.py
+++ b/test/integration/component/test_update_vm.py
@@ -61,8 +61,8 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
# Get Zone, Domain and Default Built-in template
- self.domain = get_domain(self.apiclient, self.testdata)
- self.zone = get_zone(self.apiclient, self.testdata)
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.testdata["mode"] = self.zone.networktype
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
@@ -156,4 +156,4 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
try:
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
- self.debug("Warning! Exception in tearDown: %s" % e)
\ No newline at end of file
+ self.debug("Warning! Exception in tearDown: %s" % e)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 00bb142..3a4b2d4 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -112,11 +112,13 @@ class TestVmUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestVmUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVmUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -296,11 +298,13 @@ class TestPublicIPUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestPublicIPUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestPublicIPUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -448,11 +452,13 @@ class TestVolumeUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestVolumeUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVolumeUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -622,11 +628,13 @@ class TestTemplateUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestTemplateUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplateUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
template = get_template(
@@ -787,11 +795,13 @@ class TestISOUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestISOUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestISOUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id
@@ -924,11 +934,13 @@ class TestLBRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestLBRuleUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestLBRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1086,11 +1098,13 @@ class TestSnapshotUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestSnapshotUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestSnapshotUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
@@ -1253,11 +1267,13 @@ class TestNatRuleUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestNatRuleUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNatRuleUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -1415,11 +1431,13 @@ class TestVpnUsage(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestVpnUsage, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVpnUsage, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index 038edc1..2f68257 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -92,15 +92,13 @@ class TestVMPasswordEnabled(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMPasswordEnabled,
- cls
- ).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestVMPasswordEnabled, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- domain = get_domain(cls.api_client, cls.services)
- zone = get_zone(cls.api_client, cls.services)
+ domain = get_domain(cls.api_client)
+ zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vmware_drs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py
index cc0d278..928d4b9 100644
--- a/test/integration/component/test_vmware_drs.py
+++ b/test/integration/component/test_vmware_drs.py
@@ -111,25 +111,16 @@ class TestVMPlacement(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMPlacement,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMPlacement, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services
- )
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.pod = get_pod(
cls.api_client,
- zoneid=cls.zone.id,
- services=cls.services
- )
+ zoneid=cls.zone.id)
cls.template = get_template(
cls.api_client,
cls.zone.id,
@@ -280,20 +271,13 @@ class TestAntiAffinityRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAntiAffinityRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAntiAffinityRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services
- )
+ 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,
@@ -515,20 +499,13 @@ class TestAffinityRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAffinityRules,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAffinityRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services
- )
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index a501da7..2bbc1ae 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -88,13 +88,14 @@ class TestAttachVolume(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAttachVolume, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestAttachVolume, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -378,13 +379,14 @@ class TestAttachDetachVolume(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAttachDetachVolume, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestAttachDetachVolume, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -641,13 +643,14 @@ class TestAttachVolumeISO(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAttachVolumeISO, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestAttachVolumeISO, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -852,11 +855,13 @@ class TestVolumes(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestVolumes, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVolumes, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -1133,15 +1138,12 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDeployVmWithCustomDisk,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVmWithCustomDisk, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
-
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index fa72135..a42b976 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -20,7 +20,7 @@
#Import Local Modules
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.cloudstackAPI import *
from marvin.lib.utils import *
from marvin.lib.base import *
@@ -175,14 +175,13 @@ class TestVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPC,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2192,7 +2191,7 @@ class TestVPC(cloudstackTestCase):
domain=user.domain,
type=0)
- with self.assertRaises(cloudstackAPIException):
+ with self.assertRaises(CloudstackAPIException):
vpc = VPC.create(
da_apiclient,
self.services["vpc"],
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index d827366..1a0cf8a 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -239,17 +239,17 @@ class TestVPCNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCNetwork,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetwork, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
+
# Added an attribute to track if Netscaler addition was successful.
# Value is checked in tests and if not configured, Netscaler tests will be skipped
cls.ns_configured = False
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1003,17 +1003,17 @@ class TestVPCNetworkRanges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCNetworkRanges,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkRanges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
+
# Added an attribute to track if Netscaler addition was successful.
# Value is checked in tests and if not configured, Netscaler tests will be skipped
cls.ns_configured = False
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1541,14 +1541,14 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCNetworkUpgrade,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkUpgrade, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
+
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -2123,14 +2123,14 @@ class TestVPCNetworkGc(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCNetworkGc,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCNetworkGc, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
+
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
[4/4] git commit: updated refs/heads/marvin to d70ef2a
Posted by gi...@apache.org.
CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d70ef2a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d70ef2a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d70ef2a2
Branch: refs/heads/marvin
Commit: d70ef2a279c9ed344ffb31fdd8276992aabea8f0
Parents: 4a0e95c
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Feb 26 17:13:21 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Feb 26 17:13:21 2014 +0530
----------------------------------------------------------------------
.../maint/test_egress_rules_host_maintenance.py | 12 +-
.../component/maint/test_high_availability.py | 20 +--
.../maint/test_host_high_availability.py | 17 +--
.../component/maint/test_multiple_ip_ranges.py | 14 +-
.../component/maint/test_redundant_router.py | 55 ++++----
...test_redundant_router_deployment_planning.py | 11 +-
.../test_redundant_router_network_rules.py | 11 +-
.../maint/test_vpc_host_maintenance.py | 15 +-
.../maint/test_vpc_on_host_maintenance.py | 11 +-
test/integration/component/test_accounts.py | 141 +++++++++----------
.../component/test_add_remove_network.py | 60 +++++---
.../component/test_advancedsg_networks.py | 65 ++++-----
.../component/test_affinity_groups.py | 71 ++++++----
.../component/test_allocation_states.py | 17 ++-
test/integration/component/test_asa1000v_fw.py | 18 +--
test/integration/component/test_assign_vm.py | 13 +-
test/integration/component/test_baremetal.py | 28 ++--
.../component/test_base_image_updation.py | 16 +--
test/integration/component/test_blocker_bugs.py | 69 ++++++---
.../component/test_cpu_domain_limits.py | 20 +--
test/integration/component/test_cpu_limits.py | 21 +--
.../component/test_cpu_max_limits.py | 11 +-
.../component/test_cpu_project_limits.py | 9 +-
.../component/test_custom_hostname.py | 38 ++---
.../component/test_deploy_vm_userdata_reg.py | 5 +-
.../component/test_egress_fw_rules.py | 13 +-
test/integration/component/test_egress_rules.py | 120 +++++++---------
test/integration/component/test_eip_elb.py | 16 ++-
.../component/test_explicit_dedication.py | 9 +-
test/integration/component/test_haproxy.py | 9 +-
.../component/test_implicit_planner.py | 9 +-
.../component/test_ip_reservation.py | 10 +-
.../integration/component/test_memory_limits.py | 18 +--
.../component/test_mm_domain_limits.py | 18 +--
.../integration/component/test_mm_max_limits.py | 9 +-
.../component/test_mm_project_limits.py | 9 +-
.../component/test_multiple_ip_ranges.py | 22 +--
.../component/test_netscaler_configs.py | 110 +++++++--------
test/integration/component/test_netscaler_lb.py | 110 +++++++--------
.../component/test_netscaler_lb_algo.py | 100 ++++++-------
.../component/test_netscaler_lb_sticky.py | 11 +-
.../component/test_netscaler_nw_off.py | 76 +++++-----
.../component/test_network_offering.py | 33 ++---
.../component/test_non_contiguous_vlan.py | 12 +-
.../component/test_persistent_networks.py | 10 +-
test/integration/component/test_portable_ip.py | 72 ++++++----
.../component/test_project_configs.py | 50 +++----
.../component/test_project_limits.py | 29 ++--
.../component/test_project_resources.py | 63 ++++-----
.../integration/component/test_project_usage.py | 96 ++++++-------
test/integration/component/test_projects.py | 103 +++++---------
.../component/test_recurring_snapshots.py | 10 +-
.../component/test_redundant_router_cleanups.py | 11 +-
.../component/test_redundant_router_services.py | 11 +-
.../component/test_redundant_router_upgrades.py | 11 +-
test/integration/component/test_regions.py | 2 +-
.../component/test_regions_accounts.py | 2 +-
.../component/test_reset_ssh_keypair.py | 18 ++-
.../component/test_resource_limits.py | 27 ++--
test/integration/component/test_routers.py | 32 +++--
.../component/test_security_groups.py | 53 +++----
.../component/test_shared_networks.py | 11 +-
test/integration/component/test_snapshot_gc.py | 8 +-
.../component/test_snapshot_limits.py | 8 +-
test/integration/component/test_snapshots.py | 24 ++--
.../component/test_snapshots_improvement.py | 20 +--
test/integration/component/test_stopped_vm.py | 88 ++++++------
.../component/test_storage_motion.py | 9 +-
test/integration/component/test_tags.py | 15 +-
test/integration/component/test_templates.py | 20 +--
test/integration/component/test_update_vm.py | 6 +-
test/integration/component/test_usage.py | 72 ++++++----
.../component/test_vm_passwdenabled.py | 12 +-
test/integration/component/test_vmware_drs.py | 55 +++-----
test/integration/component/test_volumes.py | 52 +++----
test/integration/component/test_vpc.py | 15 +-
test/integration/component/test_vpc_network.py | 48 +++----
.../component/test_vpc_network_lbrules.py | 11 +-
.../component/test_vpc_network_pfrules.py | 11 +-
.../component/test_vpc_network_staticnatrule.py | 11 +-
.../integration/component/test_vpc_offerings.py | 11 +-
test/integration/component/test_vpc_routers.py | 22 ++-
.../component/test_vpc_vm_life_cycle.py | 55 ++++----
.../component/test_vpc_vms_deployment.py | 11 +-
test/integration/component/test_vpn_users.py | 13 +-
85 files changed, 1304 insertions(+), 1386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_egress_rules_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_egress_rules_host_maintenance.py b/test/integration/component/maint/test_egress_rules_host_maintenance.py
index 55d6125..5ec1223 100644
--- a/test/integration/component/maint/test_egress_rules_host_maintenance.py
+++ b/test/integration/component/maint/test_egress_rules_host_maintenance.py
@@ -100,15 +100,13 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(
- TestEgressAfterHostMaintenance,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestEgressAfterHostMaintenance, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.pod = get_pod(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py
index 55cd293..da2655b 100644
--- a/test/integration/component/maint/test_high_availability.py
+++ b/test/integration/component/maint/test_high_availability.py
@@ -107,24 +107,16 @@ class TestHighAvailability(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestHighAvailability,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestHighAvailability, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services
- )
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.pod = get_pod(
cls.api_client,
- zoneid=cls.zone.id,
- services=cls.services
+ zoneid=cls.zone.id
)
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_host_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py
index 4f22887..f81bff2 100644
--- a/test/integration/component/maint/test_host_high_availability.py
+++ b/test/integration/component/maint/test_host_high_availability.py
@@ -76,20 +76,13 @@ class TestHostHighAvailability(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestHostHighAvailability,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestHostHighAvailability, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services
- )
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_multiple_ip_ranges.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_multiple_ip_ranges.py b/test/integration/component/maint/test_multiple_ip_ranges.py
index cc89706..982dd7c 100644
--- a/test/integration/component/maint/test_multiple_ip_ranges.py
+++ b/test/integration/component/maint/test_multiple_ip_ranges.py
@@ -18,7 +18,7 @@
"""
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
@@ -87,13 +87,15 @@ class TestMultipleIpRanges(cloudstackTestCase):
"""
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMultipleIpRanges, cls).getClsTestClient().getApiClient()
- cls.dbclient = super(TestMultipleIpRanges, cls).getClsTestClient().getDbConnection()
+ cls.testClient = super(TestEgressAfterHostMaintenance, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.dbclient = cls.testClient.getDbConnection()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
- cls.pod = get_pod(cls.api_client, cls.zone.id, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.services['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_redundant_router.py b/test/integration/component/maint/test_redundant_router.py
index 245ce37..66bb477 100644
--- a/test/integration/component/maint/test_redundant_router.py
+++ b/test/integration/component/maint/test_redundant_router.py
@@ -137,14 +137,13 @@ class TestCreateRvRNetworkOffering(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCreateRvRNetworkOffering,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateRvRNetworkOffering, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = []
return
@@ -231,14 +230,13 @@ class TestCreateRvRNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCreateRvRNetwork,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateRvRNetwork, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -433,14 +431,13 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestCreateRvRNetworkNonDefaultGuestCidr,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateRvRNetworkNonDefaultGuestCidr, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -642,14 +639,13 @@ class TestRVRInternals(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRVRInternals,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRVRInternals, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -946,14 +942,13 @@ class TestRvRRedundancy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRvRRedundancy,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRvRRedundancy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_redundant_router_deployment_planning.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_redundant_router_deployment_planning.py b/test/integration/component/maint/test_redundant_router_deployment_planning.py
index 2801b39..b63cda9 100644
--- a/test/integration/component/maint/test_redundant_router_deployment_planning.py
+++ b/test/integration/component/maint/test_redundant_router_deployment_planning.py
@@ -136,14 +136,13 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRvRDeploymentPlanning,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRvRDeploymentPlanning, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_redundant_router_network_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_redundant_router_network_rules.py b/test/integration/component/maint/test_redundant_router_network_rules.py
index f49a118..12c4d2c 100644
--- a/test/integration/component/maint/test_redundant_router_network_rules.py
+++ b/test/integration/component/maint/test_redundant_router_network_rules.py
@@ -137,14 +137,13 @@ class TestRedundantRouterRulesLifeCycle(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRedundantRouterRulesLifeCycle,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRedundantRouterRulesLifeCycle, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_vpc_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py
index 5c18de8..83ba271 100644
--- a/test/integration/component/maint/test_vpc_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -25,8 +25,6 @@ from marvin.cloudstackAPI import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
-from marvin.sshClient import SshClient
-import datetime
class Services:
@@ -190,14 +188,13 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVMLifeCycleHostmaintenance,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVMLifeCycleHostmaintenance, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -554,4 +551,4 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
"Router state should be running"
)
# TODO: Check for the network connectivity
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/maint/test_vpc_on_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_vpc_on_host_maintenance.py b/test/integration/component/maint/test_vpc_on_host_maintenance.py
index 3a2f7f5..eb3360a 100644
--- a/test/integration/component/maint/test_vpc_on_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_on_host_maintenance.py
@@ -77,14 +77,13 @@ class TestVPCHostMaintenance(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestVPCHostMaintenance,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestVPCHostMaintenance, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index b478ab8..7390463 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -17,14 +17,32 @@
""" P1 tests for Account
"""
#Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.sshClient import SshClient
+from marvin.cloudstackTestCase import cloudstackTestCase
+#from marvin.cloudstackAPI import *
+from marvin.lib.utils import (random_gen,
+ cleanup_resources)
+from marvin.lib.base import (Domain,
+ Account,
+ ServiceOffering,
+ VirtualMachine,
+ Network,
+ User,
+ NATRule,
+ Template,
+ PublicIPAddress)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_accounts,
+ list_virtual_machines,
+ list_service_offering,
+ list_templates,
+ list_users,
+ get_builtin_template_info,
+ wait_for_cleanup)
from nose.plugins.attrib import attr
-from marvin.cloudstackException import cloudstackAPIException
+from marvin.cloudstackException import CloudstackAPIException
+import time
class Services:
"""Test Account Services
@@ -102,13 +120,11 @@ class TestAccounts(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAccounts,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAccounts, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -232,13 +248,11 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestRemoveUserFromAccount,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRemoveUserFromAccount, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -392,13 +406,11 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestNonRootAdminsPrivileges,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestNonRootAdminsPrivileges, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone settings
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create an account, domain etc
cls.domain = Domain.create(
@@ -726,15 +738,12 @@ class TestTemplateHierarchy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestTemplateHierarchy,
- cls).getClsTestClient().getApiClient()
- cls.hypervisor = super(
- TestTemplateHierarchy,
- cls).getClsTestClient().getHypervisorInfo()
+ cls.testClient = super(TestTemplateHierarchy, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+
cls.services = Services().services
- # Get Zone settings
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Create domains, accounts and template
@@ -883,21 +892,12 @@ class TestAddVmToSubDomain(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestAddVmToSubDomain,
- cls
- ).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestAddVmToSubDomain, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
- # Setup working Environment- Create domain, zone, pod cluster etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services,
- )
+ cls.services = Services().services
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.sub_domain = Domain.create(
cls.api_client,
@@ -1035,14 +1035,12 @@ class TestUserDetails(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestUserDetails,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUserDetails, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain etc
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls._cleanup = []
return
@@ -1335,14 +1333,12 @@ class TestUserLogin(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestUserLogin,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUserLogin, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, Domain etc
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls._cleanup = []
return
@@ -1486,21 +1482,12 @@ class TestDomainForceRemove(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestDomainForceRemove,
- cls
- ).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestDomainForceRemove, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
- # Setup working Environment- Create domain, zone, pod cluster etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
- cls.zone = get_zone(
- cls.api_client,
- cls.services,
- )
+ cls.services = Services().services
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
@@ -1685,7 +1672,7 @@ class TestDomainForceRemove(cloudstackTestCase):
" to cleanup any remaining resouces")
# Sleep 3*account.gc to ensure that all resources are deleted
wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*3)
- with self.assertRaises(cloudstackAPIException):
+ with self.assertRaises(CloudstackAPIException):
Domain.list(
self.apiclient,
id=domain.id,
@@ -1693,7 +1680,7 @@ class TestDomainForceRemove(cloudstackTestCase):
)
self.debug("Checking if the resources in domain are deleted")
- with self.assertRaises(cloudstackAPIException):
+ with self.assertRaises(CloudstackAPIException):
Account.list(
self.apiclient,
name=self.account_1.name,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_add_remove_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_add_remove_network.py b/test/integration/component/test_add_remove_network.py
index b96d8d3..3e0e78b 100644
--- a/test/integration/component/test_add_remove_network.py
+++ b/test/integration/component/test_add_remove_network.py
@@ -60,6 +60,7 @@ from marvin.cloudstackAPI import (addNicToVirtualMachine,
from marvin.codes import PASS
import random
+import time
class Services:
"""Test Add Remove Network Services
@@ -173,7 +174,10 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAddNetworkToVirtualMachine, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAddNetworkToVirtualMachine, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
@@ -181,8 +185,8 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"])
# Set Zones and disk offerings
@@ -689,16 +693,18 @@ class TestRemoveNetworkFromVirtualMachine(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRemoveNetworkFromVirtualMachine, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRemoveNetworkFromVirtualMachine, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
- cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings
@@ -869,16 +875,18 @@ class TestUpdateVirtualMachineNIC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestUpdateVirtualMachineNIC, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUpdateVirtualMachineNIC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
- cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings
@@ -1083,16 +1091,18 @@ class TestFailureScenariosAddNetworkToVM(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestFailureScenariosAddNetworkToVM, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestFailureScenariosAddNetworkToVM, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
- cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1315,16 +1325,18 @@ class TestFailureScenariosRemoveNicFromVM(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestFailureScenariosRemoveNicFromVM, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestFailureScenariosRemoveNicFromVM, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
- cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings
@@ -1493,16 +1505,18 @@ class TestFailureScenariosUpdateVirtualMachineNIC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestFailureScenariosUpdateVirtualMachineNIC, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestFailureScenariosUpdateVirtualMachineNIC, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
- cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"])
# Set Zones and disk offerings
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_advancedsg_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py
index d2ea499..f9155ed 100644
--- a/test/integration/component/test_advancedsg_networks.py
+++ b/test/integration/component/test_advancedsg_networks.py
@@ -54,14 +54,12 @@ class TestCreateZoneSG(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestCreateZoneSG,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- # Fill services from the external config file
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestCreateZoneSG, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
cls._cleanup = []
return
@@ -154,14 +152,13 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestNetworksInAdvancedSG,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestNetworksInAdvancedSG, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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"])
@@ -1102,14 +1099,13 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestNetworksInAdvancedSG_VmOperations,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestNetworksInAdvancedSG_VmOperations, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -2086,14 +2082,13 @@ class TestSecurityGroups_BasicSanity(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestSecurityGroups_BasicSanity,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestSecurityGroups_BasicSanity, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -2548,14 +2543,13 @@ class TestSharedNetworkOperations(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestSharedNetworkOperations,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestSharedNetworkOperations, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -2815,14 +2809,13 @@ class TestAccountBasedIngressRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cloudstackTestClient = super(TestAccountBasedIngressRules,cls).getClsTestClient()
- cls.api_client = cloudstackTestClient.getApiClient()
-
- cls.services = cloudstackTestClient.getConfigParser().parsedDict
+ cls.testClient = super(TestAccountBasedIngressRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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.services["virtual_machine"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py
index e5d8028..62400c6 100644
--- a/test/integration/component/test_affinity_groups.py
+++ b/test/integration/component/test_affinity_groups.py
@@ -15,12 +15,20 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.sshClient import SshClient
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import deleteAffinityGroup
+from marvin.lib.utils import (cleanup_resources,
+ random_gen)
+from marvin.lib.base import (Account,
+ ServiceOffering,
+ VirtualMachine,
+ AffinityGroup,
+ Domain)
+from marvin.lib.common import (get_zone,
+ get_domain,
+ get_template,
+ list_virtual_machines,
+ wait_for_cleanup)
from nose.plugins.attrib import attr
class Services:
@@ -89,12 +97,12 @@ class TestCreateAffinityGroup(cloudstackTestCase):
@classmethod
def setUpClass(cls):
-
- cls.api_client = super(TestCreateAffinityGroup, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCreateAffinityGroup, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -283,12 +291,14 @@ class TestListAffinityGroups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
+ cls.testClient = super(TestListAffinityGroups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
- cls.api_client = super(TestListAffinityGroups, cls).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -530,11 +540,14 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeleteAffinityGroups, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeleteAffinityGroups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -800,11 +813,14 @@ class TestUpdateVMAffinityGroups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestUpdateVMAffinityGroups, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestUpdateVMAffinityGroups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1084,11 +1100,14 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDeployVMAffinityGroups, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVMAffinityGroups, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
@@ -1432,11 +1451,13 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestAffinityGroupsAdminUser, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestAffinityGroupsAdminUser, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_allocation_states.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py
index 2da0f7b..e7e7863 100644
--- a/test/integration/component/test_allocation_states.py
+++ b/test/integration/component/test_allocation_states.py
@@ -15,16 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-import marvin
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from nose.plugins.attrib import attr
-import datetime
-
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (Host,
+ Pod,
+ Zone,
+ Cluster,
+ StoragePool)
+from marvin.lib.common import get_zone
class Services:
"""Test Resource Limits Services
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_asa1000v_fw.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_asa1000v_fw.py b/test/integration/component/test_asa1000v_fw.py
index e913c76..43d06d1 100644
--- a/test/integration/component/test_asa1000v_fw.py
+++ b/test/integration/component/test_asa1000v_fw.py
@@ -18,15 +18,15 @@
""" Cisco ASA1000v external firewall
"""
#Import Local Modules
-import marvin
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.sshClient import SshClient
-import datetime
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (NetworkOffering,
+ PhysicalNetwork,
+ VNMC,
+ ASA1000V,
+ Cluster)
+from marvin.lib.common import get_zone
class Services:
@@ -101,7 +101,7 @@ class TestASASetup(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
- self.zone = get_zone(self.apiclient, self.services)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.physicalnetworks = PhysicalNetwork.list(self.apiclient, zoneid=self.zone.id)
self.assertNotEqual(len(self.physicalnetworks), 0, "Check if the list physical network API returns a non-empty response")
self.clusters = Cluster.list(self.apiclient, hypervisor='VMware')
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_assign_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_assign_vm.py b/test/integration/component/test_assign_vm.py
index 5de8dad..0429fa4 100644
--- a/test/integration/component/test_assign_vm.py
+++ b/test/integration/component/test_assign_vm.py
@@ -98,12 +98,13 @@ class TestVMOwnership(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(TestVMOwnership,
- cls).getClsTestClient().getApiClient()
- cls.services = Services().services
- # Get Zone Domain and create Domains and sub Domains.
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.testClient = super(TestVMOwnership, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Get and set template id for VM creation.
cls.template = get_template(cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_baremetal.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_baremetal.py b/test/integration/component/test_baremetal.py
index 886b18c..6ab9146 100644
--- a/test/integration/component/test_baremetal.py
+++ b/test/integration/component/test_baremetal.py
@@ -17,18 +17,18 @@
""" Test for baremetal
"""
#Import Local Modules
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import createVlanIpRange
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (NetworkOffering,
+ NetworkServiceProvider,
+ PhysicalNetwork,
+ Network,
+ Pod)
+#from marvin.lib.common import *
from nose.plugins.attrib import attr
-import telnetlib
#Import System modules
-import time
_multiprocess_shared_ = True
class Services:
@@ -89,19 +89,19 @@ class TestBaremetal(cloudstackTestCase):
physical_network = PhysicalNetwork.list(self.apiclient, zoneid=self.zoneid)[0];
dhcp_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalDhcpProvider", physical_network_id=physical_network.id)[0]
- response = NetworkServiceProvider.update(
+ NetworkServiceProvider.update(
self.apiclient,
id=dhcp_provider.id,
state='Enabled'
)
pxe_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalPxeProvider", physical_network_id=physical_network.id)[0]
- response = NetworkServiceProvider.update(
+ NetworkServiceProvider.update(
self.apiclient,
id=pxe_provider.id,
state='Enabled'
)
userdata_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalUserdataProvider", physical_network_id=physical_network.id)[0]
- response = NetworkServiceProvider.update(
+ NetworkServiceProvider.update(
self.apiclient,
id=userdata_provider.id,
state='Enabled'
@@ -119,5 +119,5 @@ class TestBaremetal(cloudstackTestCase):
cmd.startip = "10.1.1.20"
cmd.endip = "10.1.1.40"
cmd.forVirtualNetwork="false"
- response = self.apiclient.createVlanIpRange(cmd)
-
\ No newline at end of file
+ self.apiclient.createVlanIpRange(cmd)
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_base_image_updation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index c663fe0..28ac88b 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -25,11 +25,10 @@
"""
#Import Local Modules
-import marvin
from marvin.codes import (PASS,
RECURRING)
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (ServiceOffering,
Account,
@@ -51,7 +50,6 @@ from marvin.lib.utils import (validateList,
cleanup_resources)
import time
-from datetime import datetime, timedelta
class Services:
"""Test Base Image Updation
@@ -150,14 +148,14 @@ class TestBaseImageUpdate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestBaseImageUpdate,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestBaseImageUpdate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index d00218e..f5f00bb 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -16,15 +16,29 @@
# under the License.
""" Tests for Blocker bugs
"""
-import marvin
from nose.plugins.attrib import attr
-from marvin.lib.base import *
-from marvin.lib.utils import *
-from marvin.lib.common import *
+from marvin.lib.base import (Snapshot,
+ Template,
+ Domain,
+ Account,
+ ServiceOffering,
+ Network,
+ VirtualMachine,
+ PublicIPAddress,
+ StaticNATRule,
+ FireWallRule,
+ Volume)
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.common import (get_zone,
+ get_domain,
+ get_template,
+ list_routers,
+ get_builtin_template_info)
#Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import restartNetwork
+import time
class Services:
@@ -110,12 +124,13 @@ class TestTemplate(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
- cls.api_client = super(TestTemplate, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestTemplate, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["template"]["zoneid"] = cls.zone.id
@@ -243,12 +258,14 @@ class TestNATRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestNATRules, cls).getClsTestClient().getApiClient()
- cls.services = Services().services
+ cls.testClient = super(TestNATRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -449,10 +466,12 @@ class TestRouters(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouters, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouters, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -574,11 +593,13 @@ class TestRouterRestart(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestRouterRestart, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestRouterRestart, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
@@ -707,12 +728,14 @@ class TestTemplates(cloudstackTestCase):
@classmethod
def setUpClass(cls):
+ cls.testClient = super(TestTemplates, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- cls.api_client = super(TestTemplates, cls).getClsTestClient().getApiClient()
+ # Get Zone, Domain and templates
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.domain = get_domain(cls.api_client)
- # Get Zone, templates etc
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype
template = get_template(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_cpu_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_domain_limits.py b/test/integration/component/test_cpu_domain_limits.py
index 3828d05..7421559 100644
--- a/test/integration/component/test_cpu_domain_limits.py
+++ b/test/integration/component/test_cpu_domain_limits.py
@@ -19,7 +19,7 @@
"""
# Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (
Account,
ServiceOffering,
@@ -90,12 +90,13 @@ class TestDomainCPULimitsUpdateResources(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDomainCPULimitsUpdateResources,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDomainCPULimitsUpdateResources, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -500,12 +501,13 @@ class TestMultipleChildDomains(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMultipleChildDomains,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMultipleChildDomains, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_cpu_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_limits.py b/test/integration/component/test_cpu_limits.py
index 4776519..12b0790 100644
--- a/test/integration/component/test_cpu_limits.py
+++ b/test/integration/component/test_cpu_limits.py
@@ -19,7 +19,7 @@
"""
# Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (
Account,
ServiceOffering,
@@ -91,12 +91,13 @@ class TestCPULimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestCPULimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestCPULimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
@@ -349,12 +350,14 @@ class TestDomainCPULimitsConfiguration(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestDomainCPULimitsConfiguration,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDomainCPULimitsConfiguration, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_cpu_max_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_max_limits.py b/test/integration/component/test_cpu_max_limits.py
index a6ab7a6..d9f5cf2 100644
--- a/test/integration/component/test_cpu_max_limits.py
+++ b/test/integration/component/test_cpu_max_limits.py
@@ -19,7 +19,7 @@
"""
# Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (
Account,
ServiceOffering,
@@ -89,12 +89,13 @@ class TestMaxCPULimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestMaxCPULimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestMaxCPULimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_cpu_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_project_limits.py b/test/integration/component/test_cpu_project_limits.py
index ccfa691..f038fb4 100644
--- a/test/integration/component/test_cpu_project_limits.py
+++ b/test/integration/component/test_cpu_project_limits.py
@@ -90,12 +90,13 @@ class TestProjectsCPULimits(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestProjectsCPULimits,
- cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestProjectsCPULimits, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
# Get Zone, Domain and templates
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_custom_hostname.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py
index 74da3d6..dadcbea 100644
--- a/test/integration/component/test_custom_hostname.py
+++ b/test/integration/component/test_custom_hostname.py
@@ -94,13 +94,13 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestInstanceNameFlagTrue,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestInstanceNameFlagTrue, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, default template
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services["mode"] = cls.zone.networktype
cls.template = get_template(
cls.api_client,
@@ -108,12 +108,7 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
cls.services["ostype"]
)
- # Create domains, account etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
-
+ # Create account
cls.account = Account.create(
cls.api_client,
cls.services["account"],
@@ -561,13 +556,13 @@ class TestInstanceNameFlagFalse(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(
- TestInstanceNameFlagFalse,
- cls
- ).getClsTestClient().getApiClient()
+ cls.testClient = super(TestInstanceNameFlagFalse, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
cls.services = Services().services
- # Get Zone, default template
- cls.zone = get_zone(cls.api_client, cls.services)
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.api_client,
@@ -575,12 +570,7 @@ class TestInstanceNameFlagFalse(cloudstackTestCase):
cls.services["ostype"]
)
- # Create domains, account etc.
- cls.domain = get_domain(
- cls.api_client,
- cls.services
- )
-
+ # Create account
cls.account = Account.create(
cls.api_client,
cls.services["account"],
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_deploy_vm_userdata_reg.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_deploy_vm_userdata_reg.py b/test/integration/component/test_deploy_vm_userdata_reg.py
index 321bc33..c87a41a 100755
--- a/test/integration/component/test_deploy_vm_userdata_reg.py
+++ b/test/integration/component/test_deploy_vm_userdata_reg.py
@@ -71,9 +71,10 @@ class TestDeployVmWithUserData(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.apiClient = super(TestDeployVmWithUserData, cls).getClsTestClient().getApiClient()
+ cls.testClient = super(TestDeployVmWithUserData, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
- cls.zone = get_zone(cls.apiClient, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
if cls.zone.localstorageenabled:
#For devcloud since localstroage is enabled
cls.services["service_offering"]["storagetype"] = "local"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d70ef2a2/test/integration/component/test_egress_fw_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py
index 06203e0..74eb55f 100644
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -132,12 +132,13 @@ class TestEgressFWRules(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
- cls.api_client = super(TestEgressFWRules,
- cls).getClsTestClient().getApiClient()
- cls.services = Services().services
- # Get Zone Domain and create Domains and sub Domains.
- cls.domain = get_domain(cls.api_client, cls.services)
- cls.zone = get_zone(cls.api_client, cls.services)
+ cls.testClient = super(TestEgressFWRules, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
# Get and set template id for VM creation.
cls.template = get_template(cls.api_client,