change version to be aligned with OSM version
[osm/NBI.git] / osm_nbi / instance_topics.py
index b7803b3..4b3f04b 100644 (file)
@@ -18,9 +18,9 @@ from uuid import uuid4
 from http import HTTPStatus
 from time import time
 from copy import copy, deepcopy
-from validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate
-from base_topic import BaseTopic, EngineException, get_iterable
-from descriptor_topics import DescriptorTopic
+from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate
+from osm_nbi.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
@@ -31,6 +31,7 @@ __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 class NsrTopic(BaseTopic):
     topic = "nsrs"
     topic_msg = "ns"
+    schema_new = ns_instantiate
 
     def __init__(self, db, fs, msg):
         BaseTopic.__init__(self, db, fs, msg)
@@ -53,24 +54,61 @@ class NsrTopic(BaseTopic):
     def format_on_new(content, project_id=None, make_public=False):
         BaseTopic.format_on_new(content, project_id=project_id, make_public=make_public)
         content["_admin"]["nsState"] = "NOT_INSTANTIATED"
+        return None
 
-    def check_conflict_on_del(self, session, _id):
+    def check_conflict_on_del(self, session, _id, db_content):
+        """
+        Check that NSR is not instantiated
+        :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+        :param _id: nsr internal id
+        :param db_content: The database content of the nsr
+        :return: None or raises EngineException with the conflict
+        """
         if session["force"]:
             return
-        nsr = self.db.get_one("nsrs", {"_id": _id})
+        nsr = db_content
         if nsr["_admin"].get("nsState") == "INSTANTIATED":
             raise EngineException("nsr '{}' cannot be deleted because it is in 'INSTANTIATED' state. "
                                   "Launch 'terminate' operation first; or force deletion".format(_id),
                                   http_code=HTTPStatus.CONFLICT)
 
-    def delete_extra(self, session, _id):
+    def delete_extra(self, session, _id, db_content):
+        """
+        Deletes associated nslcmops and vnfrs from database. Deletes associated filesystem.
+         Set usageState of pdu, vnfd, nsd
+        :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+        :param _id: server internal id
+        :param db_content: The database content of the descriptor
+        :return: None if ok or raises EngineException with the problem
+        """
         self.fs.file_delete(_id, ignore_non_exist=True)
         self.db.del_list("nslcmops", {"nsInstanceId": _id})
         self.db.del_list("vnfrs", {"nsr-id-ref": _id})
+
         # set all used pdus as free
         self.db.set_list("pdus", {"_admin.usage.nsr_id": _id},
                          {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None})
 
+        # Set NSD usageState
+        nsr = db_content
+        used_nsd_id = nsr.get("nsd-id")
+        if used_nsd_id:
+            # check if used by another NSR
+            nsrs_list = self.db.get_one("nsrs", {"nsd-id": used_nsd_id},
+                                        fail_on_empty=False, fail_on_more=False)
+            if not nsrs_list:
+                self.db.set_one("nsds", {"_id": used_nsd_id}, {"_admin.usageState": "NOT_IN_USE"})
+
+        # Set VNFD usageState
+        used_vnfd_id_list = nsr.get("vnfd-id")
+        if used_vnfd_id_list:
+            for used_vnfd_id in used_vnfd_id_list:
+                # check if used by another NSR
+                nsrs_list = self.db.get_one("nsrs", {"vnfd-id": used_vnfd_id},
+                                            fail_on_empty=False, fail_on_more=False)
+                if not nsrs_list:
+                    self.db.set_one("vnfds", {"_id": used_vnfd_id}, {"_admin.usageState": "NOT_IN_USE"})
+
     @staticmethod
     def _format_ns_request(ns_request):
         formated_request = copy(ns_request)
