configdrive syntax, fixed to be up to par with py2

Author: Daan Hoogland

test/integration/component/test_configdrive.py

@@ -60,7 +60,6 @@
 import time
 from contextlib import contextmanager
 from nose.plugins.attrib import attr
-from retry import retry
 
 VPC_SERVICES = 'Dhcp,StaticNat,SourceNat,NetworkACL,UserData,Dns'
 ISO_SERVICES = 'Dhcp,SourceNat,StaticNat,UserData,Firewall,Dns'
@@ -1187,7 +1186,7 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils):
     """
 
     def __init__(self, methodName='runTest'):
-        super(cloudstackTestCase, self).__init__(methodName)
+        super(TestConfigDrive, self).__init__(methodName)
         ConfigDriveUtils.__init__(self)
 
     @classmethod
@@ -1200,6 +1199,7 @@ def setUpClass(cls):
         cls.db_client = test_client.getDbConnection()
         cls.test_data = test_client.getParsedTestDataConfig()
         cls.test_data.update(Services().services)
+        cls._cleanup = []
 
         # Get Zone, Domain and templates
         cls.zone = get_zone(cls.api_client)
@@ -1217,58 +1217,35 @@ def setUpClass(cls):
         cls.service_offering = ServiceOffering.create(
             cls.api_client,
             cls.test_data["service_offering"])
-        cls._cleanup = [cls.service_offering]
+        cls._cleanup.append(cls.service_offering)
 
         hypervisors = Hypervisor.list(cls.api_client, zoneid=cls.zone.id)
         cls.isSimulator = any(h.name == "Simulator" for h in hypervisors)
         return
 
     def setUp(self):
         # Create an account
+        self.cleanup = []
         self.account = Account.create(self.api_client,
                                       self.test_data["account"],
                                       admin=True,
                                       domainid=self.domain.id
                                       )
+        self.cleanup.append(self.account)
         self.tmp_files = []
-        self.cleanup = [self.account]
         self.generate_ssh_keys()
         return
 
     @classmethod
     def tearDownClass(cls):
-        # Cleanup resources used
-        cls.debug("Cleaning up the resources")
-        for obj in reversed(cls._cleanup):
-            try:
-                if isinstance(obj, VirtualMachine):
-                    obj.delete(cls.api_client, expunge=True)
-                else:
-                    obj.delete(cls.api_client)
-            except Exception as e:
-                cls.error("Failed to cleanup %s, got %s" % (obj, e))
-        # cleanup_resources(cls.api_client, cls._cleanup)
-        cls._cleanup = []
-        cls.debug("Cleanup complete!")
-        return
+        super(TestConfigDrive, cls).tearDownClass()
 
     def tearDown(self):
-        # Cleanup resources used
-        self.debug("Cleaning up the resources")
-        for obj in reversed(self.cleanup):
-            try:
-                if isinstance(obj, VirtualMachine):
-                    obj.delete(self.api_client, expunge=True)
-                else:
-                    obj.delete(self.api_client)
-            except Exception as e:
-                self.error("Failed to cleanup %s, got %s" % (obj, e))
-        # cleanup_resources(self.api_client, self.cleanup)
-        self.cleanup = []
+        super(TestConfigDrive,self).tearDown()
+
         for tmp_file in self.tmp_files:
             os.remove(tmp_file)
         self.debug("Cleanup complete!")
-        return
 
     # create_StaticNatRule_For_VM - Creates Static NAT rule on the given
     # public IP for the given VM in the given network