Fix 1472 - Error executing upgrade action over K8S NS
[osm/NBI.git] / osm_nbi / instance_topics.py
index eb632ac..bf0e3a9 100644 (file)
@@ -18,11 +18,14 @@ from uuid import uuid4
 from http import HTTPStatus
 from time import time
 from copy import copy, deepcopy
-from validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate
-from base_topic import BaseTopic, EngineException, get_iterable
-# from descriptor_topics import DescriptorTopic
+from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_terminate, ns_action, ns_scale,\
+    nsi_instantiate
+from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get, increment_ip_mac
 from yaml import safe_dump
 from osm_common.dbbase import DbException
+from osm_common.msgbase import MsgException
+from osm_common.fsbase import FsException
+from osm_nbi import utils
 from re import match  # For checking that additional parameter names are valid Jinja2 identifiers
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
@@ -31,10 +34,11 @@ __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 class NsrTopic(BaseTopic):
     topic = "nsrs"
     topic_msg = "ns"
+    quota_name = "ns_instances"
     schema_new = ns_instantiate
 
-    def __init__(self, db, fs, msg):
-        BaseTopic.__init__(self, db, fs, msg)
+    def __init__(self, db, fs, msg, auth):
+        BaseTopic.__init__(self, db, fs, msg, auth)
 
     def _check_descriptor_dependencies(self, session, descriptor):
         """
@@ -54,6 +58,7 @@ class NsrTopic(BaseTopic):
     def format_on_new(content, project_id=None, make_public=False):
         BaseTopic.format_on_new(content, project_id=project_id, make_public=make_public)
         content["_admin"]["nsState"] = "NOT_INSTANTIATED"
+        return None
 
     def check_conflict_on_del(self, session, _id, db_content):
         """
@@ -71,13 +76,14 @@ class NsrTopic(BaseTopic):
                                   "Launch 'terminate' operation first; or force deletion".format(_id),
                                   http_code=HTTPStatus.CONFLICT)
 
-    def delete_extra(self, session, _id, db_content):
+    def delete_extra(self, session, _id, db_content, not_send_msg=None):
         """
         Deletes associated nslcmops and vnfrs from database. Deletes associated filesystem.
          Set usageState of pdu, vnfd, nsd
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
         :param db_content: The database content of the descriptor
+        :param not_send_msg: To not send message (False) or store content (list) instead
         :return: None if ok or raises EngineException with the problem
         """
         self.fs.file_delete(_id, ignore_non_exist=True)
@@ -108,6 +114,9 @@ class NsrTopic(BaseTopic):
                 if not nsrs_list:
                     self.db.set_one("vnfds", {"_id": used_vnfd_id}, {"_admin.usageState": "NOT_IN_USE"})
 
+        # delete extra ro_nsrs used for internal RO module
+        self.db.del_one("ro_nsrs", q_filter={"_id": _id}, fail_on_empty=False)
+
     @staticmethod
     def _format_ns_request(ns_request):
         formated_request = copy(ns_request)
@@ -116,29 +125,46 @@ class NsrTopic(BaseTopic):
         return formated_request
 
     @staticmethod
