Skip to content

Commit 9e50752

Browse files
committed
Fix the bug of "openstack usage show"
When there is no resouce usage associated with the project, an odd output will be displayed. This patch tried to fix this issue. Change-Id: I6f254c6ba37fbb760ada08e640c4938668d560dc Closes-Bug: #1512220
1 parent cb28cd9 commit 9e50752

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

openstackclient/compute/v2/usage.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,18 @@ def take_action(self, parsed_args):
183183
))
184184

185185
info = {}
186-
info['Servers'] = len(usage.server_usages)
187-
info['RAM MB-Hours'] = float("%.2f" % usage.total_memory_mb_usage)
188-
info['CPU Hours'] = float("%.2f" % usage.total_vcpus_usage)
189-
info['Disk GB-Hours'] = float("%.2f" % usage.total_local_gb_usage)
186+
info['Servers'] = (
187+
len(usage.server_usages)
188+
if hasattr(usage, "server_usages") else None)
189+
info['RAM MB-Hours'] = (
190+
float("%.2f" % usage.total_memory_mb_usage)
191+
if hasattr(usage, "total_memory_mb_usage") else None)
192+
info['CPU Hours'] = (
193+
float("%.2f" % usage.total_vcpus_usage)
194+
if hasattr(usage, "total_vcpus_usage") else None)
195+
info['Disk GB-Hours'] = (
196+
float("%.2f" % usage.total_local_gb_usage)
197+
if hasattr(usage, "total_local_gb_usage") else None)
190198
return zip(*sorted(six.iteritems(info)))
191199

192200

0 commit comments

Comments
 (0)