Merge "[compute] Support restore server"

2 files changed, 42 insertions, 0 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index f55c0a43..88162ba5 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1273,6 +1273,28 @@ class ResizeServer(command.Command):
             compute_client.servers.revert_resize(server)
 
 
+class RestoreServer(command.Command):
+    """Restore server(s)"""
+
+    def get_parser(self, prog_name):
+        parser = super(RestoreServer, self).get_parser(prog_name)
+        parser.add_argument(
+            'server',
+            metavar='<server>',
+            nargs='+',
+            help=_('Server(s) to restore (name or ID)'),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        compute_client = self.app.client_manager.compute
+        for server in parsed_args.server:
+            utils.find_resource(
+                compute_client.servers,
+                server
+            ).restore()
+
+
 class ResumeServer(command.Command):
     """Resume server(s)"""
 
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 842a31a4..17681672 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -1171,6 +1171,26 @@ class TestServerResize(TestServer):
         )
 
 
+class TestServerRestore(TestServer):
+
+    def setUp(self):
+        super(TestServerRestore, self).setUp()
+
+        # Get the command object to test
+        self.cmd = server.RestoreServer(self.app, None)
+
+        # Set methods to be tested.
+        self.methods = {
+            'restore': None,
+        }
+
+    def test_server_restore_one_server(self):
+        self.run_method_with_servers('restore', 1)
+
+    def test_server_restore_multi_servers(self):
+        self.run_method_with_servers('restore', 3)
+
+
 class TestServerResume(TestServer):
 
     def setUp(self):