openstack/rally-openstack
Code Issues Proposed changes

Merge "Nova-network: disassociate networks before deletion"

Browse Source
This commit is contained in:
Jenkins
2015-10-04 18:01:33 +00:00
committed by Gerrit Code Review
parent 9c42c86c46 75413b38df
commit 3a3ca9c041
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rally/plugins/openstack/wrappers/network.py
View File

@@ -149,6 +149,9 @@ class NovaNetworkWrapper(NetworkWrapper):
return self._marshal_network_object(network)
def delete_network(self, network):
self.client.networks.disassociate(network["id"],
disassociate_host=False,
disassociate_project=True)
return self.client.networks.delete(network["id"])
def list_networks(self):

2
tests/unit/plugins/openstack/wrappers/test_network.py
View File

@@ -91,6 +91,8 @@ class NovaNetworkWrapperTestCase(test.TestCase):
service.client.networks.delete.return_value = "foo_deleted"
self.assertEqual(service.delete_network({"id": "foo_id"}),
"foo_deleted")
service.client.networks.disassociate.assert_called_once_with(
"foo_id", disassociate_host=False, disassociate_project=True)
service.client.networks.delete.assert_called_once_with("foo_id")
def test_list_networks(self):