cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [29/47] account name dereferences as account.name
Date Tue, 14 May 2013 13:57:48 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index 95254d8..aac9568 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -235,14 +235,14 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.debug("Enabling the VPC offering created")
         self.vpc_off.update(self.apiclient, state='Enabled')
 
-        self.debug("Creating a VPC network in the account: %s" % self.account.account.name)
+        self.debug("Creating a VPC network in the account: %s" % self.account.name)
         self.services["vpc"]["cidr"] = '10.1.1.1/16'
         self.vpc = VPC.create(
                                 self.apiclient,
                                 self.services["vpc"],
                                 vpcofferingid=self.vpc_off.id,
                                 zoneid=self.zone.id,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid
                                 )
         return
@@ -261,7 +261,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
 
     def get_Router_For_VPC(self):
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         )
         self.assertEqual(isinstance(routers, list),
@@ -284,7 +284,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.apiclient.stopRouter(cmd)
 
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         )
         self.assertEqual(isinstance(routers, list),
@@ -305,7 +305,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.apiclient.startRouter(cmd)
 
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         zoneid=self.zone.id
                                         )
@@ -389,7 +389,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
     def acquire_Public_IP(self, network):
         self.debug("Associating public IP for network: %s" % 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=None, #network.id,
@@ -412,14 +412,14 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.debug("Enabling the VPC offering created")
         vpc_off.update(self.apiclient, state='Enabled')
 
-        self.debug("Creating a VPC network in the account: %s" % self.account.account.name)
+        self.debug("Creating a VPC network in the account: %s" % self.account.name)
         self.services["vpc"]["cidr"] = cidr
         vpc = VPC.create(
                                 self.apiclient,
                                 self.services["vpc"],
                                 vpcofferingid=vpc_off.id,
                                 zoneid=self.zone.id,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid
                                 )
         return vpc
@@ -441,7 +441,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                 self.debug('Adding Network=%s' % self.services["network"])
                 obj_network = Network.create(self.apiclient,
                                                 self.services["network"],
-                                                accountid=self.account.account.name,
+                                                accountid=self.account.name,
                                                 domainid=self.account.account.domainid,
                                                 networkofferingid=nw_off.id,
                                                 zoneid=self.zone.id,
@@ -459,7 +459,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                 vm = 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(network.id)],
@@ -484,7 +484,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                                                 self.apiclient,
                                                 objservices,
                                                 ipaddressid=public_ip.ipaddress.id,
-                                                accountid=self.account.account.name,
+                                                accountid=self.account.name,
                                                 networkid=network.id,
                                                 vpcid=self.vpc.id,
                                                 domainid=self.account.account.domainid

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index 3b3d41a..842d20a 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -235,14 +235,14 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.debug("Enabling the VPC offering created")
         self.vpc_off.update(self.apiclient, state='Enabled')
 
-        self.debug("Creating a VPC network in the account: %s" % self.account.account.name)
+        self.debug("Creating a VPC network in the account: %s" % self.account.name)
         self.services["vpc"]["cidr"] = '10.1.1.1/16'
         self.vpc = VPC.create(
                                 self.apiclient,
                                 self.services["vpc"],
                                 vpcofferingid=self.vpc_off.id,
                                 zoneid=self.zone.id,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid
                                 )
         return
@@ -261,7 +261,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
 
     def get_Router_For_VPC(self):
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         )
         self.assertEqual(isinstance(routers, list),
@@ -284,7 +284,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.apiclient.stopRouter(cmd)
 
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         )
         self.assertEqual(isinstance(routers, list),
@@ -305,7 +305,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.apiclient.startRouter(cmd)
 
         routers = list_routers(self.apiclient,
-                                        account=self.account.account.name,
+                                        account=self.account.name,
                                         domainid=self.account.account.domainid,
                                         zoneid=self.zone.id
                                         )
@@ -389,7 +389,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
     def acquire_Public_IP(self, network):
         self.debug("Associating public IP for network: %s" % 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=None, #network.id,
@@ -412,14 +412,14 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         self.debug("Enabling the VPC offering created")
         vpc_off.update(self.apiclient, state='Enabled')
 
-        self.debug("Creating a VPC network in the account: %s" % self.account.account.name)
+        self.debug("Creating a VPC network in the account: %s" % self.account.name)
         self.services["vpc"]["cidr"] = cidr
         vpc = VPC.create(
                                 self.apiclient,
                                 self.services["vpc"],
                                 vpcofferingid=vpc_off.id,
                                 zoneid=self.zone.id,
-                                account=self.account.account.name,
+                                account=self.account.name,
                                 domainid=self.account.account.domainid
                                 )
         return vpc
@@ -441,7 +441,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                 self.debug('Adding Network=%s' % self.services["network"])
                 obj_network = Network.create(self.apiclient,
                                                 self.services["network"],
-                                                accountid=self.account.account.name,
+                                                accountid=self.account.name,
                                                 domainid=self.account.account.domainid,
                                                 networkofferingid=nw_off.id,
                                                 zoneid=self.zone.id,
@@ -459,7 +459,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                 vm = 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(network.id)],
@@ -484,7 +484,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                                                 self.apiclient,
                                                 objservices,
                                                 ipaddressid=public_ip.ipaddress.id,
-                                                accountid=self.account.account.name,
+                                                accountid=self.account.name,
                                                 networkid=network.id,
                                                 vpcid=self.vpc.id,
                                                 domainid=self.account.account.domainid

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 5cf62b8..033a905 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -308,13 +308,13 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Enabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         vpc = VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.validate_vpc_network(vpc)
@@ -339,7 +339,7 @@ class TestVPCOffering(cloudstackTestCase):
         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,
@@ -351,7 +351,7 @@ class TestVPCOffering(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.id,
                                   networkids=[str(network.id)]
@@ -361,7 +361,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % 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=network.id,
@@ -379,7 +379,7 @@ class TestVPCOffering(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=network.id,
                                     vpcid=vpc.id,
                                     domainid=self.account.account.domainid
@@ -388,7 +388,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % vpc.name)
         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=network.id,
@@ -436,7 +436,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % network.name)
         public_ip_3 = 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,
@@ -466,7 +466,7 @@ class TestVPCOffering(cloudstackTestCase):
                                           networkid=network.id,
                                           listall=True,
                                           isstaticnat=True,
-                                          account=self.account.account.name,
+                                          account=self.account.name,
                                           domainid=self.account.account.domainid
                                           )
         self.assertEqual(
@@ -483,7 +483,7 @@ class TestVPCOffering(cloudstackTestCase):
 #        self.debug("Associating public IP for network: %s" % network.name)
 #        public_ip_4 = 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,
@@ -495,27 +495,27 @@ class TestVPCOffering(cloudstackTestCase):
 #                                        ))
 #
 #        self.debug("Creating a remote access VPN for account: %s" %
-#                                                self.account.account.name)
+#                                                self.account.name)
 #
 #        try:
 #            vpn = Vpn.create(
 #                         self.apiclient,
 #                         publicipid=public_ip_4.ipaddress.id,
-#                         account=self.account.account.name,
+#                         account=self.account.name,
 #                         domainid=self.account.account.domainid,
 #                         networkid=network.id,
 #                         vpcid=vpc.id
 #                         )
 #        except Exception as e:
 #            self.fail("Failed to create VPN for account: %s - %s" % (
-#                                                 self.account.account.name, e))
+#                                                 self.account.name, e))
 #
 #        try:
 #            vpnuser = VpnUser.create(
 #                                 self.apiclient,
 #                                 username="root",
 #                                 password="password",
-#                                 account=self.account.account.name,
+#                                 account=self.account.name,
 #                                 domainid=self.account.account.domainid
 #                                 )
 #        except Exception as e:
@@ -524,7 +524,7 @@ class TestVPCOffering(cloudstackTestCase):
 #        self.debug("Checking if the remote access VPN is created or not?")
 #        remote_vpns = Vpn.list(
 #                               self.apiclient,
-#                               account=self.account.account.name,
+#                               account=self.account.name,
 #                               domainid=self.account.account.domainid,
 #                               publicipid=public_ip_4.ipaddress.id,
 #                               listall=True
@@ -535,7 +535,7 @@ class TestVPCOffering(cloudstackTestCase):
 #                         "List remote VPNs should not return empty response"
 #                         )
 #        self.debug("Deleting the remote access VPN for account: %s" %
-#                                                self.account.account.name)
+#                                                self.account.name)
         return
 
     @attr(tags=["advanced", "intervlan"])
@@ -589,13 +589,13 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Enabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         vpc = VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.validate_vpc_network(vpc)
@@ -611,7 +611,7 @@ class TestVPCOffering(cloudstackTestCase):
         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,
@@ -625,7 +625,7 @@ class TestVPCOffering(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.id,
                                   networkids=[str(network.id)]
@@ -635,7 +635,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % 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=network.id,
@@ -653,7 +653,7 @@ class TestVPCOffering(cloudstackTestCase):
                                     self.apiclient,
                                     self.services["lbrule"],
                                     ipaddressid=public_ip.ipaddress.id,
-                                    accountid=self.account.account.name,
+                                    accountid=self.account.name,
                                     networkid=network.id,
                                     vpcid=vpc.id
                                 )
@@ -708,13 +708,13 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Enabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         vpc = VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.validate_vpc_network(vpc)
@@ -730,7 +730,7 @@ class TestVPCOffering(cloudstackTestCase):
         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,
@@ -744,7 +744,7 @@ class TestVPCOffering(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.id,
                                   networkids=[str(network.id)]
@@ -754,7 +754,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % 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=network.id,
@@ -829,13 +829,13 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Enabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         vpc = VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.validate_vpc_network(vpc)
@@ -851,7 +851,7 @@ class TestVPCOffering(cloudstackTestCase):
         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,
@@ -863,7 +863,7 @@ class TestVPCOffering(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.id,
                                   networkids=[str(network.id)]
@@ -873,7 +873,7 @@ class TestVPCOffering(cloudstackTestCase):
         self.debug("Associating public IP for network: %s" % 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=network.id,
@@ -967,14 +967,14 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Disabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         with self.assertRaises(Exception):
             VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.debug("VPC network creation failed! (Test succeeded)")
@@ -982,13 +982,13 @@ class TestVPCOffering(cloudstackTestCase):
         vpc_off.update(self.apiclient, state='Enabled')
 
         self.debug("creating a VPC network in the account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         vpc = VPC.create(
                          self.apiclient,
                          self.services["vpc"],
                          vpcofferingid=vpc_off.id,
                          zoneid=self.zone.id,
-                         account=self.account.account.name,
+                         account=self.account.name,
                          domainid=self.account.account.domainid
                          )
         self.validate_vpc_network(vpc)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 5beb0a1..55cb513 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -206,14 +206,14 @@ class TestVPCRoutersBasic(cloudstackTestCase):
         cls.vpc_off.update(cls.apiclient, state='Enabled')
 
         #cls.debug("creating a VPC network in the account: %s" %
-                                                   # cls.account.account.name)
+                                                   # cls.account.name)
         cls.services["vpc"]["cidr"] = '10.1.1.1/16'
         cls.vpc = VPC.create(
                          cls.apiclient,
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -360,7 +360,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
 	    # Stop the VPC Router
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -435,7 +435,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
         self.validate_vpc_network(self.vpc)
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -482,7 +482,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
         self.validate_vpc_network(self.vpc)
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -498,7 +498,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
 		
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -519,7 +519,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
 
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -547,7 +547,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
 
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -580,7 +580,7 @@ class TestVPCRoutersBasic(cloudstackTestCase):
         self.debug("Router %s" % router)  
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -638,7 +638,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -655,7 +655,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.apiclient,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -667,7 +667,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         vm_1 = VirtualMachine.create(
                                   cls.apiclient,
                                   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_1.id)]
@@ -675,7 +675,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         vm_2 = VirtualMachine.create(
                                   cls.apiclient,
                                   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_1.id)]
@@ -685,7 +685,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         vm_3 = VirtualMachine.create(
                                   cls.apiclient,
                                   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_1.id)]
@@ -693,13 +693,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 
         vms = VirtualMachine.list(
                                   cls.apiclient,
-                                  account=cls.account.account.name,
+                                  account=cls.account.name,
                                   domainid=cls.account.account.domainid,
                                   listall=True
                                   )
         public_ip_1 = PublicIPAddress.create(
                                 cls.apiclient,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network_1.id,
@@ -725,7 +725,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 
         public_ip_2 = PublicIPAddress.create(
                                 cls.apiclient,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network_1.id,
@@ -747,7 +747,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
                                     networkid=cls.network_1.id,
                                     listall=True,
                                     isstaticnat=True,
-                                    account=cls.account.account.name,
+                                    account=cls.account.name,
                                     domainid=cls.account.account.domainid
                                   )
 #        cls.assertEqual(
@@ -764,7 +764,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 
         public_ip_3 = PublicIPAddress.create(
                                 cls.apiclient,
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 zoneid=cls.zone.id,
                                 domainid=cls.account.account.domainid,
                                 networkid=cls.network_1.id,
@@ -776,7 +776,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
                                     cls.apiclient,
                                     cls.services["lbrule"],
                                     ipaddressid=public_ip_3.ipaddress.id,
-                                    accountid=cls.account.account.name,
+                                    accountid=cls.account.name,
                                     networkid=cls.network_1.id,
                                     vpcid=cls.vpc.id,
                                     domainid=cls.account.account.domainid
@@ -960,13 +960,13 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 	"""
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
         public_ips = PublicIPAddress.list(
                                           self.apiclient,
-                                          account=self.account.account.name,
+                                          account=self.account.name,
                                           domainid=self.account.account.domainid,
                                           listall=True
                                          )
@@ -1085,7 +1085,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         # Stop the VPC Router
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1179,7 +1179,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1246,7 +1246,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1262,7 +1262,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
 		
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1305,7 +1305,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
                         )
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1350,7 +1350,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
  
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )
@@ -1383,7 +1383,7 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         self.debug("Router %s" % router)  
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               listall=True
                               )

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f57a851/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 247599e..13726c5 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -236,7 +236,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -252,7 +252,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -271,7 +271,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         cls.network_2 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off_no_lb.id,
                                 zoneid=cls.zone.id,
@@ -282,7 +282,7 @@ class TestVMLifeCycleVPC(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_1.id)]
@@ -291,7 +291,7 @@ class TestVMLifeCycleVPC(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_1.id)]
@@ -299,7 +299,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         cls.vm_3 = 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_2.id)]
@@ -307,7 +307,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
 
         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_1.id,
@@ -317,7 +317,7 @@ class TestVMLifeCycleVPC(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_1.id,
                                     vpcid=cls.vpc.id,
                                     domainid=cls.account.account.domainid
@@ -326,7 +326,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
 
         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_1.id,
@@ -515,7 +515,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         self.debug("Check if deployed VMs are in running state?")
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -543,7 +543,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         # 2. Rules should be still configured on virtual router.
 
         self.debug("Stopping the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.stop(self.apiclient)
             self.vm_2.stop(self.apiclient)
@@ -588,7 +588,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.start(self.apiclient)
             self.vm_2.start(self.apiclient)
@@ -614,7 +614,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.reboot(self.apiclient)
             self.vm_2.reboot(self.apiclient)
@@ -638,7 +638,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Destroying the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)
@@ -683,7 +683,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Recovering the expunged virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.recover(self.apiclient)
             self.vm_2.recover(self.apiclient)
@@ -874,7 +874,7 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Delete virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)
@@ -965,7 +965,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -981,7 +981,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -1005,7 +1005,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         cls.network_2 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.shared_nw_off.id,
                                 zoneid=cls.zone.id,
@@ -1016,7 +1016,7 @@ class TestVMLifeCycleSharedNwVPC(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_1.id),
@@ -1026,7 +1026,7 @@ class TestVMLifeCycleSharedNwVPC(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_1.id),
@@ -1035,7 +1035,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         cls.vm_3 = 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_1.id),
@@ -1043,7 +1043,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
                                   )
         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_1.id,
@@ -1053,7 +1053,7 @@ class TestVMLifeCycleSharedNwVPC(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_1.id,
                                     vpcid=cls.vpc.id,
                                     domainid=cls.account.account.domainid
@@ -1062,7 +1062,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
 
         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_1.id,
@@ -1241,7 +1241,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.debug("Check if deployed VMs are in running state?")
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -1275,7 +1275,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Stopping one of the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_2.stop(self.apiclient)
         except Exception as e:
@@ -1316,7 +1316,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Starting one of the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_2.start(self.apiclient)
         except Exception as e:
@@ -1357,7 +1357,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Restarting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.reboot(self.apiclient)
             self.vm_2.reboot(self.apiclient)
@@ -1367,7 +1367,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.debug("Check if the instance is in stopped state?")
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -1397,7 +1397,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         # 2. Rules should be still configured on virtual router.
 
         self.debug("Destroying one of the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_2.delete(self.apiclient)
         except Exception as e:
@@ -1438,7 +1438,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Recovering the expunged virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_2.recover(self.apiclient)
         except Exception as e:
@@ -1662,7 +1662,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Delete virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_2.delete(self.apiclient)
         except Exception as e:
@@ -1681,7 +1681,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
 
         self.debug(
             "Deleting the rest of the virtual machines in account: %s" %
-                                                    self.account.account.name)
+                                                    self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_3.delete(self.apiclient)
@@ -1772,7 +1772,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -1788,7 +1788,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -1808,7 +1808,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
         cls.network_2 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off_no_lb.id,
                                 zoneid=cls.zone.id,
@@ -1964,7 +1964,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
             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_1.id),
@@ -1989,7 +1989,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
                                                         self.network_1.name)
         routers = Router.list(
                               self.apiclient,
-                              account=self.account.account.name,
+                              account=self.account.name,
                               domainid=self.account.account.domainid,
                               networkid=self.network_1.id,
                               listall=True
@@ -2032,7 +2032,7 @@ class TestVMLifeCycleBothIsolated(cloudstackTestCase):
             vm = 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_1.id)]
@@ -2110,7 +2110,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -2126,7 +2126,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -2145,7 +2145,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         cls.network_2 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off_no_lb.id,
                                 zoneid=cls.zone.id,
@@ -2156,7 +2156,7 @@ class TestVMLifeCycleStoppedVPCVR(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_1.id)]
@@ -2165,7 +2165,7 @@ class TestVMLifeCycleStoppedVPCVR(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_1.id)]
@@ -2173,7 +2173,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         cls.vm_3 = 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_2.id)]
@@ -2181,7 +2181,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
 
         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_1.id,
@@ -2191,7 +2191,7 @@ class TestVMLifeCycleStoppedVPCVR(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_1.id,
                                     vpcid=cls.vpc.id,
                                     domainid=cls.account.account.domainid
@@ -2200,7 +2200,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
 
         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_1.id,
@@ -2404,7 +2404,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         self.debug("Check if deployed VMs are in running state?")
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -2432,7 +2432,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         # 2. Rules should be still configured on virtual router.
 
         self.debug("Stopping the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.stop(self.apiclient)
             self.vm_2.stop(self.apiclient)
@@ -2478,7 +2478,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.start(self.apiclient)
             self.vm_2.start(self.apiclient)
@@ -2505,7 +2505,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.reboot(self.apiclient)
             self.vm_2.reboot(self.apiclient)
@@ -2530,7 +2530,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Destroying the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)
@@ -2576,7 +2576,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Recovering the expunged virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.recover(self.apiclient)
             self.vm_2.recover(self.apiclient)
@@ -2771,7 +2771,7 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Delete virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)
@@ -2867,7 +2867,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
                          cls.services["vpc"],
                          vpcofferingid=cls.vpc_off.id,
                          zoneid=cls.zone.id,
-                         account=cls.account.account.name,
+                         account=cls.account.name,
                          domainid=cls.account.account.domainid
                          )
 
@@ -2883,7 +2883,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         cls.network_1 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off.id,
                                 zoneid=cls.zone.id,
@@ -2902,7 +2902,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         cls.network_2 = Network.create(
                                 cls.api_client,
                                 cls.services["network"],
-                                accountid=cls.account.account.name,
+                                accountid=cls.account.name,
                                 domainid=cls.account.account.domainid,
                                 networkofferingid=cls.nw_off_no_lb.id,
                                 zoneid=cls.zone.id,
@@ -2913,7 +2913,7 @@ class TestVMLifeCycleDiffHosts(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_1.id,
                                   networkids=[str(cls.network_1.id)]
@@ -2922,7 +2922,7 @@ class TestVMLifeCycleDiffHosts(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_1.id,
                                   networkids=[str(cls.network_1.id)]
@@ -2930,7 +2930,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         cls.vm_3 = 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_2.id,
                                   networkids=[str(cls.network_2.id)]
@@ -2938,7 +2938,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
 
         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_1.id,
@@ -2948,7 +2948,7 @@ class TestVMLifeCycleDiffHosts(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_1.id,
                                     vpcid=cls.vpc.id,
                                     domainid=cls.account.account.domainid
@@ -2957,7 +2957,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
 
         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_1.id,
@@ -3056,7 +3056,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
 
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   networkid=self.network_1.id,
                                   listall=True
@@ -3071,7 +3071,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
 
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   networkid=self.network_2.id,
                                   listall=True
@@ -3203,7 +3203,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         self.debug("Check if deployed VMs are in running state?")
         vms = VirtualMachine.list(
                                   self.apiclient,
-                                  account=self.account.account.name,
+                                  account=self.account.name,
                                   domainid=self.account.account.domainid,
                                   listall=True
                                   )
@@ -3231,7 +3231,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         # 2. Rules should be still configured on virtual router.
 
         self.debug("Stopping the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.stop(self.apiclient)
             self.vm_2.stop(self.apiclient)
@@ -3276,7 +3276,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.start(self.apiclient)
             self.vm_2.start(self.apiclient)
@@ -3302,7 +3302,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Starting the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.reboot(self.apiclient)
             self.vm_2.reboot(self.apiclient)
@@ -3326,7 +3326,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Destroying the virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)
@@ -3371,7 +3371,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         # 3. Make sure that we are able to access google.com from this user Vm
 
         self.debug("Recovering the expunged virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.recover(self.apiclient)
             self.vm_2.recover(self.apiclient)
@@ -3562,7 +3562,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         self.validate_network_rules()
 
         self.debug("Delete virtual machines in account: %s" %
-                                                self.account.account.name)
+                                                self.account.name)
         try:
             self.vm_1.delete(self.apiclient)
             self.vm_2.delete(self.apiclient)


Mime
View raw message