1 files changed, 50 insertions, 25 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 875b9a13..3f39210f 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1352,6 +1352,31 @@ class SetServer(command.Command):
                 raise exceptions.CommandError(msg)
 
 
+class ShelveServer(command.Command):
+    """Shelve server(s)"""
+
+    log = logging.getLogger(__name__ + '.ShelveServer')
+
+    def get_parser(self, prog_name):
+        parser = super(ShelveServer, self).get_parser(prog_name)
+        parser.add_argument(
+            'server',
+            metavar='<server>',
+            nargs='+',
+            help=_('Server(s) to shelve (name or ID)'),
+        )
+        return parser
+
+    @utils.log_method(log)
+    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,
+            ).shelve()
+
+
 class ShowServer(show.ShowOne):
     """Show server details"""
 
@@ -1389,31 +1414,6 @@ class ShowServer(show.ShowOne):
         return zip(*sorted(six.iteritems(data)))
 
 
-class ShelveServer(command.Command):
-    """Shelve server(s)"""
-
-    log = logging.getLogger(__name__ + '.ShelveServer')
-
-    def get_parser(self, prog_name):
-        parser = super(ShelveServer, self).get_parser(prog_name)
-        parser.add_argument(
-            'server',
-            metavar='<server>',
-            nargs='+',
-            help=_('Server(s) to shelve (name or ID)'),
-        )
-        return parser
-
-    @utils.log_method(log)
-    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,
-            ).shelve()
-
-
 class SshServer(command.Command):
     """Ssh to server"""
 
@@ -1748,3 +1748,28 @@ class UnsetServer(command.Command):
                 server,
                 parsed_args.property,
             )
+
+
+class UnshelveServer(command.Command):
+    """Unshelve server(s)"""
+
+    log = logging.getLogger(__name__ + '.UnshelveServer')
+
+    def get_parser(self, prog_name):
+        parser = super(UnshelveServer, self).get_parser(prog_name)
+        parser.add_argument(
+            'server',
+            metavar='<server>',
+            nargs='+',
+            help=_('Server(s) to unshelve (name or ID)'),
+        )
+        return parser
+
+    @utils.log_method(log)
+    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,
+            ).unshelve()