diff --git a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py index 0b0b928bd8..0f364bb47d 100644 --- a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py +++ b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py @@ -4951,7 +4951,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 diff --git a/releasenotes/notes/bug-2058642-fix-backup-delete-source-destination-same_vserver-7e165f9acfec123c.yaml b/releasenotes/notes/bug-2058642-fix-backup-delete-source-destination-same_vserver-7e165f9acfec123c.yaml new file mode 100644 index 0000000000..4873c1409b --- /dev/null +++ b/releasenotes/notes/bug-2058642-fix-backup-delete-source-destination-same_vserver-7e165f9acfec123c.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + NetApp driver `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.