@@ -144,17 +182,18 @@ class NsrTopic(BaseTopic):
         """
 
         try:
+            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"])
 
-            step = ""
             # look for nsr
             step = "getting nsd id='{}' from database".format(ns_request.get("nsdId"))
-            _filter = {"_id": ns_request["nsdId"]}
-            _filter.update(BaseTopic._get_project_filter(session))
+            _filter = self._get_project_filter(session)
+            _filter["_id"] = ns_request["nsdId"]
             nsd = self.db.get_one("nsds", _filter)
+            del _filter["_id"]
 
             nsr_id = str(uuid4())
 
@@ -183,13 +222,14 @@ class NsrTopic(BaseTopic):
                 "operational-events": [],   # "id", "timestamp", "description", "event",
                 "nsd-ref": nsd["id"],
                 "nsd-id": nsd["_id"],
+                "vnfd-id": [],
                 "instantiate_params": self._format_ns_request(ns_request),
                 "additionalParamsForNs": self._format_addional_params(ns_request),
                 "ns-instance-config-ref": nsr_id,
                 "id": nsr_id,
                 "_id": nsr_id,
                 # "input-parameter": xpath, value,
-                "ssh-authorized-key": ns_request.get("key-pair-ref"),  # TODO remove
+                "ssh-authorized-key": ns_request.get("ssh_keys"),  # TODO remove
             }
             ns_request["nsr_id"] = nsr_id
             # Create vld
@@ -207,9 +247,12 @@ class NsrTopic(BaseTopic):
                     member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
                 if vnfd_id not in needed_vnfds:
                     # Obtain vnfd
-                    vnfd = DescriptorTopic.get_one_by_id(self.db, session, "vnfds", vnfd_id)
+                    _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")
                     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(
@@ -320,7 +363,7 @@ class NsrTopic(BaseTopic):
                     member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"])
 
                 # add at database
-                BaseTopic.format_on_new(vnfr_descriptor, session["project_id"], make_public=session["public"])
+                self.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)
@@ -333,12 +376,12 @@ class NsrTopic(BaseTopic):
             step = "creating nsr temporal folder"
             self.fs.mkdir(nsr_id)
 
-            return nsr_id
+            return nsr_id, None
+        except ValidationError as e:   # TODO remove try Except, it is captured at nbi.py
+            raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
         except Exception as e:
             self.logger.exception("Exception {} at NsrTopic.new()".format(e), exc_info=True)
             raise EngineException("Error {}: {}".format(step, e))
-        except ValidationError as e:
-            raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
     def edit(self, session, _id, indata=None, kwargs=None, content=None):
         raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR)
@@ -475,11 +518,13 @@ class NsLcmOpTopic(BaseTopic):
             # check vnf_member_index
             if indata.get("vnf_member_index"):
                 indata["member_vnf_index"] = indata.pop("vnf_member_index")    # for backward compatibility
-            if not indata.get("member_vnf_index"):
-                raise EngineException("Missing 'member_vnf_index' parameter")
-            vnfd = check_valid_vnf_member_index(indata["member_vnf_index"])
+            if indata.get("member_vnf_index"):
+                vnfd = check_valid_vnf_member_index(indata["member_vnf_index"])
+                descriptor_configuration = vnfd.get("vnf-configuration", {}).get("config-primitive")
+            else:  # use a NSD
+                descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive")
             # check primitive
-            for config_primitive in get_iterable(vnfd.get("vnf-configuration", {}).get("config-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"):
@@ -494,11 +539,11 @@ class NsLcmOpTopic(BaseTopic):
                                 paramd["name"], indata["primitive"]))
                     # check no extra primitive params are provided
                     if in_primitive_params_copy:
-                        raise EngineException("parameter/s '{}' not present at vnfd for primitive '{}'".format(
+                        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".format(indata["primitive"]))
+                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")):
@@ -721,6 +766,15 @@ class NsLcmOpTopic(BaseTopic):
         :param headers: http request headers
         :return: id of the nslcmops
         """
+        def check_if_nsr_is_not_slice_member(session, nsr_id):
+            nsis = None
+            db_filter = self._get_project_filter(session)
+            db_filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_id
+            nsis = self.db.get_one("nsis", db_filter, fail_on_empty=False, fail_on_more=False)
+            if nsis:
+                raise EngineException("The NS instance {} cannot be terminate because is used by the slice {}".format(
+                                      nsr_id, nsis["_id"]), http_code=HTTPStatus.CONFLICT)
+
         try:
             # Override descriptor with query string kwargs
             self._update_input_with_kwargs(indata, kwargs)
