Revision fcbd025c lib/client/gnt_instance.py
b/lib/client/gnt_instance.py | ||
---|---|---|
1048 | 1048 |
if dev["sstatus"]: |
1049 | 1049 |
data.append(("on secondary", helper(dev["dev_type"], dev["sstatus"]))) |
1050 | 1050 |
|
1051 |
data.append(("name", dev["name"])) |
|
1052 |
data.append(("UUID", dev["uuid"])) |
|
1053 |
|
|
1051 | 1054 |
if dev["children"]: |
1052 | 1055 |
data.append(("child devices", [ |
1053 | 1056 |
_FormatBlockDevInfo(c_idx, False, child, roman) |
... | ... | |
1058 | 1061 |
|
1059 | 1062 |
def _FormatInstanceNicInfo(idx, nic): |
1060 | 1063 |
"""Helper function for L{_FormatInstanceInfo()}""" |
1061 |
(ip, mac, mode, link, _, netinfo) = nic |
|
1064 |
(name, uuid, ip, mac, mode, link, _, netinfo) = nic
|
|
1062 | 1065 |
network_name = None |
1063 | 1066 |
if netinfo: |
1064 | 1067 |
network_name = netinfo["name"] |
... | ... | |
1069 | 1072 |
("mode", str(mode)), |
1070 | 1073 |
("link", str(link)), |
1071 | 1074 |
("network", str(network_name)), |
1075 |
("UUID", str(uuid)), |
|
1076 |
("name", str(name)), |
|
1072 | 1077 |
] |
1073 | 1078 |
|
1074 | 1079 |
|
Also available in: Unified diff