Revision 00430f8e
b/lib/cli.py | ||
---|---|---|
764 | 764 |
if unitfields is None: |
765 | 765 |
unitfields = [] |
766 | 766 |
|
767 |
numfields = utils.FieldSet(*numfields) |
|
768 |
unitfields = utils.FieldSet(*unitfields) |
|
769 |
|
|
767 | 770 |
format_fields = [] |
768 | 771 |
for field in fields: |
769 | 772 |
if headers and field not in headers: |
... | ... | |
773 | 776 |
headers[field] = field |
774 | 777 |
if separator is not None: |
775 | 778 |
format_fields.append("%s") |
776 |
elif field in numfields:
|
|
779 |
elif numfields.Matches(field):
|
|
777 | 780 |
format_fields.append("%*s") |
778 | 781 |
else: |
779 | 782 |
format_fields.append("%-*s") |
... | ... | |
786 | 789 |
|
787 | 790 |
for row in data: |
788 | 791 |
for idx, val in enumerate(row): |
789 |
if fields[idx] in unitfields:
|
|
792 |
if unitfields.Matches(fields[idx]):
|
|
790 | 793 |
try: |
791 | 794 |
val = int(val) |
792 | 795 |
except ValueError: |
b/scripts/gnt-instance | ||
---|---|---|
221 | 221 |
"be/memory": "Configured_memory", |
222 | 222 |
"be/vcpus": "VCPUs", |
223 | 223 |
"be/auto_balance": "Auto_balance", |
224 |
"disk.count": "Disks", |
|
225 |
"nic.count": "NICs", |
|
224 | 226 |
} |
225 | 227 |
else: |
226 | 228 |
headers = None |
227 | 229 |
|
228 | 230 |
if opts.human_readable: |
229 |
unitfields = ["be/memory", "oper_ram", "sda_size", "sdb_size"]
|
|
231 |
unitfields = ["be/memory", "oper_ram", "sd(a|b)_size", "disk.size/.*"]
|
|
230 | 232 |
else: |
231 | 233 |
unitfields = None |
232 | 234 |
|
233 |
numfields = ["be/memory", "oper_ram", "sda_size", "sdb_size", "be/vcpus",
|
|
234 |
"serial_no"] |
|
235 |
numfields = ["be/memory", "oper_ram", "sd(a|b)_size", "be/vcpus",
|
|
236 |
"serial_no", "(disk|nic).count", "disk.size/.*"]
|
|
235 | 237 |
|
236 | 238 |
list_type_fields = ("tags",) |
237 | 239 |
# change raw values to nicer strings |
Also available in: Unified diff