Revision d6d415e8
| b/lib/cmdlib.py | ||
|---|---|---|
| 2403 | 2403 |
_CheckOutputFields(static=["name", "os", "pnode", "snodes", |
| 2404 | 2404 |
"admin_state", "admin_ram", |
| 2405 | 2405 |
"disk_template", "ip", "mac", "bridge", |
| 2406 |
"sda_size", "sdb_size"], |
|
| 2406 |
"sda_size", "sdb_size", "vcpus"],
|
|
| 2407 | 2407 |
dynamic=self.dynamic_fields, |
| 2408 | 2408 |
selected=self.op.output_fields) |
| 2409 | 2409 |
|
| ... | ... | |
| 2479 | 2479 |
val = None |
| 2480 | 2480 |
else: |
| 2481 | 2481 |
val = disk.size |
| 2482 |
elif field == "vcpus": |
|
| 2483 |
val = instance.vcpus |
|
| 2482 | 2484 |
else: |
| 2483 | 2485 |
raise errors.ParameterError(field) |
| 2484 | 2486 |
iout.append(val) |
| b/scripts/gnt-instance | ||
|---|---|---|
| 176 | 176 |
"oper_state": "Status", "admin_ram": "Configured_memory", |
| 177 | 177 |
"oper_ram": "Memory", "disk_template": "Disk_template", |
| 178 | 178 |
"ip": "IP Address", "mac": "MAC Address", |
| 179 |
"bridge": "Bridge", |
|
| 179 |
"bridge": "Bridge", "vcpus": "VCPUs",
|
|
| 180 | 180 |
"sda_size": "Disk/0", "sdb_size": "Disk/1"} |
| 181 | 181 |
else: |
| 182 | 182 |
headers = None |
| ... | ... | |
| 186 | 186 |
else: |
| 187 | 187 |
unitfields = None |
| 188 | 188 |
|
| 189 |
numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"] |
|
| 189 |
numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size", "vcpus"]
|
|
| 190 | 190 |
|
| 191 | 191 |
# change raw values to nicer strings |
| 192 | 192 |
for row in output: |
Also available in: Unified diff