You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/22 07:37:45 UTC
[36/50] [abbrv] Fix all occurrences of account.account
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 13726c5..7658beb 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -237,7 +237,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@@ -253,7 +253,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@@ -272,7 +272,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@@ -283,7 +283,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@@ -292,7 +292,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@@ -300,7 +300,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_2.id)]
)
@@ -309,7 +309,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -320,7 +320,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@@ -328,7 +328,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -516,7 +516,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -966,7 +966,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@@ -982,7 +982,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@@ -1006,7 +1006,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.shared_nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@@ -1017,7 +1017,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@@ -1027,7 +1027,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@@ -1036,7 +1036,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id),
str(cls.network_2.id)]
@@ -1045,7 +1045,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -1056,7 +1056,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2, cls.vm_3])
@@ -1064,7 +1064,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -1242,7 +1242,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1368,7 +1368,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1773,7 +1773,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@@ -1789,7 +1789,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@@ -1809,7 +1809,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@@ -1965,7 +1965,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id),
str(self.network_2.id)]
@@ -1990,7 +1990,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@@ -2033,7 +2033,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(self.network_1.id)]
)
@@ -2111,7 +2111,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@@ -2127,7 +2127,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@@ -2146,7 +2146,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@@ -2157,7 +2157,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@@ -2166,7 +2166,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_1.id)]
)
@@ -2174,7 +2174,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
networkids=[str(cls.network_2.id)]
)
@@ -2183,7 +2183,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -2194,7 +2194,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@@ -2202,7 +2202,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -2405,7 +2405,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -2868,7 +2868,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.nw_off = NetworkOffering.create(
@@ -2884,7 +2884,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off.id,
zoneid=cls.zone.id,
gateway='10.1.1.1',
@@ -2903,7 +2903,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.nw_off_no_lb.id,
zoneid=cls.zone.id,
gateway='10.1.2.1',
@@ -2914,7 +2914,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@@ -2923,7 +2923,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_1.id,
networkids=[str(cls.network_1.id)]
)
@@ -2931,7 +2931,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
cls.services["virtual_machine"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
serviceofferingid=cls.service_offering_2.id,
networkids=[str(cls.network_2.id)]
)
@@ -2940,7 +2940,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -2951,7 +2951,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@@ -2959,7 +2959,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network_1.id,
vpcid=cls.vpc.id
)
@@ -3057,7 +3057,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network_1.id,
listall=True
)
@@ -3072,7 +3072,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network_2.id,
listall=True
)
@@ -3204,7 +3204,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index 506ae34..c49ef45 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -320,7 +320,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -339,7 +339,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -363,7 +363,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -378,7 +378,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@@ -392,7 +392,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -404,7 +404,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -415,7 +415,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@@ -425,7 +425,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -468,7 +468,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
state="Running",
listall=True
)
@@ -535,7 +535,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -554,7 +554,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -578,7 +578,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -593,7 +593,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@@ -607,7 +607,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -619,7 +619,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -630,7 +630,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@@ -640,7 +640,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -720,7 +720,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
state="Running",
listall=True
)
@@ -788,7 +788,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -807,7 +807,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -831,7 +831,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -846,7 +846,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@@ -860,7 +860,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -872,7 +872,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -883,7 +883,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@@ -893,7 +893,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -965,7 +965,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.4.1',
@@ -978,7 +978,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_4.id)]
)
@@ -989,7 +989,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
state="Running",
listall=True
)
@@ -1057,7 +1057,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -1076,7 +1076,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1100,7 +1100,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -1115,7 +1115,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.3.1',
@@ -1129,7 +1129,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -1141,7 +1141,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -1152,7 +1152,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_3.id)]
)
@@ -1162,7 +1162,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1236,7 +1236,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.4.1',
@@ -1249,7 +1249,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_4.id)]
)
@@ -1283,7 +1283,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
state="Running",
listall=True
)
@@ -1337,7 +1337,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -1360,7 +1360,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.0.1',
@@ -1399,7 +1399,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -1417,7 +1417,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -1436,7 +1436,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -1453,7 +1453,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)]
)
@@ -1512,7 +1512,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -1531,7 +1531,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1555,7 +1555,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -1569,7 +1569,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -1578,7 +1578,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -1590,7 +1590,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -1599,7 +1599,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -1609,7 +1609,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1650,7 +1650,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_1.id,
listall=True
)
@@ -1685,7 +1685,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_2.id,
listall=True
)
@@ -1704,7 +1704,7 @@ class TestVMDeployVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1777,7 +1777,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.validate_vpc_network(vpc)
@@ -1796,7 +1796,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1820,7 +1820,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -1834,7 +1834,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -1843,7 +1843,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_1.id)]
)
@@ -1855,7 +1855,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -1864,7 +1864,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
networkids=[str(network_2.id)]
)
@@ -1874,7 +1874,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1895,7 +1895,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@@ -1927,7 +1927,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_1.id,
vpcid=vpc.id
)
@@ -1956,7 +1956,7 @@ class TestVMDeployVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -1974,7 +1974,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@@ -1993,7 +1993,7 @@ class TestVMDeployVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@@ -2066,7 +2066,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@@ -2098,7 +2098,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@@ -2127,7 +2127,7 @@ class TestVMDeployVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -2145,7 +2145,7 @@ class TestVMDeployVPC(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_2.id,
vpcid=vpc.id
)
@@ -2164,7 +2164,7 @@ class TestVMDeployVPC(cloudstackTestCase):
accountid=self.account.name,
networkid=network_2.id,
vpcid=vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@@ -2339,7 +2339,7 @@ class TestVMDeployVPC(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network_1.id,
listall=True
)
@@ -2447,7 +2447,7 @@ class TestVMDeployVPC(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
networks,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpn_users.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
index 8f08fa0..fe020d0 100644
--- a/test/integration/component/test_vpn_users.py
+++ b/test/integration/component/test_vpn_users.py
@@ -396,7 +396,7 @@ class TestVPNUsers(cloudstackTestCase):
DomainName=self.account.domain)
self.debug("Adding new user to VPN as a global admin: %s" %
- admin.account.name)
+ admin.name)
try:
self.create_VPN_Users(api_client=api_client)
except Exception as e:
@@ -438,7 +438,7 @@ class TestVPNUsers(cloudstackTestCase):
DomainName=self.account.domain)
self.debug("Adding new user to VPN as a domain admin: %s" %
- admin.account.name)
+ admin.name)
try:
self.create_VPN_Users(api_client=api_client)
except Exception as e: