From 90d86ef01cb6ce93c3341562c0e0e79da0a6d4ad Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Thu, 12 Nov 2015 23:50:36 +0800
Subject: [PATCH] Enable "openstack server unpause" command to take multiple
 servers.

Current "openstack server unpause" command could only unpause one server.
Improve it to be able to handle more than one servers. Also improve the
doc to reflect the new feature.

Change-Id: I069ebdd6dcd121f6e55c2bf40d42197f93830e0c
Implements: blueprint cmd-with-multi-servers
---
 doc/source/command-objects/server.rst |  6 +++---
 doc/source/commands.rst               |  2 +-
 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 83f83ddc49..211963f3eb 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 9a87709ce9..62ed7652cc 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 b5e7f004b8..a94857b45c 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1583,7 +1583,7 @@ class UnlockServer(command.Command):
 
 
 class UnpauseServer(command.Command):
-    """Unpause server"""
+    """Unpause server(s)"""
 
     log = logging.getLogger(__name__ + '.UnpauseServer')
 
@@ -1592,7 +1592,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
 
@@ -1600,10 +1601,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):