@@ -734,6 +788,8 @@ class NsLcmOpTopic(BaseTopic):
             nsr = self.db.get_one("nsrs", _filter)
 
             # initial checking
+            if operation == "terminate" and slice_object is False:
+                check_if_nsr_is_not_slice_member(session, nsr["_id"])
             if not nsr["_admin"].get("nsState") or nsr["_admin"]["nsState"] == "NOT_INSTANTIATED":
                 if operation == "terminate" and indata.get("autoremove"):
                     # NSR must be deleted
@@ -756,8 +812,8 @@ class NsLcmOpTopic(BaseTopic):
             rollback.append({"topic": "nslcmops", "_id": _id})
             if not slice_object:
                 self.msg.write("ns", operation, nslcmop_desc)
-            return _id
-        except ValidationError as e:
+            return _id, None
+        except ValidationError as e:  # TODO remove try Except, it is captured at nbi.py
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
         # except DbException as e:
         #     raise EngineException("Cannot get ns_instance '{}': {}".format(e), HTTPStatus.NOT_FOUND)
@@ -817,30 +873,34 @@ class NsiTopic(BaseTopic):
             raise EngineException("Descriptor error at nst-ref='{}' references a non exist nstd".format(nstd_id),
                                   http_code=HTTPStatus.CONFLICT)
 
-    def check_conflict_on_del(self, session, _id, ):
+    def check_conflict_on_del(self, session, _id, db_content):
+        """
+        Check that NSI is not instantiated
+        :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
+        :param _id: nsi internal id
+        :param db_content: The database content of the _id
+        :return: None or raises EngineException with the conflict
+        """
         if session["force"]:
             return
-        nsi = self.db.get_one("nsis", {"_id": _id})
+        nsi = db_content
         if nsi["_admin"].get("nsiState") == "INSTANTIATED":
             raise EngineException("nsi '{}' cannot be deleted because it is in 'INSTANTIATED' state. "
                                   "Launch 'terminate' operation first; or force deletion".format(_id),
                                   http_code=HTTPStatus.CONFLICT)
 
-    def delete(self, session, _id, dry_run=False):
+    def delete_extra(self, session, _id, db_content):
         """
-        Delete item by its internal _id
+        Deletes associated nsilcmops from database. Deletes associated filesystem.
+         Set usageState of nst
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
-        :param dry_run: make checking but do not delete
-        :return: dictionary with deleted item _id. It raises EngineException on error: not found, conflict, ...
+        :param db_content: The database content of the descriptor
+        :return: None if ok or raises EngineException with the problem
         """
-        # 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})
+        nsir = db_content
         for nsrs_detailed_item in nsir["_admin"]["nsrs-detailed-list"]:
             nsr_id = nsrs_detailed_item["nsrId"]
             if nsrs_detailed_item.get("shared"):
@@ -857,22 +917,66 @@ class NsiTopic(BaseTopic):
                     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)
+        # delete related nsilcmops database entries
+        self.db.del_list("nsilcmops", {"netsliceInstanceId": _id})
 
-        # Search if nst is being used by other nsi
+        # Check and set used NST usage state
         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
+        if nsir_admin and nsir_admin.get("nst-id"):
+            # check if used by another NSI
+            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"})
+
+    # 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):
         """
@@ -886,17 +990,19 @@ class NsiTopic(BaseTopic):
         """
 
         try:
+            step = ""
             slice_request = self._remove_envelop(indata)
             # Override descriptor with query string kwargs
             self._update_input_with_kwargs(slice_request, kwargs)
             self._validate_input_new(slice_request, session["force"])
 
-            step = ""
             # look for nstd
             step = "getting nstd id='{}' from database".format(slice_request.get("nstId"))
-            _filter = {"_id": slice_request["nstId"]}
-            _filter.update(BaseTopic._get_project_filter(session))
+            _filter = self._get_project_filter(session)
+            _filter["_id"] = slice_request["nstId"]
             nstd = self.db.get_one("nsts", _filter)
+            del _filter["_id"]
+
             nstd.pop("_admin", None)
             nstd_id = nstd.pop("_id", None)
             nsi_id = str(uuid4())
