fixing tests for additionalParams and NSI without osm running
[osm/NBI.git] / osm_nbi / instance_topics.py
index ac0dba9..55845d6 100644 (file)
@@ -21,6 +21,9 @@ 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 yaml import safe_dump
+from osm_common.dbbase import DbException
+from re import match  # For checking that additional parameter names are valid Jinja2 identifiers
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 
@@ -74,6 +77,7 @@ class NsrTopic(BaseTopic):
         if dry_run:
             return
 
+        self.fs.file_delete(_id, ignore_non_exist=True)
         v = self.db.del_one("nsrs", {"_id": _id})
         self.db.del_list("nslcmops", {"nsInstanceId": _id})
         self.db.del_list("vnfrs", {"nsr-id-ref": _id})
@@ -83,6 +87,67 @@ class NsrTopic(BaseTopic):
         self._send_msg("deleted", {"_id": _id})
         return v
 
+    @staticmethod
+    def _format_ns_request(ns_request):
+        formated_request = copy(ns_request)
+        formated_request.pop("additionalParamsForNs", None)
+        formated_request.pop("additionalParamsForVnf", None)
+        return formated_request
+
+    @staticmethod
+    def _format_addional_params(ns_request, member_vnf_index=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
+        """
+        additional_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
+        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):
+                    raise EngineException("Invalid param name at {}:{}. Must contain only alphanumeric characters "
+                                          "and underscores, and cannot start with a digit"
+                                          .format(where_, k))
+                # END Check that additional parameter names are valid Jinja2 identifiers
+                if not isinstance(k, str):
+                    raise EngineException("Invalid param at {}:{}. Only string keys are allowed".format(where_, k))
+                if "." in k or "$" in k:
+                    raise EngineException("Invalid param at {}:{}. Keys must not contain dots or $".format(where_, k))
+                if isinstance(v, (dict, tuple, list)):
+                    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"]))
+
+        return additional_params
+
     def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False):
         """
         Creates a new nsr into database. It also creates needed vnfrs
@@ -110,6 +175,7 @@ class NsrTopic(BaseTopic):
             nsd = self.db.get_one("nsds", _filter)
 
             nsr_id = str(uuid4())
+
             now = time()
             step = "filling nsr from input data"
             nsr_descriptor = {
@@ -134,7 +200,9 @@ class NsrTopic(BaseTopic):
                 "nsd-name-ref": nsd["name"],
                 "operational-events": [],   # "id", "timestamp", "description", "event",
                 "nsd-ref": nsd["id"],
-                "instantiate_params": ns_request,
+                "nsd-id": nsd["_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,
@@ -170,6 +238,8 @@ class NsrTopic(BaseTopic):
                     "_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,
@@ -277,6 +347,10 @@ class NsrTopic(BaseTopic):
             self.format_on_new(nsr_descriptor, session["project_id"], make_public=make_public)
             self.db.create("nsrs", nsr_descriptor)
             rollback.append({"topic": "nsrs", "_id": nsr_id})
+
+            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)
@@ -329,6 +403,7 @@ class NsLcmOpTopic(BaseTopic):
         """
         vnfds = {}
         vim_accounts = []
+        wim_accounts = []
         nsd = nsr["nsd"]
 
         def check_valid_vnf_member_index(member_vnf_index):
@@ -401,6 +476,19 @@ class NsLcmOpTopic(BaseTopic):
                 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"):
@@ -441,6 +529,7 @@ class NsLcmOpTopic(BaseTopic):
         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)
@@ -448,6 +537,7 @@ class NsLcmOpTopic(BaseTopic):
                     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
@@ -517,10 +607,10 @@ class NsLcmOpTopic(BaseTopic):
             }
             self.db.set_one("pdus", {"_id": pdu["_id"]},
                             {"_admin.usageState": "IN_USE",
-                             "_admin.usage.vnfr_id": vnfr["_id"],
-                             "_admin.usage.nsr_id": vnfr["nsr-id-ref"],
-                             "_admin.usage.vdur": vdur["vdu-id-ref"]}
-                            )
+                             "_admin.usage": {"vnfr_id": vnfr["_id"],
+                                              "nsr_id": vnfr["nsr-id-ref"],
+                                              "vdur": vdur["vdu-id-ref"]}
+                             })
             rollback.append({"topic": "pdus", "_id": pdu["_id"], "operation": "set", "content": rollback_pdu})
 
             # step 3. Fill vnfr info by filling vdur
@@ -668,7 +758,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 self.delete(session, nsInstanceId)
+                    return 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)
@@ -706,6 +796,33 @@ class NsiTopic(BaseTopic):
 
     def __init__(self, db, fs, msg):
         BaseTopic.__init__(self, db, fs, msg)
+        self.nsrTopic = NsrTopic(db, fs, msg)
+
+    @staticmethod
+    def _format_ns_request(ns_request):
+        formated_request = copy(ns_request)
+        # TODO: Add request params
+        return formated_request
+
+    @staticmethod
+    def _format_addional_params(slice_request):
+        """
+        Get and format user additional params for NS or VNF
+        :param slice_request: User instantiation additional parameters
+        :return: a formatted copy of additional params or None if not supplied
+        """
+        additional_params = copy(slice_request.get("additionalParamsForNsi"))
+        if additional_params:
+            for k, v in additional_params.items():
+                if not isinstance(k, str):
+                    raise EngineException("Invalid param at additionalParamsForNsi:{}. Only string keys are allowed".
+                                          format(k))
+                if "." in k or "$" in k:
+                    raise EngineException("Invalid param at additionalParamsForNsi:{}. Keys must not contain dots or $".
+                                          format(k))
+                if isinstance(v, (dict, tuple, list)):
+                    additional_params[k] = "!!yaml " + safe_dump(v)
+        return additional_params
 
     def _check_descriptor_dependencies(self, session, descriptor):
         """
@@ -748,6 +865,24 @@ class NsiTopic(BaseTopic):
         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, force=force, 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})
 
