bug 687 fixing pre and post scaling actions
[osm/LCM.git] / osm_lcm / ns.py
index 7bfb898..b172c2f 100644 (file)
@@ -29,7 +29,7 @@ from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase
 
 from osm_common.dbbase import DbException
 from osm_common.fsbase import FsException
-from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed
+from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed, NetworkServiceDoesNotExist
 
 from copy import copy, deepcopy
 from http import HTTPStatus
@@ -69,9 +69,9 @@ def populate_dict(target_dict, key_list, value):
 
 class NsLcm(LcmBase):
     timeout_vca_on_error = 5 * 60   # Time for charm from first time at blocked,error status to mark as failed
-    total_deploy_timeout = 30 * 60   # global timeout for deployment
-    timeout_charm_delete = 5 * 60
-    timeout_primitive = 5 * 60  # timeout for primitive execution
+    total_deploy_timeout = 2 * 3600   # global timeout for deployment
+    timeout_charm_delete = 10 * 60
+    timeout_primitive = 10 * 60  # timeout for primitive execution
 
     def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop):
         """
@@ -99,6 +99,8 @@ class NsLcm(LcmBase):
             # it unset and pass it via DeployCharms
             # artifacts=vca_config[''],
             artifacts=None,
+            juju_public_key=vca_config.get('pubkey'),
+            ca_cert=vca_config.get('cacert'),
         )
 
     def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None):
@@ -197,7 +199,8 @@ class NsLcm(LcmBase):
                 if model_name == vca_deployed["model"] and application_name == vca_deployed["application"]:
                     break
             else:
-                self.logger.error(logging_text + " Not present at nsr._admin.deployed.VCA")
+                self.logger.error(logging_text + " Not present at nsr._admin.deployed.VCA. Received model_name={}".
+                                  format(model_name))
                 return
             if task:
                 if task.cancelled():
@@ -242,6 +245,7 @@ class NsLcm(LcmBase):
         :return: The RO ns descriptor
         """
         vim_2_RO = {}
+        wim_2_RO = {}
         # TODO feature 1417: Check that no instantiation is set over PDU
         # check if PDU forces a concrete vim-network-id and add it
         # check if PDU contains a SDN-assist info (dpid, switch, port) and pass it to RO
@@ -258,6 +262,21 @@ class NsLcm(LcmBase):
             vim_2_RO[vim_account] = RO_vim_id
             return RO_vim_id
 
+        def wim_account_2_RO(wim_account):
+            if isinstance(wim_account, str):
+                if wim_account in wim_2_RO:
+                    return wim_2_RO[wim_account]
+
+                db_wim = self.db.get_one("wim_accounts", {"_id": wim_account})
+                if db_wim["_admin"]["operationalState"] != "ENABLED":
+                    raise LcmException("WIM={} is not available. operationalState={}".format(
+                        wim_account, db_wim["_admin"]["operationalState"]))
+                RO_wim_id = db_wim["_admin"]["deployed"]["RO-account"]
+                wim_2_RO[wim_account] = RO_wim_id
+                return RO_wim_id
+            else:
+                return wim_account
+
         def ip_profile_2_RO(ip_profile):
             RO_ip_profile = deepcopy((ip_profile))
             if "dns-server" in RO_ip_profile:
@@ -281,6 +300,7 @@ class NsLcm(LcmBase):
             # "name": ns_params["nsName"],
             # "description": ns_params.get("nsDescription"),
             "datacenter": vim_account_2_RO(ns_params["vimAccountId"]),
+            "wim_account": wim_account_2_RO(ns_params.get("wimAccountId")),
             # "scenario": ns_params["nsdId"],
         }
         if n2vc_key_list:
@@ -402,6 +422,10 @@ class NsLcm(LcmBase):
             if "ip-profile" in vld_params:
                 populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"),
                               ip_profile_2_RO(vld_params["ip-profile"]))
+
+            if "wimAccountId" in vld_params and vld_params["wimAccountId"] is not None:
+                populate_dict(RO_ns_params, ("networks", vld_params["name"], "wim_account"),
+                              wim_account_2_RO(vld_params["wimAccountId"])),
             if vld_params.get("vim-network-name"):
                 RO_vld_sites = []
                 if isinstance(vld_params["vim-network-name"], dict):
