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 35c39d3..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)
@@ -559,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", ()):
@@ -1098,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")):
@@ -1418,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"))