openstack
/
python-manilaclient
Code Issues Proposed changes

Merge "Fix share force delete case"

This commit is contained in:
Zuul 2024-02-17 00:27:23 +00:00 committed by Gerrit Code Review
parent 8fd50c30e9 99be0ce9cc
commit 91bd8fc327
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manilaclient/osc/v2/share.py
View File

@ -350,7 +350,7 @@ class DeleteShare(command.Command):
if parsed_args.force:
share_client.shares.force_delete(share_obj)
if parsed_args.soft:
elif parsed_args.soft:
if share_client.api_version >= api_versions.APIVersion(
'2.69'):
share_client.shares.soft_delete(share_obj)

6
manilaclient/tests/unit/osc/v2/test_share.py
View File

@ -425,6 +425,8 @@ class TestShareDelete(TestShare):
result = self.cmd.take_action(parsed_args)
self.shares_mock.delete.assert_called_with(shares[0], None)
self.shares_mock.soft_delete.assert_not_called()
self.shares_mock.force_delete.assert_not_called()
self.assertIsNone(result)
def test_share_delete_many(self):
@ -481,6 +483,8 @@ class TestShareDelete(TestShare):
result = self.cmd.take_action(parsed_args)
self.shares_mock.force_delete.assert_called_once_with(shares[0])
self.shares_mock.delete.assert_not_called()
self.shares_mock.soft_delete.assert_not_called()
self.assertIsNone(result)
def test_share_delete_with_soft(self):
@ -500,6 +504,8 @@ class TestShareDelete(TestShare):
result = self.cmd.take_action(parsed_args)
self.shares_mock.soft_delete.assert_called_once_with(shares[0])
self.shares_mock.delete.assert_not_called()
self.shares_mock.force_delete.assert_not_called()
self.assertIsNone(result)
def test_share_delete_wrong_name(self):

5
releasenotes/notes/bug-2051737-fix-share-force-delete-request-6d2578fb7da61e3f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Share force delete command was sending two REST requests, first force delete and
then delete. Fixed it by removing delete request. For more details, please refer to
`launchpad bug 2051737 <https://bugs.launchpad.net/python-manilaclient/+bug/2051737>`_