Fix 1472 - Error executing upgrade action over K8S NS
[osm/NBI.git] / osm_nbi / instance_topics.py
index 60a569a..bf0e3a9 100644 (file)
@@ -21,11 +21,11 @@ from copy import copy, deepcopy
 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 descriptor_topics import DescriptorTopic
 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>"
@@ -114,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)
@@ -174,29 +177,29 @@ 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 kdu_name:
-                    initial_primitives = None
-                elif vdu_id:
-                    vdud = next(x for x in descriptor["vdu"] if x["id"] == vdu_id)
-                    initial_primitives = deep_get(vdud, ("vdu-configuration", "initial-config-primitive"))
+            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, ("vnf-configuration", "initial-config-primitive"))
-            else:
-                initial_primitives = deep_get(descriptor, ("ns-configuration", "initial-config-primitive"))
-
-            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={}]:vnf-configuration:"
-                                                  "initial-config-primitive[name={}] not supplied".
-                                                  format(param["value"], descriptor["id"],
-                                                         initial_primitive["name"]))
+                    initial_primitives = deep_get(descriptor, ("ns-configuration", "initial-config-primitive"))
+
+                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
 
@@ -212,298 +215,51 @@ class NsrTopic(BaseTopic):
             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 nsd
             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)
 
-            # check NSD is not disabled
             step = "checking nsdOperationalState"
-            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)
+            self._check_nsd_operational_state(nsd, ns_request)
 
-            nsr_id = str(uuid4())
-
-            now = time()
             step = "filling nsr from input data"
-            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"]
-
-            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() if k in ("vld", "_id", "id", "constituent-vnfd", "name",
-                                                              "ns-configuration")},
-                "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": additional_params,
-                "ns-instance-config-ref": nsr_id,
-                "id": nsr_id,
-                "_id": nsr_id,
-                # "input-parameter": xpath, value,
-                "ssh-authorized-key": ns_request.get("ssh_keys"),  # TODO remove
-            }
-            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("vld"):
-                nsr_descriptor["vld"] = nsd["vld"]
+            nsr_id = str(uuid4())
+            nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id, session)
 
-            # Create VNFR
+            # 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())
-                additional_params, vnf_params = self._format_additional_params(ns_request,
-                                                                               member_vnf["member-vnf-index"],
-                                                                               descriptor=vnfd)
-                vnfr_descriptor = {
-                    "id": vnfr_id,
-                    "_id": vnfr_id,
-                    "nsr-id-ref": nsr_id,
-                    "member-vnf-index-ref": member_vnf["member-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("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)
-
-                # Create k8s-cluster information
-                if vnfd.get("k8s-cluster"):
-                    vnfr_descriptor["k8s-cluster"] = vnfd["k8s-cluster"]
-                    for net in get_iterable(vnfr_descriptor["k8s-cluster"].get("nets")):
-                        if net.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") == \
-                                            net["external-connection-point-ref"] and \
-                                            nsd_vld_cp.get("member-vnf-index-ref") == member_vnf["member-vnf-index"]:
-                                        net["ns-vld-id"] = nsd_vld["id"]
-                                        break
-                                else:
-                                    continue
-                                break
-                        elif net.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") == net["internal-connection-point-ref"]:
-                                        net["vnf-vld-id"] = vnfd_ivld["id"]
-                                        break
-                                else:
-                                    continue
-                                break
-                # update kdus
-                for kdu in get_iterable(vnfd.get("kdu")):
-                    additional_params, kdu_params = self._format_additional_params(ns_request,
-                                                                                   member_vnf["member-vnf-index"],
-                                                                                   kdu_name=kdu["name"],
-                                                                                   descriptor=vnfd)
-                    kdu_k8s_namespace = vnf_k8s_namespace
-                    kdu_model = kdu_params.get("kdu_model") 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"]
-                    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)
 
