X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=8d5b57346065a688d6e82a52eaedb8e14bcd7ace;hp=319a690d8f2fb91df2fd1b5d0983c5ac945106e7;hb=0b8752ff86fdb4bdb6fffe00103a221aa4bbc923;hpb=54db2e43364fc8ad616788127d0c6b9de6ac6853

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index 319a690..8d5b573 100644
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -121,7 +121,7 @@ class NsrTopic(BaseTopic):
         return formated_request
 
     @staticmethod
-    def _format_addional_params(ns_request, member_vnf_index=None, vdu_id=None, kdu_name=None, descriptor=None):
+    def _format_additional_params(ns_request, member_vnf_index=None, vdu_id=None, kdu_name=None, descriptor=None):
         """
         Get and format user additional params for NS or VNF
         :param ns_request: User instantiation additional parameters
@@ -144,18 +144,18 @@ class NsrTopic(BaseTopic):
                 additional_params = copy(item.get("additionalParams")) or {}
                 if vdu_id and item.get("additionalParamsForVdu"):
                     item_vdu = next((x for x in item["additionalParamsForVdu"] if x["vdu_id"] == vdu_id), None)
+                    other_params = item_vdu
                     if item_vdu and item_vdu.get("additionalParams"):
                         where_ += ".additionalParamsForVdu[vdu_id={}]".format(vdu_id)
                         additional_params = item_vdu["additionalParams"]
-                        other_params = item_vdu
                 if kdu_name:
                     additional_params = {}
                     if item.get("additionalParamsForKdu"):
                         item_kdu = next((x for x in item["additionalParamsForKdu"] if x["kdu_name"] == kdu_name), None)
+                        other_params = item_kdu
                         if item_kdu and item_kdu.get("additionalParams"):
                             where_ += ".additionalParamsForKdu[kdu_name={}]".format(kdu_name)
                             additional_params = item_kdu["additionalParams"]
-                            other_params = item_kdu
 
         if additional_params:
             for k, v in additional_params.items():
@@ -233,7 +233,7 @@ class NsrTopic(BaseTopic):
 
             now = time()
             step = "filling nsr from input data"
-            additional_params, _ = self._format_addional_params(ns_request, descriptor=nsd)
+            additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd)
 
             # use for k8s-namespace from ns_request or additionalParamsForNs. By default, the project_id
             ns_k8s_namespace = session["project_id"][0] if session["project_id"] else None
@@ -306,8 +306,9 @@ class NsrTopic(BaseTopic):
                 step = "filling vnfr  vnfd-id='{}' constituent-vnfd='{}'".format(
                     member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
                 vnfr_id = str(uuid4())
-                additional_params, vnf_params = self._format_addional_params(ns_request, member_vnf["member-vnf-index"],
-                                                                             descriptor=vnfd)
+                additional_params, vnf_params = self._format_additional_params(ns_request,
+                                                                               member_vnf["member-vnf-index"],
+                                                                               descriptor=vnfd)
                 vnf_k8s_namespace = ns_k8s_namespace
                 if vnf_params and vnf_params.get("k8s-namespace"):
                     vnf_k8s_namespace = vnf_params["k8s-namespace"]
@@ -372,11 +373,12 @@ class NsrTopic(BaseTopic):
                                 break
                 # update kdus
                 for kdu in get_iterable(vnfd.get("kdu")):
-                    additional_params, kdu_params = self._format_addional_params(ns_request,
-                                                                                 member_vnf["member-vnf-index"],
-                                                                                 kdu_name=kdu["name"], descriptor=vnfd)
+                    additional_params, kdu_params = self._format_additional_params(ns_request,
+                                                                                   member_vnf["member-vnf-index"],
+                                                                                   kdu_name=kdu["name"],
+                                                                                   descriptor=vnfd)
                     kdu_k8s_namespace = vnf_k8s_namespace
-                    kdu_model = kdu_params.get("kdu_model")
+                    kdu_model = kdu_params.get("kdu_model") if kdu_params else None
                     if kdu_params and kdu_params.get("k8s-namespace"):
                         kdu_k8s_namespace = kdu_params["k8s-namespace"]
 
@@ -396,8 +398,8 @@ class NsrTopic(BaseTopic):
                     vnfr_descriptor["kdur"].append(kdur)
 
                 for vdu in vnfd.get("vdu", ()):
-                    additional_params, _ = self._format_addional_params(ns_request, member_vnf["member-vnf-index"],
-                                                                        vdu_id=vdu["id"], descriptor=vnfd)
+                    additional_params, _ = self._format_additional_params(ns_request, member_vnf["member-vnf-index"],
+                                                                          vdu_id=vdu["id"], descriptor=vnfd)
                     vdur = {
                         "vdu-id-ref": vdu["id"],
                         # TODO      "name": ""     Name of the VDU in the VIM
@@ -1535,12 +1537,15 @@ class NsiLcmOpTopic(BaseTopic):
 
                 try:
                     service = self.db.get_one("nsrs", {"_id": nsr_item["nsrId"]})
-                    indata_ns = {}
-                    indata_ns = service["instantiate_params"]
-                    indata_ns["lcmOperationType"] = operation
-                    indata_ns["nsInstanceId"] = service["_id"]
-                    # Including netslice_id in the ns instantiate Operation
-                    indata_ns["netsliceInstanceId"] = netsliceInstanceId
+                    indata_ns = {
+                        "lcmOperationType": operation,
+                        "nsInstanceId": service["_id"],
+                        # Including netslice_id in the ns instantiate Operation
+                        "netsliceInstanceId": netsliceInstanceId,
+                    }
+                    if operation == "instantiate":
+                        indata_ns.update(service["instantiate_params"])
+
                     # Creating NS_LCM_OP with the flag slice_object=True to not trigger the service instantiation
                     # message via kafka bus
                     nslcmop, _ = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, kwargs, headers,