-    def _format_addional_params(ns_request, member_vnf_index=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
         :param member_vnf_index: None for extract NS params, or member_vnf_index to extract VNF params
         :param descriptor: If not None it check that needed parameters of descriptor are supplied
-        :return: a formated copy of additional params or None if not supplied
+        :return: tuple with a formatted copy of additional params or None if not supplied, plus other parameters
         """
         additional_params = None
+        other_params = None
         if not member_vnf_index:
             additional_params = copy(ns_request.get("additionalParamsForNs"))
             where_ = "additionalParamsForNs"
         elif ns_request.get("additionalParamsForVnf"):
-            for additionalParamsForVnf in get_iterable(ns_request.get("additionalParamsForVnf")):
-                if additionalParamsForVnf["member-vnf-index"] == member_vnf_index:
-                    additional_params = copy(additionalParamsForVnf.get("additionalParams"))
-                    where_ = "additionalParamsForVnf[member-vnf-index={}]".format(
-                        additionalParamsForVnf["member-vnf-index"])
-                    break
+            where_ = "additionalParamsForVnf[member-vnf-index={}]".format(member_vnf_index)
+            item = next((x for x in ns_request["additionalParamsForVnf"] if x["member-vnf-index"] == member_vnf_index),
+                        None)
+            if item:
+                if not vdu_id and not kdu_name:
+                    other_params = item
+                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"]
+                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"]
+
         if additional_params:
             for k, v in additional_params.items():
-                # BEGIN Check that additional parameter names are valid Jinja2 identifiers
-                if not match('^[a-zA-Z_][a-zA-Z0-9_]*$', k):
+                # BEGIN Check that additional parameter names are valid Jinja2 identifiers if target is not Kdu
+                if not kdu_name and not match('^[a-zA-Z_][a-zA-Z0-9_]*$', k):
                     raise EngineException("Invalid param name at {}:{}. Must contain only alphanumeric characters "
                                           "and underscores, and cannot start with a digit"
                                           .format(where_, k))
@@ -151,23 +177,31 @@ class NsrTopic(BaseTopic):
                     additional_params[k] = "!!yaml " + safe_dump(v)
 
         if descriptor:
-            # check that enough parameters are supplied for the initial-config-primitive
-            # TODO: check for cloud-init
-            if member_vnf_index:
-                if descriptor.get("vnf-configuration"):
-                    for initial_primitive in get_iterable(
-                            descriptor["vnf-configuration"].get("initial-config-primitive")):
-                        for param in get_iterable(initial_primitive.get("parameter")):
-                            if param["value"].startswith("<") and param["value"].endswith(">"):
-                                if param["value"] in ("<rw_mgmt_ip>", "<VDU_SCALE_INFO>"):
-                                    continue
-                                if not additional_params or param["value"][1:-1] not in additional_params:
-                                    raise EngineException("Parameter '{}' needed for vnfd[id={}]:vnf-configuration:"
-                                                          "initial-config-primitive[name={}] not supplied".
-                                                          format(param["value"], descriptor["id"],
-                                                                 initial_primitive["name"]))
+            for df in descriptor.get("df", []):
+                # check that enough parameters are supplied for the initial-config-primitive
+                # TODO: check for cloud-init
+                if member_vnf_index:
+                    initial_primitives = []
+                    if "lcm-operations-configuration" in df \
+                       and "operate-vnf-op-config" in df["lcm-operations-configuration"]:
+                        for config in df["lcm-operations-configuration"]["operate-vnf-op-config"].get("day1-2", []):
+                            for primitive in get_iterable(config.get("initial-config-primitive")):
+                                initial_primitives.append(primitive)
+                else:
+                    initial_primitives = deep_get(descriptor, ("ns-configuration", "initial-config-primitive"))
 
-        return additional_params
+                for initial_primitive in get_iterable(initial_primitives):
+                    for param in get_iterable(initial_primitive.get("parameter")):
+                        if param["value"].startswith("<") and param["value"].endswith(">"):
+                            if param["value"] in ("<rw_mgmt_ip>", "<VDU_SCALE_INFO>", "<ns_config_info>"):
+                                continue
+                            if not additional_params or param["value"][1:-1] not in additional_params:
+                                raise EngineException("Parameter '{}' needed for vnfd[id={}]:day1-2 configuration:"
+                                                      "initial-config-primitive[name={}] not supplied".
+                                                      format(param["value"], descriptor["id"],
+                                                             initial_primitive["name"]))
+
+        return additional_params or None, other_params or None
 
     def new(self, rollback, session, indata=None, kwargs=None, headers=None):
         """
@@ -177,209 +211,499 @@ class NsrTopic(BaseTopic):
         :param indata: params to be used for the nsr
         :param kwargs: used to override the indata descriptor
         :param headers: http request headers
-        :return: the _id of nsr descriptor created at database
+        :return: the _id of nsr descriptor created at database. Or an exception of type
+            EngineException, ValidationError, DbException, FsException, MsgException.
+            Note: Exceptions are not captured on purpose. They should be captured at called
         """
-
         try:
+            step = "checking quotas"
+            self.check_quota(session)
+
+            step = "validating input parameters"
             ns_request = self._remove_envelop(indata)
-            # Override descriptor with query string kwargs
             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"])
 
-            # look for nsr
             step = "getting nsd id='{}' from database".format(ns_request.get("nsdId"))
-            _filter = self._get_project_filter(session)
-            _filter["_id"] = ns_request["nsdId"]
-            nsd = self.db.get_one("nsds", _filter)
-            del _filter["_id"]
+            nsd = self._get_nsd_from_db(ns_request["nsdId"], session)
+            ns_k8s_namespace = self._get_ns_k8s_namespace(nsd, ns_request, session)
 
-            nsr_id = str(uuid4())
+            step = "checking nsdOperationalState"
+            self._check_nsd_operational_state(nsd, ns_request)
 
-            now = time()
             step = "filling nsr from input data"
-            nsr_descriptor = {
-                "name": ns_request["nsName"],
-                "name-ref": ns_request["nsName"],
-                "short-name": ns_request["nsName"],
-                "admin-status": "ENABLED",
-                "nsd": nsd,
-                "datacenter": ns_request["vimAccountId"],
-                "resource-orchestrator": "osmopenmano",
-                "description": ns_request.get("nsDescription", ""),
-                "constituent-vnfr-ref": [],
-
-                "operational-status": "init",    # typedef ns-operational-
-                "config-status": "init",         # typedef config-states
-                "detailed-status": "scheduled",
-
-                "orchestration-progress": {},
-                # {"networks": {"active": 0, "total": 0}, "vms": {"active": 0, "total": 0}},
-
-                "create-time": now,
-                "nsd-name-ref": nsd["name"],
-                "operational-events": [],   # "id", "timestamp", "description", "event",
-                "nsd-ref": nsd["id"],
-                "nsd-id": nsd["_id"],
-                "vnfd-id": [],
-                "instantiate_params": self._format_ns_request(ns_request),
-                "additionalParamsForNs": self._format_addional_params(ns_request),
-                "ns-instance-config-ref": nsr_id,
-                "id": nsr_id,
-                "_id": nsr_id,
-                # "input-parameter": xpath, value,
-                "ssh-authorized-key": ns_request.get("key-pair-ref"),  # TODO remove
-            }
-            ns_request["nsr_id"] = nsr_id
-            # Create vld
-            if nsd.get("vld"):
-                nsr_descriptor["vld"] = []
-                for nsd_vld in nsd.get("vld"):
-                    nsr_descriptor["vld"].append(
-                        {key: nsd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in nsd_vld})
-
-            # Create VNFR
+            nsr_id = str(uuid4())
+            nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id, session)
+
+            # Create VNFRs
             needed_vnfds = {}
-            for member_vnf in nsd.get("constituent-vnfd", ()):
-                vnfd_id = member_vnf["vnfd-id-ref"]
-                step = "getting vnfd id='{}' constituent-vnfd='{}' from database".format(
-                    member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
+            # TODO: Change for multiple df support
+            vnf_profiles = nsd.get("df", [[]])[0].get("vnf-profile", ())
+            for vnfp in vnf_profiles:
+                vnfd_id = vnfp.get("vnfd-id")
+                vnf_index = vnfp.get("id")
+                step = "getting vnfd id='{}' constituent-vnfd='{}' from database".format(vnfd_id, vnf_index)
                 if vnfd_id not in needed_vnfds:
-                    # Obtain vnfd
-                    _filter["id"] = vnfd_id
-                    vnfd = self.db.get_one("vnfds", _filter, fail_on_empty=True, fail_on_more=True)
-                    del _filter["id"]
-                    vnfd.pop("_admin")
+                    vnfd = self._get_vnfd_from_db(vnfd_id, session)
                     needed_vnfds[vnfd_id] = vnfd
                     nsr_descriptor["vnfd-id"].append(vnfd["_id"])
                 else:
                     vnfd = needed_vnfds[vnfd_id]
-                step = "filling vnfr  vnfd-id='{}' constituent-vnfd='{}'".format(
-                    member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
-                vnfr_id = str(uuid4())
-                vnfr_descriptor = {
-                    "id": vnfr_id,
-                    "_id": vnfr_id,
-                    "nsr-id-ref": nsr_id,
-                    "member-vnf-index-ref": member_vnf["member-vnf-index"],
-                    "additionalParamsForVnf": self._format_addional_params(ns_request, member_vnf["member-vnf-index"],
-                                                                           vnfd),
-                    "created-time": now,
-                    # "vnfd": vnfd,        # at OSM model.but removed to avoid data duplication TODO: revise
-                    "vnfd-ref": vnfd_id,
-                    "vnfd-id": vnfd["_id"],    # not at OSM model, but useful
-                    "vim-account-id": None,
-                    "vdur": [],
-                    "connection-point": [],
-                    "ip-address": None,  # mgmt-interface filled by LCM
-                }
 
-                # Create vld
-                if vnfd.get("internal-vld"):
-                    vnfr_descriptor["vld"] = []
-                    for vnfd_vld in vnfd.get("internal-vld"):
-                        vnfr_descriptor["vld"].append(
-                            {key: vnfd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in
-                             vnfd_vld})
-
-                vnfd_mgmt_cp = vnfd["mgmt-interface"].get("cp")
-                for cp in vnfd.get("connection-point", ()):
-                    vnf_cp = {
-                        "name": cp["name"],
-                        "connection-point-id": cp.get("id"),
-                        "id": cp.get("id"),
-                        # "ip-address", "mac-address" # filled by LCM
-                        # vim-id  # TODO it would be nice having a vim port id
-                    }
-                    vnfr_descriptor["connection-point"].append(vnf_cp)
-                for vdu in vnfd.get("vdu", ()):
-                    vdur = {
-                        "vdu-id-ref": vdu["id"],
-                        # TODO      "name": ""     Name of the VDU in the VIM
-                        "ip-address": None,  # mgmt-interface filled by LCM
-                        # "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM
-                        "internal-connection-point": [],
-                        "interfaces": [],
-                    }
-                    if vdu.get("pdu-type"):
-                        vdur["pdu-type"] = vdu["pdu-type"]
-                    # TODO volumes: name, volume-id
-                    for icp in vdu.get("internal-connection-point", ()):
-                        vdu_icp = {
-                            "id": icp["id"],
-                            "connection-point-id": icp["id"],
-                            "name": icp.get("name"),
-                            # "ip-address", "mac-address" # filled by LCM
-                            # vim-id  # TODO it would be nice having a vim port id
-                        }
-                        vdur["internal-connection-point"].append(vdu_icp)
-                    for iface in vdu.get("interface", ()):
-                        vdu_iface = {
-                            "name": iface.get("name"),
-                            # "ip-address", "mac-address" # filled by LCM
-                            # vim-id  # TODO it would be nice having a vim port id
-                        }
-                        if vnfd_mgmt_cp and iface.get("external-connection-point-ref") == vnfd_mgmt_cp:
-                            vdu_iface["mgmt-vnf"] = True
-                        if iface.get("mgmt-interface"):
-                            vdu_iface["mgmt-interface"] = True  # TODO change to mgmt-vdu
-
-                        # look for network where this interface is connected
-                        if iface.get("external-connection-point-ref"):
-                            for nsd_vld in get_iterable(nsd.get("vld")):
-                                for nsd_vld_cp in get_iterable(nsd_vld.get("vnfd-connection-point-ref")):
-                                    if nsd_vld_cp.get("vnfd-connection-point-ref") == \
-                                            iface["external-connection-point-ref"] and \
-                                            nsd_vld_cp.get("member-vnf-index-ref") == member_vnf["member-vnf-index"]:
-                                        vdu_iface["ns-vld-id"] = nsd_vld["id"]
-                                        break
-                                else:
-                                    continue
-                                break
-                        elif iface.get("internal-connection-point-ref"):
-                            for vnfd_ivld in get_iterable(vnfd.get("internal-vld")):
-                                for vnfd_ivld_icp in get_iterable(vnfd_ivld.get("internal-connection-point")):
-                                    if vnfd_ivld_icp.get("id-ref") == iface["internal-connection-point-ref"]:
-                                        vdu_iface["vnf-vld-id"] = vnfd_ivld["id"]
-                                        break
-                                else:
-                                    continue
-                                break
+                step = "filling vnfr  vnfd-id='{}' constituent-vnfd='{}'".format(vnfd_id, vnf_index)
+                vnfr_descriptor = self._create_vnfr_descriptor_from_vnfd(nsd, vnfd, vnfd_id, vnf_index, nsr_descriptor,
+                                                                         ns_request, ns_k8s_namespace)
 
-                        vdur["interfaces"].append(vdu_iface)
-                    count = vdu.get("count", 1)
-                    if count is None:
-                        count = 1
-                    count = int(count)    # TODO remove when descriptor serialized with payngbind
-                    for index in range(0, count):
-                        if index:
-                            vdur = deepcopy(vdur)
-                        vdur["_id"] = str(uuid4())
-                        vdur["count-index"] = index
-                        vnfr_descriptor["vdur"].append(vdur)
-
-                step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format(
-                    member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
-
-                # add at database
-                BaseTopic.format_on_new(vnfr_descriptor, session["project_id"], make_public=session["public"])
-                self.db.create("vnfrs", vnfr_descriptor)
-                rollback.append({"topic": "vnfrs", "_id": vnfr_id})
-                nsr_descriptor["constituent-vnfr-ref"].append(vnfr_id)
+                step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format(vnfd_id, vnf_index)
+                self._add_vnfr_to_db(vnfr_descriptor, rollback, session)
+                nsr_descriptor["constituent-vnfr-ref"].append(vnfr_descriptor["id"])
 
             step = "creating nsr at database"
-            self.format_on_new(nsr_descriptor, session["project_id"], make_public=session["public"])
-            self.db.create("nsrs", nsr_descriptor)
-            rollback.append({"topic": "nsrs", "_id": nsr_id})
+            self._add_nsr_to_db(nsr_descriptor, rollback, session)
 
             step = "creating nsr temporal folder"
             self.fs.mkdir(nsr_id)
 
-            return nsr_id
-        except Exception as e:
-            self.logger.exception("Exception {} at NsrTopic.new()".format(e), exc_info=True)
-            raise EngineException("Error {}: {}".format(step, e))
-        except ValidationError as e:
-            raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
+            return nsr_id, None
+        except (ValidationError, EngineException, DbException, MsgException, FsException) as e:
+            raise type(e)("{} while '{}'".format(e, step), http_code=e.http_code)
+
+    def _get_nsd_from_db(self, nsd_id, session):
+        _filter = self._get_project_filter(session)
+        _filter["_id"] = nsd_id
+        return self.db.get_one("nsds", _filter)
+
+    def _get_vnfd_from_db(self, vnfd_id, session):
+        _filter = self._get_project_filter(session)
+        _filter["id"] = vnfd_id
+        vnfd = self.db.get_one("vnfds", _filter, fail_on_empty=True, fail_on_more=True)
+        vnfd.pop("_admin")
+        return vnfd
+
+    def _add_nsr_to_db(self, nsr_descriptor, rollback, session):
+        self.format_on_new(nsr_descriptor, session["project_id"], make_public=session["public"])
+        self.db.create("nsrs", nsr_descriptor)
+        rollback.append({"topic": "nsrs", "_id": nsr_descriptor["id"]})
+
+    def _add_vnfr_to_db(self, vnfr_descriptor, rollback, session):
+        self.format_on_new(vnfr_descriptor, session["project_id"], make_public=session["public"])
+        self.db.create("vnfrs", vnfr_descriptor)
+        rollback.append({"topic": "vnfrs", "_id": vnfr_descriptor["id"]})
+
+    def _check_nsd_operational_state(self, nsd, ns_request):
+        if nsd["_admin"]["operationalState"] == "DISABLED":
+            raise EngineException("nsd with id '{}' is DISABLED, and thus cannot be used to create "
+                                  "a network service".format(ns_request["nsdId"]), http_code=HTTPStatus.CONFLICT)
+
+    def _get_ns_k8s_namespace(self, nsd, ns_request, session):
+        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
+        if ns_request and ns_request.get("k8s-namespace"):
+            ns_k8s_namespace = ns_request["k8s-namespace"]
+        if additional_params and additional_params.get("k8s-namespace"):
+            ns_k8s_namespace = additional_params["k8s-namespace"]
+
+        return ns_k8s_namespace
+
+    def _create_nsr_descriptor_from_nsd(self, nsd, ns_request, nsr_id, session):
+        now = time()
+        additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd)
+
+        nsr_descriptor = {
+            "name": ns_request["nsName"],
+            "name-ref": ns_request["nsName"],
+            "short-name": ns_request["nsName"],
+            "admin-status": "ENABLED",
+            "nsState": "NOT_INSTANTIATED",
+            "currentOperation": "IDLE",
+            "currentOperationID": None,
+            "errorDescription": None,
+            "errorDetail": None,
+            "deploymentStatus": None,
+            "configurationStatus": None,
+            "vcaStatus": None,
+            "nsd": {k: v for k, v in nsd.items()},
+            "datacenter": ns_request["vimAccountId"],
+            "resource-orchestrator": "osmopenmano",
+            "description": ns_request.get("nsDescription", ""),
+            "constituent-vnfr-ref": [],
+            "operational-status": "init",  # typedef ns-operational-
+            "config-status": "init",  # typedef config-states
+            "detailed-status": "scheduled",
+            "orchestration-progress": {},
+            "create-time": now,
+            "nsd-name-ref": nsd["name"],
+            "operational-events": [],  # "id", "timestamp", "description", "event",
+            "nsd-ref": nsd["id"],
+            "nsd-id": nsd["_id"],
+            "vnfd-id": [],
+            "instantiate_params": self._format_ns_request(ns_request),
+            "additionalParamsForNs": additional_params,
+            "ns-instance-config-ref": nsr_id,
+            "id": nsr_id,
+            "_id": nsr_id,
+            "ssh-authorized-key": ns_request.get("ssh_keys"),  # TODO remove
+            "flavor": [],
+            "image": [],
+        }
+        ns_request["nsr_id"] = nsr_id
+        if ns_request and ns_request.get("config-units"):
+            nsr_descriptor["config-units"] = ns_request["config-units"]
+
+        # Create vld
+        if nsd.get("virtual-link-desc"):
+            nsr_vld = deepcopy(nsd.get("virtual-link-desc", []))
+            # Fill each vld with vnfd-connection-point-ref data
+            # TODO: Change for multiple df support
+            all_vld_connection_point_data = {vld.get("id"): [] for vld in nsr_vld}
+            vnf_profiles = nsd.get("df", [[]])[0].get("vnf-profile", ())
+            for vnf_profile in vnf_profiles:
+                for vlc in vnf_profile.get("virtual-link-connectivity", ()):
+                    for cpd in vlc.get("constituent-cpd-id", ()):
+                        all_vld_connection_point_data[vlc.get("virtual-link-profile-id")].append({
+                            "member-vnf-index-ref": cpd.get("constituent-base-element-id"),
+                            "vnfd-connection-point-ref": cpd.get("constituent-cpd-id"),
+                            "vnfd-id-ref": vnf_profile.get("vnfd-id")
+                        })
+
+                vnfd = self._get_vnfd_from_db(vnf_profile.get("vnfd-id"), session)
+
+                for vdu in vnfd.get("vdu", ()):
+                    flavor_data = {}
+                    guest_epa = {}
+                    # Find this vdu compute and storage descriptors
+                    vdu_virtual_compute = {}
+                    vdu_virtual_storage = {}
+                    for vcd in vnfd.get("virtual-compute-desc", ()):
+                        if vcd.get("id") == vdu.get("virtual-compute-desc"):
+                            vdu_virtual_compute = vcd
+                    for vsd in vnfd.get("virtual-storage-desc", ()):
+                        if vsd.get("id") == vdu.get("virtual-storage-desc", [[]])[0]:
+                            vdu_virtual_storage = vsd
+                    # Get this vdu vcpus, memory and storage info for flavor_data
+                    if vdu_virtual_compute.get("virtual-cpu", {}).get("num-virtual-cpu"):
+                        flavor_data["vcpu-count"] = vdu_virtual_compute["virtual-cpu"]["num-virtual-cpu"]
+                    if vdu_virtual_compute.get("virtual-memory", {}).get("size"):
+                        flavor_data["memory-mb"] = float(vdu_virtual_compute["virtual-memory"]["size"]) * 1024.0
+                    if vdu_virtual_storage.get("size-of-storage"):
+                        flavor_data["storage-gb"] = vdu_virtual_storage["size-of-storage"]
+                    # Get this vdu EPA info for guest_epa
+                    if vdu_virtual_compute.get("virtual-cpu", {}).get("cpu-quota"):
+                        guest_epa["cpu-quota"] = vdu_virtual_compute["virtual-cpu"]["cpu-quota"]
+                    if vdu_virtual_compute.get("virtual-cpu", {}).get("pinning"):
+                        vcpu_pinning = vdu_virtual_compute["virtual-cpu"]["pinning"]
+                        if vcpu_pinning.get("thread-policy"):
+                            guest_epa["cpu-thread-pinning-policy"] = vcpu_pinning["thread-policy"]
+                        if vcpu_pinning.get("policy"):
+                            cpu_policy = "SHARED" if vcpu_pinning["policy"] == "dynamic" else "DEDICATED"
+                            guest_epa["cpu-pinning-policy"] = cpu_policy
+                    if vdu_virtual_compute.get("virtual-memory", {}).get("mem-quota"):
+                        guest_epa["mem-quota"] = vdu_virtual_compute["virtual-memory"]["mem-quota"]
+                    if vdu_virtual_compute.get("virtual-memory", {}).get("mempage-size"):
+                        guest_epa["mempage-size"] = vdu_virtual_compute["virtual-memory"]["mempage-size"]
+                    if vdu_virtual_compute.get("virtual-memory", {}).get("numa-node-policy"):
+                        guest_epa["numa-node-policy"] = vdu_virtual_compute["virtual-memory"]["numa-node-policy"]
+                    if vdu_virtual_storage.get("disk-io-quota"):
+                        guest_epa["disk-io-quota"] = vdu_virtual_storage["disk-io-quota"]
+
+                    if guest_epa:
+                        flavor_data["guest-epa"] = guest_epa
+
+                    flavor_data["name"] = vdu["id"][:56] + "-flv"
+                    flavor_data["id"] = str(len(nsr_descriptor["flavor"]))
+                    nsr_descriptor["flavor"].append(flavor_data)
+
+                    sw_image_id = vdu.get("sw-image-desc")
+                    if sw_image_id:
+                        image_data = self._get_image_data_from_vnfd(vnfd, sw_image_id)
+                        self._add_image_to_nsr(nsr_descriptor, image_data)
+
+                    # also add alternative images to the list of images
+                    for alt_image in vdu.get("alternative-sw-image-desc", ()):
+                        image_data = self._get_image_data_from_vnfd(vnfd, alt_image)
+                        self._add_image_to_nsr(nsr_descriptor, image_data)
+
+            for vld in nsr_vld:
+                vld["vnfd-connection-point-ref"] = all_vld_connection_point_data.get(vld.get("id"), [])
+                vld["name"] = vld["id"]
+            nsr_descriptor["vld"] = nsr_vld
+
+        return nsr_descriptor
+
+    def _get_image_data_from_vnfd(self, vnfd, sw_image_id):
+        sw_image_desc = utils.find_in_list(vnfd.get("sw-image-desc", ()),
+                                           lambda sw: sw["id"] == sw_image_id)
+        image_data = {}
+        if sw_image_desc.get("image"):
+            image_data["image"] = sw_image_desc["image"]
+        if sw_image_desc.get("checksum"):
+            image_data["image_checksum"] = sw_image_desc["checksum"]["hash"]
+        if sw_image_desc.get("vim-type"):
+            image_data["vim-type"] = sw_image_desc["vim-type"]
+        return image_data
+
+    def _add_image_to_nsr(self, nsr_descriptor, image_data):
+        """
+        Adds image to nsr checking first it is not already added
+        """
+        img = next((f for f in nsr_descriptor["image"] if
+                    all(f.get(k) == image_data[k] for k in image_data)), None)
+        if not img:
+            image_data["id"] = str(len(nsr_descriptor["image"]))
+            nsr_descriptor["image"].append(image_data)
+
+    def _create_vnfr_descriptor_from_vnfd(self, nsd, vnfd, vnfd_id, vnf_index, nsr_descriptor,
+                                          ns_request, ns_k8s_namespace):
+        vnfr_id = str(uuid4())
+        nsr_id = nsr_descriptor["id"]
+        now = time()
+        additional_params, vnf_params = self._format_additional_params(ns_request, vnf_index, descriptor=vnfd)
+
+        vnfr_descriptor = {
+            "id": vnfr_id,
+            "_id": vnfr_id,
+            "nsr-id-ref": nsr_id,
+            "member-vnf-index-ref": vnf_index,
+            "additionalParamsForVnf": additional_params,
+            "created-time": now,
+            # "vnfd": vnfd,        # at OSM model.but removed to avoid data duplication TODO: revise
+            "vnfd-ref": vnfd_id,
+            "vnfd-id": vnfd["_id"],  # not at OSM model, but useful
+            "vim-account-id": None,
+            "vdur": [],
+            "connection-point": [],
+            "ip-address": None,  # mgmt-interface filled by LCM
+        }
+        vnf_k8s_namespace = ns_k8s_namespace
+        if vnf_params:
+            if vnf_params.get("k8s-namespace"):
+                vnf_k8s_namespace = vnf_params["k8s-namespace"]
+            if vnf_params.get("config-units"):
+                vnfr_descriptor["config-units"] = vnf_params["config-units"]
+
+        # Create vld
+        if vnfd.get("int-virtual-link-desc"):
+            vnfr_descriptor["vld"] = []
+            for vnfd_vld in vnfd.get("int-virtual-link-desc"):
+                vnfr_descriptor["vld"].append({key: vnfd_vld[key] for key in vnfd_vld})
+
+        for cp in vnfd.get("ext-cpd", ()):
+            vnf_cp = {
+                "name": cp.get("id"),
+                "connection-point-id": cp.get("int-cpd", {}).get("cpd"),
+                "connection-point-vdu-id": cp.get("int-cpd", {}).get("vdu-id"),
+                "id": cp.get("id"),
+                # "ip-address", "mac-address" # filled by LCM
+                # vim-id  # TODO it would be nice having a vim port id
+            }
+            vnfr_descriptor["connection-point"].append(vnf_cp)
+
+        # Create k8s-cluster information
+        # TODO: Validate if a k8s-cluster net can have more than one ext-cpd ?
+        if vnfd.get("k8s-cluster"):
+            vnfr_descriptor["k8s-cluster"] = vnfd["k8s-cluster"]
+            all_k8s_cluster_nets_cpds = {}
+            for cpd in get_iterable(vnfd.get("ext-cpd")):
+                if cpd.get("k8s-cluster-net"):
+                    all_k8s_cluster_nets_cpds[cpd.get("k8s-cluster-net")] = cpd.get("id")
+            for net in get_iterable(vnfr_descriptor["k8s-cluster"].get("nets")):
+                if net.get("id") in all_k8s_cluster_nets_cpds:
+                    net["external-connection-point-ref"] = all_k8s_cluster_nets_cpds[net.get("id")]
+
+        # update kdus
+        for kdu in get_iterable(vnfd.get("kdu")):
+            additional_params, kdu_params = self._format_additional_params(ns_request,
+                                                                           vnf_index,
+                                                                           kdu_name=kdu["name"],
+                                                                           descriptor=vnfd)
+            kdu_k8s_namespace = vnf_k8s_namespace
+            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"]
+
+            kdur = {
+                "additionalParams": additional_params,
+                "k8s-namespace": kdu_k8s_namespace,
+                "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"]
+            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)
+
+        vnfd_mgmt_cp = vnfd.get("mgmt-cp")
+
+        for vdu in vnfd.get("vdu", ()):
+            vdu_mgmt_cp = []
+            try:
+                configs = vnfd.get("df")[0]["lcm-operations-configuration"]["operate-vnf-op-config"]["day1-2"]
+                vdu_config = utils.find_in_list(configs, lambda config: config["id"] == vdu["id"])
+            except Exception:
+                vdu_config = None
+            
+            if vdu_config:
+                external_connection_ee = utils.filter_in_list(
+                    vdu_config.get("execution-environment-list", []),
+                    lambda ee: "external-connection-point-ref" in ee
+                )
+                for ee in external_connection_ee:
+                    vdu_mgmt_cp.append(ee["external-connection-point-ref"])
+
+            additional_params, vdu_params = self._format_additional_params(
+                ns_request, vnf_index, vdu_id=vdu["id"], descriptor=vnfd)
+            vdur = {
+                "vdu-id-ref": vdu["id"],
+                # TODO      "name": ""     Name of the VDU in the VIM
+                "ip-address": None,  # mgmt-interface filled by LCM
+                # "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM
+                "internal-connection-point": [],
+                "interfaces": [],
+                "additionalParams": additional_params,
+                "vdu-name": vdu["name"]
+            }
+            if vdu_params and vdu_params.get("config-units"):
+                vdur["config-units"] = vdu_params["config-units"]
+            if deep_get(vdu, ("supplemental-boot-data", "boot-data-drive")):
+                vdur["boot-data-drive"] = vdu["supplemental-boot-data"]["boot-data-drive"]
+            if vdu.get("pdu-type"):
+                vdur["pdu-type"] = vdu["pdu-type"]
+                vdur["name"] = vdu["pdu-type"]
+            # TODO volumes: name, volume-id
+            for icp in vdu.get("int-cpd", ()):
+                vdu_icp = {
+                    "id": icp["id"],
+                    "connection-point-id": icp["id"],
+                    "name": icp.get("id"),
+                }
+
+                vdur["internal-connection-point"].append(vdu_icp)
+
+                for iface in icp.get("virtual-network-interface-requirement", ()):
+                    iface_fields = ("name", "mac-address")
+                    vdu_iface = {x: iface[x] for x in iface_fields if iface.get(x) is not None}
+
+                    vdu_iface["internal-connection-point-ref"] = vdu_icp["id"]
+                    if "port-security-enabled" in icp:
+                        vdu_iface["port-security-enabled"] = icp["port-security-enabled"]
+
+                    if "port-security-disable-strategy" in icp:
+                        vdu_iface["port-security-disable-strategy"] = icp["port-security-disable-strategy"]
+
+                    for ext_cp in vnfd.get("ext-cpd", ()):
+                        if not ext_cp.get("int-cpd"):
+                            continue
+                        if ext_cp["int-cpd"].get("vdu-id") != vdu["id"]:
+                            continue
+                        if icp["id"] == ext_cp["int-cpd"].get("cpd"):
+                            vdu_iface["external-connection-point-ref"] = ext_cp.get("id")
+
+                            if "port-security-enabled" in ext_cp:
+                                vdu_iface["port-security-enabled"] = (
+                                    ext_cp["port-security-enabled"]
+                                )
+
+                            if "port-security-disable-strategy" in ext_cp:
+                                vdu_iface["port-security-disable-strategy"] = (
+                                    ext_cp["port-security-disable-strategy"]
+                                )
+
+                            break
+
+                    if vnfd_mgmt_cp and vdu_iface.get("external-connection-point-ref") == vnfd_mgmt_cp:
+                        vdu_iface["mgmt-vnf"] = True
+                        vdu_iface["mgmt-interface"] = True
+
+                    for ecp in vdu_mgmt_cp:
+                        if vdu_iface.get("external-connection-point-ref") == ecp:
+                            vdu_iface["mgmt-interface"] = True
+
+                    if iface.get("virtual-interface"):
+                        vdu_iface.update(deepcopy(iface["virtual-interface"]))
+
+                    # look for network where this interface is connected
+                    iface_ext_cp = vdu_iface.get("external-connection-point-ref")
+                    if iface_ext_cp:
+                        # TODO: Change for multiple df support
+                        for df in get_iterable(nsd.get("df")):
+                            for vnf_profile in get_iterable(df.get("vnf-profile")):
+                                for vlc_index, vlc in \
+                                        enumerate(get_iterable(vnf_profile.get("virtual-link-connectivity"))):
+                                    for cpd in get_iterable(vlc.get("constituent-cpd-id")):
+                                        if cpd.get("constituent-cpd-id") == iface_ext_cp:
+                                            vdu_iface["ns-vld-id"] = vlc.get("virtual-link-profile-id")
+                                            # if iface type is SRIOV or PASSTHROUGH, set pci-interfaces flag to True
+                                            if vdu_iface.get("type") in ("SR-IOV", "PCI-PASSTHROUGH"):
+                                                nsr_descriptor["vld"][vlc_index]["pci-interfaces"] = True
+                                            break
+                    elif vdu_iface.get("internal-connection-point-ref"):
+                        vdu_iface["vnf-vld-id"] = icp.get("int-virtual-link-desc")
+                        # TODO: store fixed IP address in the record (if it exists in the ICP)
+                        # if iface type is SRIOV or PASSTHROUGH, set pci-interfaces flag to True
+                        if vdu_iface.get("type") in ("SR-IOV", "PCI-PASSTHROUGH"):
+                            ivld_index = utils.find_index_in_list(vnfd.get("int-virtual-link-desc", ()),
+                                                                  lambda ivld:
+                                                                  ivld["id"] == icp.get("int-virtual-link-desc")
+                                                                  )
+                            vnfr_descriptor["vld"][ivld_index]["pci-interfaces"] = True
+
+                    vdur["interfaces"].append(vdu_iface)
+
+            if vdu.get("sw-image-desc"):
+                sw_image = utils.find_in_list(
+                    vnfd.get("sw-image-desc", ()),
+                    lambda image: image["id"] == vdu.get("sw-image-desc"))
+                nsr_sw_image_data = utils.find_in_list(
+                    nsr_descriptor["image"],
+                    lambda nsr_image: (nsr_image.get("image") == sw_image.get("image"))
+                )
+                vdur["ns-image-id"] = nsr_sw_image_data["id"]
+
+            if vdu.get("alternative-sw-image-desc"):
+                alt_image_ids = []
+                for alt_image_id in vdu.get("alternative-sw-image-desc", ()):
+                    sw_image = utils.find_in_list(
+                        vnfd.get("sw-image-desc", ()),
+                        lambda image: image["id"] == alt_image_id)
+                    nsr_sw_image_data = utils.find_in_list(
+                        nsr_descriptor["image"],
+                        lambda nsr_image: (nsr_image.get("image") == sw_image.get("image"))
+                    )
+                    alt_image_ids.append(nsr_sw_image_data["id"])
+                vdur["alt-image-ids"] = alt_image_ids
+
+            flavor_data_name = vdu["id"][:56] + "-flv"
+            nsr_flavor_desc = utils.find_in_list(
+                nsr_descriptor["flavor"],
+                lambda flavor: flavor["name"] == flavor_data_name)
+
+            if nsr_flavor_desc:
+                vdur["ns-flavor-id"] = nsr_flavor_desc["id"]
+
+            count = int(vdu.get("count", 1))
+            for index in range(0, count):
+                vdur = deepcopy(vdur)
+                for iface in vdur["interfaces"]:
+                    if iface.get("ip-address"):
+                        iface["ip-address"] = increment_ip_mac(iface["ip-address"])
+                    if iface.get("mac-address"):
+                        iface["mac-address"] = increment_ip_mac(iface["mac-address"])
+
+                vdur["_id"] = str(uuid4())
+                vdur["id"] = vdur["_id"]
+                vdur["count-index"] = index
+                vnfr_descriptor["vdur"].append(vdur)
+
+        return vnfr_descriptor
 
     def edit(self, session, _id, indata=None, kwargs=None, content=None):
         raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR)
@@ -389,10 +713,10 @@ class VnfrTopic(BaseTopic):
     topic = "vnfrs"
     topic_msg = None
 
-    def __init__(self, db, fs, msg):
-        BaseTopic.__init__(self, db, fs, msg)
+    def __init__(self, db, fs, msg, auth):
+        BaseTopic.__init__(self, db, fs, msg, auth)
 
-    def delete(self, session, _id, dry_run=False):
+    def delete(self, session, _id, dry_run=False, not_send_msg=None):
         raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR)
 
     def edit(self, session, _id, indata=None, kwargs=None, content=None):
@@ -410,11 +734,11 @@ class NsLcmOpTopic(BaseTopic):
         "instantiate": ns_instantiate,
         "action": ns_action,
         "scale": ns_scale,
-        "terminate": None,
+        "terminate": ns_terminate,
     }
 
-    def __init__(self, db, fs, msg):
-        BaseTopic.__init__(self, db, fs, msg)
+    def __init__(self, db, fs, msg, auth):
+        BaseTopic.__init__(self, db, fs, msg, auth)
 
     def _check_ns_operation(self, session, nsr, operation, indata):
         """
@@ -424,158 +748,227 @@ class NsLcmOpTopic(BaseTopic):
         :param indata: descriptor with the parameters of the operation
         :return: None
         """
-        vnfds = {}
+        if operation == "action":
+            self._check_action_ns_operation(indata, nsr)
+        elif operation == "scale":
+            self._check_scale_ns_operation(indata, nsr)
+        elif operation == "instantiate":
+            self._check_instantiate_ns_operation(indata, nsr, session)
+
+    def _check_action_ns_operation(self, indata, nsr):
+        nsd = nsr["nsd"]
+        # check vnf_member_index
+        if indata.get("vnf_member_index"):
+            indata["member_vnf_index"] = indata.pop("vnf_member_index")  # for backward compatibility
+        if indata.get("member_vnf_index"):
+            vnfd = self._get_vnfd_from_vnf_member_index(indata["member_vnf_index"], nsr["_id"])
+            try:
+                configs = vnfd.get("df")[0]["lcm-operations-configuration"]["operate-vnf-op-config"]["day1-2"]
+            except Exception:
+                configs = []
+
+            if indata.get("vdu_id"):
+                self._check_valid_vdu(vnfd, indata["vdu_id"])
+                descriptor_configuration = utils.find_in_list(
+                    configs,
+                    lambda config: config["id"] == indata["vdu_id"]
+                )
+            elif indata.get("kdu_name"):
+                self._check_valid_kdu(vnfd, indata["kdu_name"])
+                descriptor_configuration = utils.find_in_list(
+                    configs,
+                    lambda config: config["id"] == indata.get("kdu_name")
+                )
+            else:
+                descriptor_configuration = utils.find_in_list(
+                    configs,
+                    lambda config: config["id"] == vnfd["id"]
+                )
+            if descriptor_configuration is not None:
+                descriptor_configuration = descriptor_configuration.get("config-primitive")
+        else:  # use a NSD
+            descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")
+
+        # For k8s allows default primitives without validating the parameters
+        if indata.get("kdu_name") and indata["primitive"] in ("upgrade", "rollback", "status", "inspect", "readme"):
+            # TODO should be checked that rollback only can contains revsision_numbe????
+            if not indata.get("member_vnf_index"):
+                raise EngineException("Missing action parameter 'member_vnf_index' for default KDU primitive '{}'"
+                                      .format(indata["primitive"]))
+            return
+        # if not, check primitive
+        for config_primitive in get_iterable(descriptor_configuration):
+            if indata["primitive"] == config_primitive["name"]:
+                # check needed primitive_params are provided
+                if indata.get("primitive_params"):
+                    in_primitive_params_copy = copy(indata["primitive_params"])
+                else:
+                    in_primitive_params_copy = {}
+                for paramd in get_iterable(config_primitive.get("parameter")):
+                    if paramd["name"] in in_primitive_params_copy:
+                        del in_primitive_params_copy[paramd["name"]]
+                    elif not paramd.get("default-value"):
+                        raise EngineException("Needed parameter {} not provided for primitive '{}'".format(
+                            paramd["name"], indata["primitive"]))
+                # check no extra primitive params are provided
+                if in_primitive_params_copy:
+                    raise EngineException("parameter/s '{}' not present at vnfd /nsd for primitive '{}'".format(
+                        list(in_primitive_params_copy.keys()), indata["primitive"]))
+                break
+        else:
+            raise EngineException("Invalid primitive '{}' is not present at vnfd/nsd".format(indata["primitive"]))
+
+    def _check_scale_ns_operation(self, indata, nsr):
+        vnfd = self._get_vnfd_from_vnf_member_index(indata["scaleVnfData"]["scaleByStepData"]["member-vnf-index"],
+                                                    nsr["_id"])
+        for scaling_aspect in get_iterable(vnfd.get("df", ())[0]["scaling-aspect"]):
+            if indata["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"] == scaling_aspect["id"]:
+                break
+        else:
+            raise EngineException("Invalid scaleVnfData:scaleByStepData:scaling-group-descriptor '{}' is not "
+                                  "present at vnfd:scaling-aspect"
+                                  .format(indata["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"]))
+
+    def _check_instantiate_ns_operation(self, indata, nsr, session):
+        vnf_member_index_to_vnfd = {}  # map between vnf_member_index to vnf descriptor.
         vim_accounts = []
         wim_accounts = []
         nsd = nsr["nsd"]
-
-        def check_valid_vnf_member_index(member_vnf_index):
-            # TODO change to vnfR
-            for vnf in nsd["constituent-vnfd"]:
-                if member_vnf_index == vnf["member-vnf-index"]:
-                    vnfd_id = vnf["vnfd-id-ref"]
-                    if vnfd_id not in vnfds:
-                        vnfds[vnfd_id] = self.db.get_one("vnfds", {"id": vnfd_id})
-                    return vnfds[vnfd_id]
+        self._check_valid_vim_account(indata["vimAccountId"], vim_accounts, session)
+        self._check_valid_wim_account(indata.get("wimAccountId"), wim_accounts, session)
+        for in_vnf in get_iterable(indata.get("vnf")):
+            member_vnf_index = in_vnf["member-vnf-index"]
+            if vnf_member_index_to_vnfd.get(member_vnf_index):
+                vnfd = vnf_member_index_to_vnfd[member_vnf_index]
             else:
-                raise EngineException("Invalid parameter member_vnf_index='{}' is not one of the "
-                                      "nsd:constituent-vnfd".format(member_vnf_index))
-
-        def _check_vnf_instantiation_params(in_vnfd, vnfd):
-
-            for in_vdu in get_iterable(in_vnfd.get("vdu")):
-                for vdu in get_iterable(vnfd.get("vdu")):
-                    if in_vdu["id"] == vdu["id"]:
-                        for volume in get_iterable(in_vdu.get("volume")):
-                            for volumed in get_iterable(vdu.get("volumes")):
-                                if volumed["name"] == volume["name"]:
-                                    break
-                            else:
-                                raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:"
-                                                      "volume:name='{}' is not present at vnfd:vdu:volumes list".
-                                                      format(in_vnf["member-vnf-index"], in_vdu["id"],
-                                                             volume["name"]))
-                        for in_iface in get_iterable(in_vdu["interface"]):
-                            for iface in get_iterable(vdu.get("interface")):
-                                if in_iface["name"] == iface["name"]:
-                                    break
-                            else:
-                                raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:"
-                                                      "interface[name='{}'] is not present at vnfd:vdu:interface"
-                                                      .format(in_vnf["member-vnf-index"], in_vdu["id"],
-                                                              in_iface["name"]))
-                        break
-                else:
-                    raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}'] is is not present "
-                                          "at vnfd:vdu".format(in_vnf["member-vnf-index"], in_vdu["id"]))
-
-            for in_ivld in get_iterable(in_vnfd.get("internal-vld")):
-                for ivld in get_iterable(vnfd.get("internal-vld")):
-                    if in_ivld["name"] == ivld["name"] or in_ivld["name"] == ivld["id"]:
-                        for in_icp in get_iterable(in_ivld["internal-connection-point"]):
-                            for icp in ivld["internal-connection-point"]:
-                                if in_icp["id-ref"] == icp["id-ref"]:
-                                    break
-                            else:
-                                raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld[name"
-                                                      "='{}']:internal-connection-point[id-ref:'{}'] is not present at "
-                                                      "vnfd:internal-vld:name/id:internal-connection-point"
-                                                      .format(in_vnf["member-vnf-index"], in_ivld["name"],
-                                                              in_icp["id-ref"], vnfd["id"]))
-                        break
-                else:
-                    raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'"
-                                          " is not present at vnfd '{}'".format(in_vnf["member-vnf-index"],
-                                                                                in_ivld["name"], vnfd["id"]))
-
-        def check_valid_vim_account(vim_account):
-            if vim_account in vim_accounts:
-                return
-            try:
-                db_filter = self._get_project_filter(session)
-                db_filter["_id"] = vim_account
-                self.db.get_one("vim_accounts", db_filter)
-            except Exception:
-                raise EngineException("Invalid vimAccountId='{}' not present for the project".format(vim_account))
-            vim_accounts.append(vim_account)
-
-        def check_valid_wim_account(wim_account):
-            if not isinstance(wim_account, str):
-                return
-            elif wim_account in wim_accounts:
-                return
-            try:
-                db_filter = self._get_project_filter(session, write=False, show_all=True)
-                db_filter["_id"] = wim_account
-                self.db.get_one("wim_accounts", db_filter)
-            except Exception:
-                raise EngineException("Invalid wimAccountId='{}' not present for the project".format(wim_account))
-            wim_accounts.append(wim_account)
-
-        if operation == "action":
-            # check vnf_member_index
-            if indata.get("vnf_member_index"):
-                indata["member_vnf_index"] = indata.pop("vnf_member_index")    # for backward compatibility
-            if indata.get("member_vnf_index"):
-                vnfd = check_valid_vnf_member_index(indata["member_vnf_index"])
-                descriptor_configuration = vnfd.get("vnf-configuration", {}).get("config-primitive")
-            else:  # use a NSD
-                descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")
-            # check primitive
-            for config_primitive in get_iterable(descriptor_configuration):
-                if indata["primitive"] == config_primitive["name"]:
-                    # check needed primitive_params are provided
-                    if indata.get("primitive_params"):
-                        in_primitive_params_copy = copy(indata["primitive_params"])
-                    else:
-                        in_primitive_params_copy = {}
-                    for paramd in get_iterable(config_primitive.get("parameter")):
-                        if paramd["name"] in in_primitive_params_copy:
-                            del in_primitive_params_copy[paramd["name"]]
-                        elif not paramd.get("default-value"):
-                            raise EngineException("Needed parameter {} not provided for primitive '{}'".format(
-                                paramd["name"], indata["primitive"]))
-                    # check no extra primitive params are provided
-                    if in_primitive_params_copy:
-                        raise EngineException("parameter/s '{}' not present at vnfd /nsd for primitive '{}'".format(
-                            list(in_primitive_params_copy.keys()), indata["primitive"]))
+                vnfd = self._get_vnfd_from_vnf_member_index(member_vnf_index, nsr["_id"])
+                vnf_member_index_to_vnfd[member_vnf_index] = vnfd  # add to cache, avoiding a later look for
+            self._check_vnf_instantiation_params(in_vnf, vnfd)
+            if in_vnf.get("vimAccountId"):
+                self._check_valid_vim_account(in_vnf["vimAccountId"], vim_accounts, session)
+
+        for in_vld in get_iterable(indata.get("vld")):
+            self._check_valid_wim_account(in_vld.get("wimAccountId"), wim_accounts, session)
+            for vldd in get_iterable(nsd.get("virtual-link-desc")):
+                if in_vld["name"] == vldd["id"]:
                     break
             else:
-                raise EngineException("Invalid primitive '{}' is not present at vnfd/nsd".format(indata["primitive"]))
-        if operation == "scale":
-            vnfd = check_valid_vnf_member_index(indata["scaleVnfData"]["scaleByStepData"]["member-vnf-index"])
-            for scaling_group in get_iterable(vnfd.get("scaling-group-descriptor")):
-                if indata["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"] == scaling_group["name"]:
+                raise EngineException("Invalid parameter vld:name='{}' is not present at nsd:vld".format(
+                    in_vld["name"]))
+
+    def _get_vnfd_from_vnf_member_index(self, member_vnf_index, nsr_id):
+        # Obtain vnf descriptor. The vnfr is used to get the vnfd._id used for this member_vnf_index
+        vnfr = self.db.get_one("vnfrs",
+                               {"nsr-id-ref": nsr_id, "member-vnf-index-ref": member_vnf_index},
+                               fail_on_empty=False)
+        if not vnfr:
+            raise EngineException("Invalid parameter member_vnf_index='{}' is not one of the "
+                                  "nsd:constituent-vnfd".format(member_vnf_index))
+        vnfd = self.db.get_one("vnfds", {"_id": vnfr["vnfd-id"]}, fail_on_empty=False)
+        if not vnfd:
+            raise EngineException("vnfd id={} has been deleted!. Operation cannot be performed".
+                                  format(vnfr["vnfd-id"]))
+        return vnfd
+
+    def _check_valid_vdu(self, vnfd, vdu_id):
+        for vdud in get_iterable(vnfd.get("vdu")):
+            if vdud["id"] == vdu_id:
+                return vdud
+        else:
+            raise EngineException("Invalid parameter vdu_id='{}' not present at vnfd:vdu:id".format(vdu_id))
+
+    def _check_valid_kdu(self, vnfd, kdu_name):
+        for kdud in get_iterable(vnfd.get("kdu")):
+            if kdud["name"] == kdu_name:
+                return kdud
+        else:
+            raise EngineException("Invalid parameter kdu_name='{}' not present at vnfd:kdu:name".format(kdu_name))
+
+    def _check_vnf_instantiation_params(self, in_vnf, vnfd):
+        for in_vdu in get_iterable(in_vnf.get("vdu")):
+            for vdu in get_iterable(vnfd.get("vdu")):
+                if in_vdu["id"] == vdu["id"]:
+                    for volume in get_iterable(in_vdu.get("volume")):
+                        for volumed in get_iterable(vdu.get("virtual-storage-desc")):
+                            if volumed["id"] == volume["name"]:
+                                break
+                        else:
+                            raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:"
+                                                  "volume:name='{}' is not present at "
+                                                  "vnfd:vdu:virtual-storage-desc list".
+                                                  format(in_vnf["member-vnf-index"], in_vdu["id"],
+                                                         volume["id"]))
+
+                    vdu_if_names = set()
+                    for cpd in get_iterable(vdu.get("int-cpd")):
+                        for iface in get_iterable(cpd.get("virtual-network-interface-requirement")):
+                            vdu_if_names.add(iface.get("name"))
+
+                    for in_iface in get_iterable(in_vdu["interface"]):
+                        if in_iface["name"] in vdu_if_names:
+                            break
+                        else:
+                            raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:"
+                                                  "int-cpd[id='{}'] is not present at vnfd:vdu:int-cpd"
+                                                  .format(in_vnf["member-vnf-index"], in_vdu["id"],
+                                                          in_iface["name"]))
                     break
+
             else:
-                raise EngineException("Invalid scaleVnfData:scaleByStepData:scaling-group-descriptor '{}' is not "
-                                      "present at vnfd:scaling-group-descriptor".format(
-                                          indata["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"]))
-        if operation == "instantiate":
-            # check vim_account
-            check_valid_vim_account(indata["vimAccountId"])
-            check_valid_wim_account(indata.get("wimAccountId"))
-            for in_vnf in get_iterable(indata.get("vnf")):
-                vnfd = check_valid_vnf_member_index(in_vnf["member-vnf-index"])
-                _check_vnf_instantiation_params(in_vnf, vnfd)
-                if in_vnf.get("vimAccountId"):
-                    check_valid_vim_account(in_vnf["vimAccountId"])
-
-            for in_vld in get_iterable(indata.get("vld")):
-                check_valid_wim_account(in_vld.get("wimAccountId"))
-                for vldd in get_iterable(nsd.get("vld")):
-                    if in_vld["name"] == vldd["name"] or in_vld["name"] == vldd["id"]:
+                raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}'] is not present "
+                                      "at vnfd:vdu".format(in_vnf["member-vnf-index"], in_vdu["id"]))
+
+        vnfd_ivlds_cpds = {ivld.get("id"): set() for ivld in get_iterable(vnfd.get("int-virtual-link-desc"))}
+        for vdu in get_iterable(vnfd.get("vdu")):
+            for cpd in get_iterable(vnfd.get("int-cpd")):
+                if cpd.get("int-virtual-link-desc"):
+                    vnfd_ivlds_cpds[cpd.get("int-virtual-link-desc")] = cpd.get("id")
+
+        for in_ivld in get_iterable(in_vnf.get("internal-vld")):
+            if in_ivld.get("name") in vnfd_ivlds_cpds:
+                for in_icp in get_iterable(in_ivld.get("internal-connection-point")):
+                    if in_icp["id-ref"] in vnfd_ivlds_cpds[in_ivld.get("name")]:
                         break
-                else:
-                    raise EngineException("Invalid parameter vld:name='{}' is not present at nsd:vld".format(
-                        in_vld["name"]))
+                    else:
+                        raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld[name"
+                                              "='{}']:internal-connection-point[id-ref:'{}'] is not present at "
+                                              "vnfd:internal-vld:name/id:internal-connection-point"
+                                              .format(in_vnf["member-vnf-index"], in_ivld["name"],
+                                                      in_icp["id-ref"]))
+            else:
+                raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'"
+                                      " is not present at vnfd '{}'".format(in_vnf["member-vnf-index"],
+                                                                            in_ivld["name"], vnfd["id"]))
+
+    def _check_valid_vim_account(self, vim_account, vim_accounts, session):
+        if vim_account in vim_accounts:
+            return
+        try:
+            db_filter = self._get_project_filter(session)
+            db_filter["_id"] = vim_account
+            self.db.get_one("vim_accounts", db_filter)
+        except Exception:
+            raise EngineException("Invalid vimAccountId='{}' not present for the project".format(vim_account))
+        vim_accounts.append(vim_account)
+
+    def _check_valid_wim_account(self, wim_account, wim_accounts, session):
+        if not isinstance(wim_account, str):
+            return
+        if wim_account in wim_accounts:
+            return
+        try:
+            db_filter = self._get_project_filter(session, write=False, show_all=True)
+            db_filter["_id"] = wim_account
+            self.db.get_one("wim_accounts", db_filter)
+        except Exception:
+            raise EngineException("Invalid wimAccountId='{}' not present for the project".format(wim_account))
+        wim_accounts.append(wim_account)
 
     def _look_for_pdu(self, session, rollback, vnfr, vim_account, vnfr_update, vnfr_update_rollback):
         """
         Look for a free PDU in the catalog matching vdur type and interfaces. Fills vnfr.vdur with the interface
         (ip_address, ...) information.
         Modifies PDU _admin.usageState to 'IN_USE'
-        
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param rollback: list with the database modifications to rollback if needed
         :param vnfr: vnfr to be updated. It is modified with pdu interface info if pdu is found
@@ -651,29 +1044,110 @@ class NsLcmOpTopic(BaseTopic):
                                 vnfr_update[iface_text + ".{}".format(k)] = v
                                 vnfr_update_rollback[iface_text + ".{}".format(k)] = vdur_interface.get(v)
                         if pdu_interface.get("ip-address"):
-                            if vdur_interface.get("mgmt-interface"):
+                            if vdur_interface.get("mgmt-interface") or vdur_interface.get("mgmt-vnf"):
                                 vnfr_update_rollback[vdu_text + ".ip-address"] = vdur.get("ip-address")
                                 vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"]
                             if vdur_interface.get("mgmt-vnf"):
                                 vnfr_update_rollback["ip-address"] = vnfr.get("ip-address")
                                 vnfr_update["ip-address"] = pdu_interface["ip-address"]
+                                vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"]
                         if pdu_interface.get("vim-network-name") or pdu_interface.get("vim-network-id"):
                             ifaces_forcing_vim_network.append({
                                 "name": vdur_interface.get("vnf-vld-id") or vdur_interface.get("ns-vld-id"),
                                 "vnf-vld-id": vdur_interface.get("vnf-vld-id"),
                                 "ns-vld-id": vdur_interface.get("ns-vld-id")})
                             if pdu_interface.get("vim-network-id"):
-                                ifaces_forcing_vim_network.append({
-                                    "vim-network-id": pdu_interface.get("vim-network-id")})
+                                ifaces_forcing_vim_network[-1]["vim-network-id"] = pdu_interface["vim-network-id"]
                             if pdu_interface.get("vim-network-name"):
-                                ifaces_forcing_vim_network.append({
-                                    "vim-network-name": pdu_interface.get("vim-network-name")})
+                                ifaces_forcing_vim_network[-1]["vim-network-name"] = pdu_interface["vim-network-name"]
                         break
 
         return ifaces_forcing_vim_network
 
+    def _look_for_k8scluster(self, session, rollback, vnfr, vim_account, vnfr_update, vnfr_update_rollback):
+        """
+        Look for an available k8scluster for all the kuds in the vnfd matching version and cni requirements.
+        Fills vnfr.kdur with the selected k8scluster
+
+        :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+        :param rollback: list with the database modifications to rollback if needed
+        :param vnfr: vnfr to be updated. It is modified with pdu interface info if pdu is found
+        :param vim_account: vim_account where this vnfr should be deployed
+        :param vnfr_update: dictionary filled by this method with changes to be done at database vnfr
+        :param vnfr_update_rollback: dictionary filled by this method with original content of vnfr in case a rollback
+                                     of the changed vnfr is needed
+
+        :return: List of KDU interfaces that are connected to an existing VIM network. Each item contains:
+                 "vim-network-name": used at VIM
+                  "name": interface name
+                  "vnf-vld-id": internal VNFD vld where this interface is connected, or
+                  "ns-vld-id": NSD vld where this interface is connected.
+                  NOTE: One, and only one between 'vnf-vld-id' and 'ns-vld-id' contains a value. The other will be None
+        """
+
+        ifaces_forcing_vim_network = []
+        if not vnfr.get("kdur"):
+            return ifaces_forcing_vim_network
+
+        kdu_filter = self._get_project_filter(session)
+        kdu_filter["vim_account"] = vim_account
+        # TODO kdu_filter["_admin.operationalState"] = "ENABLED"
+        available_k8sclusters = self.db.get_list("k8sclusters", kdu_filter)
+
+        k8s_requirements = {}  # just for logging
+        for k8scluster in available_k8sclusters:
+            if not vnfr.get("k8s-cluster"):
+                break
+            # restrict by cni
+            if vnfr["k8s-cluster"].get("cni"):
+                k8s_requirements["cni"] = vnfr["k8s-cluster"]["cni"]
+                if not set(vnfr["k8s-cluster"]["cni"]).intersection(k8scluster.get("cni", ())):
+                    continue
+            # restrict by version
+            if vnfr["k8s-cluster"].get("version"):
+                k8s_requirements["version"] = vnfr["k8s-cluster"]["version"]
+                if k8scluster.get("k8s_version") not in vnfr["k8s-cluster"]["version"]:
+                    continue
+            # restrict by number of networks
+            if vnfr["k8s-cluster"].get("nets"):
+                k8s_requirements["networks"] = len(vnfr["k8s-cluster"]["nets"])
+                if not k8scluster.get("nets") or len(k8scluster["nets"]) < len(vnfr["k8s-cluster"]["nets"]):
+                    continue
+            break
+        else:
+            raise EngineException("No k8scluster with requirements='{}' at vim_account={} found for member_vnf_index={}"
+                                  .format(k8s_requirements, vim_account, vnfr["member-vnf-index-ref"]))
+
+        for kdur_index, kdur in enumerate(get_iterable(vnfr.get("kdur"))):
+            # step 3. Fill vnfr info by filling kdur
+            kdu_text = "kdur.{}.".format(kdur_index)
+            vnfr_update_rollback[kdu_text + "k8s-cluster.id"] = None
+            vnfr_update[kdu_text + "k8s-cluster.id"] = k8scluster["_id"]
+
+        # step 4. Check VIM networks that forces the selected k8s_cluster
+        if vnfr.get("k8s-cluster") and vnfr["k8s-cluster"].get("nets"):
+            k8scluster_net_list = list(k8scluster.get("nets").keys())
+            for net_index, kdur_net in enumerate(vnfr["k8s-cluster"]["nets"]):
+                # get a network from k8s_cluster nets. If name matches use this, if not use other
+                if kdur_net["id"] in k8scluster_net_list:  # name matches
+                    vim_net = k8scluster["nets"][kdur_net["id"]]
+                    k8scluster_net_list.remove(kdur_net["id"])
+                else:
+                    vim_net = k8scluster["nets"][k8scluster_net_list[0]]
+                    k8scluster_net_list.pop(0)
+                vnfr_update_rollback["k8s-cluster.nets.{}.vim_net".format(net_index)] = None
+                vnfr_update["k8s-cluster.nets.{}.vim_net".format(net_index)] = vim_net
+                if vim_net and (kdur_net.get("vnf-vld-id") or kdur_net.get("ns-vld-id")):
+                    ifaces_forcing_vim_network.append({
+                        "name": kdur_net.get("vnf-vld-id") or kdur_net.get("ns-vld-id"),
+                        "vnf-vld-id": kdur_net.get("vnf-vld-id"),
+                        "ns-vld-id": kdur_net.get("ns-vld-id"),
+                        "vim-network-name": vim_net,   # TODO can it be vim-network-id ???
+                    })
+            # TODO check that this forcing is not incompatible with other forcing
+        return ifaces_forcing_vim_network
+
     def _update_vnfrs(self, session, rollback, nsr, indata):
-        vnfrs = None
         # get vnfr
         nsr_id = nsr["_id"]
         vnfrs = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
@@ -692,6 +1166,64 @@ class NsLcmOpTopic(BaseTopic):
                 if vnf_inst_params.get("vimAccountId"):
                     vim_account = vnf_inst_params.get("vimAccountId")
 
+                # get vnf.vdu.interface instantiation params to update vnfr.vdur.interfaces ip, mac
+                for vdu_inst_param in get_iterable(vnf_inst_params.get("vdu")):
+                    for vdur_index, vdur in enumerate(vnfr["vdur"]):
+                        if vdu_inst_param["id"] != vdur["vdu-id-ref"]:
+                            continue
+                        for iface_inst_param in get_iterable(vdu_inst_param.get("interface")):
+                            iface_index, _ = next(i for i in enumerate(vdur["interfaces"])
+                                                  if i[1]["name"] == iface_inst_param["name"])
+                            vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+                            if iface_inst_param.get("ip-address"):
+                                vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+                                    iface_inst_param.get("ip-address"), vdur.get("count-index", 0))
+                                vnfr_update[vnfr_update_text + ".fixed-ip"] = True
+                            if iface_inst_param.get("mac-address"):
+                                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")):
+                    for icp_inst_param in get_iterable(ivld_inst_param.get("internal-connection-point")):
+                        # look for iface
+                        for vdur_index, vdur in enumerate(vnfr["vdur"]):
+                            for iface_index, iface in enumerate(vdur["interfaces"]):
+                                if iface.get("internal-connection-point-ref") == icp_inst_param["id-ref"]:
+                                    vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+                                    if icp_inst_param.get("ip-address"):
+                                        vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+                                            icp_inst_param.get("ip-address"), vdur.get("count-index", 0))
+                                        vnfr_update[vnfr_update_text + ".fixed-ip"] = True
+                                    if icp_inst_param.get("mac-address"):
+                                        vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
+                                            icp_inst_param.get("mac-address"), vdur.get("count-index", 0))
+                                        vnfr_update[vnfr_update_text + ".fixed-mac"] = True
+                                    break
+            # get ip address from instantiation parameters.vld.vnfd-connection-point-ref
+            for vld_inst_param in get_iterable(indata.get("vld")):
+                for vnfcp_inst_param in get_iterable(vld_inst_param.get("vnfd-connection-point-ref")):
+                    if vnfcp_inst_param["member-vnf-index-ref"] != member_vnf_index:
+                        continue
+                    # look for iface
+                    for vdur_index, vdur in enumerate(vnfr["vdur"]):
+                        for iface_index, iface in enumerate(vdur["interfaces"]):
+                            if iface.get("external-connection-point-ref") == \
+                                    vnfcp_inst_param["vnfd-connection-point-ref"]:
+                                vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index)
+                                if vnfcp_inst_param.get("ip-address"):
+                                    vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac(
+                                        vnfcp_inst_param.get("ip-address"), vdur.get("count-index", 0))
+                                    vnfr_update[vnfr_update_text + ".fixed-ip"] = True
+                                if vnfcp_inst_param.get("mac-address"):
+                                    vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac(
+                                        vnfcp_inst_param.get("mac-address"), vdur.get("count-index", 0))
+                                    vnfr_update[vnfr_update_text + ".fixed-mac"] = True
+                                break
+
             vnfr_update["vim-account-id"] = vim_account
             vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id")
 
