aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/rally
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-11 17:33:44 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-11 17:57:54 +0200
commit6166caffe31888ef237874fdcaf088ac4ff8d003 (patch)
tree40f78113f88ffcd4e6e4dda81e5aee9c3be95eb9 /functest/opnfv_tests/openstack/rally
parent4fb7e1330137fb77ed1b29bbc7c1491b6e12d9b6 (diff)
Clean all possible resources
It checks all openstack resources before cleaning. It allows removing images even if the test fail quickly. Change-Id: I1763b8a70fa7ffeb03c435e8e775c7afd1a7adac Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/rally')
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 49379e991..2cdb03cb3 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -479,7 +479,8 @@ class RallyBase(singlevm.VmReady1):
def clean(self):
"""Cleanup of OpenStack resources. Should be called on completion."""
super(RallyBase, self).clean()
- self.orig_cloud.delete_flavor(self.flavor_alt.id)
+ if self.flavor_alt:
+ self.orig_cloud.delete_flavor(self.flavor_alt.id)
def is_successful(self):
"""The overall result of the test."""