cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 13357cf
Date Tue, 16 Sep 2014 06:00:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f5ff78947 -> 13357cff7


CLOUDSTACK-7516: Fixed resource permission issue in test_snapshots.py, account was using template
registered with other account

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/master
Commit: 13357cff7d15d439f1393b18558776831260a1bd
Parents: f5ff789
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Sep 9 12:16:47 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Tue Sep 16 11:30:33 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_snapshots.py | 37 ++++++++++++++---------
 1 file changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13357cff/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 8a5c7ff..0811eb1 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -18,7 +18,7 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import             attr
-from marvin.cloudstackTestCase import       cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import       cloudstackTestCase
 
 from marvin.lib.base import     (Snapshot,
                                              Template,
@@ -734,6 +734,10 @@ class TestSnapshots(cloudstackTestCase):
         #5. Login to newly created virtual machine
         #6. Compare data in the root disk with the one that was written on the volume, it
should match
 
+        userapiclient = self.testClient.getUserApiClient(
+                                    UserName=self.account.name,
+                                    DomainName=self.account.domain)
+
         random_data_0 = random_gen(size=100)
         random_data_1 = random_gen(size=100)
 
@@ -788,7 +792,7 @@ class TestSnapshots(cloudstackTestCase):
             ssh_client.execute(c)
 
         volumes = list_volumes(
-                        self.apiclient,
+                        userapiclient,
                         virtualmachineid=self.virtual_machine.id,
                         type='ROOT',
                         listall=True
@@ -803,7 +807,7 @@ class TestSnapshots(cloudstackTestCase):
 
         #Create a snapshot of volume
         snapshot = Snapshot.create(
-                                   self.apiclient,
+                                   userapiclient,
                                    volume.id,
                                    account=self.account.name,
                                    domainid=self.account.domainid
@@ -812,7 +816,7 @@ class TestSnapshots(cloudstackTestCase):
         self.debug("Snapshot created from volume ID: %s" % volume.id)
         # Generate template from the snapshot
         template = Template.create_from_snapshot(
-                                    self.apiclient,
+                                    userapiclient,
                                     snapshot,
                                     self.services["templates"]
                                     )
@@ -821,7 +825,7 @@ class TestSnapshots(cloudstackTestCase):
 
         # Verify created template
         templates = list_templates(
-                                self.apiclient,
+                                userapiclient,
                                 templatefilter=\
                                 self.services["templates"]["templatefilter"],
                                 id=template.id
@@ -841,7 +845,7 @@ class TestSnapshots(cloudstackTestCase):
 
         # Deploy new virtual machine using template
         new_virtual_machine = VirtualMachine.create(
-                                    self.apiclient,
+                                    userapiclient,
                                     self.services["server_without_disk"],
                                     templateid=template.id,
                                     accountid=self.account.name,
@@ -995,8 +999,13 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
         #    State of this VM should be Running.
 
         #Create Virtual Machine
+
+        userapiclient = self.testClient.getUserApiClient(
+                                    UserName=self.account.name,
+                                    DomainName=self.account.domain)
+
         self.virtual_machine = VirtualMachine.create(
-                                self.apiclient,
+                                userapiclient,
                                 self.services["server"],
                                 templateid=self.template.id,
                                 accountid=self.account.name,
@@ -1006,7 +1015,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
         self.debug("Created VM with ID: %s" % self.virtual_machine.id)
         # Get the Root disk of VM
         volumes = list_volumes(
-                            self.apiclient,
+                            userapiclient,
                             virtualmachineid=self.virtual_machine.id,
                             type='ROOT',
                             listall=True
@@ -1014,12 +1023,12 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
         volume = volumes[0]
 
         # Create a snapshot from the ROOTDISK
-        snapshot = Snapshot.create(self.apiclient, volume.id)
+        snapshot = Snapshot.create(userapiclient, volume.id)
         self.debug("Snapshot created: ID - %s" % snapshot.id)
         self.cleanup.append(snapshot)
 
         snapshots = list_snapshots(
-                                   self.apiclient,
+                                   userapiclient,
                                    id=snapshot.id
                                    )
         self.assertEqual(
@@ -1043,7 +1052,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
 
         # Generate template from the snapshot
         template = Template.create_from_snapshot(
-                                    self.apiclient,
+                                    userapiclient,
                                     snapshot,
                                     self.services["templates"]
                                     )
@@ -1051,7 +1060,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
         self.cleanup.append(template)
 
         templates = list_templates(
-                                self.apiclient,
+                                userapiclient,
                                 templatefilter=\
                                 self.services["templates"]["templatefilter"],
                                 id=template.id
@@ -1071,7 +1080,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
 
         # Deploy new virtual machine using template
         new_virtual_machine = VirtualMachine.create(
-                                    self.apiclient,
+                                    userapiclient,
                                     self.services["server"],
                                     templateid=template.id,
                                     accountid=self.account.name,
@@ -1086,7 +1095,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
 
         # Newly deployed VM should be 'Running'
         virtual_machines = list_virtual_machines(
-                                self.apiclient,
+                                userapiclient,
                                 id=new_virtual_machine.id,
                                 account=self.account.name,
                                 domainid=self.account.domainid


Mime
View raw message