@@ -699,7 +1231,10 @@ class NsLcmOpTopic(BaseTopic):
             ifaces_forcing_vim_network = self._look_for_pdu(session, rollback, vnfr, vim_account, vnfr_update,
                                                             vnfr_update_rollback)
 
-            # updata database vnfr
+            # get kdus
+            ifaces_forcing_vim_network += self._look_for_k8scluster(session, rollback, vnfr, vim_account, vnfr_update,
+                                                                    vnfr_update_rollback)
+            # update database vnfr
             self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, vnfr_update)
             rollback.append({"topic": "vnfrs", "_id": vnfr["_id"], "operation": "set", "content": vnfr_update_rollback})
 
@@ -738,6 +1273,10 @@ class NsLcmOpTopic(BaseTopic):
             "id": _id,
             "_id": _id,
             "operationState": "PROCESSING",  # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK
+            "queuePosition": None,
+            "stage": None,
+            "errorMessage": None,
+            "detailedStatus": None,
             "statusEnteredTime": now,
             "nsInstanceId": nsr_id,
             "lcmOperationType": operation,
@@ -752,6 +1291,19 @@ class NsLcmOpTopic(BaseTopic):
         }
         return nslcmop
 
+    def _get_enabled_vims(self, session):
+        """
+        Retrieve and return VIM accounts that are accessible by current user and has state ENABLE
+        :param session: current session with user information
+        """
+        db_filter = self._get_project_filter(session)
+        db_filter["_admin.operationalState"] = "ENABLED"
+        vims = self.db.get_list("vim_accounts", db_filter)
+        vimAccounts = []
+        for vim in vims:
+            vimAccounts.append(vim['_id'])
+        return vimAccounts
+
     def new(self, rollback, session, indata=None, kwargs=None, headers=None, slice_object=False):
         """
         Performs a new operation over a ns
@@ -770,12 +1322,12 @@ class NsLcmOpTopic(BaseTopic):
             db_filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_id
             nsis = self.db.get_one("nsis", db_filter, fail_on_empty=False, fail_on_more=False)
             if nsis:
-                raise EngineException("The NS instance {} cannot be terminate because is used by the slice {}".format(
+                raise EngineException("The NS instance {} cannot be terminated because is used by the slice {}".format(
                                       nsr_id, nsis["_id"]), http_code=HTTPStatus.CONFLICT)
 
         try:
             # Override descriptor with query string kwargs
-            self._update_input_with_kwargs(indata, kwargs)
+            self._update_input_with_kwargs(indata, kwargs, yaml_format=True)
             operation = indata["lcmOperationType"]
             nsInstanceId = indata["nsInstanceId"]
 
@@ -791,7 +1343,7 @@ class NsLcmOpTopic(BaseTopic):
             if not nsr["_admin"].get("nsState") or nsr["_admin"]["nsState"] == "NOT_INSTANTIATED":
                 if operation == "terminate" and indata.get("autoremove"):
                     # NSR must be deleted
-                    return None    # a none in this case is used to indicate not instantiated. It can be removed
+                    return None, None    # a none in this case is used to indicate not instantiated. It can be removed
                 if operation != "instantiate":
                     raise EngineException("ns_instance '{}' cannot be '{}' because it is not instantiated".format(
                         nsInstanceId, operation), HTTPStatus.CONFLICT)
@@ -805,18 +1357,22 @@ class NsLcmOpTopic(BaseTopic):
                 self._update_vnfrs(session, rollback, nsr, indata)
 
             nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata)
+            _id = nslcmop_desc["_id"]
             self.format_on_new(nslcmop_desc, session["project_id"], make_public=session["public"])
-            _id = self.db.create("nslcmops", nslcmop_desc)
+            if indata.get("placement-engine"):
+                # Save valid vim accounts in lcm operation descriptor
+                nslcmop_desc['operationParams']['validVimAccounts'] = self._get_enabled_vims(session)
+            self.db.create("nslcmops", nslcmop_desc)
             rollback.append({"topic": "nslcmops", "_id": _id})
             if not slice_object:
                 self.msg.write("ns", operation, nslcmop_desc)
-            return _id
-        except ValidationError as e:
+            return _id, None
+        except ValidationError as e:  # TODO remove try Except, it is captured at nbi.py
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
         # except DbException as e:
         #     raise EngineException("Cannot get ns_instance '{}': {}".format(e), HTTPStatus.NOT_FOUND)
 
-    def delete(self, session, _id, dry_run=False):
+    def delete(self, session, _id, dry_run=False, not_send_msg=None):
         raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR)
 
     def edit(self, session, _id, indata=None, kwargs=None, content=None):
@@ -826,10 +1382,11 @@ class NsLcmOpTopic(BaseTopic):
 class NsiTopic(BaseTopic):
     topic = "nsis"
     topic_msg = "nsi"
+    quota_name = "slice_instances"
 
-    def __init__(self, db, fs, msg):
-        BaseTopic.__init__(self, db, fs, msg)
-        self.nsrTopic = NsrTopic(db, fs, msg)
+    def __init__(self, db, fs, msg, auth):
+        BaseTopic.__init__(self, db, fs, msg, auth)
+        self.nsrTopic = NsrTopic(db, fs, msg, auth)
 
     @staticmethod
     def _format_ns_request(ns_request):
@@ -887,13 +1444,14 @@ class NsiTopic(BaseTopic):
                                   "Launch 'terminate' operation first; or force deletion".format(_id),
                                   http_code=HTTPStatus.CONFLICT)
 
-    def delete_extra(self, session, _id, db_content):
+    def delete_extra(self, session, _id, db_content, not_send_msg=None):
         """
         Deletes associated nsilcmops from database. Deletes associated filesystem.
          Set usageState of nst
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
         :param db_content: The database content of the descriptor
