Revision 23b8c8d6 scripts/gnt-instance
| 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 |
"disk.count": "Disks", "disk.sizes": "Disk_sizes", |
|
| 225 |
"nic.count": "NICs", "nic.ips": "NIC_IPs", |
|
| 226 |
"nic.bridges": "NIC_bridges", "nic.macs": "NIC_MACs", |
|
| 226 | 227 |
} |
| 227 | 228 |
else: |
| 228 | 229 |
headers = None |
| 229 | 230 |
|
| 230 | 231 |
if opts.human_readable: |
| 231 |
unitfields = ["be/memory", "oper_ram", "sd(a|b)_size", "disk.size/.*"] |
|
| 232 |
unitfields = ["be/memory", "oper_ram", "sd(a|b)_size", "disk\.size/.*"]
|
|
| 232 | 233 |
else: |
| 233 | 234 |
unitfields = None |
| 234 | 235 |
|
| 235 | 236 |
numfields = ["be/memory", "oper_ram", "sd(a|b)_size", "be/vcpus", |
| 236 |
"serial_no", "(disk|nic).count", "disk.size/.*"]
|
|
| 237 |
"serial_no", "(disk|nic)\.count", "disk\.size/.*"]
|
|
| 237 | 238 |
|
| 238 |
list_type_fields = ("tags",)
|
|
| 239 |
list_type_fields = ("tags", "disk.sizes",
|
|
| 240 |
"nic.macs", "nic.ips", "nic.bridges") |
|
| 239 | 241 |
# change raw values to nicer strings |
| 240 | 242 |
for row in output: |
| 241 | 243 |
for idx, field in enumerate(selected_fields): |
| ... | ... | |
| 261 | 263 |
if val is None: |
| 262 | 264 |
val = "N/A" |
| 263 | 265 |
elif field in list_type_fields: |
| 264 |
val = ",".join(val) |
|
| 266 |
val = ",".join(str(item) for item in val)
|
|
| 265 | 267 |
elif val is None: |
| 266 | 268 |
val = "-" |
| 267 | 269 |
row[idx] = str(val) |
Also available in: Unified diff