CLOUDSTACK-5194: portable ip - Improving cleanup code to

Gaurav Aradhye · Girish Shilamkar · commit 67b071beaac3 · 2013-11-19T11:21:33.000+05:30
avoid cascading failures
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
@@ -235,8 +235,9 @@ def test_create_portable_ip_range_non_root_admin(self):
 
         self.debug("Trying to create portable ip range with non root-admin api client, should raise exception")
         with self.assertRaises(Exception):
-            PortablePublicIpRange.create(self.api_client_user,
+            portable_ip_range = PortablePublicIpRange.create(self.api_client_user,
                                          portable_ip_range_services)
+            self.cleanup.append(portable_ip_range)
 
         return
 
@@ -258,8 +259,9 @@ def test_create_portable_ip_range_invalid_region(self):
         self.debug("Trying to create portable ip range with wrong region id")
 
         with self.assertRaises(Exception):
-            PortablePublicIpRange.create(self.apiclient,
+            portable_ip_range = PortablePublicIpRange.create(self.apiclient,
                                          portable_ip_range_services)
+            self.cleanup.append(portable_ip_range)
 
         return
 
@@ -687,8 +689,6 @@ def test_associate_ip_address(self):
 
         self.debug("Associated default public ip address: %s" % publicipaddress.ipaddress.ipaddress)
 
-
-
         self.debug("Associating public ip address with network: %s with isportable=False" % self.network.id)
         publicipaddressnotportable = PublicIPAddress.create(
                                     self.apiclient,
@@ -727,14 +727,15 @@ def test_associate_ip_address_invalid_zone(self):
         self.debug("Trying to associate portable public ip with invalid zone id, this should fail")
 
         with self.assertRaises(Exception):
-            PublicIPAddress.create(
+            publicipaddress = PublicIPAddress.create(
                                    self.apiclient,
                                    accountid=self.account.name,
                                    zoneid = -1,
                                    domainid=self.account.domainid,
                                    regionid = self.region.id,
                                    isportable=True
                                     )
+            publicipaddress.delete(self.apiclient)
         self.debug("Associating ip address failed")
         return
 
@@ -815,14 +816,15 @@ def test_associate_ip_address_services_enable_disable(self):
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 
-        self.debug("Deleting firewall rule")
-        fw_rule.delete(self.apiclient)
+        finally:
+            self.debug("Deleting firewall rule")
+            fw_rule.delete(self.apiclient)
 
-        self.debug("Deleting NAT rule")
-        nat_rule.delete(self.apiclient)
+            self.debug("Deleting NAT rule")
+            nat_rule.delete(self.apiclient)
 
-        self.debug("disassocoating portable ip: %s" % portableip.ipaddress.ipaddress)
-        portableip.delete(self.apiclient)
+            self.debug("disassocoating portable ip: %s" % portableip.ipaddress.ipaddress)
+            portableip.delete(self.apiclient)
         return
 
     @attr(tags=["advanced"])
@@ -858,14 +860,15 @@ def test_associate_ip_address_no_free_ip(self):
 
         self.debug("Trying to associate portable public ip when no free ips available, this should fail")
         with self.assertRaises(Exception):
-            PublicIPAddress.create(
+            portableipaddress = PublicIPAddress.create(
                                     self.apiclient,
                                     accountid=self.account.name,
                                     zoneid=self.zone.id,
                                     domainid=self.account.domainid,
                                     networkid=self.network.id,
                                     isportable=True
                                    )
+            portableipaddress.delete(self.apiclient)
 
         self.debug("Associating portable ip address failed")
 
@@ -1338,7 +1341,6 @@ def test_delete_account_services_enabled(self):
 
         return
 
-
 class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
     """Test Transfer Portable IP Across Networks
     """
@@ -1390,7 +1392,6 @@ def setUpClass(cls):
             cls.services["service_offering"]
         )
 
-        cls.debug("creating networks and virtual machines in each network for portable ip transfer tests: ")
         cls.network1 = Network.create(
                                     cls.api_client,
                                     cls.services["network1"],
@@ -1538,11 +1539,6 @@ def test_list_portable_ip_range_non_root_admin(self):
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 
-        self.debug("disassociating portable ip: %s" % portableip.ipaddress.ipaddress)
-        portableip.delete(self.apiclient)
-
-
-
-
-
-
+        finally:
+            self.debug("disassociating portable ip: %s" % portableip.ipaddress.ipaddress)
+            portableip.delete(self.apiclient)
