From 6166caffe31888ef237874fdcaf088ac4ff8d003 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 11 Jul 2018 17:33:44 +0200 Subject: Clean all possible resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- functest/opnfv_tests/openstack/cinder/cinder_test.py | 13 ++++++++----- functest/opnfv_tests/openstack/rally/rally.py | 3 ++- functest/opnfv_tests/openstack/tempest/tempest.py | 6 ++++-- functest/opnfv_tests/openstack/vmtp/vmtp.py | 3 ++- functest/opnfv_tests/openstack/vping/vping_ssh.py | 7 ++++--- functest/opnfv_tests/openstack/vping/vping_userdata.py | 14 ++++++++------ 6 files changed, 28 insertions(+), 18 deletions(-) (limited to 'functest/opnfv_tests') 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() 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.""" diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 168e28907..40954de2c 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -308,5 +308,7 @@ 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) diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index 52d1d6d75..326a4f383 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -146,7 +146,8 @@ class Vmtp(singlevm.VmReady1): assert self.cloud os.remove(self.privkey_filename) os.remove(self.pubkey_filename) - self.cloud.delete_image(self.image) + if self.image: + self.cloud.delete_image(self.image) self.cloud.delete_network("pns-internal-net_{}".format(self.guid)) self.cloud.delete_network("pns-internal-net2_{}".format(self.guid)) except Exception: # pylint: disable=broad-except diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py index 1fd2d975f..643f4f6de 100644 --- a/functest/opnfv_tests/openstack/vping/vping_ssh.py +++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py @@ -51,7 +51,8 @@ class VPingSSH(singlevm.SingleVm2): def clean(self): assert self.cloud - self.cloud.delete_server( - self.vm2, 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(VPingSSH, self).clean() 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() -- cgit 1.2.3-korg