addressed comments

Author: Slavka Peleva

test/integration/plugins/storpool/sp_util.py

@@ -981,16 +981,16 @@ def verify_snapshot_copies(cls, userapiclient, snapshot_id, zone_ids):
             if obj.zoneid not in snapshots:
                 new_list.append(obj)
                 snapshots.add(obj.zoneid)
-        logging.debug(new_list)
-        logging.debug(zone_ids)
-        logging.debug(snapshot_entries)
+        logging.debug("new list %s" % new_list)
+        logging.debug("zone IDs %s" % zone_ids)
+        logging.debug("snapshot entries %s" % snapshot_entries)
         if len(new_list) != len(zone_ids):
-            cls.fail("Undesired list snapshot size for multiple zones")
+            raise Exception("Undesired list snapshot size for multiple zones")
         for zone_id in zone_ids:
             zone_found = False
             for entry in new_list:
                 if entry.zoneid == zone_id:
                     zone_found = True
                     break
             if zone_found == False:
-                cls.fail("Unable to find snapshot entry for the zone ID: %s" % zone_id)
+                raise Exception("Unable to find snapshot entry for the zone ID: %s" % zone_id)

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

@@ -110,8 +110,6 @@ def setUpClass(cls):
             domainid=cls.domain.id)
         cls._cleanup.append(cls.account)
 
-        cls.helper = StorPoolHelper()
-
         compute_offering_service = cls.services["service_offerings"]["tiny"].copy()
         td = TestData()
         cls.testdata = td.testdata
@@ -164,9 +162,9 @@ def test_01_take_snapshot_multi_zone(self):
         """
 
         snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)
         self.snapshot_id = snapshot.id
         self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.zone.id, self.additional_zone.id])
-        self._cleanup.append(snapshot)
         return
 
     @skipTestIf("testsNotSupported")
@@ -176,11 +174,11 @@ def test_02_copy_snapshot_multi_pools(self):
         """
 
         snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id)
+        self._cleanup.append(snapshot)
         self.snapshot_id = snapshot.id
         Snapshot.copy(self.userapiclient, self.snapshot_id, zone_ids=[str(self.additional_zone.id)], source_zone_id=self.zone.id, usestoragereplication=True)
         self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.zone.id, self.additional_zone.id])
 
-        self._cleanup.append(snapshot)
         return
 
     @skipTestIf("testsNotSupported")
@@ -222,6 +220,7 @@ def test_05_take_snapshot_multi_zone_create_volume_additional_zone(self):
         """
 
         snapshot = Snapshot.create(self.userapiclient,volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)
         self.snapshot_id = snapshot.id
         self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.zone.id, self.additional_zone.id])
         disk_offering_id = None
@@ -236,8 +235,7 @@ def test_05_take_snapshot_multi_zone_create_volume_additional_zone(self):
             disk_offering_id = self.disk_offering.id
 
         self.volume = Volume.create(self.userapiclient, {"diskname":"StorPoolDisk-1" }, snapshotid=self.snapshot_id, zoneid=self.zone.id, diskofferingid=disk_offering_id)
-        self._cleanup.append(self.volume)
-        self._cleanup.append(snapshot)
+        self.cleanup.append(self.volume)
         if self.zone.id != self.volume.zoneid:
             self.fail("Volume from snapshot not created in the additional zone")
         return
@@ -248,13 +246,13 @@ def test_06_take_snapshot_multi_zone_create_template_additional_zone(self):
         """Test to take volume snapshot in multiple StorPool primary storages in diff zones and create a volume in one of the additional zones
         """
         snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)
         self.snapshot_id = snapshot.id
         self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.zone.id, self.additional_zone.id])
         self.template = self.helper.create_snapshot_template(self.userapiclient, self.services, self.snapshot_id, self.additional_zone.id)
+        self.cleanup.append(self.template)
         if self.additional_zone.id != self.template.zoneid:
             self.fail("Template from snapshot not created in the additional zone")
-        self._cleanup.append(snapshot)
-        self._cleanup.append(self.template)
         return
 
     @skipTestIf("testsNotSupported")
@@ -280,7 +278,7 @@ def test_08_take_snapshot_multi_zone_create_volume_additional_zone_deploy_vm(sel
          and deploy a VM from the volume in one of the additional zones
         """
         snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
