House keeping multiple_physical_network_creation.py in regards to DaanHoogland comments.

Author: Sina Kashipazha

test/integration/component/test_multiple_physical_network_creation.py

@@ -71,19 +71,18 @@ def setUpClass(cls):
                 cls.services["l2-network"],
                 zoneid=cls.zone.id
             )
+            cls._cleanup.append(cls.physical_network)
 
             cls.physical_network_2 = PhysicalNetwork.create(
                 cls.apiclient,
                 cls.services["l2-network"],
                 zoneid=cls.zone.id
             )
+            cls._cleanup.append(cls.physical_network_2)
         except Exception as e:
             cls.tearDownClass()
             raise unittest.SkipTest(e)
 
-        cls._cleanup.append(cls.physical_network)
-        cls._cleanup.append(cls.physical_network_2)
-
         cls.kvmnetworklabel=None
         try:
             hosts = Host.list(cls.apiclient, type='Routing')
@@ -128,7 +127,7 @@ def tearDownClass(cls):
                 allocationstate="Enabled"
             )
             # Cleanup resources used
-            cleanup_resources(cls.apiclient, cls._cleanup)
+            super(TestMulipleNetworkCreation, cls).tearDownClass()
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
@@ -140,12 +139,7 @@ def setUp(self):
         return
 
     def tearDown(self):
-        try:
-            # Clean up
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestMulipleNetworkCreation, self).tearDown()
 
     @attr(tags=["advanced"], required_hardware="false")
     def test_01_add_traffictype_for_untagged_networks(self):
@@ -227,6 +221,7 @@ def test_02_created_shared_guest_network(self):
             isolationmethods="VLAN",
             zoneid=self.zone.id
         )
+        self.cleanup.append(self.physical_network_3)
 
         # Enable the network
         self.physical_network_3.update(
@@ -267,12 +262,14 @@ def test_02_created_shared_guest_network(self):
             domainid=self.domain.id
             #physicalnetworkid=self.physical_network_3.id
         )
+        self.cleanup.append(self.shared_network)
 
         # Create small service offering
         self.service_offering = ServiceOffering.create(
             self.apiclient,
             self.testdata["service_offerings"]["small"]
         )
+        self.cleanup.append(self.service_offering)
 
         #4. Create virtual machine
         self.testdata["virtual_machine"]["zoneid"] = self.zone.id
@@ -284,6 +281,7 @@ def test_02_created_shared_guest_network(self):
             serviceofferingid=self.service_offering.id,
             networkids=self.shared_network.id
         )
+        self.cleanup.append(self.virtual_machine)
 
         list_vms = VirtualMachine.list(
             self.apiclient,