apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6316: Fixed component and smoke test failures for wrong references

Browse Source
This commit is contained in:
SrikanteswaraRao Talluri 2014-04-08 16:08:27 +05:30
parent 08b87c0409
commit 818d4a6d9d
8 changed files with 124 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
cls.services['mode'] = cls.zone.networktype
cls.pod = get_pod(
cls.api_client,
zoneid=cls.zone.id
zone_id=cls.zone.id
)
template = get_template(

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

@ -116,7 +116,7 @@ class TestHighAvailability(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.pod = get_pod(
cls.api_client,
zoneid=cls.zone.id
zone_id=cls.zone.id
)
cls.template = get_template(
cls.api_client,

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

@ -720,7 +720,7 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user2.name,
DomainName=self.user2.domain,
acctType=0)
type=0)
aff_1 = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -756,7 +756,7 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user2.name,
DomainName=self.user2.domain,
acctType=0)
type=0)
aff_1 = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -797,7 +797,7 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
user1apiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp = self.create_aff_grp(api_client=user1apiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1316,7 +1316,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user2.name,
DomainName=self.user2.domain,
acctType=0)
type=0)
self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1349,7 +1349,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user2.name,
DomainName=self.user2.domain,
acctType=0)
type=0)
self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1573,7 +1573,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1612,7 +1612,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1662,7 +1662,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp1 = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1698,7 +1698,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])
@ -1730,7 +1730,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=self.user1.name,
DomainName=self.user1.domain,
acctType=0)
type=0)
aff_grp = self.create_aff_grp(api_client=userapiclient,
aff_grp=self.services["host_anti_affinity"])

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

