From bfa223f61591cf7515265c0ddcacc02797cee055 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Tue, 24 Nov 2015 18:54:03 +0800
Subject: [PATCH] Enable "openstack server resume" command to take multiple
 servers.

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

Change-Id: I726eb86bfa3df3a9911f45770e6641264dbc1e0b
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 eb75ef87e..ed96286b3 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -483,17 +483,17 @@ a revert to release the new server and restart the old one.
 server resume
 -------------
 
-Resume server
+Resume server(s)
 
 .. program:: server resume
 .. code:: bash
 
     os server resume
-        <server>
+        <server> [<server> ...]
 
 .. describe:: <server>
 
-    Server (name or ID)
+    Server(s) to resume (name or ID)
 
 server set
 ----------
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 07dcd18d3..abeda0980 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -178,7 +178,7 @@ Those actions with an opposite action are noted in parens if applicable.
 * ``remove`` (``add``) - remove an object from a group of objects
 * ``rescue`` (``unrescue``) - reboot a server in a special rescue mode allowing access to the original disks
 * ``resize`` - change a server's flavor
-* ``resume`` (``suspend``) - return a suspended server to running state
+* ``resume`` (``suspend``) - return one or more suspended servers to running state
 * ``revoke`` (``issue``) - revoke a token
 * ``save`` - download an object locally
 * ``set`` (``unset``) - set a property on the object, formerly called metadata
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index db62f000a..7c58b598f 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1268,7 +1268,7 @@ class ResizeServer(command.Command):
 
 
 class ResumeServer(command.Command):
-    """Resume server"""
+    """Resume server(s)"""
 
     log = logging.getLogger(__name__ + '.ResumeServer')
 
@@ -1277,7 +1277,8 @@ class ResumeServer(command.Command):
         parser.add_argument(
             'server',
             metavar='<server>',
-            help=_('Server (name or ID)'),
+            nargs='+',
+            help=_('Server(s) to resume (name or ID)'),
         )
         return parser
 
@@ -1285,10 +1286,11 @@ class ResumeServer(command.Command):
     def take_action(self, parsed_args):
 
         compute_client = self.app.client_manager.compute
-        utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        ) .resume()
+        for server in parsed_args.server:
+            utils.find_resource(
+                compute_client.servers,
+                server,
+            ).resume()
 
 
 class SetServer(command.Command):