summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Belyaninov <dbelyaninov@mirantis.com>2017-01-30 16:43:35 +0000
committerDmitry Belyaninov <dbelyaninov@mirantis.com>2017-02-08 08:26:52 +0000
commited79fe26d96e9886c439d1404e95b4f190f87a18 (patch)
tree9f76b5b9dd5fa2b577b76c14bb6061b3195543e0
parente896751c3c797cd1c6167628d26798ddda3bdade (diff)
Artifacts removing missed
We should clean lists of artifacts to prevent duplicate removing attempt after the test execution. Change-Id: I5384c907acbb227929363215fa0e2e22a84d5738 Closes-Bug: 1594610 (cherry picked from commit 163fd05841835b366e1c332a8705b38dcdff4eed)
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Vladimir Khlyunev <vkhlyunev@mirantis.com> Code-Review+2: Nastya Urlapova <aurlapova@mirantis.com> Workflow+1: Nastya Urlapova <aurlapova@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 08 Feb 2017 11:55:30 +0000 Reviewed-on: https://review.openstack.org/430637 Project: openstack/fuel-ostf Branch: refs/heads/master
-rw-r--r--fuel_health/neutronmanager.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/fuel_health/neutronmanager.py b/fuel_health/neutronmanager.py
index 5a0bfaf..7c24d09 100644
--- a/fuel_health/neutronmanager.py
+++ b/fuel_health/neutronmanager.py
@@ -110,12 +110,15 @@ class NeutronBaseTest(fuel_health.nmanager.NovaNetworkScenarioTest):
110 router['id'], {"subnet_id": subnet_id}) 110 router['id'], {"subnet_id": subnet_id})
111 111
112 self.neutron_client.delete_router(router['id']) 112 self.neutron_client.delete_router(router['id'])
113 self.routers.pop(router['id'])
113 114
114 def _remove_subnet(self, subnet): 115 def _remove_subnet(self, subnet):
115 return self.neutron_client.delete_subnet(subnet['id']) 116 self.neutron_client.delete_subnet(subnet['id'])
117 self.subnets.remove(subnet)
116 118
117 def _remove_network(self, network): 119 def _remove_network(self, network):
118 self.neutron_client.delete_network(network['id']) 120 self.neutron_client.delete_network(network['id'])
121 self.networks.remove(network)
119 122
120 @classmethod 123 @classmethod
121 def _clean_floating_ips(cls): 124 def _clean_floating_ips(cls):