openstack/manila-tempest-plugin
Code Issues Proposed changes

Merge "Stop attempting share type deletions that'd fail"

Browse Source
This commit is contained in:
Zuul
2025-11-18 12:35:49 +00:00
committed by Gerrit Code Review
parent f1a041b361 78daf10b5b
commit 283b664c8b
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
manila_tempest_tests/tests/api/base.py
View File

@@ -930,6 +930,25 @@ class BaseSharesTest(test.BaseTestCase):
client.delete_security_service(res_id)
client.wait_for_resource_deletion(ss_id=res_id)
elif res["type"] == "share_type":
# Check if there are still shares using this
# share type before attempting deletion to avoid
# cascading cleanup issues
shares_using_type = []
try:
shares_using_type = client.list_shares(
params={'share_type_id': res_id}
)['shares']
except Exception:
pass
if shares_using_type:
# Skip deletion if any shares exist
LOG.warning("Skipping share type deletion "
"for %s , still has %d shares "
"using it.",
res_id,
len(shares_using_type))
res["deleted"] = True
continue
client.delete_share_type(res_id)
client.wait_for_resource_deletion(st_id=res_id)
elif res["type"] == "share_group":