Revision 160cd941

b/lib/client/gnt_instance.py
1045 1045
  if dev["sstatus"]:
1046 1046
    data.append(("on secondary", helper(dev["dev_type"], dev["sstatus"])))
1047 1047

  
1048
  data.append(("name", dev["name"]))
1049
  data.append(("UUID", dev["uuid"]))
1050

  
1048 1051
  if dev["children"]:
1049 1052
    data.append("child devices:")
1050 1053
    for c_idx, child in enumerate(dev["children"]):
......
1177 1180
    FormatParameterDict(buf, instance["be_instance"], be_actual, level=2)
1178 1181
    # TODO(ganeti 2.7) rework the NICs as well
1179 1182
    buf.write("    - NICs:\n")
1180
    for idx, (ip, mac, mode, link, _, netinfo) in enumerate(instance["nics"]):
1183
    for idx, nic in enumerate(instance["nics"]):
1184
      name, uuid, ip, mac, mode, link, _, netinfo = nic
1181 1185
      network_name = None
1182 1186
      if netinfo:
1183 1187
        network_name = netinfo["name"]
1184 1188
      buf.write("      - nic/%d: MAC: %s, IP: %s,"
1185
                " mode: %s, link: %s, network: %s\n" %
1186
                (idx, mac, ip, mode, link, network_name))
1189
                " mode: %s, link: %s, network: %s\n"
1190
                "        UUID: %s, name: %s\n" %
1191
                (idx, mac, ip, mode, link, network_name, uuid, name))
1187 1192
    buf.write("  Disk template: %s\n" % instance["disk_template"])
1188 1193
    buf.write("  Disks:\n")
1189 1194

  

Also available in: Unified diff