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:48 UTC
[39/50] [abbrv] git commit: updated refs/heads/pvlan to ce299da
Fix all occurrences of account.account
Fixes the dereference of account objects with account.account. This is
to conform to recent library changes in Marvin
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54ac779b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54ac779b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54ac779b
Branch: refs/heads/pvlan
Commit: 54ac779b8f3a520a391902ae4163b922e2078061
Parents: 145a116
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon May 20 22:59:52 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon May 20 22:59:52 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 2 +-
.../component/test_high_availability.py | 28 ++--
.../component/test_host_high_availability.py | 14 +-
test/integration/component/test_ldap.py | 0
test/integration/component/test_projects.py | 34 ++--
.../component/test_redundant_router.py | 120 +++++++--------
test/integration/component/test_stopped_vm.py | 70 ++++-----
test/integration/component/test_tags.py | 110 ++++++-------
test/integration/component/test_vpc.py | 124 +++++++--------
.../component/test_vpc_host_maintenance.py | 44 +++---
test/integration/component/test_vpc_network.py | 106 ++++++-------
.../component/test_vpc_network_lbrules.py | 18 +--
.../component/test_vpc_network_pfrules.py | 18 +--
.../component/test_vpc_network_staticnatrule.py | 18 +--
.../integration/component/test_vpc_offerings.py | 52 +++----
test/integration/component/test_vpc_routers.py | 56 +++----
.../component/test_vpc_vm_life_cycle.py | 98 ++++++------
.../component/test_vpc_vms_deployment.py | 154 +++++++++----------
test/integration/component/test_vpn_users.py | 4 +-
19 files changed, 535 insertions(+), 535 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index b2038a9..a25e636 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -561,7 +561,7 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
self.apiclient,
self.services["account"]
)
- self.debug("Created account: %s" % account_1.account.name)
+ self.debug("Created account: %s" % account_1.name)
self.cleanup.append(account_1)
account_2 = Account.create(
self.apiclient,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_high_availability.py b/test/integration/component/test_high_availability.py
index 12753c1..cd2dfce 100644
--- a/test/integration/component/test_high_availability.py
+++ b/test/integration/component/test_high_availability.py
@@ -220,7 +220,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
@@ -248,7 +248,7 @@ class TestHighAvailability(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -264,7 +264,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
@@ -372,7 +372,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
@@ -424,7 +424,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -464,7 +464,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -513,7 +513,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
@@ -615,7 +615,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
@@ -643,7 +643,7 @@ class TestHighAvailability(cloudstackTestCase):
networks = Network.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -659,7 +659,7 @@ class TestHighAvailability(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
@@ -833,7 +833,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
@@ -952,7 +952,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -990,7 +990,7 @@ class TestHighAvailability(cloudstackTestCase):
vms = VirtualMachine.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1037,7 +1037,7 @@ class TestHighAvailability(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
)
vms = VirtualMachine.list(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_host_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_host_high_availability.py b/test/integration/component/test_host_high_availability.py
index 7a3f62a..8c66d17 100644
--- a/test/integration/component/test_host_high_availability.py
+++ b/test/integration/component/test_host_high_availability.py
@@ -190,7 +190,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
vms = VirtualMachine.list(
@@ -235,7 +235,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@@ -289,7 +289,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_without_ha.id
)
@@ -358,7 +358,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@@ -464,7 +464,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@@ -573,7 +573,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_with_ha.id
)
@@ -705,7 +705,7 @@ class TestHostHighAvailability(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering_without_ha.id
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_ldap.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ldap.py b/test/integration/component/test_ldap.py
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index f013e99..e1975cf 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -782,8 +782,8 @@ class TestProjectOwners(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
- account=self.admin.account.name,
- domainid=self.admin.account.domainid
+ account=self.admin.name,
+ domainid=self.admin.domainid
)
self.cleanup.append(project)
# Cleanup created project at end of test
@@ -815,20 +815,20 @@ class TestProjectOwners(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.new_admin.account.name,
+ self.new_admin.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.new_admin.account.name,
+ self.new_admin.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.new_admin.account.name,
+ account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -853,14 +853,14 @@ class TestProjectOwners(cloudstackTestCase):
# Update the project with new admin
project.update(
self.apiclient,
- account=self.new_admin.account.name
+ account=self.new_admin.name
)
# listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.new_admin.account.name,
+ account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -886,7 +886,7 @@ class TestProjectOwners(cloudstackTestCase):
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.admin.account.name,
+ account=self.admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -923,8 +923,8 @@ class TestProjectOwners(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
- account=self.admin.account.name,
- domainid=self.admin.account.domainid
+ account=self.admin.name,
+ domainid=self.admin.domainid
)
# Cleanup created project at end of test
self.cleanup.append(project)
@@ -965,20 +965,20 @@ class TestProjectOwners(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.new_admin.account.name,
+ self.new_admin.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.new_admin.account.name,
+ self.new_admin.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.new_admin.account.name,
+ account=self.new_admin.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -1000,18 +1000,18 @@ class TestProjectOwners(cloudstackTestCase):
"Newly added user is not added as a regular user"
)
self.debug("Updating project with new Admin: %s" %
- self.new_admin.account.name)
+ self.new_admin.name)
# Update the project with new admin
project.update(
self.apiclient,
- account=self.new_admin.account.name
+ account=self.new_admin.name
)
# listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.new_admin.account.name,
+ account=self.new_admin.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1106,7 +1106,7 @@ class TestProjectOwners(cloudstackTestCase):
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.new_admin.account.name,
+ account=self.new_admin.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router.py b/test/integration/component/test_redundant_router.py
index 8885241..a87818a 100644
--- a/test/integration/component/test_redundant_router.py
+++ b/test/integration/component/test_redundant_router.py
@@ -331,7 +331,7 @@ class TestCreateRvRNetwork(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
)
@@ -375,7 +375,7 @@ class TestCreateRvRNetwork(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)]
)
@@ -538,7 +538,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(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,
guestcidr=' 192.168.2.0/23'
@@ -593,7 +593,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(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)]
)
@@ -760,7 +760,7 @@ class TestRVRInternals(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
)
@@ -804,7 +804,7 @@ class TestRVRInternals(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)]
)
@@ -1019,7 +1019,7 @@ class TestRedundancy(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
)
@@ -1031,7 +1031,7 @@ class TestRedundancy(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.id)]
)
@@ -1572,7 +1572,7 @@ class TestRedundancy(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.id)]
)
@@ -1712,7 +1712,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(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
)
@@ -1756,7 +1756,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(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)]
)
@@ -1801,7 +1801,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -1870,7 +1870,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -1902,7 +1902,7 @@ class TestApplyAndDeleteNetworkRulesOnRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2037,7 +2037,7 @@ class TestEnableVPNOverRvR(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
)
@@ -2081,7 +2081,7 @@ class TestEnableVPNOverRvR(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)]
)
@@ -2126,7 +2126,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2142,7 +2142,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
self.apiclient,
publicipid=public_ip.ipaddress.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
except Exception as e:
self.fail("Failed to create VPN for account: %s - %s" % (
@@ -2154,7 +2154,7 @@ class TestEnableVPNOverRvR(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)
@@ -2163,7 +2163,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
remote_vpns = Vpn.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
publicipid=public_ip.ipaddress.id,
listall=True
)
@@ -2184,7 +2184,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
remote_vpns = Vpn.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
publicipid=public_ip.ipaddress.id,
listall=True
)
@@ -2306,7 +2306,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(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
)
@@ -2350,7 +2350,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(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)]
)
@@ -2412,7 +2412,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2481,7 +2481,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2513,7 +2513,7 @@ class TestNetworkRulesMasterDownDeleteNetworkRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2694,7 +2694,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(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
)
@@ -2738,7 +2738,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(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)]
)
@@ -2790,7 +2790,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2851,7 +2851,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -2872,7 +2872,7 @@ class TestApplyDeleteNetworkRulesRebootRouter(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -3058,7 +3058,7 @@ class TestRestartRvRNetworkWithoutCleanup(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
)
@@ -3102,7 +3102,7 @@ class TestRestartRvRNetworkWithoutCleanup(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)]
)
@@ -3279,7 +3279,7 @@ class TestRestartRvRNetworkWithCleanup(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
)
@@ -3323,7 +3323,7 @@ class TestRestartRvRNetworkWithCleanup(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)]
)
@@ -3500,7 +3500,7 @@ class TestDeleteRvRNetwork(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
)
@@ -3544,7 +3544,7 @@ class TestDeleteRvRNetwork(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)]
)
@@ -3719,7 +3719,7 @@ class TestNetworkGCRvR(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
)
@@ -3763,7 +3763,7 @@ class TestNetworkGCRvR(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)]
)
@@ -3999,7 +3999,7 @@ class TestApplyRulesRestartRvRNetwork(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
)
@@ -4043,7 +4043,7 @@ class TestApplyRulesRestartRvRNetwork(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)]
)
@@ -4095,7 +4095,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -4156,7 +4156,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -4177,7 +4177,7 @@ class TestApplyRulesRestartRvRNetwork(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=network.id
)
self.debug("Associated %s with network %s" % (
@@ -4439,7 +4439,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
self.apiclient,
self.services["network"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkofferingid=network_off_vr.id,
zoneid=self.zone.id
)
@@ -4471,7 +4471,7 @@ class TestUpgradeDowngradeRVR(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)]
)
@@ -4500,7 +4500,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -4528,7 +4528,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -4574,7 +4574,7 @@ class TestUpgradeDowngradeRVR(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
)
@@ -4606,7 +4606,7 @@ class TestUpgradeDowngradeRVR(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)]
)
@@ -4635,7 +4635,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -4676,7 +4676,7 @@ class TestUpgradeDowngradeRVR(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -4808,7 +4808,7 @@ class TestRVRWithDiffEnvs(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
)
@@ -4852,7 +4852,7 @@ class TestRVRWithDiffEnvs(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)]
)
@@ -4972,7 +4972,7 @@ class TestRVRWithDiffEnvs(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
)
@@ -5016,7 +5016,7 @@ class TestRVRWithDiffEnvs(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)]
)
@@ -5208,7 +5208,7 @@ class TestRVRWithDiffEnvs(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
)
@@ -5265,7 +5265,7 @@ class TestRVRWithDiffEnvs(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
@@ -5449,7 +5449,7 @@ class TestRVRWithDiffEnvs(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
)
@@ -5506,7 +5506,7 @@ class TestRVRWithDiffEnvs(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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ac779b/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 10e3d4d..f109691 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -188,7 +188,7 @@ class TestDeployVM(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,
diskofferingid=self.disk_offering.id,
mode=self.zone.networktype
@@ -242,7 +242,7 @@ class TestDeployVM(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,
startvm=True,
diskofferingid=self.disk_offering.id,
@@ -299,7 +299,7 @@ class TestDeployVM(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,
startvm=False,
diskofferingid=self.disk_offering.id,
@@ -332,7 +332,7 @@ class TestDeployVM(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -389,7 +389,7 @@ class TestDeployVM(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,
startvm=False,
diskofferingid=self.disk_offering.id,
@@ -426,7 +426,7 @@ class TestDeployVM(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.debug("Created volume in account: %s" % self.account.name)
@@ -457,7 +457,7 @@ class TestDeployVM(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,
startvm=False,
diskofferingid=self.disk_offering.id,
@@ -494,7 +494,7 @@ class TestDeployVM(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.debug("Created volume in account: %s" % self.account.name)
@@ -570,7 +570,7 @@ class TestDeployVM(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,
startvm=False,
diskofferingid=self.disk_offering.id,
@@ -607,7 +607,7 @@ class TestDeployVM(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.debug("Created volume in account: %s" % self.account.name)
@@ -653,7 +653,7 @@ class TestDeployVM(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,
startvm=False,
diskofferingid=self.disk_offering.id,
@@ -689,7 +689,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Successfully created ISO with ID: %s" % iso.id)
@@ -746,7 +746,7 @@ class TestDeployVM(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,
startvm=False,
)
@@ -782,7 +782,7 @@ class TestDeployVM(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,
diskofferingid=self.disk_offering.id
)
@@ -819,7 +819,7 @@ class TestDeployVM(cloudstackTestCase):
self.apiclient,
type='DATADISK',
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -943,7 +943,7 @@ class TestDeployHaEnabledVM(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,
diskofferingid=self.disk_offering.id,
startvm=False
@@ -990,7 +990,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["iso"],
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
try:
# Dowanload the ISO
@@ -1007,7 +1007,7 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
self.apiclient,
self.services["virtual_machine"],
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
templateid=self.iso.id,
serviceofferingid=self.service_offering.id,
diskofferingid=self.disk_offering.id,
@@ -1057,7 +1057,7 @@ class TestDeployHaEnabledVM(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,
diskofferingid=self.disk_offering.id,
startvm=False
@@ -1175,7 +1175,7 @@ class TestRouterStateAfterDeploy(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,
diskofferingid=self.disk_offering.id,
startvm=False
@@ -1210,7 +1210,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1225,7 +1225,7 @@ class TestRouterStateAfterDeploy(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,
diskofferingid=self.disk_offering.id,
startvm=True
@@ -1260,7 +1260,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertEqual(
@@ -1295,7 +1295,7 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
routers = Router.list(
self.apiclient,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True
)
self.assertNotEqual(
@@ -1397,7 +1397,7 @@ class TestDeployVMBasicZone(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,
startvm=True,
diskofferingid=self.disk_offering.id,
@@ -1455,7 +1455,7 @@ class TestDeployVMBasicZone(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,
startvm=False,
mode=self.zone.networktype
@@ -1570,7 +1570,7 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
self.services["template"],
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
try:
self.template.download(self.apiclient)
@@ -1606,7 +1606,7 @@ class TestDeployVMFromTemplate(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,
templateid=self.template.id,
startvm=False,
@@ -1744,7 +1744,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.apiclient,
0, # Instance
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
max=1
)
self.debug(
@@ -1756,7 +1756,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@@ -1775,7 +1775,7 @@ class TestVMAccountLimit(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@@ -1861,7 +1861,7 @@ class TestUploadAttachVolume(cloudstackTestCase):
self.services["volume"],
zoneid=self.zone.id,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.debug("Uploading the volume: %s" % volume.name)
volume.wait_for_upload(self.apiclient)
@@ -1878,7 +1878,7 @@ class TestUploadAttachVolume(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=False
)
@@ -1999,7 +1999,7 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
self.services["virtual_machine"],
templateid=self.template.id,
accountid=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
hostid=host.id
)
@@ -2013,7 +2013,7 @@ class TestDeployOnSpecificHost(cloudstackTestCase):
id=vm.id,
listall=True,
account=self.account.name,
- domainid=self.account.account.domainid
+ domainid=self.account.domainid
)
self.assertEqual(