-                for vdu in vnfd.get("vdu", ()):
-                    additional_params, vdu_params = self._format_additional_params(
-                        ns_request, member_vnf["member-vnf-index"], vdu_id=vdu["id"], descriptor=vnfd)
-                    vdur = {
-                        "vdu-id-ref": vdu["id"],
-                        # TODO      "name": ""     Name of the VDU in the VIM
-                        "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
-                    }
-                    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("internal-connection-point", ()):
-                        vdu_icp = {
-                            "id": icp["id"],
-                            "connection-point-id": icp["id"],
-                            "name": icp.get("name"),
-                        }
-                        vdur["internal-connection-point"].append(vdu_icp)
-                    for iface in vdu.get("interface", ()):
-                        vdu_iface = {
-                            x: iface[x] for x in ("name", "ip-address", "mac-address", "internal-connection-point-ref",
-                                                  "external-connection-point-ref") if iface.get(x) is not None}
-                        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"]
-                                        if vnfd_ivld_icp.get("ip-address"):
-                                            vdu_iface["ip-address"] = vnfd_ivld_icp["ip-address"]
-                                        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)
-                            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["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
-                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_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)
@@ -512,6 +268,443 @@ class NsrTopic(BaseTopic):
         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)
 
@@ -555,185 +748,221 @@ class NsLcmOpTopic(BaseTopic):
         :param indata: descriptor with the parameters of the operation
         :return: None
         """
+        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):
-            # Obtain vnf descriptor. The vnfr is used to get the vnfd._id used for this member_vnf_index
+        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):
-                return vnf_member_index_to_vnfd[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"]))
-            vnf_member_index_to_vnfd[member_vnf_index] = vnfd  # add to cache, avoiding a later look for
-            return vnfd
-
-        def check_valid_vdu(vnfd, vdu_id):
-            for vdud in get_iterable(vnfd.get("vdu")):
-                if vdud["id"] == vdu_id:
-                    return vdud
+                vnfd = vnf_member_index_to_vnfd[member_vnf_index]
             else:
-                raise EngineException("Invalid parameter vdu_id='{}' not present at vnfd:vdu:id".format(vdu_id))
-
-        def check_valid_kdu(vnfd, kdu_name):
-            for kdud in get_iterable(vnfd.get("kdu")):
-                if kdud["name"] == kdu_name:
-                    return kdud
+                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 parameter kdu_name='{}' not present at vnfd:kdu:name".format(kdu_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_vnf_instantiation_params(in_vnfd, vnfd):
+    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
 
-            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"] in (ivld["id"], ivld.get("name")):
-                        for in_icp in get_iterable(in_ivld.get("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"]))
+            else:
+                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 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"])
-                if indata.get("vdu_id"):
-                    vdud = check_valid_vdu(vnfd, indata["vdu_id"])
-                    descriptor_configuration = vdud.get("vdu-configuration", {}).get("config-primitive")
-                elif indata.get("kdu_name"):
-                    kdud = check_valid_kdu(vnfd, indata["kdu_name"])
-                    descriptor_configuration = kdud.get("kdu-configuration", {}).get("config-primitive")
-                else:
-                    descriptor_configuration = vnfd.get("vnf-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
+                        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 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"]:
-                    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"]:
-                        break
-                else:
-                    raise EngineException("Invalid parameter vld:name='{}' is not present at nsd:vld".format(
-                        in_vld["name"]))
+                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):
         """
@@ -949,9 +1178,13 @@ class NsLcmOpTopic(BaseTopic):
                             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")):
@@ -964,9 +1197,11 @@ class NsLcmOpTopic(BaseTopic):
                                     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")):
@@ -982,9 +1217,11 @@ class NsLcmOpTopic(BaseTopic):
                                 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
@@ -1249,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
@@ -1316,7 +1505,7 @@ class NsiTopic(BaseTopic):
             slice_request = self._remove_envelop(indata)
             # Override descriptor with query string kwargs
             self._update_input_with_kwargs(slice_request, kwargs)
-            self._validate_input_new(slice_request, session["force"])
+            slice_request = self._validate_input_new(slice_request, session["force"])
 
             # look for nstd
             step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))