+        :param not_send_msg: To not send message (False) or store content (list) instead
         :return: None if ok or raises EngineException with the problem
         """
 
@@ -909,7 +1467,7 @@ class NsiTopic(BaseTopic):
                 if nsi:  # last one using nsr
                     continue
             try:
-                self.nsrTopic.delete(session, nsr_id, dry_run=False)
+                self.nsrTopic.delete(session, nsr_id, dry_run=False, not_send_msg=not_send_msg)
             except (DbException, EngineException) as e:
                 if e.http_code == HTTPStatus.NOT_FOUND:
                     pass
@@ -928,54 +1486,6 @@ class NsiTopic(BaseTopic):
             if not nsis_list:
                 self.db.set_one("nsts", {"_id": nsir_admin["nst-id"]}, {"_admin.usageState": "NOT_IN_USE"})
 
-    # def delete(self, session, _id, dry_run=False):
-    #     """
-    #     Delete item by its internal _id
-    #     :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
-    #     :param _id: server internal id
-    #     :param dry_run: make checking but do not delete
-    #     :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
-    #     """
-    #     # TODO add admin to filter, validate rights
-    #     BaseTopic.delete(self, session, _id, dry_run=True)
-    #     if dry_run:
-    #         return
-    #
-    #     # Deleting the nsrs belonging to nsir
-    #     nsir = self.db.get_one("nsis", {"_id": _id})
-    #     for nsrs_detailed_item in nsir["_admin"]["nsrs-detailed-list"]:
-    #         nsr_id = nsrs_detailed_item["nsrId"]
-    #         if nsrs_detailed_item.get("shared"):
-    #             _filter = {"_admin.nsrs-detailed-list.ANYINDEX.shared": True,
-    #                        "_admin.nsrs-detailed-list.ANYINDEX.nsrId": nsr_id,
-    #                        "_id.ne": nsir["_id"]}
-    #             nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
-    #             if nsi:  # last one using nsr
-    #                 continue
-    #         try:
-    #             self.nsrTopic.delete(session, nsr_id, dry_run=False)
-    #         except (DbException, EngineException) as e:
-    #             if e.http_code == HTTPStatus.NOT_FOUND:
-    #                 pass
-    #             else:
-    #                 raise
-    #     # deletes NetSlice instance object
-    #     v = self.db.del_one("nsis", {"_id": _id})
-    #
-    #     # makes a temporal list of nsilcmops objects related to the _id given and deletes them from db
-    #     _filter = {"netsliceInstanceId": _id}
-    #     self.db.del_list("nsilcmops", _filter)
-    #
-    #     # Search if nst is being used by other nsi
-    #     nsir_admin = nsir.get("_admin")
-    #     if nsir_admin:
-    #         if nsir_admin.get("nst-id"):
-    #             nsis_list = self.db.get_one("nsis", {"nst-id": nsir_admin["nst-id"]},
-    #                                         fail_on_empty=False, fail_on_more=False)
-    #             if not nsis_list:
-    #                 self.db.set_one("nsts", {"_id": nsir_admin["nst-id"]}, {"_admin.usageState": "NOT_IN_USE"})
-    #     return v
-
     def new(self, rollback, session, indata=None, kwargs=None, headers=None):
         """
         Creates a new netslice instance record into database. It also creates needed nsrs and vnfrs
@@ -988,19 +1498,33 @@ class NsiTopic(BaseTopic):
         """
 
         try:
