arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding delete_volume methods to openstack utilities

Browse Source
This commit is contained in:
lolwww
2019-06-26 01:03:58 +03:00
parent 4f234eb0aa
commit 6180153bbe
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zaza/openstack/charm_tests/cinder_backup_swift/tests.py
View File

@@ -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)

22
zaza/openstack/utilities/openstack.py
View File

@@ -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.