Merge "Resolve issues with 'server migration list'"

Author: Zuul

openstackclient/compute/v2/server.py

@@ -2041,7 +2041,7 @@ def _show_progress(progress):
                 raise SystemExit
 
 
-class ListMigration(command.Command):
+class ListMigration(command.Lister):
     _description = _("""List server migrations""")
 
     def get_parser(self, prog_name):
@@ -2168,16 +2168,21 @@ def take_action(self, parsed_args):
 
         search_opts = {
             'host': parsed_args.host,
-            'server': parsed_args.server,
             'status': parsed_args.status,
         }
 
+        if parsed_args.server:
+            search_opts['instance_uuid'] = utils.find_resource(
+                compute_client.servers,
+                parsed_args.server,
+            ).id
+
         if parsed_args.type:
             migration_type = parsed_args.type
             # we're using an alias because the default value is confusing
             if migration_type == 'cold-migration':
                 migration_type = 'migration'
-            search_opts['type'] = migration_type
+            search_opts['migration_type'] = migration_type
 
         if parsed_args.marker:
             if compute_client.api_version < api_versions.APIVersion('2.59'):

openstackclient/tests/unit/compute/v2/test_server.py

@@ -4079,7 +4079,6 @@ def test_server_migration_list_no_options(self):
         kwargs = {
             'status': None,
             'host': None,
-            'server': None,
         }
 
         self.migrations_mock.list.assert_called_with(**kwargs)
@@ -4106,10 +4105,11 @@ def test_server_migration_list(self):
         kwargs = {
             'status': 'migrating',
             'host': 'host1',
-            'server': 'server1',
-            'type': 'migration',
+            'instance_uuid': self.server.id,
+            'migration_type': 'migration',
         }
 
+        self.servers_mock.get.assert_called_with('server1')
         self.migrations_mock.list.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
@@ -4145,7 +4145,6 @@ def test_server_migration_list(self):
         kwargs = {
             'status': 'migrating',
             'host': None,
-            'server': None,
         }
 
         self.migrations_mock.list.assert_called_with(**kwargs)
@@ -4194,7 +4193,6 @@ def test_server_migration_list(self):
             'limit': 1,
             'marker': 'test_kp',
             'host': None,
-            'server': None,
             'changes_since': '2019-08-09T08:03:25Z',
         }
 
@@ -4303,7 +4301,6 @@ def test_server_migration_list_with_changes_before(self):
             'limit': 1,
             'marker': 'test_kp',
             'host': None,
-            'server': None,
             'changes_since': '2019-08-07T08:03:25Z',
             'changes_before': '2019-08-09T08:03:25Z',
         }
@@ -4375,7 +4372,6 @@ def test_server_migration_list_with_project(self):
             'limit': 1,
             'marker': 'test_kp',
             'host': None,
-            'server': None,
             'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3',
             'changes_since': '2019-08-07T08:03:25Z',
             'changes_before': "2019-08-09T08:03:25Z",
@@ -4438,7 +4434,6 @@ def test_server_migration_list_with_user(self):
             'limit': 1,
             'marker': 'test_kp',
             'host': None,
-            'server': None,
             'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6',
             'changes_since': '2019-08-07T08:03:25Z',
             'changes_before': "2019-08-09T08:03:25Z",
@@ -4500,7 +4495,6 @@ def test_server_migration_list_with_project_and_user(self):
             'status': 'migrating',
             'limit': 1,
             'host': None,
-            'server': None,
             'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3',
             'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6',
             'changes_since': '2019-08-07T08:03:25Z',