From 6e3c9a3d2dbcffd3789d11c65703cec07bf49ee3 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Tue, 16 Dec 2014 19:09:58 -0500
Subject: [PATCH] Fix a few issues with 'usage list'
* Added number of servers column, was missing
* Added a new line character after the initial usage message
Change-Id: I6c4e5bda6ba9ceafa92ecf13987c56d0bbe99961
---
openstackclient/compute/v2/usage.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index ed98af2672..05d6038f0b 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -60,12 +60,14 @@ class ListUsage(lister.Lister):
compute_client = self.app.client_manager.compute
columns = (
"tenant_id",
+ "server_usages",
"total_memory_mb_usage",
"total_vcpus_usage",
"total_local_gb_usage"
)
column_headers = (
"Project",
+ "Servers",
"RAM MB-Hours",
"CPU Hours",
"Disk GB-Hours"
@@ -84,7 +86,7 @@ class ListUsage(lister.Lister):
else:
end = now + datetime.timedelta(days=1)
- usage_list = compute_client.usage.list(start, end)
+ usage_list = compute_client.usage.list(start, end, detailed=True)
# Cache the project list
project_cache = {}
@@ -95,8 +97,8 @@ class ListUsage(lister.Lister):
# Just forget it if there's any trouble
pass
- if len(usage_list) > 0:
- sys.stdout.write("Usage from %s to %s:" % (
+ if parsed_args.formatter == 'table' and len(usage_list) > 0:
+ sys.stdout.write("Usage from %s to %s: \n" % (
start.strftime(dateformat),
end.strftime(dateformat),
))
@@ -106,6 +108,7 @@ class ListUsage(lister.Lister):
s, columns,
formatters={
'tenant_id': _format_project,
+ 'server_usages': lambda x: len(x),
'total_memory_mb_usage': lambda x: float("%.2f" % x),
'total_vcpus_usage': lambda x: float("%.2f" % x),
'total_local_gb_usage': lambda x: float("%.2f" % x),