From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 15 Dec 2020 10:33:40 +0000 (+0000)
Subject: Reverted kdur creation following the kdu modeling before SOL006
X-Git-Tag: v9.0.0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=38b1b2003576cb772cb680edcaaebbac4e9580aa;p=osm%2FNBI.git

Reverted kdur creation following the kdu modeling before SOL006

Change-Id: I12c5d5fd63c930ccfe311ffd123827c3a0e9286d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index c47ed9b..35c39d3 100644
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -502,11 +502,6 @@ class NsrTopic(BaseTopic):
                     net["external-connection-point-ref"] = all_k8s_cluster_nets_cpds[net.get("id")]
 
         # update kdus
-        # TODO: Change for multiple df support
-        all_kdu_profiles = vnfd.get("df", [[]])[0].get("kdu-profile", ())
-        all_kdu_profiles_models = {profile.get("name"): profile.get("kdu-model-id") for profile in all_kdu_profiles}
-        all_kdu_models = vnfd.get("kdu-model", ())
-        all_kdu_models = {model.get("id"): model for model in all_kdu_models}
         for kdu in get_iterable(vnfd.get("kdu")):
             additional_params, kdu_params = self._format_additional_params(ns_request,
                                                                            vnf_index,
@@ -520,16 +515,18 @@ class NsrTopic(BaseTopic):
             kdur = {
                 "additionalParams": additional_params,
                 "k8s-namespace": kdu_k8s_namespace,
-                "kdu-name": kdu.get("name"),
+                "kdu-name": kdu["name"],
                 # TODO      "name": ""     Name of the VDU in the VIM
                 "ip-address": None,  # mgmt-interface filled by LCM
                 "k8s-cluster": {},
             }
             if kdu_params and kdu_params.get("config-units"):
                 kdur["config-units"] = kdu_params["config-units"]
-
-            kdu_model_data = all_kdu_models[all_kdu_profiles_models[kdur["kdu-name"]]]
-            kdur[kdu_model_data.get("kdu-model-type")] = kdu_model or kdu_model_data
+            if kdu.get("helm-version"):
+                kdur["helm-version"] = kdu["helm-version"]
+            for k8s_type in ("helm-chart", "juju-bundle"):
+                if kdu.get(k8s_type):
+                    kdur[k8s_type] = kdu_model or kdu[k8s_type]
             if not vnfr_descriptor.get("kdur"):
                 vnfr_descriptor["kdur"] = []
             vnfr_descriptor["kdur"].append(kdur)
@@ -699,7 +696,8 @@ class NsLcmOpTopic(BaseTopic):
             elif indata.get("kdu_name"):
                 self._check_valid_kdu(vnfd, indata["kdu_name"])
                 # TODO: Change the [0] as kdu-configuration is now a list
-                descriptor_configuration = vnfd.get("kdu-configuration", [{}])[0].get("config-primitive")
+                kdud = next((k for k in vnfd["kdu"] if k["name"] == indata["kdu_name"]), None)
+                descriptor_configuration = deep_get(kdud, ("kdu-configuration", "config-primitive"))
             else:
                 # TODO: Change the [0] as vnf-configuration is now a list
                 descriptor_configuration = vnfd.get("vnf-configuration", [{}])[0].get("config-primitive")