Revision 644eeef9 lib/cmdlib.py
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) |
Also available in: Unified diff