cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion to 2054164
Date Tue, 14 May 2013 23:15:34 GMT
account name dereferences as account.name

Fix to tests to conform to library changes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f57a851
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f57a851
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f57a851

Branch: refs/heads/vmware-storage-motion
Commit: 8f57a851be69afd548cabb0c82897f9a3ca1681e
Parents: 894413e
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue May 14 10:34:01 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue May 14 10:34:01 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_asa1000v_fw.py     |    2 +-
 .../component/test_high_availability.py            |   44 ++--
 .../component/test_host_high_availability.py       |   14 +-
 .../component/test_netscaler_configs.py            |   32 ++--
 test/integration/component/test_netscaler_lb.py    |  138 ++++++------
 .../component/test_netscaler_lb_algo.py            |   80 +++---
 .../component/test_netscaler_lb_sticky.py          |   24 +-
 .../integration/component/test_redundant_router.py |  190 +++++++-------
 .../integration/component/test_regions_accounts.py |    2 +-
 test/integration/component/test_shared_networks.py |   56 +++---
 test/integration/component/test_stopped_vm.py      |  158 ++++++------
 test/integration/component/test_tags.py            |  138 ++++++------
 test/integration/component/test_vpc.py             |  162 ++++++------
 .../component/test_vpc_host_maintenance.py         |   44 ++--
 test/integration/component/test_vpc_network.py     |  132 +++++-----
 .../component/test_vpc_network_lbrules.py          |   22 +-
 .../component/test_vpc_network_pfrules.py          |   22 +-
 .../component/test_vpc_network_staticnatrule.py    |   22 +-
 test/integration/component/test_vpc_offerings.py   |   72 +++---
 test/integration/component/test_vpc_routers.py     |   58 +++---
 .../component/test_vpc_vm_life_cycle.py            |  148 ++++++------
 .../component/test_vpc_vms_deployment.py           |  170 +++++++-------
 22 files changed, 865 insertions(+), 865 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_asa1000v_fw.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_asa1000v_fw.py b/test/integration/component/test_asa1000v_fw.py
index 0b66f97..cd29fda 100644
--- a/test/integration/component/test_asa1000v_fw.py
+++ b/test/integration/component/test_asa1000v_fw.py
@@ -131,4 +131,4 @@ class TestASASetup(cloudstackTestCase):
         self.debug("Cisco ASA 1000v appliance with id %s deployed"%(Asa.id))
         AsaList = ASA1000V.list(self.apiclient, physicalnetworkid = self.physicalnetworks[0].id)
         self.assertNotEqual(len(AsaList), 0, "List ASA 1000v API returned an empty response")
-        Asa.delete(self.apiclient)
\ No newline at end of file
+        Asa.delete(self.apiclient)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 af2cda1..12753c1 100644
--- a/test/integration/component/test_high_availability.py
+++ b/test/integration/component/test_high_availability.py
@@ -214,12 +214,12 @@ class TestHighAvailability(cloudstackTestCase):
                                                        hosts[0].name,
                                                        hosts[1].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,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )
@@ -247,7 +247,7 @@ class TestHighAvailability(cloudstackTestCase):
                          )
         networks = Network.list(
                                 self.apiclient,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid,
                                 listall=True
                                 )
@@ -259,10 +259,10 @@ class TestHighAvailability(cloudstackTestCase):
         network = networks[0]
 
         self.debug("Associating public IP for account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
         public_ip = PublicIPAddress.create(
                                     self.apiclient,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     zoneid=self.zone.id,
                                     domainid=self.account.account.domainid,
                                     networkid=network.id
@@ -289,7 +289,7 @@ class TestHighAvailability(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name
+                                    accountid=self.account.name
                                     )
         self.debug("Created LB rule with ID: %s" % lb_rule.id)
 
@@ -366,12 +366,12 @@ class TestHighAvailability(cloudstackTestCase):
             self.fail("SSH Access failed for %s: %s" % \
                       (virtual_machine.ipaddress, e)
                       )
-        self.debug("Deploying VM in account: %s" % self.account.account.name)
+        self.debug("Deploying VM in account: %s" % self.account.name)
         # Spawn an instance on other host
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )
@@ -423,7 +423,7 @@ class TestHighAvailability(cloudstackTestCase):
         while True:
             vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -463,7 +463,7 @@ class TestHighAvailability(cloudstackTestCase):
         while True:
             vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -512,7 +512,7 @@ class TestHighAvailability(cloudstackTestCase):
         virtual_machine_3 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )
