Revision d4117a72 lib/client/gnt_instance.py
b/lib/client/gnt_instance.py | ||
---|---|---|
220 | 220 |
|
221 | 221 |
fmtoverride = dict.fromkeys(["tags", "disk.sizes", "nic.macs", "nic.ips", |
222 | 222 |
"nic.modes", "nic.links", "nic.bridges", |
223 |
"nic.networks", |
|
223 | 224 |
"snodes", "snodes.group", "snodes.group.uuid"], |
224 | 225 |
(lambda value: ",".join(str(item) |
225 | 226 |
for item in value), |
... | ... | |
1177 | 1178 |
FormatParameterDict(buf, instance["be_instance"], be_actual, level=2) |
1178 | 1179 |
# TODO(ganeti 2.7) rework the NICs as well |
1179 | 1180 |
buf.write(" - NICs:\n") |
1180 |
for idx, (ip, mac, mode, link) in enumerate(instance["nics"]): |
|
1181 |
buf.write(" - nic/%d: MAC: %s, IP: %s, mode: %s, link: %s\n" % |
|
1182 |
(idx, mac, ip, mode, link)) |
|
1181 |
for idx, (ip, mac, mode, link, network) in enumerate(instance["nics"]): |
|
1182 |
buf.write(" - nic/%d: MAC: %s, IP: %s," |
|
1183 |
" mode: %s, link: %s, network: %s\n" % |
|
1184 |
(idx, mac, ip, mode, link, network)) |
|
1183 | 1185 |
buf.write(" Disk template: %s\n" % instance["disk_template"]) |
1184 | 1186 |
buf.write(" Disks:\n") |
1185 | 1187 |
|
Also available in: Unified diff