From 96dcf13f46ff66a68ac5b93b88f21f57ef709bbf Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 26 Aug 2019 11:26:18 -0400 Subject: [PATCH] Clarify --migration-type migration value as cold migration This is a follow up to a review discussion [1] where the "migration" value for the --migration-type option is for a cold migration. This change just updates docs and help strings. An alternative is changing "migration" as a valid value to "cold-migration" (or accept both) and under the covers treat "cold-migration" as "migration" for the actual API call. [1] https://review.opendev.org/#/c/675117/3/novaclient/v2/shell.py@5430 Related to blueprint more-migration-list-filters Change-Id: I6baa6af8731252e3c4976db06f0ca9cdfcb5e2f1 --- doc/source/cli/nova.rst | 3 +++ novaclient/v2/migrations.py | 6 +++--- novaclient/v2/shell.py | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst index c0d80eda8..eeb804627 100644 --- a/doc/source/cli/nova.rst +++ b/doc/source/cli/nova.rst @@ -2593,6 +2593,9 @@ To see the list of evacuation operations *from* a compute service host: * evacuation * live-migration * migration + + .. note:: This is a cold migration. + * resize ``--source-compute `` diff --git a/novaclient/v2/migrations.py b/novaclient/v2/migrations.py index 0e94b4562..3aecd1e7e 100644 --- a/novaclient/v2/migrations.py +++ b/novaclient/v2/migrations.py @@ -61,7 +61,7 @@ class MigrationManager(base.ManagerWithFind): :param status: filter migrations by status (optional). :param instance_uuid: filter migrations by instance uuid (optional). :param migration_type: Filter migrations by type. Valid values are: - evacuation, live-migration, migration, resize + evacuation, live-migration, migration (cold), resize :param source_compute: Filter migrations by source compute host name. """ return self._list_base(host=host, status=status, @@ -89,7 +89,7 @@ class MigrationManager(base.ManagerWithFind): to a certain point of time. The provided time should be an ISO 8061 formatted time. e.g. 2016-03-04T06:27:59Z . (optional). :param migration_type: Filter migrations by type. Valid values are: - evacuation, live-migration, migration, resize + evacuation, live-migration, migration (cold), resize :param source_compute: Filter migrations by source compute host name. """ return self._list_base(host=host, status=status, @@ -122,7 +122,7 @@ class MigrationManager(base.ManagerWithFind): equal to a certain point of time. The provided time should be an ISO 8061 formatted time. e.g. 2016-03-05T06:27:59Z . (optional). :param migration_type: Filter migrations by type. Valid values are: - evacuation, live-migration, migration, resize + evacuation, live-migration, migration (cold), resize :param source_compute: Filter migrations by source compute host name. """ return self._list_base(host=host, status=status, diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 34dea57f4..86628c53d 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -5427,7 +5427,7 @@ def _print_migrations(cs, migrations): dest='migration_type', metavar='', help=_('Filter migrations by type. Valid values are: evacuation, ' - 'live-migration, migration, resize')) + 'live-migration, migration (cold), resize')) @utils.arg( '--source-compute', dest='source_compute', @@ -5463,7 +5463,7 @@ def do_migration_list(cs, args): dest='migration_type', metavar='', help=_('Filter migrations by type. Valid values are: evacuation, ' - 'live-migration, migration, resize')) + 'live-migration, migration (cold), resize')) @utils.arg( '--source-compute', dest='source_compute', @@ -5535,7 +5535,7 @@ def do_migration_list(cs, args): dest='migration_type', metavar='', help=_('Filter migrations by type. Valid values are: evacuation, ' - 'live-migration, migration, resize')) + 'live-migration, migration (cold), resize')) @utils.arg( '--source-compute', dest='source_compute',