@@ -426,6 +450,12 @@ class NsLcm(LcmBase):
                     RO_vld_sites.append({"netmap-use": vld_params["vim-network-id"]})
                 if RO_vld_sites:
                     populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites)
+            if vld_params.get("ns-net"):
+                if isinstance(vld_params["ns-net"], dict):
+                    for vld_id, instance_scenario_id in vld_params["ns-net"].items():
+                        RO_vld_ns_net = {"instance_scenario_id": instance_scenario_id, "osm_id": vld_id}
+                if RO_vld_ns_net:
+                    populate_dict(RO_ns_params, ("networks", vld_params["name"], "use-network"), RO_vld_ns_net)            
             if "vnfd-connection-point-ref" in vld_params:
                 for cp_params in vld_params["vnfd-connection-point-ref"]:
                     # look for interface
@@ -539,7 +569,7 @@ class NsLcm(LcmBase):
                     continue
                 vnfr_update = {}
                 if vnf_RO.get("ip_address"):
-                    db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"]
+                    db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"].split(";")[0]
                 elif not db_vnfr.get("ip-address"):
                     raise LcmExceptionNoMgmtIP("ns member_vnf_index '{}' has no IP address".format(vnf_index))
 
@@ -554,7 +584,10 @@ class NsLcm(LcmBase):
                             vdur_RO_count_index += 1
                             continue
                         vdur["vim-id"] = vdur_RO.get("vim_vm_id")
-                        vdur["ip-address"] = vdur_RO.get("ip_address")
+                        if vdur_RO.get("ip_address"):
+                            vdur["ip-address"] = vdur_RO["ip_address"].split(";")[0]
+                        else:
+                            vdur["ip-address"] = None
                         vdur["vdu-id-ref"] = vdur_RO.get("vdu_osm_id")
                         vdur["name"] = vdur_RO.get("vim_name")
                         vdur["status"] = vdur_RO.get("status")
@@ -645,8 +678,10 @@ class NsLcm(LcmBase):
 
             # Get or generates the _admin.deployed,VCA list
             vca_deployed_list = None
+            vca_model_name = None
             if db_nsr["_admin"].get("deployed"):
                 vca_deployed_list = db_nsr["_admin"]["deployed"].get("VCA")
+                vca_model_name = db_nsr["_admin"]["deployed"].get("VCA-model-name")
             if vca_deployed_list is None:
                 vca_deployed_list = []
                 db_nsr_update["_admin.deployed.VCA"] = vca_deployed_list
@@ -801,7 +836,7 @@ class NsLcm(LcmBase):
             while time() <= start_deploy + self.total_deploy_timeout:
                 desc = await RO.show("ns", RO_nsr_id)
                 ns_status, ns_status_info = RO.check_ns_status(desc)
-                db_nsr_update["admin.deployed.RO.nsr_status"] = ns_status
+                db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status
                 if ns_status == "ERROR":
                     raise ROclient.ROClientException(ns_status_info)
                 elif ns_status == "BUILD":
@@ -832,11 +867,13 @@ class NsLcm(LcmBase):
             number_to_configure = 0
 
             def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, charm_params, n2vc_info):
