Merge "Add 'openstack server migration list --type' option"

Author: Zuul

openstackclient/compute/v2/server.py

@@ -2065,6 +2065,14 @@ def get_parser(self, prog_name):
             metavar='<status>',
             help=_('Filter migrations by status')
         )
+        parser.add_argument(
+            '--type',
+            metavar='<type>',
+            choices=[
+                'evacuation', 'live-migration', 'cold-migration', 'resize',
+            ],
+            help=_('Filter migrations by type'),
+        )
         parser.add_argument(
             '--marker',
             metavar='<marker>',
@@ -2140,10 +2148,6 @@ def print_migrations(self, parsed_args, compute_client, migrations):
         if compute_client.api_version >= api_versions.APIVersion("2.59"):
             columns.insert(0, "UUID")
 
-        # TODO(brinzhang): It also suppports filter migrations by type
-        # since 2.1. https://review.opendev.org/#/c/675117 supported
-        # filtering the migrations by 'migration_type' and 'source_compute'
-        # in novaclient, that will be added in OSC by follow-up.
         if compute_client.api_version >= api_versions.APIVersion("2.23"):
             columns.insert(0, "Id")
             columns.insert(len(columns) - 2, "Type")
@@ -2168,6 +2172,13 @@ def take_action(self, parsed_args):
             'status': parsed_args.status,
         }
 
+        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
+
         if parsed_args.marker:
             if compute_client.api_version < api_versions.APIVersion('2.59'):
                 msg = _(

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

@@ -4092,6 +4092,7 @@ def test_server_migration_list(self):
             '--server', 'server1',
             '--host', 'host1',
             '--status', 'migrating',
+            '--type', 'cold-migration',
         ]
         verifylist = [
             ('server', 'server1'),
@@ -4106,6 +4107,7 @@ def test_server_migration_list(self):
             'status': 'migrating',
             'host': 'host1',
             'server': 'server1',
+            'type': 'migration',
         }
 
         self.migrations_mock.list.assert_called_with(**kwargs)