Revision 644eeef9
| b/lib/cmdlib.py | ||
|---|---|---|
| 2052 | 2052 |
self.dynamic_fields = frozenset(["oper_state", "oper_ram"]) |
| 2053 | 2053 |
_CheckOutputFields(static=["name", "os", "pnode", "snodes", |
| 2054 | 2054 |
"admin_state", "admin_ram", |
| 2055 |
"disk_template", "ip", "mac", "bridge"], |
|
| 2055 |
"disk_template", "ip", "mac", "bridge", |
|
| 2056 |
"sda_size", "sdb_size"], |
|
| 2056 | 2057 |
dynamic=self.dynamic_fields, |
| 2057 | 2058 |
selected=self.op.output_fields) |
| 2058 | 2059 |
|
| ... | ... | |
| 2126 | 2127 |
val = instance.nics[0].bridge |
| 2127 | 2128 |
elif field == "mac": |
| 2128 | 2129 |
val = instance.nics[0].mac |
| 2130 |
elif field == "sda_size" or field == "sdb_size": |
|
| 2131 |
disk = instance.FindDisk(field[:3]) |
|
| 2132 |
if disk is None: |
|
| 2133 |
val = "N/A" |
|
| 2134 |
else: |
|
| 2135 |
val = disk.size |
|
| 2129 | 2136 |
else: |
| 2130 | 2137 |
raise errors.ParameterError(field) |
| 2131 | 2138 |
val = str(val) |
| b/lib/objects.py | ||
|---|---|---|
| 379 | 379 |
|
| 380 | 380 |
return ret |
| 381 | 381 |
|
| 382 |
def FindDisk(self, name): |
|
| 383 |
"""Find a disk given having a specified name. |
|
| 384 |
|
|
| 385 |
This will return the disk which has the given iv_name. |
|
| 386 |
|
|
| 387 |
""" |
|
| 388 |
for disk in self.disks: |
|
| 389 |
if disk.iv_name == name: |
|
| 390 |
return disk |
|
| 391 |
|
|
| 392 |
return None |
|
| 393 |
|
|
| 382 | 394 |
|
| 383 | 395 |
class OS(ConfigObject): |
| 384 | 396 |
"""Config object representing an operating system.""" |
| b/scripts/gnt-instance | ||
|---|---|---|
| 50 | 50 |
"oper_state": "Status", "admin_ram": "Configured_memory", |
| 51 | 51 |
"oper_ram": "Memory", "disk_template": "Disk_template", |
| 52 | 52 |
"ip": "IP Address", "mac": "MAC Address", |
| 53 |
"bridge": "Bridge"} |
|
| 53 |
"bridge": "Bridge", |
|
| 54 |
"sda_size": "Disk/0", "sdb_size": "Disk/1"} |
|
| 54 | 55 |
else: |
| 55 | 56 |
headers = None |
| 56 | 57 |
|
| 57 | 58 |
if opts.human_readable: |
| 58 |
unitfields = ["admin_ram", "oper_ram"] |
|
| 59 |
unitfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"]
|
|
| 59 | 60 |
else: |
| 60 | 61 |
unitfields = None |
| 61 | 62 |
|
| 62 |
numfields = ["admin_ram", "oper_ram"] |
|
| 63 |
numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"]
|
|
| 63 | 64 |
|
| 64 | 65 |
data = GenerateTable(separator=opts.separator, headers=headers, |
| 65 | 66 |
fields=selected_fields, unitfields=unitfields, |
Also available in: Unified diff