bug(descriptor): missing fields in stored descriptors. 1408, 1388

[osm/NBI.git] / osm_nbi / instance_topics.py

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index 26bd26a..4a4f4c3 100644 (file)
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -226,7 +226,7 @@ class NsrTopic(BaseTopic):
             step = "validating input parameters"
             ns_request = self._remove_envelop(indata)
             self._update_input_with_kwargs(ns_request, kwargs)
-            self._validate_input_new(ns_request, session["force"])
+            ns_request = self._validate_input_new(ns_request, session["force"])
 
             step = "getting nsd id='{}' from database".format(ns_request.get("nsdId"))
             nsd = self._get_nsd_from_db(ns_request["nsdId"], session)
@@ -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["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)
@@ -562,6 +559,13 @@ class NsrTopic(BaseTopic):
                     "connection-point-id": icp["id"],
                     "name": icp.get("id"),
                 }
+
+                if "port-security-enabled" in icp:
+                    vdu_icp["port-security-enabled"] = icp["port-security-enabled"]
+
+                if "port-security-disable-strategy" in icp:
+                    vdu_icp["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
+
                 vdur["internal-connection-point"].append(vdu_icp)
 
                 for iface in icp.get("virtual-network-interface-requirement", ()):
@@ -699,7 +703,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")
@@ -1100,6 +1105,8 @@ class NsLcmOpTopic(BaseTopic):
                                 vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
                                     iface_inst_param.get("mac-address"), vdur.get("count-index", 0))
                                 vnfr_update[vnfr_update_text + ".fixed-mac"] = True
+                            if iface_inst_param.get("floating-ip-required"):
+                                vnfr_update[vnfr_update_text + ".floating-ip-required"] = True
                 # get vnf.internal-vld.internal-conection-point instantiation params to update vnfr.vdur.interfaces
                 # TODO update vld with the ip-profile
                 for ivld_inst_param in get_iterable(vnf_inst_params.get("internal-vld")):
@@ -1420,7 +1427,7 @@ class NsiTopic(BaseTopic):
             slice_request = self._remove_envelop(indata)
             # Override descriptor with query string kwargs
             self._update_input_with_kwargs(slice_request, kwargs)
-            self._validate_input_new(slice_request, session["force"])
+            slice_request = self._validate_input_new(slice_request, session["force"])
 
             # look for nstd
             step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))