apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7368: Fixed network cleanup issue in test_add_remove_network.py

Browse Source
This commit is contained in:
Gaurav Aradhye 2014-08-20 12:27:27 +05:30 committed by Girish Shilamkar
parent 76d050ba53
commit ac80535574
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/component/test_add_remove_network.py
View File

@ -579,6 +579,7 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
self.services["shared_network_2"]["vlan"] = get_free_vlan(self.apiclient, self.zone.id)[1] self.services["shared_network_2"]["vlan"] = get_free_vlan(self.apiclient, self.zone.id)[1]
network = Network.create(self.api_client,self.services["shared_network_2"],account.name, network = Network.create(self.api_client,self.services["shared_network_2"],account.name,
account.domainid, networkofferingid=self.shared_network_offering.id) account.domainid, networkofferingid=self.shared_network_offering.id)
self.cleanup.append(network)
if network is None: if network is None:
self.skipTest("Network should not be none. Case not handled for Network of type %s" % value) self.skipTest("Network should not be none. Case not handled for Network of type %s" % value)
@ -632,9 +633,10 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
domainid=self.child_domain_2.id) domainid=self.child_domain_2.id)
tempCleanupList.append(self.child_do_admin_2) tempCleanupList.append(self.child_do_admin_2)
except Exception as e: except Exception as e:
self.fail(e)
finally:
tempCleanupList.reverse() tempCleanupList.reverse()
self.cleanup += tempCleanupList self.cleanup += tempCleanupList
self.fail(e)
network = Network.create(self.api_client,self.services["isolated_network"],self.child_do_admin_1.name, network = Network.create(self.api_client,self.services["isolated_network"],self.child_do_admin_1.name,
self.child_do_admin_1.domainid,networkofferingid=self.isolated_network_offering.id) self.child_do_admin_1.domainid,networkofferingid=self.isolated_network_offering.id)