@@ -755,15 +890,14 @@ class NsiTopic(BaseTopic):
         _filter = {"netsliceInstanceId": _id} 
         self.db.del_list("nsilcmops", _filter)
 
-        _filter = {"operationParams.netsliceInstanceId": _id}
-        nslcmops_list = self.db.get_list("nslcmops", _filter)
-
-        for id_item in nslcmops_list:
-            _filter = {"_id": id_item}
-            nslcmop = self.db.get_one("nslcmops", _filter)
-            nsr_id = nslcmop["operationParams"]["nsr_id"]
-            NsrTopic.delete(self, session, nsr_id, force=False, dry_run=False)
-        self._send_msg("deleted", {"_id": _id})
+        # 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, force=False, make_public=False):
@@ -792,7 +926,7 @@ class NsiTopic(BaseTopic):
             _filter.update(BaseTopic._get_project_filter(session, write=False, show_all=True))
             nstd = self.db.get_one("nsts", _filter)
             nstd.pop("_admin", None)
-            nstd.pop("_id", None)
+            nstd_id = nstd.pop("_id", None)
             nsi_id = str(uuid4())
             step = "filling nsi_descriptor with input data"
 
@@ -808,59 +942,37 @@ class NsiTopic(BaseTopic):
                 "nsr-ref-list": [],
                 "vlr-list": [],
                 "_id": nsi_id,
+                "additionalParamsForNsi": self._format_addional_params(slice_request)
             }
 
             step = "creating nsi at database"
             self.format_on_new(nsi_descriptor, session["project_id"], make_public=make_public)
             nsi_descriptor["_admin"]["nsiState"] = "NOT_INSTANTIATED"
             nsi_descriptor["_admin"]["netslice-subnet"] = None
-            
+            nsi_descriptor["_admin"]["deployed"] = {}
+            nsi_descriptor["_admin"]["deployed"]["RO"] = []
+            nsi_descriptor["_admin"]["nst-id"] = nstd_id
+
             # Creating netslice-vld for the RO.
             step = "creating netslice-vld at database"
-            instantiation_parameters = slice_request
 
             # Building the vlds list to be deployed
             # From netslice descriptors, creating the initial list
