Merge "Fix backup delete issue when source and destination vserver are same"

This commit is contained in:
Zuul 2024-06-05 10:43:19 +00:00 committed by Gerrit Code Review
commit 83b60eb1f9
2 changed files with 11 additions and 1 deletions
manila/share/drivers/netapp/dataontap/cluster_mode
releasenotes/notes

@ -4964,7 +4964,9 @@ class NetAppCmodeFileStorageLibrary(object):
# Delete the vserver peering
try:
src_vserver_client.delete_vserver_peer(src_vserver, des_vserver)
if src_vserver != des_vserver:
src_vserver_client.delete_vserver_peer(src_vserver,
des_vserver)
except netapp_api.NaApiError:
pass

@ -0,0 +1,8 @@
---
fixes:
- |
NetApp driver `bug #2058642
<https://bugs.launchpad.net/tempest/+bug/2058642>`_:
Fix the backup delete issue for NetApp driver when source and destination
vserver are same. Added the logic in resource cleanup part to delete
the vserver peering when source and destination vserver are not same.