diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-02 10:57:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-02 10:57:02 +0000 |
| commit | d4fb5cefda8425e6e0ea6c46878c4a717aadc304 (patch) | |
| tree | 9127ce4d2a89c57656bc020bc39b322a7ee9279d /openstackclient | |
| parent | cb28cd9ac0135867117683d7a8d20730067b16e8 (diff) | |
| parent | 0ee5527fa52b219b49082d61d95d84f4b948c02f (diff) | |
| download | python-openstackclient-d4fb5cefda8425e6e0ea6c46878c4a717aadc304.tar.gz | |
Merge "Trivial clean up: do not use plural form in command arguments."
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 661ce847..ac717405 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -607,7 +607,7 @@ class DeleteServer(command.Command): def get_parser(self, prog_name): parser = super(DeleteServer, self).get_parser(prog_name) parser.add_argument( - 'servers', + 'server', metavar='<server>', nargs="+", help=_('Server(s) to delete (name or ID)'), @@ -622,7 +622,7 @@ class DeleteServer(command.Command): @utils.log_method(log) def take_action(self, parsed_args): compute_client = self.app.client_manager.compute - for server in parsed_args.servers: + for server in parsed_args.server: server_obj = utils.find_resource( compute_client.servers, server) compute_client.servers.delete(server_obj.id) diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 1e99bcd0..4f5bdd5b 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -311,7 +311,7 @@ class TestServerDelete(TestServer): compute_fakes.server_id, ] verifylist = [ - ('servers', [compute_fakes.server_id]), + ('server', [compute_fakes.server_id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -328,7 +328,7 @@ class TestServerDelete(TestServer): compute_fakes.server_id, '--wait' ] verifylist = [ - ('servers', [compute_fakes.server_id]), + ('server', [compute_fakes.server_id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -351,7 +351,7 @@ class TestServerDelete(TestServer): compute_fakes.server_id, '--wait' ] verifylist = [ - ('servers', [compute_fakes.server_id]), + ('server', [compute_fakes.server_id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) |