openstack/python-openstackclient
Code Issues Proposed changes

Fix --shared/block-migration options in server migrate command

Browse Source 
Currently, --shared-migration and --block-migration options effects are
reversed: --block-migration requests a migration with share,
--shared-migration a block-migration.

This change corrects OSC implementation and clarifies arguments passed
to novaclient (the root cause of the bug).

Change-Id: Ib682cff0c44d3b1304670f8606907b1762d8b1e7
Closes-Bug: #1518059
This commit is contained in:
Cedric Brandily 2016-10-11 22:01:16 +02:00
parent bfeecd50fd
commit 694a24c309
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstackclient/compute/v2/server.py
View File

@ -973,15 +973,15 @@ class MigrateServer(command.Command):
migration_group = parser.add_mutually_exclusive_group() migration_group = parser.add_mutually_exclusive_group()
migration_group.add_argument( migration_group.add_argument(
'--shared-migration', '--shared-migration',
dest='shared_migration', dest='block_migration',
action='store_true', action='store_false',
default=True, default=False,
help=_('Perform a shared live migration (default)'), help=_('Perform a shared live migration (default)'),
) )
migration_group.add_argument( migration_group.add_argument(
'--block-migration', '--block-migration',
dest='shared_migration', dest='block_migration',
action='store_false', action='store_true',
help=_('Perform a block live migration'), help=_('Perform a block live migration'),
) )
disk_group = parser.add_mutually_exclusive_group() disk_group = parser.add_mutually_exclusive_group()
@ -1016,9 +1016,9 @@ class MigrateServer(command.Command):
) )
if parsed_args.live: if parsed_args.live:
server.live_migrate( server.live_migrate(
parsed_args.live, host=parsed_args.live,
parsed_args.shared_migration, block_migration=parsed_args.block_migration,
parsed_args.disk_overcommit, disk_over_commit=parsed_args.disk_overcommit,
) )
else: else:
server.migrate() server.migrate()