From 40a9a5bfb3a786e8c2911786a740d4671bf5dab6 Mon Sep 17 00:00:00 2001
From: Luciano Lo Giudice <luciano.logiudice@canonical.com>
Date: Mon, 20 Sep 2021 11:55:52 -0300
Subject: [PATCH] Safely remove volume

Move the checks inside a 'try' block so that the volume can be
safely remove as a 'finally' statement.
---
 .../charm_tests/cinder_netapp/tests.py        | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/zaza/openstack/charm_tests/cinder_netapp/tests.py b/zaza/openstack/charm_tests/cinder_netapp/tests.py
index b5ce8fb..11bfe01 100644
--- a/zaza/openstack/charm_tests/cinder_netapp/tests.py
+++ b/zaza/openstack/charm_tests/cinder_netapp/tests.py
@@ -63,15 +63,17 @@ class CinderNetAppTest(test_utils.OpenStackBaseTest):
         vol_new = self.cinder_client.volumes.create(
             name=test_vol_name,
             size='1')
-        openstack_utils.resource_reaches_status(
-            self.cinder_client.volumes,
-            vol_new.id,
-            wait_iteration_max_time=12000,
-            stop_after_attempt=5,
-            expected_status='available',
-            msg='Volume status wait')
-        test_vol = self.cinder_client.volumes.find(name=test_vol_name)
-        self.assertEqual(
-            getattr(test_vol, 'os-vol-host-attr:host').split('#')[0],
-            'cinder@cinder-netapp')
-        self.cinder_client.volumes.delete(vol_new)
+        try:
+            openstack_utils.resource_reaches_status(
+                self.cinder_client.volumes,
+                vol_new.id,
+                wait_iteration_max_time=12000,
+                stop_after_attempt=5,
+                expected_status='available',
+                msg='Volume status wait')
+            test_vol = self.cinder_client.volumes.find(name=test_vol_name)
+            self.assertEqual(
+                getattr(test_vol, 'os-vol-host-attr:host').split('#')[0],
+                'cinder@cinder-netapp')
+        finally:
+            self.cinder_client.volumes.delete(vol_new)