From a9fe7e8fb73a1daaa41f7c70d5acd037353593ee Mon Sep 17 00:00:00 2001 From: Guido Trotter Date: Wed, 10 Jun 2009 18:32:23 +0100 Subject: [PATCH] Iallocator: NIC parameters Signed-off-by: Guido Trotter Reviewed-by: Iustin Pop --- lib/cmdlib.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index c22adcc..5dd52b0 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -6931,8 +6931,19 @@ class IAllocator(object): # instance data instance_data = {} for iinfo, beinfo in i_list: - nic_data = [{"mac": n.mac, "ip": n.ip, "bridge": n.bridge} - for n in iinfo.nics] + nic_data = [] + for nic in iinfo.nics: + filled_params = objects.FillDict( + cluster_info.nicparams[constants.PP_DEFAULT], + nic.nicparams) + nic_dict = {"mac": nic.mac, + "ip": nic.ip, + "mode": filled_params[constants.NIC_MODE], + "link": filled_params[constants.NIC_LINK], + } + if filled_params[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: + nic_dict["bridge"] = filled_params[constants.NIC_LINK] + nic_data.append(nic_dict) pir = { "tags": list(iinfo.GetTags()), "admin_up": iinfo.admin_up, -- 1.7.10.4