diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-11 17:33:44 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-11 18:14:19 +0200 |
| commit | d8a6342c5fa1c17d7454e245626ed745612d841a (patch) | |
| tree | bad64ebf00a833e8316d44c4f21e05ddc10ac5f8 /functest/opnfv_tests/openstack/tempest/tempest.py | |
| parent | 01360bc0547f223689b86a9b25ff89ca0cb4719a (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>
(cherry picked from commit 6166caffe31888ef237874fdcaf088ac4ff8d003)
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 53085d66b..911c8caad 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -316,8 +316,10 @@ class TempestCommon(singlevm.VmReady1): Cleanup all OpenStack objects. Should be called on completion. """ super(TempestCommon, self).clean() - self.cloud.delete_image(self.image_alt) - self.orig_cloud.delete_flavor(self.flavor_alt.id) + if self.image_alt: + self.cloud.delete_image(self.image_alt) + if self.flavor_alt: + self.orig_cloud.delete_flavor(self.flavor_alt.id) class TempestSmokeSerial(TempestCommon): |