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:46 UTC
[37/50] [abbrv] Fix all occurrences of account.account
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index 0adf9d7..dc53585 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -333,7 +333,7 @@ class TestVPCNetwork(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)
@@ -353,7 +353,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -426,7 +426,7 @@ class TestVPCNetwork(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)
@@ -451,7 +451,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -497,7 +497,7 @@ class TestVPCNetwork(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)
@@ -517,7 +517,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -588,7 +588,7 @@ class TestVPCNetwork(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)
@@ -608,7 +608,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -646,7 +646,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -693,7 +693,7 @@ class TestVPCNetwork(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)
@@ -744,7 +744,7 @@ class TestVPCNetwork(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)
@@ -772,7 +772,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -821,7 +821,7 @@ class TestVPCNetwork(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)
@@ -842,7 +842,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.2.1',
@@ -890,7 +890,7 @@ class TestVPCNetwork(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)
@@ -952,7 +952,7 @@ class TestVPCNetwork(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)
@@ -976,7 +976,7 @@ class TestVPCNetwork(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1022,7 +1022,7 @@ class TestVPCNetwork(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)
@@ -1193,7 +1193,7 @@ class TestVPCNetworkRanges(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)
@@ -1215,7 +1215,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.2.1.1',
@@ -1255,7 +1255,7 @@ class TestVPCNetworkRanges(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)
@@ -1277,7 +1277,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.2.1.1',
@@ -1317,7 +1317,7 @@ class TestVPCNetworkRanges(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)
@@ -1342,7 +1342,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1384,7 +1384,7 @@ class TestVPCNetworkRanges(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)
@@ -1406,7 +1406,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1447,7 +1447,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1465,7 +1465,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1505,7 +1505,7 @@ class TestVPCNetworkRanges(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)
@@ -1540,7 +1540,7 @@ class TestVPCNetworkRanges(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=account.name,
- domainid=account.account.domainid,
+ domainid=account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1710,7 +1710,7 @@ class TestVPCNetworkUpgrade(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)
@@ -1751,7 +1751,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=nw_off_no_pf.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1765,7 +1765,7 @@ class TestVPCNetworkUpgrade(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)]
)
@@ -1774,7 +1774,7 @@ class TestVPCNetworkUpgrade(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)]
)
@@ -1785,7 +1785,7 @@ class TestVPCNetworkUpgrade(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
)
@@ -1804,7 +1804,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
accountid=self.account.name,
networkid=network_1.id,
vpcid=vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (
@@ -1816,7 +1816,7 @@ class TestVPCNetworkUpgrade(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
)
@@ -1845,7 +1845,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -1934,7 +1934,7 @@ class TestVPCNetworkUpgrade(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
)
@@ -2059,7 +2059,7 @@ class TestVPCNetworkUpgrade(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)
@@ -2099,7 +2099,7 @@ class TestVPCNetworkUpgrade(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',
@@ -2113,7 +2113,7 @@ class TestVPCNetworkUpgrade(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)]
)
@@ -2182,7 +2182,7 @@ class TestVPCNetworkGc(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(
@@ -2197,7 +2197,7 @@ class TestVPCNetworkGc(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',
@@ -2208,7 +2208,7 @@ class TestVPCNetworkGc(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)]
)
@@ -2216,7 +2216,7 @@ class TestVPCNetworkGc(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)]
)
@@ -2224,7 +2224,7 @@ class TestVPCNetworkGc(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
)
@@ -2235,7 +2235,7 @@ class TestVPCNetworkGc(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])
@@ -2243,7 +2243,7 @@ class TestVPCNetworkGc(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
)
@@ -2289,7 +2289,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
for vm in vms:
@@ -2305,7 +2305,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
for vm in vms:
@@ -2396,7 +2396,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -2515,7 +2515,7 @@ class TestVPCNetworkGc(cloudstackTestCase):
routers = Router.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_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index a24e813..b4a6607 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -244,7 +244,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return
@@ -264,7 +264,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -287,7 +287,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -308,7 +308,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@@ -391,7 +391,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@@ -420,7 +420,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return vpc
@@ -442,7 +442,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
obj_network = Network.create(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,
@@ -460,7 +460,7 @@ class TestVPCNetworkLBRules(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)],
hostid=host_id
@@ -487,7 +487,7 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index aac9568..56792f4 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -243,7 +243,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return
@@ -262,7 +262,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -285,7 +285,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -306,7 +306,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@@ -391,7 +391,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@@ -420,7 +420,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return vpc
@@ -442,7 +442,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
obj_network = Network.create(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,
@@ -460,7 +460,7 @@ class TestVPCNetworkPFRules(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)],
hostid=host_id
@@ -487,7 +487,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index 842d20a..aceca62 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -243,7 +243,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return
@@ -262,7 +262,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
def get_Router_For_VPC(self):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -285,7 +285,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
)
self.assertEqual(isinstance(routers, list),
True,
@@ -306,7 +306,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
routers = list_routers(self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
zoneid=self.zone.id
)
self.assertEqual(isinstance(routers, list),
@@ -391,7 +391,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
public_ip = PublicIPAddress.create(self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=None, #network.id,
vpcid=self.vpc.id
)
@@ -420,7 +420,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
return vpc
@@ -442,7 +442,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
obj_network = Network.create(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,
@@ -460,7 +460,7 @@ class TestVPCNetworkPFRules(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)],
hostid=host_id
@@ -487,7 +487,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=self.vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Adding virtual machines %s and %s to LB rule" % (vmarray))
lb_rule.assign(self.apiclient, vmarray)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 033a905..4b98775 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -315,7 +315,7 @@ class TestVPCOffering(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)
@@ -340,7 +340,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -352,7 +352,7 @@ class TestVPCOffering(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)]
)
@@ -363,7 +363,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -382,7 +382,7 @@ class TestVPCOffering(cloudstackTestCase):
accountid=self.account.name,
networkid=network.id,
vpcid=vpc.id,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Associating public IP for network: %s" % vpc.name)
@@ -390,7 +390,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -438,7 +438,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -467,7 +467,7 @@ class TestVPCOffering(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -485,7 +485,7 @@ class TestVPCOffering(cloudstackTestCase):
# self.apiclient,
# accountid=self.account.name,
# zoneid=self.zone.id,
-# domainid=self.account.account.domainid,
+# domainid=self.account.domainid,
# networkid=network.id,
# vpcid=vpc.id
# )
@@ -502,7 +502,7 @@ class TestVPCOffering(cloudstackTestCase):
# self.apiclient,
# publicipid=public_ip_4.ipaddress.id,
# account=self.account.name,
-# domainid=self.account.account.domainid,
+# domainid=self.account.domainid,
# networkid=network.id,
# vpcid=vpc.id
# )
@@ -516,7 +516,7 @@ class TestVPCOffering(cloudstackTestCase):
# username="root",
# password="password",
# account=self.account.name,
-# domainid=self.account.account.domainid
+# domainid=self.account.domainid
# )
# except Exception as e:
# self.fail("Failed to create VPN user: %s" % e)
@@ -525,7 +525,7 @@ class TestVPCOffering(cloudstackTestCase):
# remote_vpns = Vpn.list(
# self.apiclient,
# account=self.account.name,
-# domainid=self.account.account.domainid,
+# domainid=self.account.domainid,
# publicipid=public_ip_4.ipaddress.id,
# listall=True
# )
@@ -596,7 +596,7 @@ class TestVPCOffering(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)
@@ -612,7 +612,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -626,7 +626,7 @@ class TestVPCOffering(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)]
)
@@ -637,7 +637,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -715,7 +715,7 @@ class TestVPCOffering(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)
@@ -731,7 +731,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -745,7 +745,7 @@ class TestVPCOffering(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)]
)
@@ -756,7 +756,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -836,7 +836,7 @@ class TestVPCOffering(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)
@@ -852,7 +852,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -864,7 +864,7 @@ class TestVPCOffering(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)]
)
@@ -875,7 +875,7 @@ class TestVPCOffering(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -975,7 +975,7 @@ class TestVPCOffering(cloudstackTestCase):
vpcofferingid=vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("VPC network creation failed! (Test succeeded)")
self.debug("Enabling the VPC offering created")
@@ -989,7 +989,7 @@ class TestVPCOffering(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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 55cb513..763a4cb 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -214,7 +214,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
vpcofferingid=cls.vpc_off.id,
zoneid=cls.zone.id,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
cls._cleanup.append(cls.service_offering)
@@ -361,7 +361,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -436,7 +436,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -483,7 +483,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -499,7 +499,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -520,7 +520,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -548,7 +548,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -581,7 +581,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
router = routers[0]
@@ -639,7 +639,7 @@ class TestVPCRouterOneNetwork(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(
@@ -656,7 +656,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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',
@@ -668,7 +668,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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)]
)
@@ -676,7 +676,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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)]
)
@@ -686,7 +686,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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)]
)
@@ -694,14 +694,14 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vms = VirtualMachine.list(
cls.apiclient,
account=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
listall=True
)
public_ip_1 = PublicIPAddress.create(
cls.apiclient,
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
)
@@ -727,7 +727,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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
)
@@ -748,7 +748,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=cls.account.name,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
# cls.assertEqual(
# isinstance(public_ips, list),
@@ -766,7 +766,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
cls.apiclient,
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
)
@@ -779,7 +779,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
accountid=cls.account.name,
networkid=cls.network_1.id,
vpcid=cls.vpc.id,
- domainid=cls.account.account.domainid
+ domainid=cls.account.domainid
)
lb_rule.assign(cls.apiclient, [vm_3])
@@ -961,13 +961,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
public_ips = PublicIPAddress.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
for vm, public_ip in zip(vms, public_ips):
@@ -1086,7 +1086,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1180,7 +1180,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1247,7 +1247,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1263,7 +1263,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1306,7 +1306,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1351,7 +1351,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1384,7 +1384,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
router = routers[0]