Merge "fix share server get migration progress"

manilaclient/osc/v2/share_servers.py

@@ -639,10 +639,9 @@ class ShareServerMigrationShow(command.ShowOne):
     def take_action(self, parsed_args):
         share_client = self.app.client_manager.share
         if share_client.api_version >= api_versions.APIVersion("2.57"):
-            share_server = osc_utils.find_resource(
-                share_client.share_servers, parsed_args.share_server
+            result = share_client.share_servers.migration_get_progress(
+                parsed_args.share_server
             )
-            result = share_server.migration_get_progress()
             return self.dict2columns(result)
         else:
             raise exceptions.CommandError(

manilaclient/tests/unit/osc/v2/test_share_servers.py

@@ -651,6 +651,11 @@ class TestShareServerMigrationShow(TestShareServer):
         )
         self.share_networks_mock.get.return_value = self.new_share_network
 
+        migration_dict = {
+            'total_progress': 'fake',
+            'task_state': 'migration_in_progress',
+            'destination_share_server_id': 'fake_id',
+        }
         self.share_server = manila_fakes.FakeShareServer.create_one_server(
             attrs={
                 'status': 'migrating',
@@ -659,6 +664,10 @@ class TestShareServerMigrationShow(TestShareServer):
             methods={'migration_get_progress': None},
         )
         self.servers_mock.get.return_value = self.share_server
+        share_client = self.app.client_manager.share
+        share_client.share_servers.migration_get_progress.return_value = (
+            migration_dict
+        )
 
         # Get the command objects to test
         self.cmd = osc_share_servers.ShareServerMigrationShow(self.app, None)

releasenotes/notes/bug-2068732-fix-migration-get-progress-on-source-share-server-7ef327dcdedcfbd6.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue while getting share server migration progress for source
+    share server after migration is completed.