openstack/tempest
Code Issues Proposed changes

Merge "Fix 404 when deleteing volume group"

Browse Source
This commit is contained in:
Zuul 2020-06-17 16:34:04 +00:00 committed by Gerrit Code Review
commit 367e148d43
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tempest/api/volume/base.py
View File

@ -233,12 +233,15 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
return group return group
def delete_group(self, group_id, delete_volumes=True): def delete_group(self, group_id, delete_volumes=True):
self.groups_client.delete_group(group_id, delete_volumes) group_vols = []
if delete_volumes: if delete_volumes:
vols = self.volumes_client.list_volumes(detail=True)['volumes'] vols = self.volumes_client.list_volumes(detail=True)['volumes']
for vol in vols: for vol in vols:
if vol['group_id'] == group_id: if vol['group_id'] == group_id:
self.volumes_client.wait_for_resource_deletion(vol['id']) group_vols.append(vol['id'])
self.groups_client.delete_group(group_id, delete_volumes)
for vol in group_vols:
self.volumes_client.wait_for_resource_deletion(vol)
self.groups_client.wait_for_resource_deletion(group_id) self.groups_client.wait_for_resource_deletion(group_id)