Revision 3fb1e1c5
b/lib/cmdlib.py | ||
---|---|---|
2472 | 2472 |
_CheckOutputFields(static=["name", "os", "pnode", "snodes", |
2473 | 2473 |
"admin_state", "admin_ram", |
2474 | 2474 |
"disk_template", "ip", "mac", "bridge", |
2475 |
"sda_size", "sdb_size", "vcpus", "tags"], |
|
2475 |
"sda_size", "sdb_size", "vcpus", "tags", |
|
2476 |
"auto_balance", |
|
2477 |
"network_port", "kernel_path", "initrd_path", |
|
2478 |
"hvm_boot_order", "hvm_acpi", "hvm_pae", |
|
2479 |
"hvm_cdrom_image_path", "hvm_nic_type", |
|
2480 |
"hvm_disk_type", "vnc_bind_address"], |
|
2476 | 2481 |
dynamic=self.dynamic_fields, |
2477 | 2482 |
selected=self.op.output_fields) |
2478 | 2483 |
|
... | ... | |
2593 | 2598 |
val = instance.vcpus |
2594 | 2599 |
elif field == "tags": |
2595 | 2600 |
val = list(instance.GetTags()) |
2601 |
elif field in ("network_port", "kernel_path", "initrd_path", |
|
2602 |
"hvm_boot_order", "hvm_acpi", "hvm_pae", |
|
2603 |
"hvm_cdrom_image_path", "hvm_nic_type", |
|
2604 |
"hvm_disk_type", "vnc_bind_address"): |
|
2605 |
val = getattr(instance, field, None) |
|
2606 |
if val is not None: |
|
2607 |
pass |
|
2608 |
elif field in ("hvm_nic_type", "hvm_disk_type", |
|
2609 |
"kernel_path", "initrd_path"): |
|
2610 |
val = "default" |
|
2611 |
else: |
|
2612 |
val = "-" |
|
2596 | 2613 |
else: |
2597 | 2614 |
raise errors.ParameterError(field) |
2598 | 2615 |
iout.append(val) |
b/scripts/gnt-instance | ||
---|---|---|
184 | 184 |
"snodes": "Secondary_Nodes", "admin_state": "Autostart", |
185 | 185 |
"oper_state": "Running", "admin_ram": "Configured_memory", |
186 | 186 |
"oper_ram": "Memory", "disk_template": "Disk_template", |
187 |
"ip": "IP Address", "mac": "MAC Address",
|
|
187 |
"ip": "IP_address", "mac": "MAC_address",
|
|
188 | 188 |
"bridge": "Bridge", "vcpus": "VCPUs", |
189 | 189 |
"sda_size": "Disk/0", "sdb_size": "Disk/1", |
190 | 190 |
"status": "Status", "tags": "Tags", |
191 |
"network_port": "Network_port", |
|
192 |
"kernel_path": "Kernel_path", |
|
193 |
"initrd_path": "Initrd_path", |
|
194 |
"hvm_boot_order": "HVM_boot_order", |
|
195 |
"hvm_acpi": "HVM_ACPI", |
|
196 |
"hvm_pae": "HVM_PAE", |
|
197 |
"hvm_cdrom_image_path": "HVM_CDROM_image_path", |
|
198 |
"hvm_nic_type": "HVM_NIC_type", |
|
199 |
"hvm_disk_type": "HVM_disk_type", |
|
200 |
"vnc_bind_address": "VNC_bind_address", |
|
191 | 201 |
} |
192 | 202 |
else: |
193 | 203 |
headers = None |
Also available in: Unified diff