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:47 UTC
[38/50] [abbrv] Fix all occurrences of account.account
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index ab5ab31..12a5863 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -224,7 +224,7 @@ class TestResourceTags(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,
mode=cls.zone.networktype
)
@@ -280,7 +280,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -297,7 +297,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@@ -346,7 +346,7 @@ class TestResourceTags(cloudstackTestCase):
resourceType='LoadBalancer',
key='LB',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
value=40
)
@@ -393,7 +393,7 @@ class TestResourceTags(cloudstackTestCase):
resourceType='LoadBalancer',
key='LB',
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
@@ -423,7 +423,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -440,7 +440,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@@ -484,7 +484,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='portForwardingRule',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='PF',
value=40
)
@@ -529,7 +529,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='portForwardingRule',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='PF',
value=40
)
@@ -560,7 +560,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -577,7 +577,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@@ -626,7 +626,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='FirewallRule',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='FW',
value='40'
)
@@ -671,7 +671,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='FirewallRule',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='FW',
value='40'
)
@@ -704,7 +704,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -721,7 +721,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.cleanup.append(public_ip)
@@ -754,7 +754,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
public_ip.ipaddress.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
except Exception as e:
@@ -792,7 +792,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='VPN',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='protocol',
value='L2TP'
)
@@ -823,7 +823,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='VPN',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='protocol',
value='L2TP'
)
@@ -863,7 +863,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -907,7 +907,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -978,7 +978,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Template',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@@ -1019,7 +1019,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Template',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@@ -1042,7 +1042,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@@ -1070,7 +1070,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@@ -1115,7 +1115,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='OS',
value='CentOS'
)
@@ -1141,7 +1141,7 @@ class TestResourceTags(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.cleanup.append(volume)
@@ -1162,7 +1162,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1205,7 +1205,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region'
)
self.assertEqual(
@@ -1262,7 +1262,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='snapshot',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='type',
value='manual'
)
@@ -1312,7 +1312,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='snapshot',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='type',
value='manual'
)
@@ -1337,7 +1337,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1363,7 +1363,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Network',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1381,7 +1381,7 @@ class TestResourceTags(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True,
key='region',
value='India'
@@ -1409,7 +1409,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='Network',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1479,7 +1479,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1516,7 +1516,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1550,7 +1550,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1596,7 +1596,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1642,7 +1642,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1691,7 +1691,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["project"],
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
# Cleanup created project at end of test
self.cleanup.append(project)
@@ -1758,7 +1758,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='project',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -1799,7 +1799,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=user_account.name,
- domainid=user_account.account.domainid
+ domainid=user_account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@@ -1827,7 +1827,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=user_account.name,
- domainid=user_account.account.domainid,
+ domainid=user_account.domainid,
key='region',
)
@@ -1849,7 +1849,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=other_user_account.name,
- domainid=other_user_account.account.domainid,
+ domainid=other_user_account.domainid,
key='region',
)
@@ -1884,7 +1884,7 @@ class TestResourceTags(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=user_account.name,
- domainid=user_account.account.domainid
+ domainid=user_account.domainid
)
self.debug("ISO created with ID: %s" % iso.id)
@@ -1912,7 +1912,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='ISO',
account=user_account.name,
- domainid=user_account.account.domainid,
+ domainid=user_account.domainid,
key='region',
)
@@ -2009,7 +2009,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2042,7 +2042,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2065,7 +2065,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2103,7 +2103,7 @@ class TestResourceTags(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
diskofferingid=self.disk_offering.id
)
self.cleanup.append(volume)
@@ -2124,7 +2124,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='volume',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
)
self.assertEqual(
@@ -2152,7 +2152,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2185,7 +2185,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2246,7 +2246,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
@@ -2295,7 +2295,7 @@ class TestResourceTags(cloudstackTestCase):
listall=True,
resourceType='userVM',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
key='region',
value='India'
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index 83b913a..7dbe7c4 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -316,7 +316,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -348,7 +348,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -373,7 +373,7 @@ class TestVPC(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,
@@ -397,7 +397,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -432,7 +432,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -475,7 +475,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -500,7 +500,7 @@ class TestVPC(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,
@@ -524,7 +524,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway=gateway,
@@ -575,7 +575,7 @@ class TestVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -613,7 +613,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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_1)
@@ -624,7 +624,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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_2)
@@ -714,7 +714,7 @@ class TestVPC(cloudstackTestCase):
supportedservices='Vpn,Dhcp,Dns,SourceNat,PortForwarding,Lb,UserData,StaticNat,NetworkACL',
listall=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(vpcs, list),
@@ -733,7 +733,7 @@ class TestVPC(cloudstackTestCase):
restartrequired=True,
listall=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
if vpcs is not None:
for vpc in vpcs:
@@ -748,7 +748,7 @@ class TestVPC(cloudstackTestCase):
restartrequired=False,
listall=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(vpcs, list),
@@ -789,7 +789,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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_1)
@@ -869,7 +869,7 @@ class TestVPC(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)
@@ -898,7 +898,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -913,7 +913,7 @@ class TestVPC(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',
@@ -927,7 +927,7 @@ class TestVPC(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)]
)
@@ -937,7 +937,7 @@ class TestVPC(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)]
)
@@ -949,7 +949,7 @@ class TestVPC(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)]
)
@@ -959,7 +959,7 @@ class TestVPC(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)]
)
@@ -970,7 +970,7 @@ class TestVPC(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
)
@@ -1002,7 +1002,7 @@ class TestVPC(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
)
@@ -1031,7 +1031,7 @@ class TestVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -1049,7 +1049,7 @@ class TestVPC(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
)
@@ -1068,7 +1068,7 @@ class TestVPC(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" % (
@@ -1214,7 +1214,7 @@ class TestVPC(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)
@@ -1243,7 +1243,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=self.network_offering_no_lb.id,
zoneid=self.zone.id,
gateway='10.1.1.1',
@@ -1258,7 +1258,7 @@ class TestVPC(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',
@@ -1272,7 +1272,7 @@ class TestVPC(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)]
)
@@ -1282,7 +1282,7 @@ class TestVPC(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)]
)
@@ -1294,7 +1294,7 @@ class TestVPC(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)]
)
@@ -1304,7 +1304,7 @@ class TestVPC(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)]
)
@@ -1315,7 +1315,7 @@ class TestVPC(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
)
@@ -1347,7 +1347,7 @@ class TestVPC(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
)
@@ -1376,7 +1376,7 @@ class TestVPC(cloudstackTestCase):
listall=True,
isstaticnat=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(
isinstance(public_ips, list),
@@ -1394,7 +1394,7 @@ class TestVPC(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
)
@@ -1413,7 +1413,7 @@ class TestVPC(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" % (
@@ -1558,7 +1558,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -1574,7 +1574,7 @@ class TestVPC(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1590,7 +1590,7 @@ class TestVPC(cloudstackTestCase):
src_nat_list = PublicIPAddress.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True,
issourcenat=True,
vpcid=vpc.id
@@ -1614,7 +1614,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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_1)
@@ -1628,7 +1628,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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_2)
@@ -1642,7 +1642,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("%s" % vpc_3)
except Exception as e:
@@ -1677,7 +1677,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
self.network_offering = NetworkOffering.create(
@@ -1701,7 +1701,7 @@ class TestVPC(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,
@@ -1714,7 +1714,7 @@ class TestVPC(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)]
)
@@ -1729,7 +1729,7 @@ class TestVPC(cloudstackTestCase):
self.apiclient,
zoneid=self.zone.id,
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id,
vpcid=vpc.id
)
@@ -1823,7 +1823,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -1852,7 +1852,7 @@ class TestVPC(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,
@@ -1879,7 +1879,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkDomain=netdomain
)
self.validate_vpc_network(vpc)
@@ -1904,7 +1904,7 @@ class TestVPC(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,
@@ -1917,7 +1917,7 @@ class TestVPC(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)]
)
@@ -2355,7 +2355,7 @@ class TestVPC(cloudstackTestCase):
self.services["vpc"],
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.services["vpc_no_name"]["cidr"] = "10.1.1.1/16"
@@ -2367,7 +2367,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
# Create VPC without zoneid param
@@ -2377,7 +2377,7 @@ class TestVPC(cloudstackTestCase):
self.services["vpc"],
vpcofferingid=self.vpc_off.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
vpc_wo_cidr = {"name": "TestVPC_WO_CIDR",
@@ -2392,7 +2392,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.vpc_off.id,
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
@attr(tags=["advanced", "intervlan"])
@@ -2414,7 +2414,7 @@ class TestVPC(cloudstackTestCase):
vpcofferingid=self.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)
@@ -2439,7 +2439,7 @@ class TestVPC(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,
@@ -2671,7 +2671,7 @@ class TestVPCHostMaintenance(cloudstackTestCase):
vpcofferingid=self.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, state='Disabled')
return
@@ -2697,7 +2697,7 @@ class TestVPCHostMaintenance(cloudstackTestCase):
vpcofferingid=self.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, state='Disabled')
interval = list_configurations(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_vpc_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_host_maintenance.py b/test/integration/component/test_vpc_host_maintenance.py
index 4c14f99..1cce276 100644
--- a/test/integration/component/test_vpc_host_maintenance.py
+++ b/test/integration/component/test_vpc_host_maintenance.py
@@ -242,7 +242,7 @@ class TestVMLifeCycleHostmaintenance(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(
@@ -258,7 +258,7 @@ class TestVMLifeCycleHostmaintenance(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',
@@ -277,7 +277,7 @@ class TestVMLifeCycleHostmaintenance(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',
@@ -288,7 +288,7 @@ class TestVMLifeCycleHostmaintenance(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)]
)
@@ -297,7 +297,7 @@ class TestVMLifeCycleHostmaintenance(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)]
)
@@ -305,14 +305,14 @@ class TestVMLifeCycleHostmaintenance(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)]
)
routers = Router.list(
cls.api_client,
account=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
listall=True
)
if isinstance(routers, list):
@@ -376,7 +376,7 @@ class TestVMLifeCycleHostmaintenance(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
)
@@ -391,7 +391,7 @@ class TestVMLifeCycleHostmaintenance(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
)
@@ -441,7 +441,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -458,7 +458,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -618,7 +618,7 @@ class TestVPCNetworkRules(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(
@@ -634,7 +634,7 @@ class TestVPCNetworkRules(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',
@@ -653,7 +653,7 @@ class TestVPCNetworkRules(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',
@@ -664,7 +664,7 @@ class TestVPCNetworkRules(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)]
)
@@ -673,7 +673,7 @@ class TestVPCNetworkRules(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_1.id)]
)
@@ -681,7 +681,7 @@ class TestVPCNetworkRules(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_2.id)]
)
@@ -689,7 +689,7 @@ class TestVPCNetworkRules(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)]
)
@@ -739,7 +739,7 @@ class TestVPCNetworkRules(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
)
@@ -754,7 +754,7 @@ class TestVPCNetworkRules(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
)
@@ -800,7 +800,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network_1.id,
vpcid=self.vpc.id
)
@@ -825,7 +825,7 @@ class TestVPCNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network_2.id,
vpcid=self.vpc.id
)