Revision 0b13832c

b/lib/cmdlib.py
5830 5830
        "pnode": instance.primary_node,
5831 5831
        "snodes": instance.secondary_nodes,
5832 5832
        "os": instance.os,
5833
        "nics": [(nic.mac, nic.ip, nic.bridge) for nic in instance.nics],
5833
        # this happens to be the same format used for hooks
5834
        "nics": _NICListToTuple(self, instance.nics),
5834 5835
        "disks": disks,
5835 5836
        "hypervisor": instance.hypervisor,
5836 5837
        "network_port": instance.network_port,
b/scripts/gnt-instance
1158 1158
    buf.write("    - memory: %dMiB\n" %
1159 1159
              instance["be_actual"][constants.BE_MEMORY])
1160 1160
    buf.write("    - NICs:\n")
1161
    for idx, (mac, ip, bridge) in enumerate(instance["nics"]):
1162
      buf.write("      - nic/%d: MAC: %s, IP: %s, bridge: %s\n" %
1163
                (idx, mac, ip, bridge))
1161
    for idx, (mac, ip, mode, link) in enumerate(instance["nics"]):
1162
      buf.write("      - nic/%d: MAC: %s, IP: %s, mode: %s, link: %s\n" %
1163
                (idx, mac, ip, mode, link))
1164 1164
    buf.write("  Disks:\n")
1165 1165

  
1166 1166
    for idx, device in enumerate(instance["disks"]):
......
1388 1388
           "Lists the instances and their status. The available fields are"
1389 1389
           " (see the man page for details): status, oper_state, oper_ram,"
1390 1390
           " name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
1391
           " ip, mac, bridge, sda_size, sdb_size, vcpus, serial_no,"
1391
           " ip, mac, mode, link, sda_size, sdb_size, vcpus, serial_no,"
1392 1392
           " hypervisor."
1393 1393
           " The default field"
1394 1394
           " list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),

Also available in: Unified diff