+            step = "checking quotas"
+            self.check_quota(session)
+
+            step = ""
             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"])
 
-            step = ""
             # look for nstd
             step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))
             _filter = self._get_project_filter(session)
             _filter["_id"] = slice_request["nstId"]
             nstd = self.db.get_one("nsts", _filter)
+            # check NST is not disabled
+            step = "checking NST operationalState"
+            if nstd["_admin"]["operationalState"] == "DISABLED":
+                raise EngineException("nst with id '{}' is DISABLED, and thus cannot be used to create a netslice "
+                                      "instance".format(slice_request["nstId"]), http_code=HTTPStatus.CONFLICT)
             del _filter["_id"]
 
+            # check NSD is not disabled
+            step = "checking operationalState"
+            if nstd["_admin"]["operationalState"] == "DISABLED":
+                raise EngineException("nst with id '{}' is DISABLED, and thus cannot be used to create "
+                                      "a network slice".format(slice_request["nstId"]), http_code=HTTPStatus.CONFLICT)
+
             nstd.pop("_admin", None)
             nstd_id = nstd.pop("_id", None)
             nsi_id = str(uuid4())
@@ -1044,7 +1568,7 @@ class NsiTopic(BaseTopic):
                 nsi_vlds.append(nsi_vld)
 
             nsi_descriptor["_admin"]["netslice-vld"] = nsi_vlds
