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 17:57:54 +0200 |
| commit | 6166caffe31888ef237874fdcaf088ac4ff8d003 (patch) | |
| tree | 40f78113f88ffcd4e6e4dda81e5aee9c3be95eb9 /functest/opnfv_tests/openstack/cinder | |
| parent | 4fb7e1330137fb77ed1b29bbc7c1491b6e12d9b6 (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/cinder')
| -rw-r--r-- | functest/opnfv_tests/openstack/cinder/cinder_test.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/cinder/cinder_test.py b/functest/opnfv_tests/openstack/cinder/cinder_test.py index 7d4b4358b..5354291e6 100644 --- a/functest/opnfv_tests/openstack/cinder/cinder_test.py +++ b/functest/opnfv_tests/openstack/cinder/cinder_test.py @@ -111,9 +111,12 @@ class CinderCheck(singlevm.SingleVm2): def clean(self): assert self.cloud - self.cloud.delete_server( - self.vm2, wait=True, - timeout=getattr(config.CONF, 'vping_vm_delete_timeout')) - self.cloud.delete_floating_ip(self.fip2.id) - self.cloud.delete_volume(self.volume.id) + if self.vm2: + self.cloud.delete_server( + self.vm2, wait=True, + timeout=getattr(config.CONF, 'vping_vm_delete_timeout')) + if self.fip2: + self.cloud.delete_floating_ip(self.fip2.id) + if self.volume: + self.cloud.delete_volume(self.volume.id) super(CinderCheck, self).clean() |