@ -120,7 +120,7 @@ class TestVMPlacement(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.pod = get_pod(
cls.api_client,
zoneid=cls.zone.id)
zone_id=cls.zone.id)
cls.template = get_template(
cls.api_client,
cls.zone.id,

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

@ -1936,7 +1936,7 @@ class TestVPC(cloudstackTestCase):
userapiclient = self.testClient.getUserApiClient(
UserName=user.name,
DomainName=user.domain,
acctType=0)
type=0)
vpc = VPC.create(
@ -2016,8 +2016,8 @@ class TestVPC(cloudstackTestCase):
#0 - User, 1 - Root Admin, 2 - Domain Admin
userapiclient = self.testClient.getUserApiClient(
account=user.name,
domain=self.services["domain"]["name"],
UserName=user.name,
DomainName=self.services["domain"]["name"],
type=2)
vpc = VPC.create(
@ -2091,8 +2091,8 @@ class TestVPC(cloudstackTestCase):
user.name)
userapiclient = self.testClient.getUserApiClient(
account=user.name,
domain=user.domain,
UserName=user.name,
DomainName=user.domain,
type=0)
vpc = VPC.create(
@ -2170,8 +2170,8 @@ class TestVPC(cloudstackTestCase):
self.debug("Created account: %s" % domain_admin.name)
self.cleanup.append(domain_admin)
da_apiclient = self.testClient.getUserApiClient(
account=domain_admin.name,
domain=domain_admin.domain,
UserName=domain_admin.name,
DomainName=domain_admin.domain,
type=2)
user = Account.create(
@ -2187,8 +2187,8 @@ class TestVPC(cloudstackTestCase):
#0 - User, 1 - Root Admin, 2 - Domain Admin
userapiclient = self.testClient.getUserApiClient(
account=user.name,
domain=user.domain,
UserName=user.name,
DomainName=user.domain,
type=0)
with self.assertRaises(CloudstackAPIException):
@ -2221,8 +2221,8 @@ class TestVPC(cloudstackTestCase):
self.debug("Created account: %s" % domain_admin.name)
self.cleanup.append(domain_admin)
da_apiclient = self.testClient.getUserApiClient(
account=domain_admin.name,
domain=self.services["domain"]["name"],
UserName=domain_admin.name,
DomaimName=self.services["domain"]["name"],
type=2)
user = Account.create(
@ -2238,8 +2238,8 @@ class TestVPC(cloudstackTestCase):
#0 - User, 1 - Root Admin, 2 - Domain Admin
userapiclient = self.testClient.getUserApiClient(
account=user.name,
domain=user.domain,
UserName=user.name,
DomainName=user.domain,
type=0)
vpc = VPC.create(

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

@ -177,7 +177,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.apiclient,
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
@ -185,16 +185,16 @@ class TestVPCRoutersBasic(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.apiclient,
cls.api_client,
cls.services["service_offering"]
)
cls.vpc_off = VpcOffering.create(
cls.apiclient,
cls.api_client,
cls.services["vpc_offering"]
)
cls.vpc_off.update(cls.apiclient, state='Enabled')
cls.vpc_off.update(cls.api_client, state='Enabled')
cls.account = Account.create(
cls.apiclient,
cls.api_client,
cls.services["account"],
admin=True,
domainid=cls.domain.id
@ -202,13 +202,13 @@ class TestVPCRoutersBasic(cloudstackTestCase):
cls._cleanup = [cls.account]
cls._cleanup.append(cls.vpc_off)
#cls.debug("Enabling the VPC offering created")
cls.vpc_off.update(cls.apiclient, state='Enabled')
cls.vpc_off.update(cls.api_client, state='Enabled')
#cls.debug("creating a VPC network in the account: %s" %
# cls.account.name)
cls.services["vpc"]["cidr"] = '10.1.1.1/16'
cls.vpc = VPC.create(
cls.apiclient,
cls.api_client,
cls.services["vpc"],
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
@ -223,13 +223,13 @@ class TestVPCRoutersBasic(cloudstackTestCase):
def tearDownClass(cls):
try:
#Cleanup resources used
cleanup_resources(cls.apiclient, cls._cleanup)
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.api_client = self.testClient.getApiClient()
return
@ -241,7 +241,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.debug("Check if the VPC offering is created successfully?")
vpc_offs = VpcOffering.list(
self.apiclient,
self.api_client,
id=vpc_offering.id
)
self.assertEqual(
@ -264,7 +264,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.debug("Check if the VPC network is created successfully?")
vpc_networks = VPC.list(
self.apiclient,
self.api_client,
id=network.id
)
self.assertEqual(
@ -290,7 +290,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
""" Migrate the router """
self.debug("Checking if the host is available for migration?")
hosts = Host.list(self.apiclient, zoneid=self.zone.id, type='Routing')
hosts = Host.list(self.api_client, zoneid=self.zone.id, type='Routing')
self.assertEqual(
isinstance(hosts, list),
@ -318,7 +318,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
cmd.isAsync = "false"
cmd.hostid = host.id
cmd.virtualmachineid = router.id
self.apiclient.migrateSystemVm(cmd)
self.api_client.migrateSystemVm(cmd)
except Exception as e:
self.fail("Failed to migrate instance, %s" % e)
@ -328,7 +328,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -357,7 +357,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
# Stop the VPC Router
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -373,11 +373,11 @@ class TestVPCRoutersBasic(cloudstackTestCase):
#Stop the router
cmd = stopRouter.stopRouterCmd()
cmd.id = router.id
self.apiclient.stopRouter(cmd)
self.api_client.stopRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -398,11 +398,11 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.debug("Starting the router with ID: %s" % router.id)
cmd = startRouter.startRouterCmd()
cmd.id = router.id
self.apiclient.startRouter(cmd)
self.api_client.startRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -432,7 +432,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.validate_vpc_offering(self.vpc_off)
self.validate_vpc_network(self.vpc)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -448,11 +448,11 @@ class TestVPCRoutersBasic(cloudstackTestCase):
#Reboot the router
cmd = rebootRouter.rebootRouterCmd()
cmd.id = router.id
self.apiclient.rebootRouter(cmd)
self.api_client.rebootRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -477,7 +477,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.validate_vpc_network(self.vpc)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -504,7 +504,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.validate_vpc_network(self.vpc)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -520,15 +520,15 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.debug("Stopping the router with ID: %s" % router.id)
cmd = stopRouter.stopRouterCmd()
cmd.id = router.id
self.apiclient.stopRouter(cmd)
self.api_client.stopRouter(cmd)
service_offering = ServiceOffering.create(
self.apiclient,
self.api_client,
self.services["service_offering_new"]
)
self.debug("Changing service offering for the Router %s" % router.id)
try:
router = Router.change_service_offering(self.apiclient,
router = Router.change_service_offering(self.api_client,
router.id,
service_offering.id
)
@ -537,7 +537,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.debug("Router %s" % router)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -561,7 +561,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
self.validate_vpc_offering(self.vpc_off)
self.validate_vpc_network(self.vpc)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -572,12 +572,12 @@ class TestVPCRoutersBasic(cloudstackTestCase):
"List Routers should return a valid list"
)
Router.destroy( self.apiclient,
Router.destroy( self.api_client,
id=routers[0].id
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -594,7 +594,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls._cleanup = []
cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
cls.testClient = super(TestVPCRouterOneNetwork, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
@ -602,7 +602,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.template = get_template(
cls.apiclient,
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
@ -610,19 +610,19 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.apiclient,
cls.api_client,
cls.services["service_offering"]
)
cls._cleanup.append(cls.service_offering)
cls.vpc_off = VpcOffering.create(
cls.apiclient,
cls.api_client,
cls.services["vpc_offering"]
)
cls.vpc_off.update(cls.apiclient, state='Enabled')
cls.vpc_off.update(cls.api_client, state='Enabled')
cls._cleanup.append(cls.vpc_off)
cls.account = Account.create(
cls.apiclient,
cls.api_client,
cls.services["account"],
admin=True,
domainid=cls.domain.id
@ -631,7 +631,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.services["vpc"]["cidr"] = '10.1.1.1/16'
cls.vpc = VPC.create(
cls.apiclient,
cls.api_client,
cls.services["vpc"],
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
@ -640,7 +640,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
private_gateway = PrivateGateway.create(
cls.apiclient,
cls.api_client,
gateway='10.1.3.1',
ipaddress='10.1.3.100',
netmask='255.255.255.0',
@ -648,34 +648,34 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vpcid=cls.vpc.id
)
cls.gateways = PrivateGateway.list(
cls.apiclient,
cls.api_client,
id=private_gateway.id,
listall=True
)
static_route = StaticRoute.create(
cls.apiclient,
cls.api_client,
cidr='11.1.1.1/24',
gatewayid=private_gateway.id
)
cls.static_routes = StaticRoute.list(
cls.apiclient,
cls.api_client,
id=static_route.id,
listall=True
)
cls.nw_off = NetworkOffering.create(
cls.apiclient,
cls.api_client,
cls.services["network_offering"],
conservemode=False
)
# Enable Network offering
cls.nw_off.update(cls.apiclient, state='Enabled')
cls.nw_off.update(cls.api_client, state='Enabled')
cls._cleanup.append(cls.nw_off)
# Creating network using the network offering created
cls.network_1 = Network.create(
cls.apiclient,
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
domainid=cls.account.domainid,
@ -687,7 +687,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
# Spawn an instance in that network
vm_1 = VirtualMachine.create(
cls.apiclient,
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.domainid,
@ -695,7 +695,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
networkids=[str(cls.network_1.id)]
)
vm_2 = VirtualMachine.create(
cls.apiclient,
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.domainid,
@ -705,7 +705,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
# Spawn an instance in that network
vm_3 = VirtualMachine.create(
cls.apiclient,
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
domainid=cls.account.domainid,
@ -714,14 +714,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
vms = VirtualMachine.list(
cls.apiclient,
cls.api_client,
account=cls.account.name,
domainid=cls.account.domainid,
listall=True
)
public_ip_1 = PublicIPAddress.create(
cls.apiclient,
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.domainid,
@ -730,7 +730,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
nat_rule = NATRule.create(
cls.apiclient,
cls.api_client,
vm_1,
cls.services["natrule"],
ipaddressid=public_ip_1.ipaddress.id,
@ -740,14 +740,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
nwacl_nat = NetworkACL.create(
cls.apiclient,
cls.api_client,
networkid=cls.network_1.id,
services=cls.services["natrule"],
traffictype='Ingress'
)
public_ip_2 = PublicIPAddress.create(
cls.apiclient,
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.domainid,
@ -756,7 +756,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
try:
StaticNATRule.enable(
cls.apiclient,
cls.api_client,
ipaddressid=public_ip_2.ipaddress.id,
virtualmachineid=vm_2.id,
networkid=cls.network_1.id
@ -766,7 +766,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
public_ip_2.ipaddress.ipaddress, e))
public_ips = PublicIPAddress.list(
cls.apiclient,
cls.api_client,
networkid=cls.network_1.id,
listall=True,
isstaticnat=True,
@ -774,7 +774,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
domainid=cls.account.domainid
)
public_ip_3 = PublicIPAddress.create(
cls.apiclient,
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
domainid=cls.account.domainid,
@ -783,7 +783,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
lb_rule = LoadBalancerRule.create(
cls.apiclient,
cls.api_client,
cls.services["lbrule"],
ipaddressid=public_ip_3.ipaddress.id,
accountid=cls.account.name,
@ -792,17 +792,17 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
domainid=cls.account.domainid
)
lb_rule.assign(cls.apiclient, [vm_3])
lb_rule.assign(cls.api_client, [vm_3])
nwacl_lb = NetworkACL.create(
cls.apiclient,
cls.api_client,
networkid=cls.network_1.id,
services=cls.services["lbrule"],
traffictype='Ingress'
)
nwacl_internet_1 = NetworkACL.create(
cls.apiclient,
cls.api_client,
networkid=cls.network_1.id,
services=cls.services["http_rule"],
traffictype='Egress'
@ -812,20 +812,20 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
def tearDownClass(cls):
try:
#Cleanup resources used
cleanup_resources(cls.apiclient, cls._cleanup)
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.api_client = self.testClient.getApiClient()
self.cleanup = []
return
def tearDown(self):
try:
#Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
cleanup_resources(self.api_client, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@ -836,7 +836,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
self.debug("Check if the VPC offering is created successfully?")
vpc_offs = VpcOffering.list(
self.apiclient,
self.api_client,
id=vpc_offering.id
)
self.assertEqual(
@ -859,7 +859,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
self.debug("Check if the VPC network is created successfully?")
vpc_networks = VPC.list(
self.apiclient,
self.api_client,
id=network.id
)
self.assertEqual(
@ -885,13 +885,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
""" Validate network rules
"""
vms = VirtualMachine.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
)
public_ips = PublicIPAddress.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -925,7 +925,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
""" Migrate the router """
self.debug("Checking if the host is available for migration?")
hosts = Host.list(self.apiclient, zoneid=self.zone.id, type='Routing')
hosts = Host.list(self.api_client, zoneid=self.zone.id, type='Routing')
self.assertEqual(
isinstance(hosts, list),
@ -953,7 +953,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cmd.isAsync = "false"
cmd.hostid = host.id
cmd.virtualmachineid = router.id
self.apiclient.migrateSystemVm(cmd)
self.api_client.migrateSystemVm(cmd)
except Exception as e:
self.fail("Failed to migrate instance, %s" % e)
@ -963,7 +963,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -1010,7 +1010,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
# Stop the VPC Router
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1026,11 +1026,11 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
#Stop the router
cmd = stopRouter.stopRouterCmd()
cmd.id = router.id
self.apiclient.stopRouter(cmd)
self.api_client.stopRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -1051,11 +1051,11 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
self.debug("Starting the router with ID: %s" % router.id)
cmd = startRouter.startRouterCmd()
cmd.id = router.id
self.apiclient.startRouter(cmd)
self.api_client.startRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -1104,7 +1104,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1120,11 +1120,11 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
#Reboot the router
cmd = rebootRouter.rebootRouterCmd()
cmd.id = router.id
self.apiclient.rebootRouter(cmd)
self.api_client.rebootRouter(cmd)
#List routers to check state of router
router_response = list_routers(
self.apiclient,
self.api_client,
id=router.id
)
self.assertEqual(
@ -1170,7 +1170,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
"List static route should return a valid response"
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1214,7 +1214,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1230,15 +1230,15 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
self.debug("Stopping the router with ID: %s" % router.id)
cmd = stopRouter.stopRouterCmd()
cmd.id = router.id
self.apiclient.stopRouter(cmd)
self.api_client.stopRouter(cmd)
service_offering = ServiceOffering.create(
self.apiclient,
self.api_client,
self.services["service_offering_new"]
)
self.debug("Changing service offering for the Router %s" % router.id)
try:
router = Router.change_service_offering(self.apiclient,
router = Router.change_service_offering(self.api_client,
router.id,
service_offering.id
)
@ -1247,7 +1247,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
self.debug("Router %s" % router)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1292,7 +1292,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True
@ -1303,12 +1303,12 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
"List Routers should return a valid list"
)
Router.destroy( self.apiclient,
Router.destroy( self.api_client,
id=routers[0].id
)
routers = Router.list(
self.apiclient,
self.api_client,
account=self.account.name,
domainid=self.account.domainid,
listall=True

2
test/integration/smoke/test_volumes.py
View File

@ -309,7 +309,7 @@ class TestVolumes(cloudstackTestCase):
cleanup_resources(self.apiClient, self.cleanup)
return
@attr(tags = ["advanced", "advancedns", "smoke", "basic"])
@attr(tags = ["advanced", "advancedns", "smoke", "basic","test"])
def test_02_attach_volume(self):
"""Attach a created Volume to a Running VM
"""

11
tools/marvin/marvin/config/test_data.py
View File

@ -433,5 +433,14 @@ test_data = {
"privateport": 22,
"publicport": 22,
"protocol": 'TCP',
"forvirtualnetwork": "true"
"forvirtualnetwork": "true",
"customdisksize": 1,
"diskname": "Test Volume",
"portableIpRange": {
"gateway" : "10.223.252.195",
"netmask" : "255.255.255.192",
"startip" : "10.223.252.196",
"endip" : "10.223.252.197",
"vlan" : "1001"
}
}