3 files changed, 42 insertions, 11 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 9fb91dca..b5e7f004 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -915,7 +915,7 @@ class MigrateServer(command.Command):
 
 
 class PauseServer(command.Command):
-    """Pause server"""
+    """Pause server(s)"""
 
     log = logging.getLogger(__name__ + '.PauseServer')
 
@@ -924,18 +924,19 @@ class PauseServer(command.Command):
         parser.add_argument(
             'server',
             metavar='<server>',
-            help=_('Server (name or ID)'),
+            nargs='+',
+            help=_('Server(s) to pause (name or ID)'),
         )
         return parser
 
     @utils.log_method(log)
     def take_action(self, parsed_args):
-
         compute_client = self.app.client_manager.compute
-        utils.find_resource(
-            compute_client.servers,
-            parsed_args.server,
-        ).pause()
+        for server in parsed_args.server:
+            utils.find_resource(
+                compute_client.servers,
+                server
+            ).pause()
 
 
 class RebootServer(command.Command):
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 3a031bff..c2d51c2a 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -17,11 +17,33 @@
 
 import logging
 
+from cliff import command
 from cliff import lister
 
 from openstackclient.common import utils
 
 
+class DeleteService(command.Command):
+    """Delete service command"""
+
+    log = logging.getLogger(__name__ + ".DeleteService")
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteService, self).get_parser(prog_name)
+        parser.add_argument(
+            "service",
+            metavar="<service>",
+            help="Compute service to delete (ID only)")
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        compute_client = self.app.client_manager.compute
+
+        compute_client.services.delete(parsed_args.service)
+        return
+
+
 class ListService(lister.Lister):
     """List service command"""
 
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index 31b90c22..6d5d678f 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -183,10 +183,18 @@ class ShowUsage(show.ShowOne):
             ))
 
         info = {}
-        info['Servers'] = len(usage.server_usages)
-        info['RAM MB-Hours'] = float("%.2f" % usage.total_memory_mb_usage)
-        info['CPU Hours'] = float("%.2f" % usage.total_vcpus_usage)
-        info['Disk GB-Hours'] = float("%.2f" % usage.total_local_gb_usage)
+        info['Servers'] = (
+            len(usage.server_usages)
+            if hasattr(usage, "server_usages") else None)
+        info['RAM MB-Hours'] = (
+            float("%.2f" % usage.total_memory_mb_usage)
+            if hasattr(usage, "total_memory_mb_usage") else None)
+        info['CPU Hours'] = (
+            float("%.2f" % usage.total_vcpus_usage)
+            if hasattr(usage, "total_vcpus_usage") else None)
+        info['Disk GB-Hours'] = (
+            float("%.2f" % usage.total_local_gb_usage)
+            if hasattr(usage, "total_local_gb_usage") else None)
         return zip(*sorted(six.iteritems(info)))