openstack/manila
Code Issues Proposed changes

Merge "[Netapp] Fix soft_delete_snapshot get children case"

Browse Source
This commit is contained in:
Zuul 2024-07-10 18:08:47 +00:00 committed by Gerrit Code Review
commit 7de1b3afb1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/share/drivers/netapp/dataontap/client/client_cmode.py
View File

@ -3567,7 +3567,7 @@ class NetAppCmodeClient(client_base.NetAppBaseClient):
# Snapshots are locked by clone(s), so split the clone(s) # Snapshots are locked by clone(s), so split the clone(s)
snapshot_children = self.get_clone_children_for_snapshot( snapshot_children = self.get_clone_children_for_snapshot(
volume_name, snapshot_name) volume_name, DELETED_PREFIX + snapshot_name)
for snapshot_child in snapshot_children: for snapshot_child in snapshot_children:
self.volume_clone_split_start(snapshot_child['name']) self.volume_clone_split_start(snapshot_child['name'])

2
manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py
View File

@ -5172,7 +5172,7 @@ class NetAppClientCmodeTestCase(test.TestCase):
fake.SHARE_NAME, fake.SNAPSHOT_NAME, fake.SHARE_NAME, fake.SNAPSHOT_NAME,
'deleted_manila_' + fake.SNAPSHOT_NAME) 'deleted_manila_' + fake.SNAPSHOT_NAME)
mock_get_clone_children_for_snapshot.assert_called_once_with( mock_get_clone_children_for_snapshot.assert_called_once_with(
fake.SHARE_NAME, fake.SNAPSHOT_NAME) fake.SHARE_NAME, 'deleted_manila_' + fake.SNAPSHOT_NAME)
mock_volume_clone_split_start.assert_has_calls([ mock_volume_clone_split_start.assert_has_calls([
mock.call(fake.CDOT_CLONE_CHILD_1), mock.call(fake.CDOT_CLONE_CHILD_1),
mock.call(fake.CDOT_CLONE_CHILD_2), mock.call(fake.CDOT_CLONE_CHILD_2),