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

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

Browse Source
This commit is contained in:
Girish Shilamkar 2014-02-26 17:13:21 +05:30
parent 4a0e95cf5b
commit d70ef2a279
85 changed files with 1306 additions and 1388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/component/maint/test_egress_rules_host_maintenance.py
View File

@ -100,15 +100,13 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestEgressAfterHostMaintenance, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestEgressAfterHostMaintenance,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.pod = get_pod( cls.pod = get_pod(
cls.api_client, cls.api_client,

20
test/integration/component/maint/test_high_availability.py
View File

@ -107,24 +107,16 @@ class TestHighAvailability(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestHighAvailability, cls).getClsTestClient()
TestHighAvailability, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services
)
cls.pod = get_pod( cls.pod = get_pod(
cls.api_client, cls.api_client,
zoneid=cls.zone.id, zoneid=cls.zone.id
services=cls.services
) )
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

17
test/integration/component/maint/test_host_high_availability.py
View File

@ -76,20 +76,13 @@ class TestHostHighAvailability(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestHostHighAvailability, cls).getClsTestClient()
TestHostHighAvailability, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services
)
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

14
test/integration/component/maint/test_multiple_ip_ranges.py
View File

@ -18,7 +18,7 @@
""" """
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
@ -87,13 +87,15 @@ class TestMultipleIpRanges(cloudstackTestCase):
""" """
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMultipleIpRanges, cls).getClsTestClient().getApiClient() cls.testClient = super(TestEgressAfterHostMaintenance, cls).getClsTestClient()
cls.dbclient = super(TestMultipleIpRanges, cls).getClsTestClient().getDbConnection() cls.api_client = cls.testClient.getApiClient()
cls.dbclient = cls.testClient.getDbConnection()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id

55
test/integration/component/maint/test_redundant_router.py
View File

@ -137,14 +137,13 @@ class TestCreateRvRNetworkOffering(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestCreateRvRNetworkOffering, cls).getClsTestClient()
TestCreateRvRNetworkOffering, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = [] cls._cleanup = []
return return
@ -231,14 +230,13 @@ class TestCreateRvRNetwork(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestCreateRvRNetwork, cls).getClsTestClient()
TestCreateRvRNetwork, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -433,14 +431,13 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestCreateRvRNetworkNonDefaultGuestCidr, cls).getClsTestClient()
TestCreateRvRNetworkNonDefaultGuestCidr, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -642,14 +639,13 @@ class TestRVRInternals(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRVRInternals, cls).getClsTestClient()
TestRVRInternals, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -946,14 +942,13 @@ class TestRvRRedundancy(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRvRRedundancy, cls).getClsTestClient()
TestRvRRedundancy, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

11
test/integration/component/maint/test_redundant_router_deployment_planning.py
View File

@ -136,14 +136,13 @@ class TestRvRDeploymentPlanning(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRvRDeploymentPlanning, cls).getClsTestClient()
TestRvRDeploymentPlanning, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

11
test/integration/component/maint/test_redundant_router_network_rules.py
View File

@ -137,14 +137,13 @@ class TestRedundantRouterRulesLifeCycle(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRedundantRouterRulesLifeCycle, cls).getClsTestClient()
TestRedundantRouterRulesLifeCycle, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

15
test/integration/component/maint/test_vpc_host_maintenance.py
View File

@ -25,8 +25,6 @@ from marvin.cloudstackAPI import *
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
from marvin.sshClient import SshClient
import datetime
class Services: class Services:
@ -190,14 +188,13 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMLifeCycleHostmaintenance, cls).getClsTestClient()
TestVMLifeCycleHostmaintenance, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -554,4 +551,4 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
"Router state should be running" "Router state should be running"
) )
# TODO: Check for the network connectivity # TODO: Check for the network connectivity
return return

11
test/integration/component/maint/test_vpc_on_host_maintenance.py
View File

@ -77,14 +77,13 @@ class TestVPCHostMaintenance(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCHostMaintenance, cls).getClsTestClient()
TestVPCHostMaintenance, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

141
test/integration/component/test_accounts.py
View File