-            nsi_vlds = []           
-            if nstd.get("netslice-vld"):
-                # Building VLDs from NST
-                for netslice_vlds in nstd["netslice-vld"]:
-                    nsi_vld = {}
-                    # Adding nst vld name and global vimAccountId for netslice vld creation
-                    nsi_vld["name"] = netslice_vlds["name"]
-                    nsi_vld["vimAccountId"] = slice_request["vimAccountId"]
-                    # Getting template Instantiation parameters from NST
-                    for netslice_vld in netslice_vlds["nss-connection-point-ref"]:
-                        for netslice_subnet in nstd["netslice-subnet"]:
-                            nsi_vld["nsd-ref"] = netslice_subnet["nsd-ref"]
-                            nsi_vld["nsd-connection-point-ref"] = netslice_vld["nsd-connection-point-ref"]
-                            # Obtaining the vimAccountId from template instantiation parameter            
-                            if netslice_subnet.get("instantiation-parameters"):
-                                # Taking the vimAccountId from NST netslice-subnet instantiation parameters
-                                if netslice_subnet["instantiation-parameters"].get("vimAccountId"):
-                                    netsn = netslice_subnet["instantiation-parameters"]["vimAccountId"]
-                                    nsi_vld["vimAccountId"] = netsn
-                            # Obtaining the vimAccountId from user instantiation parameter
-                            if instantiation_parameters.get("netslice-subnet"):
-                                for ins_param in instantiation_parameters["netslice-subnet"]:
-                                    if ins_param.get("id") == netslice_vld["nss-ref"]:
-                                        if ins_param.get("vimAccountId"):
-                                            nsi_vld["vimAccountId"] = ins_param["vimAccountId"]
-                    # Adding vim-network-name defined by the user to vld
-                    if instantiation_parameters.get("netslice-vld"):
-                        for ins_param in instantiation_parameters["netslice-vld"]:
-                            if ins_param["name"] == netslice_vlds["name"]:
-                                if ins_param.get("vim-network-name"):
-                                    nsi_vld["vim-network-name"] = ins_param.get("vim-network-name")
-                                if ins_param.get("vim-network-id"):
-                                    nsi_vld["vim-network-id"] = ins_param.get("vim-network-id")
-                    nsi_vlds.append(nsi_vld)
+            nsi_vlds = []
+
+            for netslice_vlds in get_iterable(nstd.get("netslice-vld")):
+                # Getting template Instantiation parameters from NST
+                nsi_vld = deepcopy(netslice_vlds)
+                nsi_vld["shared-nsrs-list"] = []
+                nsi_vld["vimAccountId"] = slice_request["vimAccountId"]
+                nsi_vlds.append(nsi_vld)
 
             nsi_descriptor["_admin"]["netslice-vld"] = nsi_vlds
             # Creating netslice-subnet_record. 
             needed_nsds = {}
             services = []
 
