You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/15 04:52:14 UTC
[14/50] [abbrv] git commit: updated refs/heads/object_store to f41c800
CLOUDSTACK-2363: Fix to conform to library changes
Several fixes for account.account references are fixed to the correct
account. reference
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/862b9550
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/862b9550
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/862b9550
Branch: refs/heads/object_store
Commit: 862b955059b2f9f8913ffc6637bab1f839047e44
Parents: 19bed63
Author: SrikanteswaraRao Talluri <sr...@citrix.com>
Authored: Wed Jun 12 21:31:40 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jun 12 21:31:40 2013 +0530
----------------------------------------------------------------------
.../component/test_advancedsg_networks.py | 14 +--
.../component/test_custom_hostname.py | 20 ++---
.../component/test_netscaler_configs.py | 20 ++---
test/integration/component/test_netscaler_lb.py | 80 ++++++++---------
.../component/test_netscaler_lb_algo.py | 56 ++++++------
.../component/test_netscaler_lb_sticky.py | 6 +-
.../component/test_shared_networks.py | 94 ++++++++++----------
7 files changed, 145 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_advancedsg_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py
index 229cfd6..e1694f1 100644
--- a/test/integration/component/test_advancedsg_networks.py
+++ b/test/integration/component/test_advancedsg_networks.py
@@ -274,7 +274,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -308,7 +308,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.user_account.account.id,
+ id=self.user_account.id,
listall=True
)
self.assertEqual(
@@ -452,7 +452,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -471,7 +471,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Domain admin account created: %s" % self.admin_account.account.id)
+ self.debug("Domain admin account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -599,7 +599,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
liistall=True
)
self.assertEqual(
@@ -693,7 +693,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
self.shared_network_sg = Network.create(
self.api_client,
self.services["shared_network_sg"],
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.shared_network_offering_sg.id,
zoneid=self.zone.id
)
@@ -726,7 +726,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.shared_network_sg.id,
serviceofferingid=self.service_offering.id
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_custom_hostname.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py
index a85f619..c9db215 100644
--- a/test/integration/component/test_custom_hostname.py
+++ b/test/integration/component/test_custom_hostname.py
@@ -169,13 +169,13 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
# 2. Give the user provided user name. Internal name should be
# i-<userid>-<vmid>-display name
- self.debug("Deploying VM in account: %s" % self.account.account.name)
+ self.debug("Deploying VM in account: %s" % self.account.name)
# Spawn an instance in that network
virtual_machine = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account.account.name,
- domainid=self.account.account.domainid,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
)
self.debug(
@@ -208,11 +208,11 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
# Fetch account ID and VMID from database to check internal name
self.debug("select id from account where uuid = '%s';" \
- % self.account.account.id)
+ % self.account.id)
qresultset = self.dbclient.execute(
"select id from account where uuid = '%s';" \
- % self.account.account.id
+ % self.account.id
)
self.assertEqual(
isinstance(qresultset, list),
@@ -273,12 +273,12 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
# Removing display name from config
del self.services["virtual_machine"]["displayname"]
- self.debug("Deploying VM in account: %s" % self.account.account.name)
+ self.debug("Deploying VM in account: %s" % self.account.name)
virtual_machine = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- accountid=self.account.account.name,
- domainid=self.account.account.domainid,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
)
self.debug(
@@ -307,11 +307,11 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
)
# Fetch account ID and VMID from database to check internal name
self.debug("select id from account where uuid = '%s';" \
- % self.account.account.id)
+ % self.account.id)
qresultset = self.dbclient.execute(
"select id from account where uuid = '%s';" \
- % self.account.account.id
+ % self.account.id
)
self.assertEqual(
isinstance(qresultset, list),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_netscaler_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py
index 1c67bc4..3c18c00 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -2135,7 +2135,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -2145,7 +2145,7 @@ class TestGuestNetworkShutDown(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.id)]
)
@@ -2153,7 +2153,7 @@ class TestGuestNetworkShutDown(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.id)]
)
@@ -2161,7 +2161,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls.lb_rule = LoadBalancerRule.create(
@@ -2658,7 +2658,7 @@ class TestServiceProvider(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
)
@@ -2691,7 +2691,7 @@ class TestServiceProvider(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
)
@@ -2721,7 +2721,7 @@ class TestServiceProvider(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
)
@@ -2734,7 +2734,7 @@ class TestServiceProvider(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)]
)
@@ -2766,7 +2766,7 @@ class TestServiceProvider(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug(
@@ -2813,7 +2813,7 @@ class TestServiceProvider(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)]
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 1988897..b4e6c30 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -245,7 +245,7 @@ class TestLbSourceNat(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
)
@@ -258,7 +258,7 @@ class TestLbSourceNat(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)]
)
@@ -294,7 +294,7 @@ class TestLbSourceNat(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)]
)
@@ -325,7 +325,7 @@ class TestLbSourceNat(cloudstackTestCase):
self.apiclient,
associatednetworkid=self.network.id,
account=self.account.name,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
listall=True,
issourcenat=True,
)
@@ -454,7 +454,7 @@ class TestLbOnIpWithPf(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
)
@@ -467,7 +467,7 @@ class TestLbOnIpWithPf(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)]
)
@@ -503,7 +503,7 @@ class TestLbOnIpWithPf(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)]
)
@@ -535,7 +535,7 @@ class TestLbOnIpWithPf(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
@@ -665,7 +665,7 @@ class TestPfOnIpWithLb(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
)
@@ -678,7 +678,7 @@ class TestPfOnIpWithLb(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)]
)
@@ -714,7 +714,7 @@ class TestPfOnIpWithLb(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)]
)
@@ -747,7 +747,7 @@ class TestPfOnIpWithLb(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -877,7 +877,7 @@ class TestLbOnNonSourceNat(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
)
@@ -890,7 +890,7 @@ class TestLbOnNonSourceNat(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)]
)
@@ -926,7 +926,7 @@ class TestLbOnNonSourceNat(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)]
)
@@ -959,7 +959,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -1097,7 +1097,7 @@ class TestAddMultipleVmsLb(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
)
@@ -1110,7 +1110,7 @@ class TestAddMultipleVmsLb(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)]
)
@@ -1146,7 +1146,7 @@ class TestAddMultipleVmsLb(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)]
)
@@ -1179,7 +1179,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -1371,7 +1371,7 @@ class TestMultipleLbRules(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
)
@@ -1384,7 +1384,7 @@ class TestMultipleLbRules(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)]
)
@@ -1420,7 +1420,7 @@ class TestMultipleLbRules(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)]
)
@@ -1455,7 +1455,7 @@ class TestMultipleLbRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -1501,7 +1501,7 @@ class TestMultipleLbRules(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -1688,7 +1688,7 @@ class TestMultipleLbRulesSameIp(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
)
@@ -1701,7 +1701,7 @@ class TestMultipleLbRulesSameIp(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)]
)
@@ -1737,7 +1737,7 @@ class TestMultipleLbRulesSameIp(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)]
)
@@ -1772,7 +1772,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -1953,7 +1953,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1963,7 +1963,7 @@ class TestLoadBalancingRule(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.id)]
)
@@ -1971,7 +1971,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls.lb_rule = LoadBalancerRule.create(
@@ -2176,7 +2176,7 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -2186,7 +2186,7 @@ class TestDeleteCreateLBRule(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.id)]
)
@@ -2194,7 +2194,7 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -2315,7 +2315,7 @@ class TestVmWithLb(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -2325,7 +2325,7 @@ class TestVmWithLb(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.id)]
)
@@ -2333,7 +2333,7 @@ class TestVmWithLb(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.id)]
)
@@ -2341,7 +2341,7 @@ class TestVmWithLb(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls.lb_rule_1 = LoadBalancerRule.create(
@@ -2355,7 +2355,7 @@ class TestVmWithLb(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls.lb_rule_2 = LoadBalancerRule.create(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_netscaler_lb_algo.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py
index 4a2d1fe..99a537d 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -212,7 +212,7 @@ class TestLbWithRoundRobin(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
)
@@ -225,7 +225,7 @@ class TestLbWithRoundRobin(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)]
)
@@ -259,7 +259,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -425,7 +425,7 @@ class TestLbWithLeastConn(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
)
@@ -438,7 +438,7 @@ class TestLbWithLeastConn(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)]
)
@@ -472,14 +472,14 @@ class TestLbWithLeastConn(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
ip_with_lb_rule = PublicIPAddress.create(
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -644,7 +644,7 @@ class TestLbWithSourceIp(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
)
@@ -657,7 +657,7 @@ class TestLbWithSourceIp(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)]
)
@@ -691,7 +691,7 @@ class TestLbWithSourceIp(cloudstackTestCase):
self.apiclient,
accountid=self.account.name,
zoneid=self.zone.id,
- domainid=self.account.account.domainid,
+ domainid=self.account.domainid,
networkid=self.network.id
)
self.debug("Associated %s with network %s" % (
@@ -791,7 +791,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -808,7 +808,7 @@ class TestLbAlgoRrLc(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.id)]
)
@@ -816,7 +816,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -1003,7 +1003,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1020,7 +1020,7 @@ class TestLbAlgoLcRr(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.id)]
)
@@ -1028,7 +1028,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -1212,7 +1212,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1229,7 +1229,7 @@ class TestLbAlgoRrSb(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.id)]
)
@@ -1238,7 +1238,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -1425,7 +1425,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1442,7 +1442,7 @@ class TestLbAlgoSbRr(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.id)]
)
@@ -1451,7 +1451,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -1639,7 +1639,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1656,7 +1656,7 @@ class TestLbAlgoSbLc(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.id)]
)
@@ -1665,7 +1665,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
@@ -1853,7 +1853,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -1870,7 +1870,7 @@ class TestLbAlgoLcSb(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.id)]
)
@@ -1878,7 +1878,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_netscaler_lb_sticky.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py
index 7f391d0..5c95fb8 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -156,7 +156,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
cls.api_client,
cls.services["network"],
accountid=cls.account.name,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkofferingid=cls.network_offering.id,
zoneid=cls.zone.id
)
@@ -166,7 +166,7 @@ class TestLbStickyPolicy(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.id)]
)
@@ -174,7 +174,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
cls.api_client,
accountid=cls.account.name,
zoneid=cls.zone.id,
- domainid=cls.account.account.domainid,
+ domainid=cls.account.domainid,
networkid=cls.network.id
)
cls._cleanup = [
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/862b9550/test/integration/component/test_shared_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py
index 5f96419..cb2b55f 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -270,7 +270,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.account.account.id,
+ id=self.account.id,
listall=True
)
self.assertEqual(
@@ -406,7 +406,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.account.account.id,
+ id=self.account.id,
listall=True
)
self.assertEqual(
@@ -495,7 +495,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.account.account.id,
+ id=self.account.id,
listall=True
)
self.assertEqual(
@@ -597,7 +597,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -631,7 +631,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.user_account.account.id,
+ id=self.user_account.id,
listall=True
)
self.assertEqual(
@@ -807,7 +807,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.user_account.name,
- domainid=self.user_account.account.domainid,
+ domainid=self.user_account.domainid,
serviceofferingid=self.service_offering.id,
networkids=self.network.id
)
@@ -880,7 +880,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -914,7 +914,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.user_account.account.id,
+ id=self.user_account.id,
listall=True
)
self.assertEqual(
@@ -1027,7 +1027,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["network"],
accountid=self.user_account.name,
- domainid=self.user_account.account.domainid,
+ domainid=self.user_account.domainid,
networkofferingid=self.shared_network_offering.id,
zoneid=self.zone.id
)
@@ -1061,7 +1061,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -1073,7 +1073,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.user_account.name,
- domainid=self.user_account.account.domainid,
+ domainid=self.user_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -1146,7 +1146,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -1165,7 +1165,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin type account created: %s" % self.admin_account.account.id)
+ self.debug("Admin type account created: %s" % self.admin_account.id)
#create domain
self.dom_domain = Domain.create(
@@ -1206,7 +1206,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.domain_admin_account.account.id,
+ id=self.domain_admin_account.id,
listall=True
)
self.assertEqual(
@@ -1225,7 +1225,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The domain admin account created is not enabled."
)
- self.debug("Domain admin account created: %s" % self.domain_admin_account.account.id)
+ self.debug("Domain admin account created: %s" % self.domain_admin_account.id)
#Create an user account
self.domain_user_account = Account.create(
@@ -1240,7 +1240,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.domain_user_account.account.id,
+ id=self.domain_user_account.id,
listall=True
)
self.assertEqual(
@@ -1259,7 +1259,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The domain user account created is not enabled."
)
- self.debug("Domain user account created: %s" % self.domain_user_account.account.id)
+ self.debug("Domain user account created: %s" % self.domain_user_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -1388,7 +1388,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -1400,7 +1400,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.domain_user_account.name,
- domainid=self.domain_user_account.account.domainid,
+ domainid=self.domain_user_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -1428,7 +1428,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.domain_admin_account.name,
- domainid=self.domain_admin_account.account.domainid,
+ domainid=self.domain_admin_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -1500,7 +1500,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -1519,7 +1519,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin account created: %s" % self.admin_account.account.id)
+ self.debug("Admin account created: %s" % self.admin_account.id)
self.services["project"]["name"] = "proj-SADJKS"
self.services["project"]["displaytext"] = "proj-SADJKS"
@@ -1528,7 +1528,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["project"],
account=self.admin_account.name,
- domainid=self.admin_account.account.domainid
+ domainid=self.admin_account.domainid
)
self.cleanup_projects.append(self.project1)
@@ -1558,7 +1558,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["project"],
account=self.admin_account.name,
- domainid=self.admin_account.account.domainid
+ domainid=self.admin_account.domainid
)
self.cleanup_projects.append(self.project2)
@@ -1674,7 +1674,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["network"],
projectid=self.project1.id,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.shared_network_offering.id,
zoneid=self.zone.id
)
@@ -1709,7 +1709,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network.id,
projectid=self.project2.id,
serviceofferingid=self.service_offering.id
@@ -1722,7 +1722,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network.id,
projectid=self.project1.id,
serviceofferingid=self.service_offering.id
@@ -1784,7 +1784,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -1803,7 +1803,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Domain admin account created: %s" % self.admin_account.account.id)
+ self.debug("Domain admin account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -1944,7 +1944,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -1963,7 +1963,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin account created: %s" % self.admin_account.account.id)
+ self.debug("Admin account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -2129,7 +2129,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -2148,7 +2148,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin account created: %s" % self.admin_account.account.id)
+ self.debug("Admin account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -2309,7 +2309,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network.id,
serviceofferingid=self.service_offering.id
)
@@ -2337,7 +2337,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.network1.id,
serviceofferingid=self.service_offering.id
)
@@ -2392,7 +2392,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
liistall=True
)
self.assertEqual(
@@ -2540,7 +2540,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.shared_network = Network.create(
self.api_client,
self.services["network"],
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.shared_network_offering.id,
zoneid=self.zone.id
)
@@ -2573,7 +2573,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["isolated_network"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.isolated_network_offering.id,
zoneid=self.zone.id
)
@@ -2601,7 +2601,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.shared_network.id,
serviceofferingid=self.service_offering.id
)
@@ -2628,7 +2628,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["virtual_machine"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkids=self.isolated_network.id,
serviceofferingid=self.service_offering.id
)
@@ -2657,7 +2657,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
accountid=self.admin_account.name,
zoneid=self.zone.id,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkid=self.isolated_network.id
)
@@ -2730,7 +2730,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -2749,7 +2749,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin type account created: %s" % self.admin_account.account.id)
+ self.debug("Admin type account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -2845,7 +2845,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["network"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.shared_network_offering.id,
zoneid=self.zone.id
)
@@ -2875,7 +2875,7 @@ class TestSharedNetworks(cloudstackTestCase):
#verify that the account got created with state enabled
list_accounts_response = Account.list(
self.api_client,
- id=self.admin_account.account.id,
+ id=self.admin_account.id,
listall=True
)
self.assertEqual(
@@ -2894,7 +2894,7 @@ class TestSharedNetworks(cloudstackTestCase):
"The admin account created is not enabled."
)
- self.debug("Admin type account created: %s" % self.admin_account.account.id)
+ self.debug("Admin type account created: %s" % self.admin_account.id)
#Verify that there should be at least one physical network present in zone.
list_physical_networks_response = PhysicalNetwork.list(
@@ -2990,7 +2990,7 @@ class TestSharedNetworks(cloudstackTestCase):
self.api_client,
self.services["network"],
accountid=self.admin_account.name,
- domainid=self.admin_account.account.domainid,
+ domainid=self.admin_account.domainid,
networkofferingid=self.shared_network_offering.id,
zoneid=self.zone.id
)