@@ -951,7 +1057,9 @@ class NsiTopic(BaseTopic):
                     member_ns["nsd-ref"], member_ns["id"])
                 if nsd_id not in needed_nsds:
                     # Obtain nsd
-                    nsd = DescriptorTopic.get_one_by_id(self.db, session, "nsds", nsd_id)
+                    _filter["id"] = nsd_id
+                    nsd = self.db.get_one("nsds", _filter, fail_on_empty=True, fail_on_more=True)
+                    del _filter["id"]
                     nsd.pop("_admin")
                     needed_nsds[nsd_id] = nsd
                 else:
@@ -972,16 +1080,17 @@ class NsiTopic(BaseTopic):
                 _id_nsr = None
                 indata_ns = {}
                 # Is the nss shared and instantiated?
-                _filter = {"_admin.nsrs-detailed-list.ANYINDEX.shared": True,
-                           "_admin.nsrs-detailed-list.ANYINDEX.nsd-id": service["nsd-ref"]}
+                _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True
+                _filter["_admin.nsrs-detailed-list.ANYINDEX.nsd-id"] = service["nsd-ref"]
+                _filter["_admin.nsrs-detailed-list.ANYINDEX.nss-id"] = service["id"]
                 nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
-                
                 if nsi and service.get("is-shared-nss"):
                     nsrs_detailed_list = nsi["_admin"]["nsrs-detailed-list"]
                     for nsrs_detailed_item in nsrs_detailed_list:
                         if nsrs_detailed_item["nsd-id"] == service["nsd-ref"]:
-                            _id_nsr = nsrs_detailed_item["nsrId"]
-                            break
+                            if nsrs_detailed_item["nss-id"] == service["id"]:
+                                _id_nsr = nsrs_detailed_item["nsrId"]
+                                break
                     for netslice_subnet in nsi["_admin"]["netslice-subnet"]:
                         if netslice_subnet["nss-id"] == service["id"]:
                             indata_ns = netslice_subnet
@@ -996,7 +1105,8 @@ class NsiTopic(BaseTopic):
                     indata_ns["nsName"] = slice_request.get("nsiName") + "." + service["id"]
                     indata_ns["vimAccountId"] = slice_request.get("vimAccountId")
                     indata_ns["nsDescription"] = service["description"]
-                    indata_ns["key-pair-ref"] = slice_request.get("key-pair-ref")
+                    if slice_request.get("ssh_keys"):
+                        indata_ns["ssh_keys"] = slice_request.get("ssh_keys")
 
                     if ns_params:
                         for ns_param in ns_params:
@@ -1007,9 +1117,9 @@ class NsiTopic(BaseTopic):
                                 break                   
 
                     # Creates Nsr objects
-                    _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers)
+                    _id_nsr, _ = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers)
                 nsrs_item = {"nsrId": _id_nsr, "shared": service.get("is-shared-nss"), "nsd-id": service["nsd-ref"], 
-                             "nslcmop_instantiate": None}
+                             "nss-id": service["id"], "nslcmop_instantiate": None}
                 indata_ns["nss-id"] = service["id"]
                 nsrs_list.append(nsrs_item)
                 nsi_netslice_subnet.append(indata_ns)
@@ -1024,8 +1134,8 @@ class NsiTopic(BaseTopic):
             # Creating the entry in the database
             self.db.create("nsis", nsi_descriptor)
             rollback.append({"topic": "nsis", "_id": nsi_id})
-            return nsi_id
-        except Exception as e:
+            return nsi_id, None
+        except Exception as e:   # TODO remove try Except, it is captured at nbi.py
             self.logger.exception("Exception {} at NsiTopic.new()".format(e), exc_info=True)
             raise EngineException("Error {}: {}".format(step, e))
         except ValidationError as e:
@@ -1090,7 +1200,7 @@ class NsiLcmOpTopic(BaseTopic):
             "isCancelPending": False,
             "links": {
                 "self": "/osm/nsilcm/v1/nsi_lcm_op_occs/" + _id,
-                "nsInstance": "/osm/nsilcm/v1/netslice_instances/" + netsliceInstanceId,
+                "netsliceInstanceId": "/osm/nsilcm/v1/netslice_instances/" + netsliceInstanceId,
             }
         }
         return nsilcmop
