aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/vping/vping_userdata.py
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/vping/vping_userdata.py
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/vping/vping_userdata.py')
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_userdata.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index 3b0a1a9e1..421ea6a2c 100644
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -122,10 +122,12 @@ class VPingUserdata(singlevm.VmReady2):
def clean(self):
assert self.cloud
- self.cloud.delete_server(
- self.vm1, wait=True,
- timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
- self.cloud.delete_server(
- self.vm2, wait=True,
- timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
+ if self.vm1:
+ self.cloud.delete_server(
+ self.vm1, wait=True,
+ timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
+ if self.vm2:
+ self.cloud.delete_server(
+ self.vm2, wait=True,
+ timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
super(VPingUserdata, self).clean()