diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-05 20:27:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-05 20:27:32 +0000 |
| commit | 5b8f18fe4b15069b024e3b84717551fb4c769745 (patch) | |
| tree | acfb05c10e3848774d90709824fe4eefef9159ce /openstackclient | |
| parent | dc00d7c758a431845750974cc10a2734e14f9d03 (diff) | |
| parent | a33f14e298883d6a639b14c9cdb7ac2ba2d0e63d (diff) | |
| download | python-openstackclient-5b8f18fe4b15069b024e3b84717551fb4c769745.tar.gz | |
Merge "Rename --verify for server resize to avoid conflict"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 6 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 3d28cc15..49ef18b2 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1073,9 +1073,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', @@ -1114,7 +1114,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 5a126697..079f301e 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), ] |