cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/5] CLOUDSTACK-2323: fix test scripts to conform with library changes
Date Mon, 06 May 2013 09:26:46 GMT
Updated Branches:
  refs/heads/master 70c936bb8 -> f0749ce62


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0749ce6/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 750f985..ecac8c9 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -126,7 +126,7 @@ class TestCreateVolume(cloudstackTestCase):
                             domainid=cls.domain.id
                             )
 
-        cls.services["account"] = cls.account.account.name
+        cls.services["account"] = cls.account.name
         cls.service_offering = ServiceOffering.create(
                                             cls.api_client,
                                             cls.services["service_offering"]
@@ -134,8 +134,8 @@ class TestCreateVolume(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                     cls.api_client,
                                     cls.services,
-                                    accountid=cls.account.account.name,
-                                    domainid=cls.account.account.domainid,
+                                    accountid=cls.account.name,
+                                    domainid=cls.account.domainid,
                                     serviceofferingid=cls.service_offering.id,
                                     mode=cls.services["mode"]
                                 )
@@ -167,8 +167,8 @@ class TestCreateVolume(cloudstackTestCase):
                                    self.apiClient,
                                    v,
                                    zoneid=self.zone.id,
-                                   account=self.account.account.name,
-                                   domainid=self.account.account.domainid,
+                                   account=self.account.name,
+                                   domainid=self.account.domainid,
                                    diskofferingid=self.disk_offering.id
                                    )
             self.debug("Created a volume with ID: %s" % volume.id)
@@ -177,8 +177,8 @@ class TestCreateVolume(cloudstackTestCase):
         volume = Volume.create_custom_disk(
                                     self.apiClient,
                                     self.services,
-                                    account=self.account.account.name,
-                                    domainid=self.account.account.domainid,
+                                    account=self.account.name,
+                                    domainid=self.account.domainid,
                                     )
         self.debug("Created a volume with custom offering: %s" % volume.id)
         self.volumes.append(volume)
@@ -320,7 +320,7 @@ class TestVolumes(cloudstackTestCase):
                             domainid=cls.domain.id
                             )
 
-        cls.services["account"] = cls.account.account.name
+        cls.services["account"] = cls.account.name
         cls.service_offering = ServiceOffering.create(
                                             cls.api_client,
                                             cls.services["service_offering"]
@@ -328,8 +328,8 @@ class TestVolumes(cloudstackTestCase):
         cls.virtual_machine = VirtualMachine.create(
                                     cls.api_client,
                                     cls.services,
-                                    accountid=cls.account.account.name,
-                                    domainid=cls.account.account.domainid,
+                                    accountid=cls.account.name,
+                                    domainid=cls.account.domainid,
                                     serviceofferingid=cls.service_offering.id,
                                     mode=cls.services["mode"]
                                 )
@@ -337,8 +337,8 @@ class TestVolumes(cloudstackTestCase):
         cls.volume = Volume.create(
                                    cls.api_client,
                                    cls.services,
-                                   account=cls.account.account.name,
-                                   domainid=cls.account.account.domainid
+                                   account=cls.account.name,
+                                   domainid=cls.account.domainid
                                    )
         cls._cleanup = [
                         cls.resized_disk_offering,


Mime
View raw message