cleanup and fix test_ps_resize_volume.py

Author: Daan Hoogland

test/integration/component/test_ps_resize_volume.py

@@ -120,12 +120,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            # Cleanup resources used
-            cleanup_resources(cls.api_client, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestResizeVolume, cls).tearDownClass()
 
     def setUp(self):
         if self.unsupportedStorageType:
@@ -137,13 +132,7 @@ def setUp(self):
         return
 
     def tearDown(self):
-        try:
-            # Clean up, terminate the created instance, volumes and snapshots
-            cleanup_resources(self.apiclient, self.cleanup)
-            pass
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestResizeVolume, self).tearDown()
 
     def updateResourceLimits(self, accountLimit=None, domainLimit=None):
         """Update primary storage limits of the parent domain and its
@@ -153,13 +142,13 @@ def updateResourceLimits(self, accountLimit=None, domainLimit=None):
             if domainLimit:
                 # Update resource limit for domain
                 Resources.updateLimit(self.apiclient, resourcetype=10,
-                                      max=domainLimit,
+                                      max=int(domainLimit),
                                       domainid=self.parent_domain.id)
             if accountLimit:
                 # Update resource limit for domain
                 Resources.updateLimit(self.apiclient,
                                       resourcetype=10,
-                                      max=accountLimit,
+                                      max=int(accountLimit),
                                       account=self.parentd_admin.name,
                                       domainid=self.parent_domain.id)
         except Exception as e:
@@ -172,14 +161,13 @@ def setupAccounts(self):
                                                services=self.services[
                                                    "domain"],
                                                parentdomainid=self.domain.id)
+            self.cleanup.append(self.parent_domain)
             self.parentd_admin = Account.create(self.apiclient,
                                                 self.services["account"],
                                                 admin=True,
                                                 domainid=self.parent_domain.id)
 
-            # Cleanup the resources created at end of test
             self.cleanup.append(self.parentd_admin)
-            self.cleanup.append(self.parent_domain)
         except Exception as e:
             return [FAIL, e]
         return [PASS, None]
@@ -199,7 +187,6 @@ def test_01_increase_volume_size_within_account_limit(self):
         # 6. Resize operation should be successful and primary storage count
         #    for account should be updated successfully"""
 
-        # Setting up account and domain hierarchy
         result = self.setupAccounts()
         self.assertEqual(result[0], PASS, result[1])
 
@@ -220,14 +207,14 @@ def test_01_increase_volume_size_within_account_limit(self):
                 domainid=self.parent_domain.id,
                 serviceofferingid=self.service_offering.id
             )
+            self.cleanup.append(virtualMachine)
 
             volume = Volume.create(
                 apiclient, self.services["volume"],
                 zoneid=self.zone.id,
                 account=self.parentd_admin.name,
                 domainid=self.parent_domain.id,
                 diskofferingid=self.disk_offering_5_GB.id)
-
             virtualMachine.attach_volume(apiclient, volume=volume)
 
             expectedCount = (templateSize + self.disk_offering_5_GB.disksize)
@@ -291,14 +278,14 @@ def test_02_increase_volume_size_above_account_limit(self):
                 domainid=self.parent_domain.id,
                 serviceofferingid=self.service_offering.id
             )
+            self.cleanup.append(virtualMachine)
 
             volume = Volume.create(
                 apiclient, self.services["volume"],
                 zoneid=self.zone.id,
                 account=self.parentd_admin.name,
                 domainid=self.parent_domain.id,
                 diskofferingid=self.disk_offering_5_GB.id)
-
             virtualMachine.attach_volume(apiclient, volume=volume)
 
             expectedCount = (templateSize + self.disk_offering_5_GB.disksize)
@@ -355,14 +342,14 @@ def test_03_increase_volume_size_above_domain_limit(self):
                 domainid=self.parent_domain.id,
                 serviceofferingid=self.service_offering.id
             )
+            self.cleanup.append(virtualMachine)
 
             volume = Volume.create(
                 apiclient, self.services["volume"],
                 zoneid=self.zone.id,
                 account=self.parentd_admin.name,
                 domainid=self.parent_domain.id,
                 diskofferingid=self.disk_offering_5_GB.id)
-
             virtualMachine.attach_volume(apiclient, volume=volume)
 
             expectedCount = (templateSize + self.disk_offering_5_GB.disksize)