-        self._cleanup.append(snapshot)
+        self.cleanup.append(snapshot)
         self.snapshot_id = snapshot.id
         self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.zone.id, self.additional_zone.id])
         vm = self.create_volume_from_snapshot_deploy_vm(snapshotid=self.snapshot_id, zoneid=self.additional_zone.id)

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

@@ -87,22 +87,25 @@ def setUpClass(cls):
 
         if storage_pools_response:
             cls.zone_wide_storage = storage_pools_response[0]
+            storage_tag = None
+            if cls.zone_wide_storage.tags:
+                storage_tag = cls.zone_wide_storage.tags
 
             cls.debug(
                 "zone wide storage id is %s" %
                 cls.zone_wide_storage.id)
             cls.service_offering = ServiceOffering.create(
                 cls.apiclient,
                 cls.services["service_offerings"]["small"],
-                tags=cls.zone_wide_storage.tags
+                tags=storage_tag
             )
             cls._cleanup.append(cls.service_offering)
 
             do = {
                 "name": "do-tags",
                 "displaytext": "Disk offering with tags",
                 "disksize":8,
-                "tags": cls.zone_wide_storage.tags
+                "tags": storage_tag
             }
             cls.disk_offering = DiskOffering.create(
                 cls.apiclient,
@@ -271,7 +274,7 @@ def test_05_deploy_vm_with_existing_snapshot_deleted_volume(self):
         self.deploy_vm_from_snapshot(snapshot)
 
     def deploy_vm_from_snapshot(self, snapshot):
-        virtual_machine = VirtualMachine.create(self.apiclient,
+        self.virtual_machine = VirtualMachine.create(self.apiclient,
                                                 {"name": "Test-%s" % uuid.uuid4()},
                                                 accountid=self.account.name,
                                                 domainid=self.account.domainid,
@@ -280,12 +283,12 @@ def deploy_vm_from_snapshot(self, snapshot):
                                                 snapshotid=snapshot.id,
                                                 mode="basic",
                                                 )
-        self._cleanup.append(virtual_machine)
+        self.cleanup.append(self.virtual_machine)
         try:
-            ssh_client = virtual_machine.get_ssh_client()
+            ssh_client = self.virtual_machine.get_ssh_client()
         except Exception as e:
             self.fail("SSH failed for virtual machine: %s - %s" %
-                      (virtual_machine.ipaddress, e))
+                      (self.virtual_machine.ipaddress, e))
 
     def create_volume_from_snapshot_deploy_vm(self, snapshotid):
         volume = Volume.create_from_snapshot(
@@ -297,7 +300,7 @@ def create_volume_from_snapshot_deploy_vm(self, snapshotid):
             domainid=self.account.domainid,
             zoneid=self.zone.id,
         )
-        virtual_machine = VirtualMachine.create(self.apiclient,
+        self.virtual_machine = VirtualMachine.create(self.apiclient,
                                                 {"name": "Test-%s" % uuid.uuid4()},
                                                 accountid=self.account.name,
                                                 domainid=self.account.domainid,
@@ -306,9 +309,9 @@ def create_volume_from_snapshot_deploy_vm(self, snapshotid):
                                                 volumeid=volume.id,
                                                 mode="basic",
                                                 )
-        self._cleanup.append(virtual_machine)
+        self.cleanup.append(self.virtual_machine)
         try:
-            ssh_client = virtual_machine.get_ssh_client()
+            ssh_client = self.virtual_machine.get_ssh_client()
         except Exception as e:
             self.fail("SSH failed for virtual machine: %s - %s" %
-                      (virtual_machine.ipaddress, e))
+                      (self.virtual_machine.ipaddress, e))