From a33f14e298883d6a639b14c9cdb7ac2ba2d0e63d Mon Sep 17 00:00:00 2001
From: zhiyuan_cai <luckyvega.g@gmail.com>
Date: Mon, 16 Feb 2015 11:00:50 +0800
Subject: [PATCH] Rename --verify for server resize to avoid conflict
Currently server resize command has a verify argument for user to
confirm resize operation. But this argument is also registered by
openstack client shell which is used to enable server certificate
verification. So verify argument can not be correctly passed to
server resize command.
This patch renames --verify to --confirm (nova client has a
resize-confirm command) to solve this problem.
Change-Id: I751aa3df16c3b637b82944dd350afc5cbab62120
Closes-Bug: #1416542
---
doc/source/command-objects/server.rst | 6 +++---
openstackclient/compute/v2/server.py | 6 +++---
openstackclient/tests/compute/v2/test_server.py | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index ee6416fc7c..34555580ed 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -423,16 +423,16 @@ Scale server to a new flavor
<server>
os server resize
- --verify | --revert
+ --confirm | --revert
<server>
.. option:: --flavor <flavor>
Resize server to specified flavor
-.. option:: --verify
+.. option:: --confirm
- Verify server resize is complete
+ Confirm server resize is complete
.. option:: --revert
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index f0a59d348b..051e1c73a1 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1069,9 +1069,9 @@ class ResizeServer(command.Command):
help=_('Resize server to specified flavor'),
)
phase_group.add_argument(
- '--verify',
+ '--confirm',
action="store_true",
- help=_('Verify server resize is complete'),
+ help=_('Confirm server resize is complete'),
)
phase_group.add_argument(
'--revert',
@@ -1110,7 +1110,7 @@ class ResizeServer(command.Command):
else:
sys.stdout.write(_('\nError resizing server'))
raise SystemExit
- elif parsed_args.verify:
+ elif parsed_args.confirm:
compute_client.servers.confirm_resize(server)
elif parsed_args.revert:
compute_client.servers.revert_resize(server)
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 5a1266970d..079f301eac 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -437,7 +437,7 @@ class TestServerResize(TestServer):
compute_fakes.server_id,
]
verifylist = [
- ('verify', False),
+ ('confirm', False),
('revert', False),
('server', compute_fakes.server_id),
]
@@ -461,7 +461,7 @@ class TestServerResize(TestServer):
]
verifylist = [
('flavor', compute_fakes.flavor_id),
- ('verify', False),
+ ('confirm', False),
('revert', False),
('server', compute_fakes.server_id),
]
@@ -486,11 +486,11 @@ class TestServerResize(TestServer):
def test_server_resize_confirm(self):
arglist = [
- '--verify',
+ '--confirm',
compute_fakes.server_id,
]
verifylist = [
- ('verify', True),
+ ('confirm', True),
('revert', False),
('server', compute_fakes.server_id),
]
@@ -515,7 +515,7 @@ class TestServerResize(TestServer):
compute_fakes.server_id,
]
verifylist = [
- ('verify', False),
+ ('confirm', False),
('revert', True),
('server', compute_fakes.server_id),
]