Changes for IM change 10095: remove kdu-model
Change-Id: I14dff0d94e8deb389d915f43e2a8aa41c618ca76
Signed-off-by: lloretgalleg <illoret@indra.es>
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 @@
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 @@
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):