Skip to content

Commit

Permalink
NetApp Derive vserver name from share server identifier (#136)
Browse files Browse the repository at this point in the history
Instead of using the identifier the migration methods are deriving
the vserver name from the share server id. This causes failure for
migrate a share server that had been migrated before.

Closes-bug: #2037109
Change-Id: Ida13bacab960761bb7cd0708017d864db0d7358f
  • Loading branch information
kpawar-sap authored Oct 5, 2023
1 parent 88808da commit b6ae0d5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ def _check_for_migration_support(
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:
Expand Down Expand Up @@ -1451,7 +1451,7 @@ def _migration_start_using_svm_migrate(
# 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:
Expand Down
1 change: 1 addition & 0 deletions manila/tests/share/drivers/netapp/dataontap/fakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
SHARE_SERVER = {
'id': 'fake_id',
'share_network_id': 'c5b3a865-56d0-4d88-abe5-879965e099c9',
'identifier': 'fake_id',
'backend_details': {
'vserver_name': VSERVER1
},
Expand Down

0 comments on commit b6ae0d5

Please sign in to comment.