@@ -609,12 +609,12 @@ class TestHighAvailability(cloudstackTestCase):
                                                        hosts[0].name,
                                                        hosts[1].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,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )
@@ -642,7 +642,7 @@ class TestHighAvailability(cloudstackTestCase):
                          )
         networks = Network.list(
                                 self.apiclient,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid,
                                 listall=True
                                 )
@@ -654,10 +654,10 @@ class TestHighAvailability(cloudstackTestCase):
         network = networks[0]
 
         self.debug("Associating public IP for account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
         public_ip = PublicIPAddress.create(
                                     self.apiclient,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     zoneid=self.zone.id,
                                     domainid=self.account.account.domainid,
                                     networkid=network.id
@@ -684,7 +684,7 @@ class TestHighAvailability(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name
+                                    accountid=self.account.name
                                     )
         self.debug("Created LB rule with ID: %s" % lb_rule.id)
 
@@ -827,12 +827,12 @@ class TestHighAvailability(cloudstackTestCase):
             self.fail("SSH Access failed for %s: %s" % \
                       (virtual_machine.ipaddress, e)
                       )
-        self.debug("Deploying VM in account: %s" % self.account.account.name)
+        self.debug("Deploying VM in account: %s" % self.account.name)
         # Spawn an instance on other host
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )
@@ -951,7 +951,7 @@ class TestHighAvailability(cloudstackTestCase):
         while True:
             vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -989,7 +989,7 @@ class TestHighAvailability(cloudstackTestCase):
         while True:
             vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -1036,7 +1036,7 @@ class TestHighAvailability(cloudstackTestCase):
         virtual_machine_3 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id
                                   )

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 03ea067..7a3f62a 100644
--- a/test/integration/component/test_host_high_availability.py
+++ b/test/integration/component/test_host_high_availability.py
@@ -189,7 +189,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_with_ha.id
                                   )
@@ -234,7 +234,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_with_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_with_ha.id
                                   )
@@ -288,7 +288,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_without_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_without_ha.id
                                   )
@@ -357,7 +357,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_with_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_with_ha.id
                                   )
@@ -463,7 +463,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_with_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_with_ha.id
                                   )
@@ -572,7 +572,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_with_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_with_ha.id
                                   )
@@ -704,7 +704,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         virtual_machine_without_ha = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering_without_ha.id
                                   )

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 2cfe463..1c67bc4 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -2134,7 +2134,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -2144,7 +2144,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
         cls.vm_1 = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
@@ -2152,14 +2152,14 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
         cls.vm_2 = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -2168,7 +2168,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["lbrule"],
                                     ipaddressid=cls.public_ip.ipaddress.id,
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     networkid=cls.network.id
                                 )
         cls.lb_rule.assign(cls.api_client, [cls.vm_1, cls.vm_2])
