openstack/manila
Code Issues Proposed changes

Merge "NetApp Derive vserver name from share server identifier"

Browse Source
This commit is contained in:
Zuul 2023-12-13 20:14:14 +00:00 committed by Gerrit Code Review
commit 357f62cf97
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
View File

@ -1282,7 +1282,7 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
if (dest_client.is_svm_migrate_supported()
and src_client.is_svm_migrate_supported()):
source_share_server_name = self._get_vserver_name(
source_share_server['id'])
source_share_server['identifier'])
# Check if the migration is supported.
try:
@ -1521,7 +1521,7 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
# Prepare the migration request.
src_cluster_name = src_client.get_cluster_name()
source_share_server_name = self._get_vserver_name(
source_share_server['id'])
source_share_server['identifier'])
# 3. Send the migration request to ONTAP.
try:

1
manila/tests/share/drivers/netapp/dataontap/fakes.py
View File

@ -571,6 +571,7 @@ NETWORK_INFO_NETMASK = '255.255.255.0'
SHARE_SERVER = {
'id': 'fake_id',
'share_network_id': 'c5b3a865-56d0-4d88-abe5-879965e099c9',
'identifier': 'fake_id',
'backend_details': {
'vserver_name': VSERVER1
},

8
releasenotes/notes/bug-2037109-netapp-use-identifier-to-derive-vserver-name-during-migration-81fd7d24b36b4dbe.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
NetApp ONTAP driver during migration uses share server id which was causing
failure for migrate a share server that had been migrated before. Fixed it
by using share server identifier instead of id. Please refer to the
`Launchpad bug #2037109 <https://bugs.launchpad.net/manila/+bug/2037109>`_
for more details.