X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fdata_utils%2Fvnfd.py;fp=osm_lcm%2Fdata_utils%2Fvnfd.py;h=f312e577628ae51aa428a4a2616eace56053ef50;hb=07e53f5dde4bf7b2f31d71d0da0eab00c8d63648;hp=b12f7d038187a004eb66e4684987379cee71d404;hpb=40603578bc470675f4662ca9534be7515e7a8c9c;p=osm%2FLCM.git diff --git a/osm_lcm/data_utils/vnfd.py b/osm_lcm/data_utils/vnfd.py index b12f7d0..f312e57 100644 --- a/osm_lcm/data_utils/vnfd.py +++ b/osm_lcm/data_utils/vnfd.py @@ -23,6 +23,7 @@ ## from osm_lcm.data_utils import list_utils +from osm_lcm.lcm_utils import get_iterable def get_lcm_operations_configuration(vnfd): @@ -88,12 +89,6 @@ def get_vdu_profile(vnfd, vdu_profile_id): lambda vdu_profile: vdu_profile["id"] == vdu_profile_id) -def get_kdu_profile(vnfd, kdu_profile_id): - return list_utils.find_in_list( - vnfd.get("df", ())[0]["kdu-profile"], - lambda kdu_profile: kdu_profile["name"] == kdu_profile_id) - - def get_vnf_configuration(vnfd): if "vnf-configuration-id" not in vnfd.get("df")[0]: return None @@ -110,11 +105,10 @@ def get_vdu_configuration(vnfd, vdu_id): lambda vdu_configuration: vdu_configuration["id"] == vdu_profile["vdu-configuration-id"]) -def get_kdu_configuration(vnfd, kdu_id): - kdu_profile = get_kdu_profile(vnfd, kdu_id) - return list_utils.find_in_list( - vnfd.get("kdu-configuration", ()), - lambda kdu_configuration: kdu_configuration["id"] == kdu_profile["kdu-configuration-id"]) +def get_kdu_configuration(vnfd, kdu_name): + for kdu in get_iterable(vnfd, "kdu"): + if kdu_name == kdu["name"]: + return kdu.get("kdu-configuration") def get_virtual_link_profiles(vnfd):