From 6180153bbe55af62f09f600267b2b9d3d267f6fd Mon Sep 17 00:00:00 2001
From: lolwww <me@litvinov.co.nz>
Date: Wed, 26 Jun 2019 01:03:58 +0300
Subject: [PATCH] Adding delete_volume methods to openstack utilities

---
 .../charm_tests/cinder_backup_swift/tests.py  |  4 ++--
 zaza/openstack/utilities/openstack.py         | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/zaza/openstack/charm_tests/cinder_backup_swift/tests.py b/zaza/openstack/charm_tests/cinder_backup_swift/tests.py
index 2fb1f36..8f4eae7 100644
--- a/zaza/openstack/charm_tests/cinder_backup_swift/tests.py
+++ b/zaza/openstack/charm_tests/cinder_backup_swift/tests.py
@@ -47,8 +47,8 @@ class CinderBackupSwiftTest(test_utils.OpenStackBaseTest):
             volume.id)
         # Delete volume backup
         logging.info('Deleting volume backup')
-        openstack_utils.delete_resource(
+        openstack_utils.delete_volume_backup(
             self.cinder_client,
             volume_backup.id)
         logging.info('Deleting volume')
-        openstack_utils.delete_resource(self.cinder_client, volume.id)
+        openstack_utils.delete_volume(self.cinder_client, volume.id)
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index f128b05..c6450d7 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -1690,6 +1690,28 @@ def delete_image(glance, img_id):
     delete_resource(glance.images, img_id, msg="glance image")
 
 
+def delete_volume(cinder, vol_id):
+    """Delete the given volume from cinder.
+    :param cinder: Authenticated cinderclient
+    :type cinder: cinderclient.Client
+    :param vol_id: unique name or id for the openstack resource
+    :type vol_id: str
+    """
+    resource_removed.retry.stop = tenacity.stop_after_attempt(5)
+    delete_resource(cinder.volumes, vol_id, msg="deleting cinder volume")
+
+
+def delete_volume_backup(cinder, vol_backup_id):
+    """Delete the given volume from cinder.
+    :param cinder: Authenticated cinderclient
+    :type cinder: cinderclient.Client
+    :param vol_backup_id: unique name or id for the openstack resource
+    :type vol_backup_id: str
+    """
+    resource_removed.retry.stop = tenacity.stop_after_attempt(5)
+    delete_resource(cinder.backups, vol_backup_id,
+                    msg="deleting cinder volume backup")
+
 def upload_image_to_glance(glance, local_path, image_name, disk_format='qcow2',
                            visibility='public', container_format='bare'):
     """Upload the given image to glance and apply the given label.