summaryrefslogtreecommitdiff
path: root/openstackclient/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-16 15:52:50 +0000
committerGerrit Code Review <review@openstack.org>2017-03-16 15:52:50 +0000
commit6cae88fa2b936420e62bb70d91f4d2f11eb4dae7 (patch)
tree12a3069530f07fd60612ccc98621e95c2103aad5 /openstackclient/compute
parentc1503492cdada52086da353d06f082f2a53782e5 (diff)
parent7063ffb3cacadbaf2e47c4e6d7b2cf8d694c83a7 (diff)
downloadpython-openstackclient-6cae88fa2b936420e62bb70d91f4d2f11eb4dae7.tar.gz
Merge "Add a validation about options for server migrate command"
Diffstat (limited to 'openstackclient/compute')
-rw-r--r--openstackclient/compute/v2/server.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index d33c631a..1f91e6d9 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1104,6 +1104,10 @@ class MigrateServer(command.Command):
disk_over_commit=parsed_args.disk_overcommit,
)
else:
+ if parsed_args.block_migration or parsed_args.disk_overcommit:
+ raise exceptions.CommandError("--live must be specified if "
+ "--block-migration or "
+ "--disk-overcommit is specified")
server.migrate()
if parsed_args.wait: