Revision a9fe7e8f lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
6931 | 6931 |
# instance data |
6932 | 6932 |
instance_data = {} |
6933 | 6933 |
for iinfo, beinfo in i_list: |
6934 |
nic_data = [{"mac": n.mac, "ip": n.ip, "bridge": n.bridge} |
|
6935 |
for n in iinfo.nics] |
|
6934 |
nic_data = [] |
|
6935 |
for nic in iinfo.nics: |
|
6936 |
filled_params = objects.FillDict( |
|
6937 |
cluster_info.nicparams[constants.PP_DEFAULT], |
|
6938 |
nic.nicparams) |
|
6939 |
nic_dict = {"mac": nic.mac, |
|
6940 |
"ip": nic.ip, |
|
6941 |
"mode": filled_params[constants.NIC_MODE], |
|
6942 |
"link": filled_params[constants.NIC_LINK], |
|
6943 |
} |
|
6944 |
if filled_params[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: |
|
6945 |
nic_dict["bridge"] = filled_params[constants.NIC_LINK] |
|
6946 |
nic_data.append(nic_dict) |
|
6936 | 6947 |
pir = { |
6937 | 6948 |
"tags": list(iinfo.GetTags()), |
6938 | 6949 |
"admin_up": iinfo.admin_up, |
Also available in: Unified diff