@ -17,14 +17,32 @@
""" P1 tests for Account """ P1 tests for Account
""" """
#Import Local Modules #Import Local Modules
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import * #from marvin.cloudstackAPI import *
from marvin.lib.utils import * from marvin.lib.utils import (random_gen,
from marvin.lib.base import * cleanup_resources)
from marvin.lib.common import * from marvin.lib.base import (Domain,
from marvin.sshClient import SshClient 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 nose.plugins.attrib import attr
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
import time
class Services: class Services:
"""Test Account Services """Test Account Services
@ -102,13 +120,11 @@ class TestAccounts(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAccounts, cls).getClsTestClient()
TestAccounts, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -232,13 +248,11 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRemoveUserFromAccount, cls).getClsTestClient()
TestRemoveUserFromAccount, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -392,13 +406,11 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNonRootAdminsPrivileges, cls).getClsTestClient()
TestNonRootAdminsPrivileges, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone settings cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create an account, domain etc # Create an account, domain etc
cls.domain = Domain.create( cls.domain = Domain.create(
@ -726,15 +738,12 @@ class TestTemplateHierarchy(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestTemplateHierarchy, cls).getClsTestClient()
TestTemplateHierarchy, cls.api_client = cls.testClient.getApiClient()
cls).getClsTestClient().getApiClient() cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.hypervisor = super(
TestTemplateHierarchy,
cls).getClsTestClient().getHypervisorInfo()
cls.services = Services().services cls.services = Services().services
# Get Zone settings cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create domains, accounts and template # Create domains, accounts and template
@ -883,21 +892,12 @@ class TestAddVmToSubDomain(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAddVmToSubDomain, cls).getClsTestClient()
TestAddVmToSubDomain, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Setup working Environment- Create domain, zone, pod cluster etc. cls.services = Services().services
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services,
)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.sub_domain = Domain.create( cls.sub_domain = Domain.create(
cls.api_client, cls.api_client,
@ -1035,14 +1035,12 @@ class TestUserDetails(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestUserDetails, cls).getClsTestClient()
TestUserDetails, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain etc cls.domain = get_domain(cls.api_client)
cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls._cleanup = [] cls._cleanup = []
return return
@ -1335,14 +1333,12 @@ class TestUserLogin(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestUserLogin, cls).getClsTestClient()
TestUserLogin, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain etc cls.domain = get_domain(cls.api_client)
cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls._cleanup = [] cls._cleanup = []
return return
@ -1486,21 +1482,12 @@ class TestDomainForceRemove(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDomainForceRemove, cls).getClsTestClient()
TestDomainForceRemove, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Setup working Environment- Create domain, zone, pod cluster etc. cls.services = Services().services
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services,
)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -1685,7 +1672,7 @@ class TestDomainForceRemove(cloudstackTestCase):
" to cleanup any remaining resouces") " to cleanup any remaining resouces")
# Sleep 3*account.gc to ensure that all resources are deleted # Sleep 3*account.gc to ensure that all resources are deleted
wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*3) wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*3)
with self.assertRaises(cloudstackAPIException): with self.assertRaises(CloudstackAPIException):
Domain.list( Domain.list(
self.apiclient, self.apiclient,
id=domain.id, id=domain.id,
@ -1693,7 +1680,7 @@ class TestDomainForceRemove(cloudstackTestCase):
) )
self.debug("Checking if the resources in domain are deleted") self.debug("Checking if the resources in domain are deleted")
with self.assertRaises(cloudstackAPIException): with self.assertRaises(CloudstackAPIException):
Account.list( Account.list(
self.apiclient, self.apiclient,
name=self.account_1.name, name=self.account_1.name,

60
test/integration/component/test_add_remove_network.py
View File

@ -60,6 +60,7 @@ from marvin.cloudstackAPI import (addNicToVirtualMachine,
from marvin.codes import PASS from marvin.codes import PASS
import random import random
import time
class Services: class Services:
"""Test Add Remove Network Services """Test Add Remove Network Services
@ -173,7 +174,10 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
@ -181,8 +185,8 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"]) template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings
@ -689,16 +693,18 @@ class TestRemoveNetworkFromVirtualMachine(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM") raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings
@ -869,16 +875,18 @@ class TestUpdateVirtualMachineNIC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM") raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings
@ -1083,16 +1091,18 @@ class TestFailureScenariosAddNetworkToVM(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM") raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1315,16 +1325,18 @@ class TestFailureScenariosRemoveNicFromVM(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM") raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings
@ -1493,16 +1505,18 @@ class TestFailureScenariosUpdateVirtualMachineNIC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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) hypervisor = get_hypervisor_type(cls.api_client)
if hypervisor.lower() not in ["xenserver","kvm"]: if hypervisor.lower() not in ["xenserver","kvm"]:
raise unittest.SkipTest("This feature is supported only on XenServer and KVM") raise unittest.SkipTest("This feature is supported only on XenServer and KVM")
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"]) template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"])
# Set Zones and disk offerings # Set Zones and disk offerings

65
test/integration/component/test_advancedsg_networks.py
View File

@ -54,14 +54,12 @@ class TestCreateZoneSG(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestCreateZoneSG,cls).getClsTestClient() cls.testClient = super(TestCreateZoneSG, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cloudstackTestClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls._cleanup = [] cls._cleanup = []
return return
@ -154,14 +152,13 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestNetworksInAdvancedSG,cls).getClsTestClient() cls.testClient = super(TestNetworksInAdvancedSG, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = cloudstackTestClient.getConfigParser().parsedDict
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(cls.api_client, cls.zone.id, cls.template = get_template(cls.api_client, cls.zone.id,
cls.services["ostype"]) cls.services["ostype"])
@ -1102,14 +1099,13 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestNetworksInAdvancedSG_VmOperations,cls).getClsTestClient() cls.testClient = super(TestNetworksInAdvancedSG_VmOperations, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -2086,14 +2082,13 @@ class TestSecurityGroups_BasicSanity(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestSecurityGroups_BasicSanity,cls).getClsTestClient() cls.testClient = super(TestSecurityGroups_BasicSanity, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -2548,14 +2543,13 @@ class TestSharedNetworkOperations(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestSharedNetworkOperations,cls).getClsTestClient() cls.testClient = super(TestSharedNetworkOperations, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -2815,14 +2809,13 @@ class TestAccountBasedIngressRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cloudstackTestClient = super(TestAccountBasedIngressRules,cls).getClsTestClient() cls.testClient = super(TestAccountBasedIngressRules, cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
cls.services = cloudstackTestClient.getConfigParser().parsedDict
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"]) cls.template = get_template(cls.api_client,cls.zone.id,cls.services["ostype"])
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id

71
test/integration/component/test_affinity_groups.py
View File

@ -15,12 +15,20 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import cloudstackTestCase, unittest
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import deleteAffinityGroup
from marvin.lib.utils import * from marvin.lib.utils import (cleanup_resources,
from marvin.lib.base import * random_gen)
from marvin.lib.common import * from marvin.lib.base import (Account,
from marvin.sshClient import SshClient 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 from nose.plugins.attrib import attr
class Services: class Services:
@ -89,12 +97,12 @@ class TestCreateAffinityGroup(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.testClient = super(TestCreateAffinityGroup, cls).getClsTestClient()
cls.api_client = super(TestCreateAffinityGroup, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -283,12 +291,14 @@ class TestListAffinityGroups(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -530,11 +540,14 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -800,11 +813,14 @@ class TestUpdateVMAffinityGroups(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1084,11 +1100,14 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1432,11 +1451,13 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

17
test/integration/component/test_allocation_states.py
View File

@ -15,16 +15,15 @@
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
import marvin
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import * from marvin.lib.utils import cleanup_resources
from marvin.lib.utils import * from marvin.lib.base import (Host,
from marvin.lib.base import * Pod,
from marvin.lib.common import * Zone,
from nose.plugins.attrib import attr Cluster,
import datetime StoragePool)
from marvin.lib.common import get_zone
class Services: class Services:
"""Test Resource Limits Services """Test Resource Limits Services

18
test/integration/component/test_asa1000v_fw.py
View File

@ -18,15 +18,15 @@
""" Cisco ASA1000v external firewall """ Cisco ASA1000v external firewall
""" """
#Import Local Modules #Import Local Modules
import marvin
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import * from marvin.lib.utils import cleanup_resources
from marvin.lib.utils import * from marvin.lib.base import (NetworkOffering,
from marvin.lib.base import * PhysicalNetwork,
from marvin.lib.common import * VNMC,
from marvin.sshClient import SshClient ASA1000V,
import datetime Cluster)
from marvin.lib.common import get_zone
class Services: class Services:
@ -101,7 +101,7 @@ class TestASASetup(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient() self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection() 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.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.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') self.clusters = Cluster.list(self.apiclient, hypervisor='VMware')

13
test/integration/component/test_assign_vm.py
View File

@ -98,12 +98,13 @@ class TestVMOwnership(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super(TestVMOwnership, cls.testClient = super(TestVMOwnership, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone Domain and create Domains and sub Domains. cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) # Get Zone, Domain and templates
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['mode'] = cls.zone.networktype
# Get and set template id for VM creation. # Get and set template id for VM creation.
cls.template = get_template(cls.api_client, cls.template = get_template(cls.api_client,

28
test/integration/component/test_baremetal.py
View File

@ -17,18 +17,18 @@
""" Test for baremetal """ Test for baremetal
""" """
#Import Local Modules #Import Local Modules
import marvin from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import createVlanIpRange
from marvin.cloudstackAPI import * from marvin.lib.utils import cleanup_resources
from marvin.sshClient import SshClient from marvin.lib.base import (NetworkOffering,
from marvin.lib.utils import * NetworkServiceProvider,
from marvin.lib.base import * PhysicalNetwork,
from marvin.lib.common import * Network,
Pod)
#from marvin.lib.common import *
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
import telnetlib
#Import System modules #Import System modules
import time
_multiprocess_shared_ = True _multiprocess_shared_ = True
class Services: class Services:
@ -89,19 +89,19 @@ class TestBaremetal(cloudstackTestCase):
physical_network = PhysicalNetwork.list(self.apiclient, zoneid=self.zoneid)[0]; 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] dhcp_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalDhcpProvider", physical_network_id=physical_network.id)[0]
response = NetworkServiceProvider.update( NetworkServiceProvider.update(
self.apiclient, self.apiclient,
id=dhcp_provider.id, id=dhcp_provider.id,
state='Enabled' state='Enabled'
) )
pxe_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalPxeProvider", physical_network_id=physical_network.id)[0] pxe_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalPxeProvider", physical_network_id=physical_network.id)[0]
response = NetworkServiceProvider.update( NetworkServiceProvider.update(
self.apiclient, self.apiclient,
id=pxe_provider.id, id=pxe_provider.id,
state='Enabled' state='Enabled'
) )
userdata_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalUserdataProvider", physical_network_id=physical_network.id)[0] userdata_provider = NetworkServiceProvider.list(self.apiclient, name="BaremetalUserdataProvider", physical_network_id=physical_network.id)[0]
response = NetworkServiceProvider.update( NetworkServiceProvider.update(
self.apiclient, self.apiclient,
id=userdata_provider.id, id=userdata_provider.id,
state='Enabled' state='Enabled'
@ -119,5 +119,5 @@ class TestBaremetal(cloudstackTestCase):
cmd.startip = "10.1.1.20" cmd.startip = "10.1.1.20"
cmd.endip = "10.1.1.40" cmd.endip = "10.1.1.40"
cmd.forVirtualNetwork="false" cmd.forVirtualNetwork="false"
response = self.apiclient.createVlanIpRange(cmd) self.apiclient.createVlanIpRange(cmd)

16
test/integration/component/test_base_image_updation.py
View File

@ -25,11 +25,10 @@
""" """
#Import Local Modules #Import Local Modules
import marvin
from marvin.codes import (PASS, from marvin.codes import (PASS,
RECURRING) RECURRING)
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (ServiceOffering, from marvin.lib.base import (ServiceOffering,
Account, Account,
@ -51,7 +50,6 @@ from marvin.lib.utils import (validateList,
cleanup_resources) cleanup_resources)
import time import time
from datetime import datetime, timedelta
class Services: class Services:
"""Test Base Image Updation """Test Base Image Updation
@ -150,14 +148,14 @@ class TestBaseImageUpdate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestBaseImageUpdate, cls).getClsTestClient()
TestBaseImageUpdate, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

71
test/integration/component/test_blocker_bugs.py
View File

@ -16,15 +16,29 @@
# under the License. # under the License.
""" Tests for Blocker bugs """ Tests for Blocker bugs
""" """
import marvin
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.lib.base import * from marvin.lib.base import (Snapshot,
from marvin.lib.utils import * Template,
from marvin.lib.common import * 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 #Import Local Modules
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import restartNetwork
import time
class Services: class Services:
@ -110,12 +124,13 @@ class TestTemplate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestTemplate, cls).getClsTestClient()
cls.api_client = super(TestTemplate, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["template"]["zoneid"] = cls.zone.id cls.services["template"]["zoneid"] = cls.zone.id
@ -243,12 +258,14 @@ class TestNATRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestNATRules, cls).getClsTestClient().getApiClient() cls.testClient = super(TestNATRules, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -449,10 +466,12 @@ class TestRouters(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # 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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -574,11 +593,13 @@ class TestRouterRestart(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -707,12 +728,14 @@ class TestTemplates(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestTemplates, cls).getClsTestClient()
cls.api_client = super(TestTemplates, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# 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 cls.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

20
test/integration/component/test_cpu_domain_limits.py
View File

@ -19,7 +19,7 @@
""" """
# Import Local Modules # Import Local Modules
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import ( from marvin.lib.base import (
Account, Account,
ServiceOffering, ServiceOffering,
@ -90,12 +90,13 @@ class TestDomainCPULimitsUpdateResources(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestDomainCPULimitsUpdateResources, cls.testClient = super(TestDomainCPULimitsUpdateResources, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -500,12 +501,13 @@ class TestMultipleChildDomains(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMultipleChildDomains, cls.testClient = super(TestMultipleChildDomains, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

21
test/integration/component/test_cpu_limits.py
View File

@ -19,7 +19,7 @@
""" """
# Import Local Modules # Import Local Modules
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import ( from marvin.lib.base import (
Account, Account,
ServiceOffering, ServiceOffering,
@ -91,12 +91,13 @@ class TestCPULimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestCPULimits, cls.testClient = super(TestCPULimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -349,12 +350,14 @@ class TestDomainCPULimitsConfiguration(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestDomainCPULimitsConfiguration, cls.testClient = super(TestDomainCPULimitsConfiguration, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

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

@ -19,7 +19,7 @@
""" """
# Import Local Modules # Import Local Modules
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import ( from marvin.lib.base import (
Account, Account,
ServiceOffering, ServiceOffering,
@ -89,12 +89,13 @@ class TestMaxCPULimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMaxCPULimits, cls.testClient = super(TestMaxCPULimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

9
test/integration/component/test_cpu_project_limits.py
View File

@ -90,12 +90,13 @@ class TestProjectsCPULimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestProjectsCPULimits, cls.testClient = super(TestProjectsCPULimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

38
test/integration/component/test_custom_hostname.py
View File

@ -94,13 +94,13 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestInstanceNameFlagTrue, cls).getClsTestClient()
TestInstanceNameFlagTrue, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, default template # Get Zone, Domain and templates
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["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -108,12 +108,7 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
cls.services["ostype"] cls.services["ostype"]
) )
# Create domains, account etc. # Create account
cls.domain = get_domain(
cls.api_client,
cls.services
)
cls.account = Account.create( cls.account = Account.create(
cls.api_client, cls.api_client,
cls.services["account"], cls.services["account"],
@ -561,13 +556,13 @@ class TestInstanceNameFlagFalse(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestInstanceNameFlagFalse, cls).getClsTestClient()
TestInstanceNameFlagFalse, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, default template # Get Zone, Domain and templates
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.template = get_template(
cls.api_client, cls.api_client,
@ -575,12 +570,7 @@ class TestInstanceNameFlagFalse(cloudstackTestCase):
cls.services["ostype"] cls.services["ostype"]
) )
# Create domains, account etc. # Create account
cls.domain = get_domain(
cls.api_client,
cls.services
)
cls.account = Account.create( cls.account = Account.create(
cls.api_client, cls.api_client,
cls.services["account"], cls.services["account"],

5
test/integration/component/test_deploy_vm_userdata_reg.py
View File

@ -71,9 +71,10 @@ class TestDeployVmWithUserData(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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.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: if cls.zone.localstorageenabled:
#For devcloud since localstroage is enabled #For devcloud since localstroage is enabled
cls.services["service_offering"]["storagetype"] = "local" cls.services["service_offering"]["storagetype"] = "local"

13
test/integration/component/test_egress_fw_rules.py
View File

@ -132,12 +132,13 @@ class TestEgressFWRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super(TestEgressFWRules, cls.testClient = super(TestEgressFWRules, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone Domain and create Domains and sub Domains. cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) # Get Zone, Domain and templates
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['mode'] = cls.zone.networktype
# Get and set template id for VM creation. # Get and set template id for VM creation.
cls.template = get_template(cls.api_client, cls.template = get_template(cls.api_client,

120
test/integration/component/test_egress_rules.py
View File

@ -149,15 +149,13 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestDefaultSecurityGroupEgress, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestDefaultSecurityGroupEgress,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -307,15 +305,13 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestAuthorizeIngressRule, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestAuthorizeIngressRule,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -465,15 +461,13 @@ class TestDefaultGroupEgress(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestDefaultGroupEgress, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestDefaultGroupEgress,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -663,15 +657,13 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestDefaultGroupEgressAfterDeploy, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestDefaultGroupEgressAfterDeploy,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -842,15 +834,13 @@ class TestRevokeEgressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestRevokeEgressRule, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestRevokeEgressRule,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1125,15 +1115,13 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestInvalidAccountAuthroize, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestInvalidAccountAuthroize,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1246,15 +1234,13 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestMultipleAccountsEgressRuleNeg, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestMultipleAccountsEgressRuleNeg,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1495,15 +1481,13 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestMultipleAccountsEgressRule, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestMultipleAccountsEgressRule,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1786,15 +1770,13 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestStartStopVMWithEgressRule, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestStartStopVMWithEgressRule,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1993,15 +1975,13 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestInvalidParametersForEgress, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestInvalidParametersForEgress,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

16
test/integration/component/test_eip_elb.py
View File

@ -91,11 +91,13 @@ class TestEIP(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -909,11 +911,13 @@ class TestELB(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

9
test/integration/component/test_explicit_dedication.py
View File

@ -96,12 +96,13 @@ class TestExplicitDedication(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestExplicitDedication, cls).getClsTestClient().getApiClient() cls.testClient = super(TestExplicitDedication, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(

9
test/integration/component/test_haproxy.py
View File

@ -118,12 +118,13 @@ class TestHAProxyStickyness(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestHAProxyStickyness, cls.testClient = super(TestHAProxyStickyness, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

9
test/integration/component/test_implicit_planner.py
View File

@ -91,12 +91,13 @@ class TestImplicitPlanner(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestImplicitPlanner, cls).getClsTestClient().getApiClient() cls.testClient = super(TestImplicitPlanner, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services) domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

10
test/integration/component/test_ip_reservation.py
View File

@ -19,7 +19,7 @@
import marvin import marvin
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
@ -111,11 +111,13 @@ class TestIpReservation(cloudstackTestCase):
""" """
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

18
test/integration/component/test_memory_limits.py
View File

@ -90,12 +90,13 @@ class TestMemoryLimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMemoryLimits, cls.testClient = super(TestMemoryLimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
@ -367,12 +368,13 @@ class TestDomainMemoryLimitsConfiguration(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestDomainMemoryLimitsConfiguration, cls.testClient = super(TestDomainMemoryLimitsConfiguration, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(

18
test/integration/component/test_mm_domain_limits.py
View File

@ -91,12 +91,13 @@ class TestDomainMemoryLimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestDomainMemoryLimits, cls.testClient = super(TestDomainMemoryLimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -521,12 +522,13 @@ class TestMultipleChildDomainsMemory(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMultipleChildDomainsMemory, cls.testClient = super(TestMultipleChildDomainsMemory, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(

9
test/integration/component/test_mm_max_limits.py
View File

@ -88,12 +88,13 @@ class TestMaxMemoryLimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestMaxMemoryLimits, cls.testClient = super(TestMaxMemoryLimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(

9
test/integration/component/test_mm_project_limits.py
View File

@ -90,12 +90,13 @@ class TestProjectsMemoryLimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestProjectsMemoryLimits, cls.testClient = super(TestProjectsMemoryLimits, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(

22
test/integration/component/test_multiple_ip_ranges.py
View File

@ -18,7 +18,7 @@
""" """
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
@ -78,12 +78,14 @@ class TestMultipleIpRanges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.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 #listing vlan ip ranges with the id should through exception , if not mark the test case as failed
try: try:
new_vlan.list(self.apiclient, id=new_vlan.vlan.id) new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
except cloudstackAPIException as cs: except CloudstackAPIException as cs:
self.debug(cs.errorMsg) self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("entity does not exist")>0, msg="Failed to delete IP range") self.assertTrue(cs.errorMsg.find("entity does not exist")>0, msg="Failed to delete IP range")
return return
@ -387,7 +389,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding overlapped ip range") self.debug("Adding overlapped ip range")
try: try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"]) new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
except cloudstackAPIException as cs: except CloudstackAPIException as cs:
self.debug(cs.errorMsg) 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") 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 return
@ -443,7 +445,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding ip range overlapped with two cidrs") self.debug("Adding ip range overlapped with two cidrs")
try: try:
new_vlan3 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"]) new_vlan3 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
except cloudstackAPIException as cs: except CloudstackAPIException as cs:
self.debug(cs.errorMsg) 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") 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 return
@ -496,7 +498,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding IP range super set to existing CIDR") self.debug("Adding IP range super set to existing CIDR")
try: try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"]) new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
except cloudstackAPIException as cs: except CloudstackAPIException as cs:
self.debug(cs.errorMsg) self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("superset")>0, msg="Fail: CS allowed adding ip range superset to existing CIDR") self.assertTrue(cs.errorMsg.find("superset")>0, msg="Fail: CS allowed adding ip range superset to existing CIDR")
return return
@ -549,7 +551,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.debug("Adding ip range subset to existing cidr") self.debug("Adding ip range subset to existing cidr")
try: try:
new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"]) new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
except cloudstackAPIException as cs: except CloudstackAPIException as cs:
self.debug(cs.errorMsg) self.debug(cs.errorMsg)
self.assertTrue(cs.errorMsg.find("subset")>0, msg="Fail: CS allowed adding ip range subset to existing CIDR") self.assertTrue(cs.errorMsg.find("subset")>0, msg="Fail: CS allowed adding ip range subset to existing CIDR")
return return

110
test/integration/component/test_netscaler_configs.py
View File

@ -156,14 +156,13 @@ class TestAddNetScaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAddNetScaler, cls).getClsTestClient()
TestAddNetScaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = [] cls._cleanup = []
return return
@ -282,14 +281,13 @@ class TestInvalidParametersNetscaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestInvalidParametersNetscaler, cls).getClsTestClient()
TestInvalidParametersNetscaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = [] cls._cleanup = []
return return
@ -526,14 +524,13 @@ class TestNetScalerDedicated(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetScalerDedicated, cls).getClsTestClient()
TestNetScalerDedicated, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -749,14 +746,13 @@ class TestNetScalerShared(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetScalerShared, cls).getClsTestClient()
TestNetScalerShared, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -992,14 +988,13 @@ class TestNetScalerCustomCapacity(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetScalerCustomCapacity, cls).getClsTestClient()
TestNetScalerCustomCapacity, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1265,14 +1260,13 @@ class TestNetScalerNoCapacity(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetScalerNoCapacity, cls).getClsTestClient()
TestNetScalerNoCapacity, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1539,14 +1533,13 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestGuestNetworkWithNetScaler, cls).getClsTestClient()
TestGuestNetworkWithNetScaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2096,14 +2089,13 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestGuestNetworkShutDown, cls).getClsTestClient()
TestGuestNetworkShutDown, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2502,14 +2494,13 @@ class TestServiceProvider(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestServiceProvider, cls).getClsTestClient()
TestServiceProvider, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2817,14 +2808,13 @@ class TestDeleteNetscaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeleteNetscaler, cls).getClsTestClient()
TestDeleteNetscaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

110
test/integration/component/test_netscaler_lb.py
View File

@ -150,14 +150,13 @@ class TestLbSourceNat(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbSourceNat, cls).getClsTestClient()
TestLbSourceNat, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -359,14 +358,13 @@ class TestLbOnIpWithPf(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbOnIpWithPf, cls).getClsTestClient()
TestLbOnIpWithPf, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -572,14 +570,13 @@ class TestPfOnIpWithLb(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestPfOnIpWithLb, cls).getClsTestClient()
TestPfOnIpWithLb, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -786,14 +783,13 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbOnNonSourceNat, cls).getClsTestClient()
TestLbOnNonSourceNat, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1003,14 +999,13 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestAddMultipleVmsLb, cls).getClsTestClient()
TestAddMultipleVmsLb, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1282,14 +1277,13 @@ class TestMultipleLbRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestMultipleLbRules, cls).getClsTestClient()
TestMultipleLbRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1601,14 +1595,13 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestMultipleLbRulesSameIp, cls).getClsTestClient()
TestMultipleLbRulesSameIp, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1926,14 +1919,13 @@ class TestLoadBalancingRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLoadBalancingRule, cls).getClsTestClient()
TestLoadBalancingRule, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2140,14 +2132,13 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestDeleteCreateLBRule, cls).getClsTestClient()
TestDeleteCreateLBRule, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2269,14 +2260,13 @@ class TestVmWithLb(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestVmWithLb, cls).getClsTestClient()
TestVmWithLb, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

100
test/integration/component/test_netscaler_lb_algo.py
View File

@ -26,7 +26,6 @@ from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
from marvin.sshClient import SshClient from marvin.sshClient import SshClient
import datetime
class Services: class Services:
@ -117,14 +116,13 @@ class TestLbWithRoundRobin(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbWithRoundRobin, cls).getClsTestClient()
TestLbWithRoundRobin, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -330,14 +328,13 @@ class TestLbWithLeastConn(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbWithLeastConn, cls).getClsTestClient()
TestLbWithLeastConn, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -552,14 +549,13 @@ class TestLbWithSourceIp(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestLbWithSourceIp, cls).getClsTestClient()
TestLbWithSourceIp, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -768,14 +764,13 @@ class TestLbAlgoRrLc(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoRrLc, cls).getClsTestClient()
TestLbAlgoRrLc, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -973,14 +968,13 @@ class TestLbAlgoLcRr(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoLcRr, cls).getClsTestClient()
TestLbAlgoLcRr, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1175,14 +1169,13 @@ class TestLbAlgoRrSb(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoRrSb, cls).getClsTestClient()
TestLbAlgoRrSb, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1380,14 +1373,13 @@ class TestLbAlgoSbRr(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoSbRr, cls).getClsTestClient()
TestLbAlgoSbRr, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1588,14 +1580,13 @@ class TestLbAlgoSbLc(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoSbLc, cls).getClsTestClient()
TestLbAlgoSbLc, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1795,14 +1786,13 @@ class TestLbAlgoLcSb(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbAlgoLcSb, cls).getClsTestClient()
TestLbAlgoLcSb, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -117,14 +117,13 @@ class TestLbStickyPolicy(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._cleanup = [] cls._cleanup = []
cls.api_client = super( cls.testClient = super(TestLbStickyPolicy, cls).getClsTestClient()
TestLbStickyPolicy, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

76
test/integration/component/test_netscaler_nw_off.py
View File

@ -191,14 +191,13 @@ class TestAddMultipleNetScaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAddMultipleNetScaler, cls).getClsTestClient()
TestAddMultipleNetScaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls._cleanup = [] cls._cleanup = []
return return
@ -506,14 +505,13 @@ class TestNetScalerSharedMode(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetScalerSharedMode, cls).getClsTestClient()
TestNetScalerSharedMode, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1051,14 +1049,13 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNwOffDedicatedNetscaler, cls).getClsTestClient()
TestNwOffDedicatedNetscaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1217,14 +1214,13 @@ class TestNwOffNetscaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNwOffNetscaler, cls).getClsTestClient()
TestNwOffNetscaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1525,14 +1521,13 @@ class TestNwOffSToDUpgrade(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNwOffSToDUpgrade, cls).getClsTestClient()
TestNwOffSToDUpgrade, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1940,14 +1935,13 @@ class TestNwOffDToSUpgrade(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNwOffDToSUpgrade, cls).getClsTestClient()
TestNwOffDToSUpgrade, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2341,15 +2335,13 @@ class TestNOWithNetscaler(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNOWithNetscaler, cls).getClsTestClient()
TestNOWithNetscaler, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

33
test/integration/component/test_network_offering.py
View File

@ -160,14 +160,13 @@ class TestNOVirtualRouter(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNOVirtualRouter, cls).getClsTestClient()
TestNOVirtualRouter, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -733,14 +732,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetworkUpgrade, cls).getClsTestClient()
TestNetworkUpgrade, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1181,14 +1179,13 @@ class TestNetworkUpgrade(cloudstackTestCase):
class TestNOWithOnlySourceNAT(cloudstackTestCase): class TestNOWithOnlySourceNAT(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.apiclient = super( cls.testClient = super(TestNOWithOnlySourceNAT, cls).getClsTestClient()
TestNOWithOnlySourceNAT, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.apiclient, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.apiclient, cls.apiclient,

12
test/integration/component/test_non_contiguous_vlan.py
View File

@ -89,12 +89,14 @@ class TestNonContiguousVLANRanges(cloudstackTestCase):
""" """
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, pod, domain # 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.pod = get_pod(cls.api_client, cls.zone.id, cls.services) cls.pod = get_pod(cls.api_client, cls.zone.id)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.api_client, cls.api_client,

10
test/integration/component/test_persistent_networks.py
View File

@ -19,7 +19,7 @@
import marvin import marvin
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
@ -129,11 +129,13 @@ class TestPersistentNetworks(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

72
test/integration/component/test_portable_ip.py
View File

@ -18,7 +18,7 @@
""" """
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
from marvin.lib.common import * from marvin.lib.common import *
@ -136,13 +136,15 @@ class TestCreatePortablePublicIpRanges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -272,13 +274,15 @@ class TestDeletePortablePublicIpRanges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -444,13 +448,15 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -568,13 +574,15 @@ class TestAssociatePublicIp(cloudstackTestCase):
""" """
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -884,13 +892,15 @@ class TestDisassociatePublicIp(cloudstackTestCase):
""" """
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -1134,14 +1144,16 @@ class TestDeleteAccount(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -1348,13 +1360,15 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.region = get_region(cls.api_client, cls.services) cls.region = get_region(cls.api_client, cls.services)
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id

50
test/integration/component/test_project_configs.py
View File

@ -109,13 +109,11 @@ class TestUserProjectCreation(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestUserProjectCreation, cls).getClsTestClient()
TestUserProjectCreation, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
configs = Configurations.list( configs = Configurations.list(
@ -275,13 +273,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectCreationNegative, cls).getClsTestClient()
TestProjectCreationNegative, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Checking for prereqisits - global configs # Checking for prereqisits - global configs
@ -420,13 +416,11 @@ class TestProjectInviteRequired(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectInviteRequired, cls).getClsTestClient()
TestProjectInviteRequired, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create domains, account etc. # Create domains, account etc.
@ -572,13 +566,11 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectInviteRequiredTrue, cls).getClsTestClient()
TestProjectInviteRequiredTrue, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create domains, account etc. # Create domains, account etc.
@ -725,13 +717,11 @@ class TestProjectInviteTimeout(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectInviteTimeout, cls).getClsTestClient()
TestProjectInviteTimeout, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create domains, account etc. # Create domains, account etc.

29
test/integration/component/test_project_limits.py
View File

@ -124,13 +124,11 @@ class TestProjectLimits(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAddNetScaler, cls).getClsTestClient()
TestProjectLimits, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
# Create domains, account etc. # Create domains, account etc.
@ -502,10 +500,11 @@ class TestResourceLimitsProject(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -945,14 +944,12 @@ class TestMaxProjectNetworks(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestMaxProjectNetworks, cls).getClsTestClient()
TestMaxProjectNetworks, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

63
test/integration/component/test_project_resources.py
View File

@ -161,13 +161,11 @@ class TestOfferings(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestOfferings, cls).getClsTestClient()
TestOfferings, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone and template cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -342,13 +340,11 @@ class TestNetwork(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNetwork, cls).getClsTestClient()
TestNetwork, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone and template cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -550,13 +546,11 @@ class TestTemplates(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestTemplates, cls).getClsTestClient()
TestTemplates, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -780,13 +774,11 @@ class TestSnapshots(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestSnapshots, cls).getClsTestClient()
TestSnapshots, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -928,13 +920,11 @@ class TestPublicIpAddress(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestPublicIpAddress, cls).getClsTestClient()
TestPublicIpAddress, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -1213,15 +1203,12 @@ class TestSecurityGroup(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestSecurityGroup, cls).getClsTestClient()
cls.api_client = super( cls.api_client = cls.testClient.getApiClient()
TestSecurityGroup,
cls
).getClsTestClient().getApiClient()
# Get Zone, Domain and templates cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

96
test/integration/component/test_project_usage.py
View File

@ -116,14 +116,13 @@ class TestVmUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVmUsage, cls).getClsTestClient()
TestVmUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -311,14 +310,13 @@ class TestPublicIPUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestPublicIPUsage, cls).getClsTestClient()
TestPublicIPUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -483,14 +481,13 @@ class TestVolumeUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVolumeUsage, cls).getClsTestClient()
TestVolumeUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -668,14 +665,13 @@ class TestTemplateUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestTemplateUsage, cls).getClsTestClient()
TestTemplateUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
template = get_template( template = get_template(
@ -844,11 +840,13 @@ class TestISOUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id cls.services["iso"]["zoneid"] = cls.zone.id
@ -990,14 +988,13 @@ class TestLBRuleUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestLBRuleUsage, cls).getClsTestClient()
TestLBRuleUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -1173,14 +1170,13 @@ class TestSnapshotUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestSnapshotUsage, cls).getClsTestClient()
TestSnapshotUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1351,14 +1347,13 @@ class TestNatRuleUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestNatRuleUsage, cls).getClsTestClient()
TestNatRuleUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -1534,14 +1529,13 @@ class TestVpnUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVpnUsage, cls).getClsTestClient()
TestVpnUsage, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,

105
test/integration/component/test_projects.py
View File

@ -103,20 +103,14 @@ class TestMultipleProjectCreation(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestMultipleProjectCreation, cls).getClsTestClient()
TestMultipleProjectCreation, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype
# Create domains, account etc. cls.services = Services().services
cls.domain = get_domain( # Get Zone, Domain and templates
cls.api_client, cls.domain = get_domain(cls.api_client)
cls.services cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
) cls.services['mode'] = cls.zone.networktype
configs = Configurations.list( configs = Configurations.list(
cls.api_client, cls.api_client,
@ -320,18 +314,14 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestCrossDomainAccountAdd, cls).getClsTestClient()
TestCrossDomainAccountAdd, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone # Get Zone, Domain and templates
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['mode'] = cls.zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
)
configs = Configurations.list( configs = Configurations.list(
cls.api_client, cls.api_client,
@ -454,18 +444,14 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeleteAccountWithProject, cls).getClsTestClient()
TestDeleteAccountWithProject, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone # Get Zone, Domain and templates
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['mode'] = cls.zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
)
configs = Configurations.list( configs = Configurations.list(
cls.api_client, cls.api_client,
@ -567,13 +553,12 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeleteDomainWithProject, cls).getClsTestClient()
TestDeleteDomainWithProject, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone # 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 cls.services['mode'] = cls.zone.networktype
configs = Configurations.list( configs = Configurations.list(
@ -708,17 +693,13 @@ class TestProjectOwners(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectOwners, cls).getClsTestClient()
TestProjectOwners, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone # Get Zone
cls.domain = get_domain( cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.api_client, cls.domain = get_domain(cls.api_client)
cls.services
)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
configs = Configurations.list( configs = Configurations.list(
@ -1136,18 +1117,14 @@ class TestProjectResources(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectResources, cls).getClsTestClient()
TestProjectResources, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone # 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.services['mode'] = cls.zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
)
configs = Configurations.list( configs = Configurations.list(
cls.api_client, cls.api_client,
@ -1440,18 +1417,14 @@ class TestProjectSuspendActivate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestProjectSuspendActivate, cls).getClsTestClient()
TestProjectSuspendActivate, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, domain, template etc # 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.services['mode'] = cls.zone.networktype
cls.domain = get_domain(
cls.api_client,
cls.services
)
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

10
test/integration/component/test_recurring_snapshots.py
View File

@ -126,11 +126,13 @@ class TestRecurringSnapshots(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -402,4 +404,4 @@ class TestRecurringSnapshots(cloudstackTestCase):
self.services["recurring_snapshot"]["maxsnaps"], self.services["recurring_snapshot"]["maxsnaps"],
"Check maximum number of recurring snapshots retained" "Check maximum number of recurring snapshots retained"
) )
return return

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

@ -137,14 +137,13 @@ class TestRedundantRouterNetworkCleanups(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRedundantRouterNetworkCleanups, cls).getClsTestClient()
TestRedundantRouterNetworkCleanups, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -138,14 +138,13 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestEnableVPNOverRvR, cls).getClsTestClient()
TestEnableVPNOverRvR, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -137,14 +137,13 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRvRUpgradeDowngrade, cls).getClsTestClient()
TestRvRUpgradeDowngrade, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

2
test/integration/component/test_regions.py
View File

@ -41,7 +41,7 @@ class TestRegions(cloudstackTestCase):
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestRegions, cls).getClsTestClient().getApiClient() cls.api_client = super(TestRegions, cls).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.cleanup = [] cls.cleanup = []
return return

2
test/integration/component/test_regions_accounts.py
View File

@ -57,7 +57,7 @@ class TestRegionsAccounts(cloudstackTestCase):
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestRegionsAccounts, cls).getClsTestClient().getApiClient() cls.api_client = super(TestRegionsAccounts, cls).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.cleanup = [] cls.cleanup = []
return return

18
test/integration/component/test_reset_ssh_keypair.py
View File

@ -114,14 +114,13 @@ class TestResetSSHKeypair(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestResetSSHKeypair, cls).getClsTestClient()
TestResetSSHKeypair, cls.api_client = cls.testClient.getApiClient()
cls).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services) domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
# Set Zones and disk offerings # Set Zones and disk offerings
@ -955,14 +954,13 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestResetSSHKeyUserRights, cls).getClsTestClient()
TestResetSSHKeyUserRights, cls.api_client = cls.testClient.getApiClient()
cls).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
# Set Zones and disk offerings # Set Zones and disk offerings

27
test/integration/component/test_resource_limits.py
View File

@ -127,11 +127,13 @@ class TestResourceLimitsAccount(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -897,10 +899,11 @@ class TestResourceLimitsDomain(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -1354,14 +1357,12 @@ class TestMaxAccountNetworks(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestMaxAccountNetworks, cls).getClsTestClient()
TestMaxAccountNetworks, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = cls.zone.networktype cls.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

32
test/integration/component/test_routers.py
View File

@ -98,11 +98,13 @@ class TestRouterServices(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -641,11 +643,13 @@ class TestRouterStopCreatePF(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -853,11 +857,13 @@ class TestRouterStopCreateLB(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -1065,11 +1071,13 @@ class TestRouterStopCreateFW(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,

53
test/integration/component/test_security_groups.py
View File

@ -117,12 +117,13 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestDefaultSecurityGroup, cls).getClsTestClient()
cls.api_client = super(TestDefaultSecurityGroup, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -390,12 +391,13 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestAuthorizeIngressRule, cls).getClsTestClient()
cls.api_client = super(TestAuthorizeIngressRule, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -526,12 +528,13 @@ class TestRevokeIngressRule(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestRevokeIngressRule, cls).getClsTestClient()
cls.api_client = super(TestRevokeIngressRule, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -684,12 +687,13 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestDhcpOnlyRouter, cls).getClsTestClient()
cls.api_client = super(TestDhcpOnlyRouter, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -821,12 +825,13 @@ class TestdeployVMWithUserData(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestdeployVMWithUserData, cls).getClsTestClient()
cls.api_client = super(TestdeployVMWithUserData, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -985,8 +990,8 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
self.services = Services().services self.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services) self.domain = get_domain(self.apiclient)
self.zone = get_zone(self.apiclient, self.services) self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = self.zone.networktype self.services['mode'] = self.zone.networktype
template = get_template( template = get_template(
@ -1232,8 +1237,8 @@ class TestIngressRule(cloudstackTestCase):
self.services = Services().services self.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services) self.domain = get_domain(self.apiclient)
self.zone = get_zone(self.apiclient, self.services) self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = self.zone.networktype self.services['mode'] = self.zone.networktype
template = get_template( template = get_template(

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

@ -154,16 +154,13 @@ class TestSharedNetworks(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestSharedNetworks, cls).getClsTestClient()
TestSharedNetworks, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

8
test/integration/component/test_snapshot_gc.py
View File

@ -122,11 +122,13 @@ class TestAccountSnapshotClean(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

8
test/integration/component/test_snapshot_limits.py
View File

@ -123,11 +123,13 @@ class TestSnapshotLimit(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls._cleanup = [] cls._cleanup = []

24
test/integration/component/test_snapshots.py
View File

@ -158,11 +158,13 @@ class TestSnapshots(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -910,11 +912,13 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.template = get_template( cls.template = get_template(
@ -1108,11 +1112,13 @@ class TestSnapshotEvents(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

20
test/integration/component/test_snapshots_improvement.py
View File

@ -126,11 +126,13 @@ class TestSnapshotOnRootVolume(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestSnapshotOnRootVolume, cls.testClient = super(TestSnapshotOnRootVolume, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) # Get Zone, Domain and templates
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.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -299,13 +301,13 @@ class TestCreateSnapshot(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestCreateSnapshot, cls).getClsTestClient()
TestCreateSnapshot, cls.api_client = cls.testClient.getApiClient()
cls).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,

88
test/integration/component/test_stopped_vm.py
View File

@ -108,14 +108,13 @@ class TestDeployVM(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployVM, cls).getClsTestClient()
TestDeployVM, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -962,14 +961,13 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployHaEnabledVM, cls).getClsTestClient()
TestDeployHaEnabledVM, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1194,14 +1192,13 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestRouterStateAfterDeploy, cls).getClsTestClient()
TestRouterStateAfterDeploy, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1409,14 +1406,13 @@ class TestDeployVMBasicZone(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployVMBasicZone, cls).getClsTestClient()
TestDeployVMBasicZone, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1477,14 +1473,13 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployVMFromTemplate, cls).getClsTestClient()
TestDeployVMFromTemplate, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
# Create service, disk offerings etc # Create service, disk offerings etc
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
@ -1639,14 +1634,13 @@ class TestVMAccountLimit(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMAccountLimit, cls).getClsTestClient()
TestVMAccountLimit, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1755,14 +1749,13 @@ class TestUploadAttachVolume(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestUploadAttachVolume, cls).getClsTestClient()
TestUploadAttachVolume, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
@ -1865,14 +1858,13 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployOnSpecificHost, cls).getClsTestClient()
TestDeployOnSpecificHost, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

9
test/integration/component/test_storage_motion.py
View File

@ -89,12 +89,13 @@ class TestStorageMotion(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestStorageMotion, cls).getClsTestClient().getApiClient() cls.testClient = super(TestStorageMotion, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services) domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(

15
test/integration/component/test_tags.py
View File

@ -174,16 +174,13 @@ class TestResourceTags(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestResourceTags, cls).getClsTestClient()
TestResourceTags, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
# Create domains, account etc. cls.services = Services().services
cls.domain = get_domain(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.account = Account.create( cls.account = Account.create(
cls.api_client, cls.api_client,

20
test/integration/component/test_templates.py
View File

@ -118,12 +118,13 @@ class TestCreateTemplate(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestCreateTemplate, cls).getClsTestClient()
cls.api_client = super(TestCreateTemplate, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -277,12 +278,13 @@ class TestTemplates(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.services = Services().services cls.testClient = super(TestTemplates, cls).getClsTestClient()
cls.api_client = super(TestTemplates, cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
# Get Zone, templates etc cls.services = Services().services
cls.domain = get_domain(cls.api_client, cls.services) # Get Zone, Domain and templates
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['mode'] = cls.zone.networktype
#populate second zone id for iso copy #populate second zone id for iso copy
cmd = listZones.listZonesCmd() cmd = listZones.listZonesCmd()

6
test/integration/component/test_update_vm.py
View File

@ -61,8 +61,8 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient() self.apiclient = self.testClient.getApiClient()
# Get Zone, Domain and Default Built-in template # Get Zone, Domain and Default Built-in template
self.domain = get_domain(self.apiclient, self.testdata) self.domain = get_domain(self.apiclient)
self.zone = get_zone(self.apiclient, self.testdata) self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.testdata["mode"] = self.zone.networktype self.testdata["mode"] = self.zone.networktype
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"]) self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
@ -156,4 +156,4 @@ class TestUpdateVirtualMachine(cloudstackTestCase):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self.cleanup)
except Exception as e: except Exception as e:
self.debug("Warning! Exception in tearDown: %s" % e) self.debug("Warning! Exception in tearDown: %s" % e)

72
test/integration/component/test_usage.py
View File

@ -112,11 +112,13 @@ class TestVmUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -296,11 +298,13 @@ class TestPublicIPUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -448,11 +452,13 @@ class TestVolumeUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -622,11 +628,13 @@ class TestTemplateUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
template = get_template( template = get_template(
@ -787,11 +795,13 @@ class TestISOUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.services["iso"]["zoneid"] = cls.zone.id cls.services["iso"]["zoneid"] = cls.zone.id
@ -924,11 +934,13 @@ class TestLBRuleUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -1086,11 +1098,13 @@ class TestSnapshotUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
@ -1253,11 +1267,13 @@ class TestNatRuleUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,
@ -1415,11 +1431,13 @@ class TestVpnUsage(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,

12
test/integration/component/test_vm_passwdenabled.py
View File

@ -92,15 +92,13 @@ class TestVMPasswordEnabled(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMPasswordEnabled, cls).getClsTestClient()
TestVMPasswordEnabled, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
domain = get_domain(cls.api_client, cls.services) domain = get_domain(cls.api_client)
zone = get_zone(cls.api_client, cls.services) zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = zone.networktype cls.services['mode'] = zone.networktype
template = get_template( template = get_template(
cls.api_client, cls.api_client,

55
test/integration/component/test_vmware_drs.py
View File

@ -111,25 +111,16 @@ class TestVMPlacement(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMPlacement, cls).getClsTestClient()
TestVMPlacement, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services
)
cls.pod = get_pod( cls.pod = get_pod(
cls.api_client, cls.api_client,
zoneid=cls.zone.id, zoneid=cls.zone.id)
services=cls.services
)
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -280,20 +271,13 @@ class TestAntiAffinityRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAntiAffinityRules, cls).getClsTestClient()
TestAntiAffinityRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services
)
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -515,20 +499,13 @@ class TestAffinityRules(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestAffinityRules, cls).getClsTestClient()
TestAffinityRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain( cls.domain = get_domain(cls.api_client)
cls.api_client, cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services
)
cls.zone = get_zone(
cls.api_client,
cls.services
)
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

52
test/integration/component/test_volumes.py
View File

@ -88,13 +88,14 @@ class TestAttachVolume(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestAttachVolume, cls).getClsTestClient().getApiClient() cls.testClient = super(TestAttachVolume, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -378,13 +379,14 @@ class TestAttachDetachVolume(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestAttachDetachVolume, cls).getClsTestClient().getApiClient() cls.testClient = super(TestAttachDetachVolume, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -641,13 +643,14 @@ class TestAttachVolumeISO(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestAttachVolumeISO, cls).getClsTestClient().getApiClient() cls.testClient = super(TestAttachVolumeISO, cls).getClsTestClient()
cls.services = Services().services cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
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['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -852,11 +855,13 @@ class TestVolumes(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): 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 cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,
@ -1133,15 +1138,12 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestDeployVmWithCustomDisk, cls).getClsTestClient()
TestDeployVmWithCustomDisk, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services['mode'] = cls.zone.networktype
cls.disk_offering = DiskOffering.create( cls.disk_offering = DiskOffering.create(
cls.api_client, cls.api_client,

15
test/integration/component/test_vpc.py
View File

@ -20,7 +20,7 @@
#Import Local Modules #Import Local Modules
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import * from marvin.cloudstackTestCase import *
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.cloudstackAPI import * from marvin.cloudstackAPI import *
from marvin.lib.utils import * from marvin.lib.utils import *
from marvin.lib.base import * from marvin.lib.base import *
@ -175,14 +175,13 @@ class TestVPC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPC, cls).getClsTestClient()
TestVPC, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2192,7 +2191,7 @@ class TestVPC(cloudstackTestCase):
domain=user.domain, domain=user.domain,
type=0) type=0)
with self.assertRaises(cloudstackAPIException): with self.assertRaises(CloudstackAPIException):
vpc = VPC.create( vpc = VPC.create(
da_apiclient, da_apiclient,
self.services["vpc"], self.services["vpc"],

48
test/integration/component/test_vpc_network.py
View File

@ -239,17 +239,17 @@ class TestVPCNetwork(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCNetwork, cls).getClsTestClient()
TestVPCNetwork, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Added an attribute to track if Netscaler addition was successful. # Added an attribute to track if Netscaler addition was successful.
# Value is checked in tests and if not configured, Netscaler tests will be skipped # Value is checked in tests and if not configured, Netscaler tests will be skipped
cls.ns_configured = False cls.ns_configured = False
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1003,17 +1003,17 @@ class TestVPCNetworkRanges(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCNetworkRanges, cls).getClsTestClient()
TestVPCNetworkRanges, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Added an attribute to track if Netscaler addition was successful. # Added an attribute to track if Netscaler addition was successful.
# Value is checked in tests and if not configured, Netscaler tests will be skipped # Value is checked in tests and if not configured, Netscaler tests will be skipped
cls.ns_configured = False cls.ns_configured = False
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1541,14 +1541,14 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCNetworkUpgrade, cls).getClsTestClient()
TestVPCNetworkUpgrade, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2123,14 +2123,14 @@ class TestVPCNetworkGc(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCNetworkGc, cls).getClsTestClient()
TestVPCNetworkGc, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -181,14 +181,13 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
# We want to fail quicker if it's failure # We want to fail quicker if it's failure
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
cls.api_client = super( cls.testClient = super(TestVPCNetworkLBRules, cls).getClsTestClient()
TestVPCNetworkLBRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -182,14 +182,13 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
# We want to fail quicker if it's failure # We want to fail quicker if it's failure
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
cls.api_client = super( cls.testClient = super(TestVPCNetworkPFRules, cls).getClsTestClient()
TestVPCNetworkPFRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -182,14 +182,13 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
# We want to fail quicker if it's failure # We want to fail quicker if it's failure
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
cls.api_client = super( cls.testClient = super(TestVPCNetworkPFRules, cls).getClsTestClient()
TestVPCNetworkPFRules, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -137,14 +137,13 @@ class TestVPCOffering(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVPCOffering, cls).getClsTestClient()
TestVPCOffering, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

22
test/integration/component/test_vpc_routers.py
View File

@ -169,14 +169,13 @@ class TestVPCRoutersBasic(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.apiclient = super( cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
TestVPCRoutersBasic, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.apiclient, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.apiclient, cls.apiclient,
cls.zone.id, cls.zone.id,
@ -594,15 +593,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.apiclient = super(
TestVPCRouterOneNetwork,
cls
).getClsTestClient().getApiClient()
cls._cleanup = [] cls._cleanup = []
cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.apiclient, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.apiclient, cls.apiclient,
cls.zone.id, cls.zone.id,

55
test/integration/component/test_vpc_vm_life_cycle.py
View File

@ -211,14 +211,13 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMLifeCycleVPC, cls).getClsTestClient()
TestVMLifeCycleVPC, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -894,14 +893,13 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMLifeCycleSharedNwVPC, cls).getClsTestClient()
TestVMLifeCycleSharedNwVPC, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -1698,14 +1696,13 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMLifeCycleBothIsolated, cls).getClsTestClient()
TestVMLifeCycleBothIsolated, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2033,14 +2030,13 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMLifeCycleStoppedVPCVR, cls).getClsTestClient()
TestVMLifeCycleStoppedVPCVR, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
@ -2736,14 +2732,13 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
def setUpClass(cls): def setUpClass(cls):
try: try:
cls.api_client = super( cls.testClient = super(TestVMLifeCycleDiffHosts, cls).getClsTestClient()
TestVMLifeCycleDiffHosts, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

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

@ -166,14 +166,13 @@ class TestVMDeployVPC(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.testClient = super(TestVMDeployVPC, cls).getClsTestClient()
TestVMDeployVPC, cls.api_client = cls.testClient.getApiClient()
cls
).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,

13
test/integration/component/test_vpn_users.py
View File

@ -19,7 +19,7 @@
""" """
# Import Local Modules # Import Local Modules
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from marvin.cloudstackException import cloudstackAPIException from marvin.cloudstackException import CloudstackAPIException
from marvin.cloudstackTestCase import cloudstackTestCase from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import ( from marvin.lib.base import (
Account, Account,
@ -94,12 +94,13 @@ class Services:
class TestVPNUsers(cloudstackTestCase): class TestVPNUsers(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super(TestVPNUsers, cls.testClient = super(TestVPNUsers, cls).getClsTestClient()
cls).getClsTestClient().getApiClient() cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services cls.services = Services().services
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client)
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.services["mode"] = cls.zone.networktype
@ -155,7 +156,7 @@ class TestVPNUsers(cloudstackTestCase):
services=self.services["virtual_machine"] services=self.services["virtual_machine"]
) )
return return
except cloudstackAPIException as e: except CloudstackAPIException as e:
self.tearDown() self.tearDown()
raise e raise e