From 62ad3537c3f4629b08be4382d4c42b9cd54ba8d4 Mon Sep 17 00:00:00 2001 From: Kiran Pawar Date: Wed, 5 Jun 2024 09:59:11 +0000 Subject: [PATCH] [Netapp] Fix soft_delete_snapshot get children case In soft delete snapshot, after rename, we retrieve snapshot children, but instead of renamed snapshot we were looking for earlier named snapshot. Fixed this. Closes-bug: #2025641 Change-Id: I0577153fe8b2abf1aa521b61754788f2666a3e0f --- manila/share/drivers/netapp/dataontap/client/client_cmode.py | 2 +- .../share/drivers/netapp/dataontap/client/test_client_cmode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manila/share/drivers/netapp/dataontap/client/client_cmode.py b/manila/share/drivers/netapp/dataontap/client/client_cmode.py index 5969a04fe9..1d76590727 100644 --- a/manila/share/drivers/netapp/dataontap/client/client_cmode.py +++ b/manila/share/drivers/netapp/dataontap/client/client_cmode.py @@ -3524,7 +3524,7 @@ class NetAppCmodeClient(client_base.NetAppBaseClient): # Snapshots are locked by clone(s), so split the clone(s) snapshot_children = self.get_clone_children_for_snapshot( - volume_name, snapshot_name) + volume_name, DELETED_PREFIX + snapshot_name) for snapshot_child in snapshot_children: self.volume_clone_split_start(snapshot_child['name']) diff --git a/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py b/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py index 5d1da06547..eb7da7c6fa 100644 --- a/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py +++ b/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py @@ -5130,7 +5130,7 @@ class NetAppClientCmodeTestCase(test.TestCase): fake.SHARE_NAME, fake.SNAPSHOT_NAME, 'deleted_manila_' + fake.SNAPSHOT_NAME) 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.call(fake.CDOT_CLONE_CHILD_1), mock.call(fake.CDOT_CLONE_CHILD_2),