@@ -2237,7 +2237,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
 
         self.debug(
             "Stopping all the VM instances for the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
 
         self.vm_1.stop(self.apiclient)
         self.vm_2.stop(self.apiclient)
@@ -2311,7 +2311,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
 
         self.debug(
             "starting one VM instances for the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         self.vm_1.start(self.apiclient)
 
         vms = VirtualMachine.list(
@@ -2657,7 +2657,7 @@ class TestServiceProvider(cloudstackTestCase):
             Network.create(
                             self.apiclient,
                             self.services["network"],
-                            accountid=self.account.account.name,
+                            accountid=self.account.name,
                             domainid=self.account.account.domainid,
                             networkofferingid=self.network_offering.id,
                             zoneid=self.zone.id
@@ -2690,7 +2690,7 @@ class TestServiceProvider(cloudstackTestCase):
             Network.create(
                             self.apiclient,
                             self.services["network"],
-                            accountid=self.account.account.name,
+                            accountid=self.account.name,
                             domainid=self.account.account.domainid,
                             networkofferingid=self.network_offering.id,
                             zoneid=self.zone.id
@@ -2720,20 +2720,20 @@ class TestServiceProvider(cloudstackTestCase):
         self.network = Network.create(
                             self.apiclient,
                             self.services["network"],
-                            accountid=self.account.account.name,
+                            accountid=self.account.name,
                             domainid=self.account.account.domainid,
                             networkofferingid=self.network_offering.id,
                             zoneid=self.zone.id
                             )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -2764,7 +2764,7 @@ class TestServiceProvider(cloudstackTestCase):
         self.debug("Acquiring a public IP for Network: %s" % self.network.name)
         public_ip = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -2777,7 +2777,7 @@ class TestServiceProvider(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.debug("Created the load balancing rule for public IP: %s" %
@@ -2806,13 +2806,13 @@ class TestServiceProvider(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
             VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 898f8b1..80b3f0b 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -244,20 +244,20 @@ class TestLbSourceNat(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -287,13 +287,13 @@ class TestLbSourceNat(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -324,7 +324,7 @@ class TestLbSourceNat(cloudstackTestCase):
         src_nat_list = PublicIPAddress.list(
                                         self.apiclient,
                                         associatednetworkid=self.network.id,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         listall=True,
                                         issourcenat=True,
@@ -350,7 +350,7 @@ class TestLbSourceNat(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=src_nat.id,
-                                    accountid=self.account.account.name
+                                    accountid=self.account.name
                                 )
         return
 
@@ -453,20 +453,20 @@ class TestLbOnIpWithPf(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -496,13 +496,13 @@ class TestLbOnIpWithPf(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -533,7 +533,7 @@ class TestLbOnIpWithPf(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % self.network.id)
         ip_with_nat_rule = PublicIPAddress.create(
                                     self.apiclient,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     zoneid=self.zone.id,
                                     domainid=self.account.account.domainid,
                                     networkid=self.network.id
@@ -561,7 +561,7 @@ class TestLbOnIpWithPf(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_nat_rule.ipaddress.id,
-                                    accountid=self.account.account.name
+                                    accountid=self.account.name
                                     )
         return
 
@@ -664,20 +664,20 @@ class TestPfOnIpWithLb(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -707,13 +707,13 @@ class TestPfOnIpWithLb(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -745,7 +745,7 @@ class TestPfOnIpWithLb(cloudstackTestCase):
 
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -761,7 +761,7 @@ class TestPfOnIpWithLb(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -876,20 +876,20 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -919,13 +919,13 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -957,7 +957,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
 
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -973,7 +973,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1096,20 +1096,20 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1139,13 +1139,13 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1177,7 +1177,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
 
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -1193,7 +1193,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1370,20 +1370,20 @@ class TestMultipleLbRules(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1413,13 +1413,13 @@ class TestMultipleLbRules(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1453,7 +1453,7 @@ class TestMultipleLbRules(cloudstackTestCase):
 
         public_ip_1 = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -1472,7 +1472,7 @@ class TestMultipleLbRules(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip_1.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1499,7 +1499,7 @@ class TestMultipleLbRules(cloudstackTestCase):
 
         public_ip_2 = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -1518,7 +1518,7 @@ class TestMultipleLbRules(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip_2.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1687,20 +1687,20 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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_1 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1730,13 +1730,13 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
                         )
 
         self.debug("Deploying another VM in account: %s" %
-                                            self.account.account.name)
+                                            self.account.name)
 
         # Spawn an instance in that network
         virtual_machine_2 = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -1770,7 +1770,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
 
         public_ip = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -1789,7 +1789,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1823,7 +1823,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.debug("Create LB rule on same port failed!")
@@ -1838,7 +1838,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -1952,7 +1952,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1962,14 +1962,14 @@ class TestLoadBalancingRule(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1978,7 +1978,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["lbrule"],
                                     ipaddressid=cls.public_ip.ipaddress.id,
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     networkid=cls.network.id
                                 )
         cls._cleanup = [
@@ -2176,7 +2176,7 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -2186,14 +2186,14 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -2231,7 +2231,7 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup = []
@@ -2267,7 +2267,7 @@ class TestDeleteCreateLBRule(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -2315,7 +2315,7 @@ class TestVmWithLb(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -2325,7 +2325,7 @@ class TestVmWithLb(cloudstackTestCase):
         cls.vm_1 = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
@@ -2333,14 +2333,14 @@ class TestVmWithLb(cloudstackTestCase):
         cls.vm_2 = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip_1 = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -2349,12 +2349,12 @@ class TestVmWithLb(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["lbrule"],
                                     ipaddressid=cls.public_ip_1.ipaddress.id,
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     networkid=cls.network.id
                                 )
         cls.public_ip_2 = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -2363,7 +2363,7 @@ class TestVmWithLb(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["lbrule"],
                                     ipaddressid=cls.public_ip_2.ipaddress.id,
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     networkid=cls.network.id
                                 )
         cls._cleanup = [

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 75b15d6..4a2d1fe 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -211,20 +211,20 @@ class TestLbWithRoundRobin(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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
         self.virtual_machine = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -257,7 +257,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
 
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -275,7 +275,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -424,20 +424,20 @@ class TestLbWithLeastConn(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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
         self.virtual_machine = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -470,14 +470,14 @@ class TestLbWithLeastConn(cloudstackTestCase):
 
         PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
                                 )
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -495,7 +495,7 @@ class TestLbWithLeastConn(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -643,20 +643,20 @@ class TestLbWithSourceIp(cloudstackTestCase):
         self.network = Network.create(
                                     self.apiclient,
                                     self.services["network"],
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     domainid=self.account.account.domainid,
                                     networkofferingid=self.network_offering.id,
                                     zoneid=self.zone.id
                                     )
         self.debug("Created network with ID: %s" % self.network.id)
 
-        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
         self.virtual_machine = VirtualMachine.create(
                                   self.apiclient,
                                   self.services["virtual_machine"],
-                                  accountid=self.account.account.name,
+                                  accountid=self.account.name,
                                   domainid=self.account.account.domainid,
                                   serviceofferingid=self.service_offering.id,
                                   networkids=[str(self.network.id)]
@@ -689,7 +689,7 @@ class TestLbWithSourceIp(cloudstackTestCase):
 
         ip_with_lb_rule = PublicIPAddress.create(
                                 self.apiclient,
-                                accountid=self.account.account.name,
+                                accountid=self.account.name,
                                 zoneid=self.zone.id,
                                 domainid=self.account.account.domainid,
                                 networkid=self.network.id
@@ -707,7 +707,7 @@ class TestLbWithSourceIp(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=ip_with_lb_rule.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
 
@@ -790,7 +790,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -807,14 +807,14 @@ class TestLbAlgoRrLc(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -885,7 +885,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -1002,7 +1002,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1019,14 +1019,14 @@ class TestLbAlgoLcRr(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1097,7 +1097,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -1211,7 +1211,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1228,7 +1228,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
@@ -1236,7 +1236,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
 
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1307,7 +1307,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -1424,7 +1424,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1441,7 +1441,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
@@ -1449,7 +1449,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
 
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1519,7 +1519,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -1638,7 +1638,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1655,7 +1655,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
@@ -1663,7 +1663,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
 
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1734,7 +1734,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -1852,7 +1852,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -1869,14 +1869,14 @@ class TestLbAlgoLcSb(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -1947,7 +1947,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/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 a921f4b..7f391d0 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -155,7 +155,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         cls.network = Network.create(
                                     cls.api_client,
                                     cls.services["network"],
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     domainid=cls.account.account.domainid,
                                     networkofferingid=cls.network_offering.id,
                                     zoneid=cls.zone.id
@@ -165,14 +165,14 @@ class TestLbStickyPolicy(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                   cls.api_client,
                                   cls.services["virtual_machine"],
-                                  accountid=cls.account.account.name,
+                                  accountid=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   serviceofferingid=cls.service_offering.id,
                                   networkids=[str(cls.network.id)]
                                   )
         cls.public_ip = PublicIPAddress.create(
                                 cls.api_client,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network.id
@@ -242,7 +242,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -331,7 +331,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -420,7 +420,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -511,7 +511,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -602,7 +602,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -693,7 +693,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -784,7 +784,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -875,7 +875,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)
@@ -966,7 +966,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=self.public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=self.network.id
                                 )
         self.cleanup.append(lb_rule)


Mime
View raw message