@@ -1115,7 +1225,7 @@ class NsiLcmOpTopic(BaseTopic):
         :param rollback: list to append created items at database in case a rollback must to be done
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param indata: descriptor with the parameters of the operation. It must contains among others
-            nsiInstanceId: _id of the nsir to perform the operation
+            netsliceInstanceId: _id of the nsir to perform the operation
             operation: it can be: instantiate, terminate, action, TODO: update, heal
         :param kwargs: used to override the indata descriptor
         :param headers: http request headers
@@ -1125,13 +1235,14 @@ class NsiLcmOpTopic(BaseTopic):
             # Override descriptor with query string kwargs
             self._update_input_with_kwargs(indata, kwargs)
             operation = indata["lcmOperationType"]
-            nsiInstanceId = indata["nsiInstanceId"]
+            netsliceInstanceId = indata["netsliceInstanceId"]
             validate_input(indata, self.operation_schema[operation])
 
-            # get nsi from nsiInstanceId
-            _filter = BaseTopic._get_project_filter(session)
-            _filter["_id"] = nsiInstanceId
+            # get nsi from netsliceInstanceId
+            _filter = self._get_project_filter(session)
+            _filter["_id"] = netsliceInstanceId
             nsir = self.db.get_one("nsis", _filter)
+            del _filter["_id"]
 
             # initial checking
             if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED":
@@ -1140,11 +1251,11 @@ class NsiLcmOpTopic(BaseTopic):
                     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)
+                        netsliceInstanceId, operation), HTTPStatus.CONFLICT)
             else:
                 if operation == "instantiate" and not session["force"]:
                     raise EngineException("netslice_instance '{}' cannot be '{}' because it is already instantiated".
-                                          format(nsiInstanceId, operation), HTTPStatus.CONFLICT)
+                                          format(netsliceInstanceId, operation), HTTPStatus.CONFLICT)
             
             # Creating all the NS_operation (nslcmop)
             # Get service list from db
@@ -1154,12 +1265,15 @@ class NsiLcmOpTopic(BaseTopic):
             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}
-
+                    _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True
+                    _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_item["nsrId"]
+                    _filter["_admin.nsrs-detailed-list.ANYINDEX.nslcmop_instantiate.ne"] = None
+                    _filter["_id.ne"] = netsliceInstanceId
                     nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False)
+                    if operation == "terminate":
+                        _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): None}
+                        self.db.set_one("nsis", {"_id": nsir["_id"]}, _update)
+                        
                     # looks the first nsi fulfilling the conditions but not being the current NSIR
                     if nsi:
                         nsi_admin_shared = nsi["_admin"]["nsrs-detailed-list"]
@@ -1182,12 +1296,11 @@ class NsiLcmOpTopic(BaseTopic):
                     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 
+                    indata_ns["netsliceInstanceId"] = netsliceInstanceId
+                    # Creating NS_LCM_OP with the flag slice_object=True to not trigger the service instantiation
                     # message via kafka bus
-                    nslcmop = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, kwargs, headers, 
-                                                        slice_object=True)
+                    nslcmop, _ = self.nsi_NsLcmOpTopic.new(rollback, session, indata_ns, kwargs, headers,
+                                                           slice_object=True)
                     nslcmops.append(nslcmop)
                     if operation == "terminate":
                         nslcmop = None
@@ -1204,12 +1317,12 @@ class NsiLcmOpTopic(BaseTopic):
             indata["nslcmops_ids"] = nslcmops
             self._check_nsi_operation(session, nsir, operation, indata)
 
-            nsilcmop_desc = self._create_nsilcmop(session, nsiInstanceId, operation, indata)
+            nsilcmop_desc = self._create_nsilcmop(session, netsliceInstanceId, operation, indata)
             self.format_on_new(nsilcmop_desc, session["project_id"], make_public=session["public"])
             _id = self.db.create("nsilcmops", nsilcmop_desc)
             rollback.append({"topic": "nsilcmops", "_id": _id})
             self.msg.write("nsi", operation, nsilcmop_desc)
-            return _id
+            return _id, None
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)