-            # Creating netslice-subnet_record. 
+            # Creating netslice-subnet_record.
             needed_nsds = {}
             services = []
 
@@ -1080,14 +1604,15 @@ class NsiTopic(BaseTopic):
                 # Is the nss shared and instantiated?
                 _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True
                 _filter["_admin.nsrs-detailed-list.ANYINDEX.nsd-id"] = service["nsd-ref"]
+                _filter["_admin.nsrs-detailed-list.ANYINDEX.nss-id"] = service["id"]
                 nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
-                
                 if nsi and service.get("is-shared-nss"):
                     nsrs_detailed_list = nsi["_admin"]["nsrs-detailed-list"]
                     for nsrs_detailed_item in nsrs_detailed_list:
                         if nsrs_detailed_item["nsd-id"] == service["nsd-ref"]:
-                            _id_nsr = nsrs_detailed_item["nsrId"]
-                            break
+                            if nsrs_detailed_item["nss-id"] == service["id"]:
+                                _id_nsr = nsrs_detailed_item["nsrId"]
+                                break
                     for netslice_subnet in nsi["_admin"]["netslice-subnet"]:
                         if netslice_subnet["nss-id"] == service["id"]:
                             indata_ns = netslice_subnet
@@ -1102,7 +1627,8 @@ class NsiTopic(BaseTopic):
                     indata_ns["nsName"] = slice_request.get("nsiName") + "." + service["id"]
                     indata_ns["vimAccountId"] = slice_request.get("vimAccountId")
                     indata_ns["nsDescription"] = service["description"]