-                """An inner function to deploy the charm from either vnf or vdu
-                vnf_index is mandatory. vdu_id can be None for a vnf configuration or the id for vdu configuration
+                """An inner function to deploy the charm from either ns, vnf or vdu
+                For ns both vnf_index and vdu_id are None.
+                For vnf only vdu_id is None
+                For vdu both vnf_index and vdu_id contain a value
                 """
-                if not charm_params["rw_mgmt_ip"]:
-                    raise LcmException("vnfd/vdu has not management ip address to configure it")
+                if not charm_params.get("rw_mgmt_ip") and vnf_index:  # if NS skip mgmt_ip checking
+                    raise LcmException("ns/vnfd/vdu has not management ip address to configure it")
                 # Login to the VCA.
                 # if number_to_configure == 0:
                 #     self.logger.debug("Logging into N2VC...")
@@ -848,7 +885,8 @@ class NsLcm(LcmBase):
 
                 # Note: The charm needs to exist on disk at the location
                 # specified by charm_path.
-                base_folder = vnfd["_admin"]["storage"]
+                descriptor = vnfd if vnf_index else nsd
+                base_folder = descriptor["_admin"]["storage"]
                 storage_params = self.fs.get_params()
                 charm_path = "{}{}/{}/charms/{}".format(
                     storage_params["path"],
@@ -859,12 +897,10 @@ class NsLcm(LcmBase):
 
                 # ns_name will be ignored in the current version of N2VC
                 # but will be implemented for the next point release.
-                model_name = "default"    # TODO bug 585  nsr_id
-                if vdu_id:
-                    vdu_id_text = vdu_id + "-"
-                else:
-                    vdu_id_text = "-"
-                application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index, vdu_id_text)
+                model_name = nsr_id
+                vdu_id_text = (str(vdu_id) if vdu_id else "") + "-"
+                vnf_index_text = (str(vnf_index) if vnf_index else "") + "-"
+                application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index_text, vdu_id_text)
 
                 vca_index = len(vca_deployed_list)
                 # trunk name and add two char index at the end to ensure that it is unique. It is assumed no more than
@@ -899,7 +935,7 @@ class NsLcm(LcmBase):
                     self.n2vc.DeployCharms(
                         model_name,          # The network service name
                         application_name,    # The application name
-                        vnfd,                # The vnf descriptor
+                        descriptor,          # The vnf/nsd descriptor
                         charm_path,          # Path to charm
                         charm_params,        # Runtime params, like mgmt ip
                         {},                  # for native charms only
@@ -934,6 +970,13 @@ class NsLcm(LcmBase):
                     proxy_charm = vnf_config["juju"]["charm"]
 
                     if proxy_charm:
+                        if not vca_model_name:
+                            step = "creating VCA model name '{}'".format(nsr_id)
+                            self.logger.debug(logging_text + step)
+                            await self.n2vc.CreateNetworkService(nsr_id)
+                            vca_model_name = nsr_id
+                            db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id
+                            self.update_db_2("nsrs", nsr_id, db_nsr_update)
                         step = "connecting to N2VC to configure vnf {}".format(vnf_index)
                         vnfr_params["rw_mgmt_ip"] = db_vnfrs[vnf_index]["ip-address"]
                         charm_params = {
@@ -945,6 +988,7 @@ class NsLcm(LcmBase):
                         # Login to the VCA. If there are multiple calls to login(),
                         # subsequent calls will be a nop and return immediately.
                         await self.n2vc.login()
+
                         deploy_charm(vnf_index, None, None, None, charm_params, n2vc_info)
                         number_to_configure += 1
 
@@ -957,6 +1001,12 @@ class NsLcm(LcmBase):
                         proxy_charm = vdu_config["juju"]["charm"]
 
                         if proxy_charm:
+                            if not vca_model_name:
+                                step = "creating VCA model name"
+                                await self.n2vc.CreateNetworkService(nsr_id)
+                                vca_model_name = nsr_id
+                                db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id
+                                self.update_db_2("nsrs", nsr_id, db_nsr_update)
                             step = "connecting to N2VC to configure vdu {} from vnf {}".format(vdu["id"], vnf_index)
                             await self.n2vc.login()
                             vdur = db_vnfrs[vnf_index]["vdur"][vdu_index]
@@ -974,6 +1024,37 @@ class NsLcm(LcmBase):
                                          charm_params, n2vc_info)
                             number_to_configure += 1
 
+            # Check if this NS has a charm configuration
+
+            ns_config = nsd.get("ns-configuration")
+            if ns_config and ns_config.get("juju"):
+                proxy_charm = ns_config["juju"]["charm"]
+
+                if proxy_charm:
+                    step = "connecting to N2VC to configure ns"
+                    # TODO is NS magmt IP address needed?
+
+                    # Get additional parameters
+                    additional_params = {}
+                    if db_nsr.get("additionalParamsForNs"):
+                        additional_params = db_nsr["additionalParamsForNs"].copy()
+                    for k, v in additional_params.items():
+                        if isinstance(v, str) and v.startswith("!!yaml "):
+                            additional_params[k] = yaml.safe_load(v[7:])
+
+                    # additional_params["rw_mgmt_ip"] = db_nsr["ip-address"]
+                    charm_params = {
+                        "user_values": additional_params,
+                        # "rw_mgmt_ip": db_nsr["ip-address"],
+                        "initial-config-primitive": ns_config.get('initial-config-primitive') or {}
+                    }
+
+                    # Login to the VCA. If there are multiple calls to login(),
+                    # subsequent calls will be a nop and return immediately.
+                    await self.n2vc.login()
+                    deploy_charm(None, None, None, None, charm_params, n2vc_info)
+                    number_to_configure += 1
+
             db_nsr_update["operational-status"] = "running"
             configuration_failed = False
             if number_to_configure:
@@ -1122,6 +1203,112 @@ class NsLcm(LcmBase):
             await asyncio.sleep(10)
             timeout -= 10
 
+    # Check if this VNFD has a configured terminate action
+    def _has_terminate_config_primitive(self, vnfd):
+        vnf_config = vnfd.get("vnf-configuration")
+        if vnf_config and vnf_config.get("terminate-config-primitive"):
+            return True
+        else:
+            return False
+
+    # Get a numerically sorted list of the sequences for this VNFD's terminate action
+    def _get_terminate_config_primitive_seq_list(self, vnfd):
+        # No need to check for existing primitive twice, already done before
+        vnf_config = vnfd.get("vnf-configuration")
+        seq_list = vnf_config.get("terminate-config-primitive")
+        # Get all 'seq' tags in seq_list, order sequences numerically, ascending.
+        seq_list_sorted = sorted(seq_list, key=lambda x: int(x['seq']))
+        return seq_list_sorted
+
+    @staticmethod
+    def _create_nslcmop(nsr_id, operation, params):
+        """
+        Creates a ns-lcm-opp content to be stored at database.
+        :param nsr_id: internal id of the instance
+        :param operation: instantiate, terminate, scale, action, ...
+        :param params: user parameters for the operation
+        :return: dictionary following SOL005 format
+        """
+        # Raise exception if invalid arguments
+        if not (nsr_id and operation and params):
+            raise LcmException(
+                "Parameters 'nsr_id', 'operation' and 'params' needed to create primitive not provided")
+        now = time()
+        _id = str(uuid4())
+        nslcmop = {
+            "id": _id,
+            "_id": _id,
+            # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK
+            "operationState": "PROCESSING",
+            "statusEnteredTime": now,
+            "nsInstanceId": nsr_id,
+            "lcmOperationType": operation,
+            "startTime": now,
+            "isAutomaticInvocation": False,
+            "operationParams": params,
+            "isCancelPending": False,
+            "links": {
+                "self": "/osm/nslcm/v1/ns_lcm_op_occs/" + _id,
+                "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsr_id,
+            }
+        }
+        return nslcmop
+
+    # Create a primitive with params from VNFD
+    # - Called from terminate() before deleting instance
+    # - Calls action() to execute the primitive
+    async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id):
+        logging_text = "Task ns={} _terminate_action={} ".format(nsr_id, nslcmop_id)
+        db_vnfds = {}
+        db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
+        # Loop over VNFRs
+        for vnfr in db_vnfrs_list:
+            vnfd_id = vnfr["vnfd-id"]
+            vnf_index = vnfr["member-vnf-index-ref"]
+            if vnfd_id not in db_vnfds:
+                step = "Getting vnfd={} id='{}' from db".format(vnfd_id, vnfd_id)
+                vnfd = self.db.get_one("vnfds", {"_id": vnfd_id})
+                db_vnfds[vnfd_id] = vnfd
+            vnfd = db_vnfds[vnfd_id]
+            if not self._has_terminate_config_primitive(vnfd):
+                continue
+            # Get the primitive's sorted sequence list
+            seq_list = self._get_terminate_config_primitive_seq_list(vnfd)
+            for seq in seq_list:
+                # For each sequence in list, call terminate action
+                step = "Calling terminate action for vnf_member_index={} primitive={}".format(
+                    vnf_index, seq.get("name"))
+                self.logger.debug(logging_text + step)
+                # Create the primitive for each sequence
+                operation = "action"
+                # primitive, i.e. "primitive": "touch"
+                primitive = seq.get('name')
+                primitive_params = {}
+                params = {
+                    "member_vnf_index": vnf_index,
+                    "primitive": primitive,
+                    "primitive_params": primitive_params,
+                }
+                nslcmop_primitive = self._create_nslcmop(nsr_id, operation, params)
+                # Get a copy of db_nslcmop 'admin' part
+                db_nslcmop_action = {"_admin": deepcopy(db_nslcmop["_admin"])}
+                # Update db_nslcmop with the primitive data
+                db_nslcmop_action.update(nslcmop_primitive)
+                # Create a new db entry for the created primitive, returns the new ID.
+                # (The ID is normally obtained from Kafka.)
+                nslcmop_terminate_action_id = self.db.create(
+                    "nslcmops", db_nslcmop_action)
+                # Execute the primitive
+                nslcmop_operation_state, nslcmop_operation_state_detail = await self.action(
+                    nsr_id, nslcmop_terminate_action_id)
+                # Launch Exception if action() returns other than ['COMPLETED', 'PARTIALLY_COMPLETED']
+                nslcmop_operation_states_ok = ['COMPLETED', 'PARTIALLY_COMPLETED']
+                if (nslcmop_operation_state not in nslcmop_operation_states_ok):
+                    raise LcmException(
+                        "terminate_primitive_action for vnf_member_index={}",
+                        " primitive={} fails with error {}".format(
+                            vnf_index, seq.get("name"), nslcmop_operation_state_detail))
+
     async def terminate(self, nsr_id, nslcmop_id):
         logging_text = "Task ns={} terminate={} ".format(nsr_id, nslcmop_id)
         self.logger.debug(logging_text + "Enter")
@@ -1145,11 +1332,27 @@ class NsLcm(LcmBase):
                 return
             # #TODO check if VIM is creating and wait
             # RO_vim_id = db_vim["_admin"]["deployed"]["RO"]
+            # Call internal terminate action
+            await self._terminate_action(db_nslcmop, nslcmop_id, nsr_id)
 
             db_nsr_update["operational-status"] = "terminating"
             db_nsr_update["config-status"] = "terminating"
 
-            if nsr_deployed and nsr_deployed.get("VCA"):
+            if nsr_deployed and nsr_deployed.get("VCA-model-name"):
+                vca_model_name = nsr_deployed["VCA-model-name"]
+                step = "deleting VCA model name '{}' and all charms".format(vca_model_name)
+                self.logger.debug(logging_text + step)
+                try:
+                    await self.n2vc.DestroyNetworkService(vca_model_name)
+                except NetworkServiceDoesNotExist:
+                    pass
+                db_nsr_update["_admin.deployed.VCA-model-name"] = None
+                if nsr_deployed.get("VCA"):
+                    for vca_index in range(0, len(nsr_deployed["VCA"])):
+                        db_nsr_update["_admin.deployed.VCA.{}".format(vca_index)] = None
+                self.update_db_2("nsrs", nsr_id, db_nsr_update)
+            # for backward compatibility if charm have been created with "default"  model name delete one by one
+            elif nsr_deployed and nsr_deployed.get("VCA"):
                 try:
                     step = "Scheduling configuration charms removing"
                     db_nsr_update["detailed-status"] = "Deleting charms"
@@ -1318,7 +1521,7 @@ class NsLcm(LcmBase):
                 if db_nslcmop["operationParams"].get("autoremove"):
                     autoremove = True
 
-        except (ROclient.ROClientException, DbException) as e:
+        except (ROclient.ROClientException, DbException, LcmException) as e:
             self.logger.error(logging_text + "Exit Exception {}".format(e))
             exc = e
         except asyncio.CancelledError:
@@ -1425,7 +1628,7 @@ class NsLcm(LcmBase):
             )
             while time() - start_primitive_time < self.timeout_primitive:
                 primitive_result_ = await self.n2vc.GetPrimitiveStatus(model_name, primitive_id)
-                if primitive_result_ == "running":
+                if primitive_result_ in ("running", "pending"):
                     pass
                 elif primitive_result_ in ("completed", "failed"):
                     primitive_result = "COMPLETED" if primitive_result_ == "completed" else "FAILED"
@@ -1451,6 +1654,7 @@ class NsLcm(LcmBase):
         db_nsr_update = {"_admin.nslcmop": nslcmop_id}
         db_nslcmop_update = {}
         nslcmop_operation_state = None
+        nslcmop_operation_state_detail = None
         exc = None
         try:
             step = "Getting information from database"
@@ -1458,15 +1662,22 @@ class NsLcm(LcmBase):
             db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
 
             nsr_deployed = db_nsr["_admin"].get("deployed")
-            vnf_index = db_nslcmop["operationParams"]["member_vnf_index"]
+            vnf_index = db_nslcmop["operationParams"].get("member_vnf_index")
             vdu_id = db_nslcmop["operationParams"].get("vdu_id")
             vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index")
             vdu_name = db_nslcmop["operationParams"].get("vdu_name")
 
-            step = "Getting vnfr from database"
-            db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id})
-            step = "Getting vnfd from database"
-            db_vnfd = self.db.get_one("vnfds", {"_id": db_vnfr["vnfd-id"]})
+            if vnf_index:
+                step = "Getting vnfr from database"
+                db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id})
+                step = "Getting vnfd from database"
+                db_vnfd = self.db.get_one("vnfds", {"_id": db_vnfr["vnfd-id"]})
+            else:
+                if db_nsr.get("nsd"):
+                    db_nsd = db_nsr.get("nsd")    # TODO this will be removed
+                else:
+                    step = "Getting nsd from database"
+                    db_nsd = self.db.get_one("nsds", {"_id": db_nsr["nsd-id"]})
 
             # look if previous tasks in process
             task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id)
@@ -1497,23 +1708,34 @@ class NsLcm(LcmBase):
                             if config_primitive["name"] == primitive:
                                 config_primitive_desc = config_primitive
                                 break
-            for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()):
-                if config_primitive["name"] == primitive:
-                    config_primitive_desc = config_primitive
-                    break
+            elif vnf_index:
+                for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()):
+                    if config_primitive["name"] == primitive:
+                        config_primitive_desc = config_primitive
+                        break
+            else:
+                for config_primitive in db_nsd.get("ns-configuration", {}).get("config-primitive", ()):
+                    if config_primitive["name"] == primitive:
+                        config_primitive_desc = config_primitive
+                        break
+
             if not config_primitive_desc:
-                raise LcmException("Primitive {} not found at vnf-configuration:config-primitive or vdu:"
-                                   "vdu-configuration:config-primitive".format(primitive))
+                raise LcmException("Primitive {} not found at [ns|vnf|vdu]-configuration:config-primitive ".
+                                   format(primitive))
 
-            vnfr_params = {}
-            if db_vnfr.get("additionalParamsForVnf"):
-                vnfr_params.update(db_vnfr["additionalParamsForVnf"])
+            desc_params = {}
+            if vnf_index:
+                if db_vnfr.get("additionalParamsForVnf"):
+                    desc_params.update(db_vnfr["additionalParamsForVnf"])
+            else:
+                if db_nsr.get("additionalParamsForVnf"):
+                    desc_params.update(db_nsr["additionalParamsForNs"])
 
             # TODO check if ns is in a proper status
             result, result_detail = await self._ns_execute_primitive(
                 nsr_deployed, vnf_index, vdu_id, vdu_name, vdu_count_index, primitive,
-                self._map_primitive_params(config_primitive_desc, primitive_params, vnfr_params))
-            db_nslcmop_update["detailed-status"] = result_detail
+                self._map_primitive_params(config_primitive_desc, primitive_params, desc_params))
+            db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = result_detail
             db_nslcmop_update["operationState"] = nslcmop_operation_state = result
             db_nslcmop_update["statusEnteredTime"] = time()
             self.logger.debug(logging_text + " task Done with result {} {}".format(result, result_detail))
@@ -1530,7 +1752,8 @@ class NsLcm(LcmBase):
             self.logger.critical(logging_text + "Exit Exception {} {}".format(type(e).__name__, e), exc_info=True)
         finally:
             if exc and db_nslcmop:
-                db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc)
+                db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = \
+                    "FAILED {}: {}".format(step, exc)
                 db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED"
                 db_nslcmop_update["statusEnteredTime"] = time()
             try:
@@ -1551,6 +1774,7 @@ class NsLcm(LcmBase):
                     self.logger.error(logging_text + "kafka_write notification Exception {}".format(e))
             self.logger.debug(logging_text + "Exit")
             self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_action")
+            return nslcmop_operation_state, nslcmop_operation_state_detail
 
     async def scale(self, nsr_id, nslcmop_id):
         logging_text = "Task ns={} scale={} ".format(nsr_id, nslcmop_id)
@@ -1706,7 +1930,7 @@ class NsLcm(LcmBase):
                                 "[vnf-config-primitive-name-ref='{}'] does not match any vnf-configuration:config-"
                                 "primitive".format(scaling_group, config_primitive))
 
-                        vnfr_params = {"<VDU_SCALE_INFO>": vdu_scaling_info}
+                        vnfr_params = {"VDU_SCALE_INFO": vdu_scaling_info}
                         if db_vnfr.get("additionalParamsForVnf"):
                             vnfr_params.update(db_vnfr["additionalParamsForVnf"])