+            # Updating the nstd with the nsd["_id"] associated to the nss -> services list
             for member_ns in nstd["netslice-subnet"]:
                 nsd_id = member_ns["nsd-ref"]
                 step = "getting nstd id='{}' constituent-nsd='{}' from database".format(
@@ -870,12 +982,10 @@ class NsiTopic(BaseTopic):
                     nsd = DescriptorTopic.get_one_by_id(self.db, session, "nsds", nsd_id)
                     nsd.pop("_admin")
                     needed_nsds[nsd_id] = nsd
-                    member_ns["_id"] = needed_nsds[nsd_id].get("_id")
-                    services.append(member_ns)
                 else:
                     nsd = needed_nsds[nsd_id]
-                    member_ns["_id"] = needed_nsds[nsd_id].get("_id")
-                    services.append(member_ns)
+                member_ns["_id"] = needed_nsds[nsd_id].get("_id")
+                services.append(member_ns)
 
                 step = "filling nsir nsd-id='{}' constituent-nsd='{}' from database".format(
                     member_ns["nsd-ref"], member_ns["id"])
@@ -883,49 +993,52 @@ class NsiTopic(BaseTopic):
             # creates Network Services records (NSRs)
             step = "creating nsrs at database using NsrTopic.new()"
             ns_params = slice_request.get("netslice-subnet")
-
             nsrs_list = []
             nsi_netslice_subnet = []
             for service in services:
+                # Check if the netslice-subnet is shared and if it is share if the nss exists
+                _id_nsr = None
                 indata_ns = {}
-                indata_ns["nsdId"] = service["_id"]
-                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"] = None
-
-                # NsrTopic(rollback, session, indata_ns, kwargs, headers, force)
-                # Overwriting ns_params filtering by nsName == netslice-subnet.id
-
-                if ns_params:
-                    for ns_param in ns_params:
-                        if ns_param.get("id") == service["id"]:
-                            copy_ns_param = deepcopy(ns_param)
-                            del copy_ns_param["id"]
-                            indata_ns.update(copy_ns_param)
-                # TODO: Improve network selection via networkID
-                if nsi_vlds:
-                    indata_ns_list = []
-                    for nsi_vld in nsi_vlds:
-                        nsd = self.db.get_one("nsds", {"id": nsi_vld["nsd-ref"]})
-                        if nsd["connection-point"]:
-                            for vld_id_ref in nsd["connection-point"]:
-                                name = vld_id_ref["vld-id-ref"]
-                                vnm = nsi_vld.get("vim-network-name")
-                                if type(vnm) is not dict:
-                                    vnm = {slice_request.get("vimAccountId"): vnm}
-                                if vld_id_ref["name"] == nsi_vld["nsd-connection-point-ref"]:
-                                    if list(vnm.values())[0] is None:
-                                        networkName = "default"
-                                    else:
-                                        networkName = str(list(vnm.values())[0])
-                                    # VIMNetworkName = NetSliceName-NetworkName
-                                    vimnetname = str(slice_request["nsiName"]) + "-" + networkName
-                                    indata_ns_list.append({"name": name, "vim-network-name": vimnetname})
-                    indata_ns["vld"] = indata_ns_list
-                            
-                _id_nsr = NsrTopic.new(self, rollback, session, indata_ns, kwargs, headers, force)
-                nsrs_item = {"nsrId": _id_nsr}
+                # Is the nss shared and instantiated?
+                _filter = {"_admin.nsrs-detailed-list.ANYINDEX.shared": True,
+                           "_admin.nsrs-detailed-list.ANYINDEX.nsd-id": service["nsd-ref"]}
+                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
+                    for netslice_subnet in nsi["_admin"]["netslice-subnet"]:
+                        if netslice_subnet["nss-id"] == service["id"]:
+                            indata_ns = netslice_subnet
+                            break
+                else:
+                    indata_ns = {}
+                    if service.get("instantiation-parameters"):
+                        indata_ns = deepcopy(service["instantiation-parameters"])
+                        # del service["instantiation-parameters"]
+                        
+                    indata_ns["nsdId"] = service["_id"]
+                    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 ns_params:
+                        for ns_param in ns_params:
+                            if ns_param.get("id") == service["id"]:
+                                copy_ns_param = deepcopy(ns_param)
+                                del copy_ns_param["id"]
+                                indata_ns.update(copy_ns_param)
+                                break                   
+
+                    # Creates Nsr objects
+                    _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers, force)
+                nsrs_item = {"nsrId": _id_nsr, "shared": service.get("is-shared-nss"), "nsd-id": service["nsd-ref"], 
+                             "nslcmop_instantiate": None}
+                indata_ns["nss-id"] = service["id"]
                 nsrs_list.append(nsrs_item)
                 nsi_netslice_subnet.append(indata_ns)
                 nsr_ref = {"nsr-ref": _id_nsr}
@@ -934,6 +1047,8 @@ class NsiTopic(BaseTopic):
             # Adding the nsrs list to the nsi
             nsi_descriptor["_admin"]["nsrs-detailed-list"] = nsrs_list
             nsi_descriptor["_admin"]["netslice-subnet"] = nsi_netslice_subnet
+            self.db.set_one("nsts", {"_id": slice_request["nstId"]}, {"_admin.usageState": "IN_USE"})
+
             # Creating the entry in the database
             self.db.create("nsis", nsi_descriptor)
             rollback.append({"topic": "nsis", "_id": nsi_id})