-                    indata_ns["key-pair-ref"] = slice_request.get("key-pair-ref")
+                    if slice_request.get("ssh_keys"):
+                        indata_ns["ssh_keys"] = slice_request.get("ssh_keys")
 
                     if ns_params:
                         for ns_param in ns_params:
@@ -1113,9 +1639,9 @@ class NsiTopic(BaseTopic):
                                 break                   
 
                     # Creates Nsr objects
-                    _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers)
+                    _id_nsr, _ = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers)
                 nsrs_item = {"nsrId": _id_nsr, "shared": service.get("is-shared-nss"), "nsd-id": service["nsd-ref"], 
-                             "nslcmop_instantiate": None}
+                             "nss-id": service["id"], "nslcmop_instantiate": None}
                 indata_ns["nss-id"] = service["id"]
                 nsrs_list.append(nsrs_item)
                 nsi_netslice_subnet.append(indata_ns)
@@ -1130,8 +1656,8 @@ class NsiTopic(BaseTopic):
             # Creating the entry in the database
             self.db.create("nsis", nsi_descriptor)
             rollback.append({"topic": "nsis", "_id": nsi_id})
-            return nsi_id
-        except Exception as e:
+            return nsi_id, None
+        except Exception as e:   # TODO remove try Except, it is captured at nbi.py
             self.logger.exception("Exception {} at NsiTopic.new()".format(e), exc_info=True)
             raise EngineException("Error {}: {}".format(step, e))
         except ValidationError as e:
