openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix the bug of "openstack usage show""

Browse Source
This commit is contained in:
Jenkins 2015-11-11 21:46:38 +00:00 committed by Gerrit Code Review
commit 53fc20fa6f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstackclient/compute/v2/usage.py
View File

@ -183,10 +183,18 @@ class ShowUsage(show.ShowOne):
)) ))
info = {} info = {}
info['Servers'] = len(usage.server_usages) info['Servers'] = (
info['RAM MB-Hours'] = float("%.2f" % usage.total_memory_mb_usage) len(usage.server_usages)
info['CPU Hours'] = float("%.2f" % usage.total_vcpus_usage) if hasattr(usage, "server_usages") else None)
info['Disk GB-Hours'] = float("%.2f" % usage.total_local_gb_usage) 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))) return zip(*sorted(six.iteritems(info)))