test accounts cleanup

Author: Daan Hoogland

test/integration/smoke/test_accounts.py

@@ -220,6 +220,7 @@ def test_01_create_account(self):
             account=account.name,
             domainid=account.domainid
         )
+        self.cleanup.append(user)
         self.debug("Created user: %s" % user.id)
         list_users_response = list_users(
             self.apiclient,
@@ -324,20 +325,20 @@ def setUpClass(cls):
         )
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
         cls.services["virtual_machine"]["template"] = cls.template.id
+        cls._cleanup = []
 
         cls.service_offering = ServiceOffering.create(
             cls.api_client,
             cls.services["service_offering"]
         )
+        cls._cleanup.append(cls.service_offering)
         # Create an account
         cls.account = Account.create(
             cls.api_client,
             cls.services["account"]
         )
+        cls._cleanup.append(cls.account)
 
-        cls._cleanup = [cls.account,
-                        cls.service_offering,
-                        ]
         return
 
     @classmethod
@@ -380,6 +381,7 @@ def test_01_user_remove_VM_running(self):
             domainid=self.account.domainid
         )
         self.debug("Created user: %s" % user_1.id)
+        self.cleanup.append(user_1)
 
         user_2 = User.create(
             self.apiclient,
@@ -419,6 +421,7 @@ def test_01_user_remove_VM_running(self):
         # Remove one of the user
         self.debug("Deleting user: %s" % user_1.id)
         user_1.delete(self.apiclient)
+        self.cleanup.remove(user_1)
 
         # Account should exist after deleting user
         accounts_response = list_accounts(
@@ -991,6 +994,7 @@ def setUpClass(cls):
             domainid=cls.account_1.domainid,
             serviceofferingid=cls.service_offering.id
         )
+        cls._cleanup.append(cls.vm_1)
 
         cls.vm_2 = VirtualMachine.create(
             cls.api_client,
@@ -1000,6 +1004,7 @@ def setUpClass(cls):
             domainid=cls.account_2.domainid,
             serviceofferingid=cls.service_offering.id
         )
+        cls._cleanup.append(cls.vm_2)
         return
 
     @classmethod
@@ -1812,6 +1817,7 @@ def test_forceDeleteDomain(self):
             self.services["domain"],
             parentdomainid=self.domain.id
         )
+        self.cleanup.append(domain)
         self.debug("Domain is created succesfully.")
         self.debug(
             "Checking if the created domain is listed in list domains API")
@@ -1828,12 +1834,14 @@ def test_forceDeleteDomain(self):
             self.services["account"],
             domainid=domain.id
         )
+        self.cleanup.append(self.account_1)
 
         self.account_2 = Account.create(
             self.apiclient,
             self.services["account"],
             domainid=domain.id
         )
+        self.cleanup.append(self.account_2)
 
         try:
             self.debug("Creating a tiny service offering for VM deployment")
@@ -1842,6 +1850,7 @@ def test_forceDeleteDomain(self):
                 self.services["service_offering"],
                 domainid=self.domain.id
             )
+            self.cleanup.append(self.service_offering)
 
             self.debug("Deploying virtual machine in account 1: %s" %
                        self.account_1.name)
@@ -1853,17 +1862,19 @@ def test_forceDeleteDomain(self):
                 domainid=self.account_1.domainid,
                 serviceofferingid=self.service_offering.id
             )
+            self.cleanup.append(vm_1)
 
             self.debug("Deploying virtual machine in account 2: %s" %
                        self.account_2.name)
-            VirtualMachine.create(
+            vm_2 = VirtualMachine.create(
                 self.apiclient,
                 self.services["virtual_machine"],
                 templateid=self.template.id,
                 accountid=self.account_2.name,
                 domainid=self.account_2.domainid,
                 serviceofferingid=self.service_offering.id
             )
+            self.cleanup.append(vm_2)
 
             networks = Network.list(
                 self.apiclient,
@@ -1927,15 +1938,12 @@ def test_forceDeleteDomain(self):
                 "Length of response from listLbRules should not be 0"
             )
         except Exception as e:
-            self.cleanup.append(self.domain)
-            self.cleanup.append(self.account_1)
-            self.cleanup.append(self.account_2)
-            self.cleanup.append(self.service_offering)
             self.fail(e)
 
         self.debug("Deleting domain with force option")
         try:
             domain.delete(self.apiclient, cleanup=True)
+            self.cleanup.remove(domain)
         except Exception as e:
             self.debug("Waiting for account.cleanup.interval" +
                        " to cleanup any remaining resouces")
@@ -2033,17 +2041,19 @@ def test_DeleteDomain(self):
             domainid=self.account_1.domainid,
             serviceofferingid=self.service_offering.id
         )
+        self.cleanup.append(vm_1)
 
         self.debug("Deploying virtual machine in account 2: %s" %
                    self.account_2.name)
-        VirtualMachine.create(
+        vm_2 = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],
             templateid=self.template.id,
             accountid=self.account_2.name,
             domainid=self.account_2.domainid,
             serviceofferingid=self.service_offering.id
         )
+        self.cleanup.append(vm_2)
 
         networks = Network.list(
             self.apiclient,
@@ -2110,6 +2120,7 @@ def test_DeleteDomain(self):
         self.debug("Deleting domain without force option")
         with self.assertRaises(Exception):
             domain.delete(self.apiclient, cleanup=False)
+            # TODO should domain be removed from self.cleanup or can it remain in the list?
         return
 
 class TestMoveUser(cloudstackTestCase):