Revision e69d05fd scripts/gnt-instance
b/scripts/gnt-instance | ||
---|---|---|
43 | 43 |
_VALUE_TRUE = "true" |
44 | 44 |
|
45 | 45 |
_LIST_DEF_FIELDS = [ |
46 |
"name", "os", "pnode", "status", "oper_ram", |
|
46 |
"name", "hypervisor", "os", "pnode", "status", "oper_ram",
|
|
47 | 47 |
] |
48 | 48 |
|
49 | 49 |
|
... | ... | |
197 | 197 |
"hvm_nic_type": "HVM_NIC_type", |
198 | 198 |
"hvm_disk_type": "HVM_disk_type", |
199 | 199 |
"vnc_bind_address": "VNC_bind_address", |
200 |
"serial_no": "SerialNo", |
|
200 |
"serial_no": "SerialNo", "hypervisor": "Hypervisor",
|
|
201 | 201 |
} |
202 | 202 |
else: |
203 | 203 |
headers = None |
... | ... | |
709 | 709 |
buf.write(" Nodes:\n") |
710 | 710 |
buf.write(" - primary: %s\n" % instance["pnode"]) |
711 | 711 |
buf.write(" - secondaries: %s\n" % ", ".join(instance["snodes"])) |
712 |
buf.write(" Hypervisor: %s\n" % instance["hypervisor"]) |
|
712 | 713 |
buf.write(" Operating system: %s\n" % instance["os"]) |
713 | 714 |
if instance.has_key("network_port"): |
714 | 715 |
buf.write(" Allocated network port: %s\n" % instance["network_port"]) |
... | ... | |
974 | 975 |
"Lists the instances and their status. The available fields are" |
975 | 976 |
" (see the man page for details): status, oper_state, oper_ram," |
976 | 977 |
" name, os, pnode, snodes, admin_state, admin_ram, disk_template," |
977 |
" ip, mac, bridge, sda_size, sdb_size, vcpus, serial_no." |
|
978 |
" ip, mac, bridge, sda_size, sdb_size, vcpus, serial_no," |
|
979 |
" hypervisor." |
|
978 | 980 |
" The default field" |
979 | 981 |
" list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS), |
980 | 982 |
), |
Also available in: Unified diff