Commit 23b8c8d6 authored by Iustin Pop's avatar Iustin Pop
Browse files

Improvements to CLI output

This patch adds nicer formatting for some gnt-instance list operations.

Reviewed-by: ultrotter
parent c7f5f338
...@@ -221,21 +221,23 @@ def ListInstances(opts, args): ...@@ -221,21 +221,23 @@ def ListInstances(opts, args):
"be/memory": "Configured_memory", "be/memory": "Configured_memory",
"be/vcpus": "VCPUs", "be/vcpus": "VCPUs",
"be/auto_balance": "Auto_balance", "be/auto_balance": "Auto_balance",
"disk.count": "Disks", "disk.count": "Disks", "disk.sizes": "Disk_sizes",
"nic.count": "NICs", "nic.count": "NICs", "nic.ips": "NIC_IPs",
"nic.bridges": "NIC_bridges", "nic.macs": "NIC_MACs",
} }
else: else:
headers = None headers = None
if opts.human_readable: if opts.human_readable:
unitfields = ["be/memory", "oper_ram", "sd(a|b)_size", "disk.size/.*"] unitfields = ["be/memory", "oper_ram", "sd(a|b)_size", "disk\.size/.*"]
else: else:
unitfields = None unitfields = None
numfields = ["be/memory", "oper_ram", "sd(a|b)_size", "be/vcpus", numfields = ["be/memory", "oper_ram", "sd(a|b)_size", "be/vcpus",
"serial_no", "(disk|nic).count", "disk.size/.*"] "serial_no", "(disk|nic)\.count", "disk\.size/.*"]
list_type_fields = ("tags",) list_type_fields = ("tags", "disk.sizes",
"nic.macs", "nic.ips", "nic.bridges")
# change raw values to nicer strings # change raw values to nicer strings
for row in output: for row in output:
for idx, field in enumerate(selected_fields): for idx, field in enumerate(selected_fields):
...@@ -261,7 +263,7 @@ def ListInstances(opts, args): ...@@ -261,7 +263,7 @@ def ListInstances(opts, args):
if val is None: if val is None:
val = "N/A" val = "N/A"
elif field in list_type_fields: elif field in list_type_fields:
val = ",".join(val) val = ",".join(str(item) for item in val)
elif val is None: elif val is None:
val = "-" val = "-"
row[idx] = str(val) row[idx] = str(val)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment