summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-09 22:54:21 +0000
committerGerrit Code Review <review@openstack.org>2019-10-09 22:54:21 +0000
commit3f286e7d8c83f665cb00b32c7f9ccaa00f03e628 (patch)
tree20d0e4514e75327eef844ebd30699623f2caa621
parent364cad41912e2c0f99a30f78b2835f3480a18d6e (diff)
parent96dcf13f46ff66a68ac5b93b88f21f57ef709bbf (diff)
downloadpython-novaclient-3f286e7d8c83f665cb00b32c7f9ccaa00f03e628.tar.gz
Merge "Clarify --migration-type migration value as cold migration"
-rw-r--r--doc/source/cli/nova.rst3
-rw-r--r--novaclient/v2/migrations.py6
-rw-r--r--novaclient/v2/shell.py6
3 files changed, 9 insertions, 6 deletions
diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst
index bf919d4b..cada3d62 100644
--- a/doc/source/cli/nova.rst
+++ b/doc/source/cli/nova.rst
@@ -2544,6 +2544,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 <source_compute>``
diff --git a/novaclient/v2/migrations.py b/novaclient/v2/migrations.py
index 0e94b456..3aecd1e7 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 3d7ba896..b656baba 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -5415,7 +5415,7 @@ def _print_migrations(cs, migrations):
dest='migration_type',
metavar='<migration_type>',
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',
@@ -5451,7 +5451,7 @@ def do_migration_list(cs, args):
dest='migration_type',
metavar='<migration_type>',
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',
@@ -5523,7 +5523,7 @@ def do_migration_list(cs, args):
dest='migration_type',
metavar='<migration_type>',
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',