@@ -1149,9 +1675,9 @@ class NsiLcmOpTopic(BaseTopic):
         "terminate": None
     }
     
-    def __init__(self, db, fs, msg):
-        BaseTopic.__init__(self, db, fs, msg)
-        self.nsi_NsLcmOpTopic = NsLcmOpTopic(self.db, self.fs, self.msg)
+    def __init__(self, db, fs, msg, auth):
+        BaseTopic.__init__(self, db, fs, msg, auth)
+        self.nsi_NsLcmOpTopic = NsLcmOpTopic(self.db, self.fs, self.msg, self.auth)
 
     def _check_nsi_operation(self, session, nsir, operation, indata):
         """
@@ -1170,7 +1696,9 @@ class NsiLcmOpTopic(BaseTopic):
                 if nstId == netslice_subnet["id"]:
                     nsd_id = netslice_subnet["nsd-ref"]
                     if nsd_id not in nsds:
-                        nsds[nsd_id] = self.db.get_one("nsds", {"id": nsd_id})
+                        _filter = self._get_project_filter(session)
+                        _filter["id"] = nsd_id
+                        nsds[nsd_id] = self.db.get_one("nsds", _filter)
                     return nsds[nsd_id]
             else:
                 raise EngineException("Invalid parameter nstId='{}' is not one of the "
@@ -1238,13 +1766,14 @@ class NsiLcmOpTopic(BaseTopic):
             _filter = self._get_project_filter(session)
             _filter["_id"] = netsliceInstanceId
             nsir = self.db.get_one("nsis", _filter)
+            logging_prefix = "nsi={} {} ".format(netsliceInstanceId, operation)
             del _filter["_id"]
 
             # initial checking
             if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED":
                 if operation == "terminate" and indata.get("autoremove"):
                     # NSIR must be deleted
-                    return None    # a none in this case is used to indicate not instantiated. It can be removed
+                    return None, None    # a none in this case is used to indicate not instantiated. It can be removed
                 if operation != "instantiate":
                     raise EngineException("netslice_instance '{}' cannot be '{}' because it is not instantiated".format(
                         netsliceInstanceId, operation), HTTPStatus.CONFLICT)
@@ -1259,53 +1788,56 @@ class NsiLcmOpTopic(BaseTopic):
             nslcmops = []
             # nslcmops_item = None
             for index, nsr_item in enumerate(nsrs_list):
-                nsi = None
+                nsr_id = nsr_item["nsrId"]
                 if nsr_item.get("shared"):
                     _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True
-                    _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_item["nsrId"]
+                    _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_id
                     _filter["_admin.nsrs-detailed-list.ANYINDEX.nslcmop_instantiate.ne"] = None
                     _filter["_id.ne"] = netsliceInstanceId
                     nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
                     if operation == "terminate":
                         _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): None}
                         self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
-                        
-                    # looks the first nsi fulfilling the conditions but not being the current NSIR
-                    if nsi:
-                        nsi_admin_shared = nsi["_admin"]["nsrs-detailed-list"]
-                        for nsi_nsr_item in nsi_admin_shared:
-                            if nsi_nsr_item["nsd-id"] == nsr_item["nsd-id"] and nsi_nsr_item["shared"]:
-                                self.add_shared_nsr_2vld(nsir, nsr_item)
-                                nslcmops.append(nsi_nsr_item["nslcmop_instantiate"])
-                                _update = {"_admin.nsrs-detailed-list.{}".format(index): nsi_nsr_item}
-                                self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
-                                break
-                        # continue to not create nslcmop since nsrs is shared and nsrs was created
-                        continue
-                    else:
-                        self.add_shared_nsr_2vld(nsir, nsr_item)
-
+                        if nsi:  # other nsi is using this nsr and it needs this nsr instantiated
+                            continue  # do not create nsilcmop
+                    else:  # instantiate
+                        # looks the first nsi fulfilling the conditions but not being the current NSIR
+                        if nsi:
+                            nsi_nsr_item = next(n for n in nsi["_admin"]["nsrs-detailed-list"] if
+                                                n["nsrId"] == nsr_id and n["shared"] and
+                                                n["nslcmop_instantiate"])
+                            self.add_shared_nsr_2vld(nsir, nsr_item)
+                            nslcmops.append(nsi_nsr_item["nslcmop_instantiate"])
+                            _update = {"_admin.nsrs-detailed-list.{}".format(index): nsi_nsr_item}
+                            self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
+                            # continue to not create nslcmop since nsrs is shared and nsrs was created
+                            continue
+                        else:
+                            self.add_shared_nsr_2vld(nsir, nsr_item)
+
+                # create operation
                 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
-                    del indata_ns["key-pair-ref"]
-                    # Creating NS_LCM_OP with the flag slice_object=True to not trigger the service instantiation 
+                    indata_ns = {
+                        "lcmOperationType": operation,
+                        "nsInstanceId": nsr_id,
+                        # Including netslice_id in the ns instantiate Operation
+                        "netsliceInstanceId": netsliceInstanceId,
+                    }
+                    if operation == "instantiate":
+                        service = self.db.get_one("nsrs", {"_id": nsr_id})
+                        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, 
-                                                        slice_object=True)
+                    nslcmop, _ = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, None, headers,
+                                                           slice_object=True)
                     nslcmops.append(nslcmop)
-                    if operation == "terminate":
-                        nslcmop = None
-                    _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): nslcmop}
-                    self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
+                    if operation == "instantiate":
+                        _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): nslcmop}
+                        self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
                 except (DbException, EngineException) as e:
                     if e.http_code == HTTPStatus.NOT_FOUND:
-                        self.logger.info("HTTPStatus.NOT_FOUND")
+                        self.logger.info(logging_prefix + "skipping NS={} because not found".format(nsr_id))
                         pass
                     else:
                         raise
@@ -1319,11 +1851,11 @@ class NsiLcmOpTopic(BaseTopic):
             _id = self.db.create("nsilcmops", nsilcmop_desc)
             rollback.append({"topic": "nsilcmops", "_id": _id})
             self.msg.write("nsi", operation, nsilcmop_desc)
-            return _id
+            return _id, None
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def delete(self, session, _id, dry_run=False):
+    def delete(self, session, _id, dry_run=False, not_send_msg=None):
         raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR)
 
     def edit(self, session, _id, indata=None, kwargs=None, content=None):