restructure cleanup

Author: DaanHoogland

test/integration/smoke/test_vmware_vapps.py

@@ -79,13 +79,6 @@ def setUpClass(cls):
 
         if cls.hypervisorNotSupported == False:
 
-            cls.account = Account.create(
-                cls.apiclient,
-                cls.services["account"],
-                domainid=cls.domain.id
-            )
-            cls._cleanup.append(cls.account)
-
             cls.templates = get_test_ovf_templates(
                 cls.apiclient,
                 cls.zone.id,
@@ -115,6 +108,13 @@ def setUpClass(cls):
             cls._cleanup.append(cls.l2_network_offering)
             cls.l2_network_offering.update(cls.apiclient, state='Enabled')
 
+            cls.account = Account.create(
+                cls.apiclient,
+                cls.services["account"],
+                domainid=cls.domain.id
+            )
+            cls._cleanup.append(cls.account)
+
     @classmethod
     def tearDownClass(cls):
         super(TestVAppsVM, cls).tearDownClass()
@@ -235,7 +235,6 @@ def test_01_vapps_vm_cycle(self):
                 properties=vm_service['properties'],
                 nicnetworklist=nicnetworklist
             )
-            self.cleanup.append(vm)
 
             list_vm_response = VirtualMachine.list(
                 self.apiclient,
@@ -288,4 +287,3 @@ def test_01_vapps_vm_cycle(self):
             cmd = destroyVirtualMachine.destroyVirtualMachineCmd()
             cmd.id = vm.id
             self.apiclient.destroyVirtualMachine(cmd)
-            self.cleanup.remove(vm)