diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-16 02:28:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-16 02:28:41 +0000 |
| commit | f177160991e91e847db24b173a1c42c34ee03b12 (patch) | |
| tree | 3584aa18a544d0326f1c8d4d9bb771a993540fdc | |
| parent | 6952916c48da93fac5d2d84c64cf3af5fa212956 (diff) | |
| parent | 90d86ef01cb6ce93c3341562c0e0e79da0a6d4ad (diff) | |
| download | python-openstackclient-f177160991e91e847db24b173a1c42c34ee03b12.tar.gz | |
Merge "Enable "openstack server unpause" command to take multiple servers."
| -rw-r--r-- | doc/source/command-objects/server.rst | 6 | ||||
| -rw-r--r-- | doc/source/commands.rst | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 14 |
3 files changed, 12 insertions, 10 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index 83f83ddc..211963f3 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -658,17 +658,17 @@ Unlock server server unpause -------------- -Unpause server +Unpause server(s) .. program:: server unpause .. code:: bash os server unpause - <server> + <server> [<server> ...] .. describe:: <server> - Server (name or ID) + Server(s) to unpause (name or ID) server unrescue --------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 9a87709c..62ed7652 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -187,7 +187,7 @@ Those actions with an opposite action are noted in parens if applicable. * ``stop`` (``start``) - stop one or more servers * ``suspend`` (``resume``) - stop a server and save to disk freeing memory * ``unlock`` (``lock``) - unlock a server -* ``unpause`` (``pause``) - return a paused server to running state +* ``unpause`` (``pause``) - return one or more paused servers to running state * ``unrescue`` (``rescue``) - return a server to normal boot mode * ``unset`` (``set``) - remove an attribute of the object diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 6a2809c6..7c8e4055 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1631,7 +1631,7 @@ class UnlockServer(command.Command): class UnpauseServer(command.Command): - """Unpause server""" + """Unpause server(s)""" log = logging.getLogger(__name__ + '.UnpauseServer') @@ -1640,7 +1640,8 @@ class UnpauseServer(command.Command): parser.add_argument( 'server', metavar='<server>', - help=_('Server (name or ID)'), + nargs='+', + help=_('Server(s) to unpause (name or ID)'), ) return parser @@ -1648,10 +1649,11 @@ class UnpauseServer(command.Command): def take_action(self, parsed_args): compute_client = self.app.client_manager.compute - utils.find_resource( - compute_client.servers, - parsed_args.server, - ).unpause() + for server in parsed_args.server: + utils.find_resource( + compute_client.servers, + server, + ).unpause() class UnrescueServer(command.Command): |