@@ -955,9 +1070,10 @@ class NsiLcmOpTopic(BaseTopic):
         "instantiate": nsi_instantiate,
         "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 _check_nsi_operation(self, session, nsir, operation, indata):
         """
@@ -1007,6 +1123,20 @@ class NsiLcmOpTopic(BaseTopic):
         }
         return nsilcmop
 
+    def add_shared_nsr_2vld(self, nsir, nsr_item):
+        for nst_sb_item in nsir["network-slice-template"].get("netslice-subnet"):
+            if nst_sb_item.get("is-shared-nss"):
+                for admin_subnet_item in nsir["_admin"].get("netslice-subnet"):
+                    if admin_subnet_item["nss-id"] == nst_sb_item["id"]:
+                        for admin_vld_item in nsir["_admin"].get("netslice-vld"):
+                            for admin_vld_nss_cp_ref_item in admin_vld_item["nss-connection-point-ref"]:
+                                if admin_subnet_item["nss-id"] == admin_vld_nss_cp_ref_item["nss-ref"]:
+                                    if not nsr_item["nsrId"] in admin_vld_item["shared-nsrs-list"]:
+                                        admin_vld_item["shared-nsrs-list"].append(nsr_item["nsrId"])
+                                    break
+        # self.db.set_one("nsis", {"_id": nsir["_id"]}, nsir)
+        self.db.set_one("nsis", {"_id": nsir["_id"]}, {"_admin.netslice-vld": nsir["_admin"].get("netslice-vld")})
+
     def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False):
         """
         Performs a new operation over a ns
@@ -1037,7 +1167,7 @@ class NsiLcmOpTopic(BaseTopic):
             if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED":
                 if operation == "terminate" and indata.get("autoremove"):
                     # NSIR must be deleted
-                    return self.delete(session, nsiInstanceId)
+                    return 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(
                         nsiInstanceId, operation), HTTPStatus.CONFLICT)
@@ -1050,24 +1180,60 @@ class NsiLcmOpTopic(BaseTopic):
             # Get service list from db
             nsrs_list = nsir["_admin"]["nsrs-detailed-list"]
             nslcmops = []
-            for nsr_item in nsrs_list:
-                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"] = nsiInstanceId
-                del indata_ns["key-pair-ref"]
-                nsi_NsLcmOpTopic = NsLcmOpTopic(self.db, self.fs, self.msg)
-                # Creating NS_LCM_OP with the flag slice_object=True to not trigger the service instantiation 
-                # message via kafka bus
-                nslcmop = nsi_NsLcmOpTopic.new(rollback, session, indata_ns, kwargs, headers, force, slice_object=True)
-                nslcmops.append(nslcmop)
+            # nslcmops_item = None
+            for index, nsr_item in enumerate(nsrs_list):
+                nsi = None
+                if nsr_item.get("shared"):
+                    _filter = {"_admin.nsrs-detailed-list.ANYINDEX.shared": True, 
+                               "_admin.nsrs-detailed-list.ANYINDEX.nsrId": nsr_item["nsrId"],
+                               "_admin.nsrs-detailed-list.ANYINDEX.nslcmop_instantiate.ne": None,
+                               "_id.ne": nsiInstanceId}
+
+                    nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
+                    # 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)
+
+                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"] = nsiInstanceId
+                    del indata_ns["key-pair-ref"]
+                    # 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, force, 
+                                                        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)
+                except (DbException, EngineException) as e:
+                    if e.http_code == HTTPStatus.NOT_FOUND:
+                        self.logger.info("HTTPStatus.NOT_FOUND")
+                        pass
+                    else:
+                        raise
 
             # Creates nsilcmop
             indata["nslcmops_ids"] = nslcmops
             self._check_nsi_operation(session, nsir, operation, indata)
+
             nsilcmop_desc = self._create_nsilcmop(session, nsiInstanceId, operation, indata)
             self.format_on_new(nsilcmop_desc, session["project_id"], make_public=make_public)
             _id = self.db.create("nsilcmops", nsilcmop_desc)
@@ -1076,8 +1242,6 @@ class NsiLcmOpTopic(BaseTopic):
             return _id
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
-        # except DbException as e:
-        #     raise EngineException("Cannot get nsi_instance '{}': {}".format(e), HTTPStatus.NOT_FOUND)
 
     def delete(self, session, _id, force=False, dry_run=False):
         raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR)