diff options
Diffstat (limited to 'functest/opnfv_tests/openstack/cinder/cinder_test.py')
| -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() |