X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=f3418f73e199244f3741881acd05419973ecf52b;hp=8b18f0f25f58f51e2df0a1d324243074ba9df5d9;hb=86e916adddf8831299ca21a0b420dddaa632ddb6;hpb=032916caa09d64edf381dec5d66c6a8cc50e75a6 diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 8b18f0f..f3418f7 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -20,8 +20,10 @@ 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 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 " @@ -52,38 +54,58 @@ class NsrTopic(BaseTopic): BaseTopic.format_on_new(content, project_id=project_id, make_public=make_public) content["_admin"]["nsState"] = "NOT_INSTANTIATED" - def check_conflict_on_del(self, session, _id, force=False): - if force: + 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(self, session, _id, force=False, dry_run=False): + def delete_extra(self, session, _id, db_content): """ - Delete item by its internal _id - :param session: contains the used login username, working project, and admin rights + 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 force: indicates if deletion must be forced in case of conflict - :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, force, dry_run=True) - 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}) + # set all used pdus as free self.db.set_list("pdus", {"_admin.usage.nsr_id": _id}, {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None}) - self._send_msg("deleted", {"_id": _id}) - return v + + # 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): @@ -114,6 +136,12 @@ class NsrTopic(BaseTopic): 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: @@ -140,16 +168,14 @@ class NsrTopic(BaseTopic): return additional_params - def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False): + def new(self, rollback, session, indata=None, kwargs=None, headers=None): """ Creates a new nsr into database. It also creates needed vnfrs :param rollback: list to append the created items at database in case a rollback must be done - :param session: contains the used login username and working project + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param indata: params to be used for the nsr :param kwargs: used to override the indata descriptor :param headers: http request headers - :param force: If True avoid some dependence checks - :param make_public: Make the created item public to all projects :return: the _id of nsr descriptor created at database """ @@ -157,14 +183,14 @@ class NsrTopic(BaseTopic): 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, force) + 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, write=False, show_all=True)) + _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()) @@ -188,11 +214,12 @@ class NsrTopic(BaseTopic): "orchestration-progress": {}, # {"networks": {"active": 0, "total": 0}, "vms": {"active": 0, "total": 0}}, - "crete-time": now, + "create-time": now, "nsd-name-ref": nsd["name"], "operational-events": [], # "id", "timestamp", "description", "event", "nsd-ref": nsd["id"], "nsd-id": nsd["_id"], + "vnfd-id": [], "instantiate_params": self._format_ns_request(ns_request), "additionalParamsForNs": self._format_addional_params(ns_request), "ns-instance-config-ref": nsr_id, @@ -217,9 +244,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( @@ -330,13 +360,13 @@ 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=make_public) + BaseTopic.format_on_new(vnfr_descriptor, session["project_id"], make_public=session["public"]) self.db.create("vnfrs", vnfr_descriptor) rollback.append({"topic": "vnfrs", "_id": vnfr_id}) nsr_descriptor["constituent-vnfr-ref"].append(vnfr_id) step = "creating nsr at database" - self.format_on_new(nsr_descriptor, session["project_id"], make_public=make_public) + 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}) @@ -350,7 +380,7 @@ class NsrTopic(BaseTopic): except ValidationError as e: raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY) - def edit(self, session, _id, indata=None, kwargs=None, force=False, content=None): + def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -361,13 +391,13 @@ class VnfrTopic(BaseTopic): def __init__(self, db, fs, msg): BaseTopic.__init__(self, db, fs, msg) - def delete(self, session, _id, force=False, dry_run=False): + def delete(self, session, _id, dry_run=False): raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR) - def edit(self, session, _id, indata=None, kwargs=None, force=False, content=None): + def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) - def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False): + def new(self, rollback, session, indata=None, kwargs=None, headers=None): # Not used because vnfrs are created and deleted by NsrTopic class directly raise EngineException("Method new called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -388,7 +418,7 @@ class NsLcmOpTopic(BaseTopic): def _check_ns_operation(self, session, nsr, operation, indata): """ Check that user has enter right parameters for the operation - :param session: + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param operation: it can be: instantiate, terminate, action, TODO: update, heal :param indata: descriptor with the parameters of the operation :return: None @@ -461,7 +491,7 @@ class NsLcmOpTopic(BaseTopic): if vim_account in vim_accounts: return try: - db_filter = self._get_project_filter(session, write=False, show_all=True) + db_filter = self._get_project_filter(session) db_filter["_id"] = vim_account self.db.get_one("vim_accounts", db_filter) except Exception: @@ -543,7 +573,7 @@ class NsLcmOpTopic(BaseTopic): (ip_address, ...) information. Modifies PDU _admin.usageState to 'IN_USE' - :param session: client session information + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param rollback: list with the database modifications to rollback if needed :param vnfr: vnfr to be updated. It is modified with pdu interface info if pdu is found :param vim_account: vim_account where this vnfr should be deployed @@ -564,7 +594,7 @@ class NsLcmOpTopic(BaseTopic): if not vdur.get("pdu-type"): continue pdu_type = vdur.get("pdu-type") - pdu_filter = self._get_project_filter(session, write=True, show_all=True) + pdu_filter = self._get_project_filter(session) pdu_filter["vim_accounts"] = vim_account pdu_filter["type"] = pdu_type pdu_filter["_admin.operationalState"] = "ENABLED" @@ -719,19 +749,16 @@ class NsLcmOpTopic(BaseTopic): } return nslcmop - def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False, - slice_object=False): + def new(self, rollback, session, indata=None, kwargs=None, headers=None, slice_object=False): """ Performs a new operation over a ns :param rollback: list to append created items at database in case a rollback must to be done - :param session: contains the used login username and working project + :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 nsInstanceId: _id of the nsr 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 - :param force: If True avoid some dependence checks - :param make_public: Make the created item public to all projects :return: id of the nslcmops """ try: @@ -742,7 +769,7 @@ class NsLcmOpTopic(BaseTopic): validate_input(indata, self.operation_schema[operation]) # get ns from nsr_id - _filter = BaseTopic._get_project_filter(session, write=True, show_all=False) + _filter = BaseTopic._get_project_filter(session) _filter["_id"] = nsInstanceId nsr = self.db.get_one("nsrs", _filter) @@ -755,7 +782,7 @@ class NsLcmOpTopic(BaseTopic): raise EngineException("ns_instance '{}' cannot be '{}' because it is not instantiated".format( nsInstanceId, operation), HTTPStatus.CONFLICT) else: - if operation == "instantiate" and not indata.get("force"): + if operation == "instantiate" and not session["force"]: raise EngineException("ns_instance '{}' cannot be '{}' because it is already instantiated".format( nsInstanceId, operation), HTTPStatus.CONFLICT) self._check_ns_operation(session, nsr, operation, indata) @@ -764,7 +791,7 @@ class NsLcmOpTopic(BaseTopic): self._update_vnfrs(session, rollback, nsr, indata) nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata) - self.format_on_new(nslcmop_desc, session["project_id"], make_public=make_public) + self.format_on_new(nslcmop_desc, session["project_id"], make_public=session["public"]) _id = self.db.create("nslcmops", nslcmop_desc) rollback.append({"topic": "nslcmops", "_id": _id}) if not slice_object: @@ -775,10 +802,10 @@ class NsLcmOpTopic(BaseTopic): # except DbException as e: # raise EngineException("Cannot get ns_instance '{}': {}".format(e), HTTPStatus.NOT_FOUND) - def delete(self, session, _id, force=False, dry_run=False): + def delete(self, session, _id, dry_run=False): raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR) - def edit(self, session, _id, indata=None, kwargs=None, force=False, content=None): + def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -819,7 +846,7 @@ class NsiTopic(BaseTopic): def _check_descriptor_dependencies(self, session, descriptor): """ Check that the dependent descriptors exist on a new descriptor or edition - :param session: client session information + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param descriptor: descriptor to be inserted or edit :return: None or raises exception """ @@ -830,61 +857,119 @@ class NsiTopic(BaseTopic): raise EngineException("Descriptor error at nst-ref='{}' references a non exist nstd".format(nstd_id), http_code=HTTPStatus.CONFLICT) - @staticmethod - def format_on_new(content, project_id=None, make_public=False): - BaseTopic.format_on_new(content, project_id=project_id, make_public=make_public) - - def check_conflict_on_del(self, session, _id, force=False): - if force: + 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, force=False, dry_run=False): + def delete_extra(self, session, _id, db_content): """ - Delete item by its internal _id - :param session: contains the used login username, working project, and admin rights + 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 force: indicates if deletion must be forced in case of conflict - :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, force, dry_run=True) - if dry_run: - return - - # 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) - - _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"] - self.nsrTopic.delete(session, nsr_id, force=False, dry_run=False) - self._send_msg("deleted", {"_id": _id}) - return v - - def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False): + # Deleting the nsrs belonging to nsir + 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"): + _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 + + # delete related nsilcmops database entries + self.db.del_list("nsilcmops", {"netsliceInstanceId": _id}) + + # Check and set used NST usage state + nsir_admin = nsir.get("_admin") + 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): """ Creates a new netslice instance record into database. It also creates needed nsrs and vnfrs :param rollback: list to append the created items at database in case a rollback must be done - :param session: contains the used login username and working project + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param indata: params to be used for the nsir :param kwargs: used to override the indata descriptor :param headers: http request headers - :param force: If True avoid some dependence checks - :param make_public: Make the created item public to all projects :return: the _id of nsi descriptor created at database """ @@ -892,16 +977,18 @@ 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, force) + 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, write=False, show_all=True)) + _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.pop("_id", None) + nstd_id = nstd.pop("_id", None) nsi_id = str(uuid4()) step = "filling nsi_descriptor with input data" @@ -921,147 +1008,101 @@ class NsiTopic(BaseTopic): } step = "creating nsi at database" - self.format_on_new(nsi_descriptor, session["project_id"], make_public=make_public) + self.format_on_new(nsi_descriptor, session["project_id"], make_public=session["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 / vim-network-id 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") - if netslice_vlds.get("mgmt-network"): - nsi_vld["mgmt-network"] = netslice_vlds.get("mgmt-network") - 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( 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 - 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"]) - # check additionalParamsForSubnet contains a valid id - if slice_request.get("additionalParamsForSubnet"): - for additional_params_subnet in get_iterable(slice_request.get("additionalParamsForSubnet")): - for service in services: - if additional_params_subnet["id"] == service["id"]: - break - else: - raise EngineException("Error at additionalParamsForSubnet:id='{}' not match any " - "netslice-subnet:id".format(additional_params_subnet["id"])) - # 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) - break + # Is the nss shared and instantiated? + _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True + _filter["_admin.nsrs-detailed-list.ANYINDEX.nsd-id"] = service["nsd-ref"] + nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False) - # Override the instantiation parameters for netslice-vld provided by user - 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 cp_item in nsd["connection-point"]: - if cp_item["name"] == nsi_vld["nsd-connection-point-ref"]: - vld_id_ref = cp_item["vld-id-ref"] - # Mapping the vim-network-name or vim-network-id instantiation parameters - if nsi_vld.get("vim-network-id"): - vnid = nsi_vld.get("vim-network-id") - if type(vnid) is not dict: - vim_network_id = {slice_request.get("vimAccountId"): vnid} - else: # is string - vim_network_id = vnid - indata_ns_list.append({"name": vld_id_ref, "vim-network-id": vim_network_id}) - # Case not vim-network-name instantiation parameter - elif nsi_vld.get("vim-network-name"): - vnm = nsi_vld.get("vim-network-name") - if type(vnm) is not dict: - vim_network_name = {slice_request.get("vimAccountId"): vnm} - else: # is string - vim_network_name = vnm - indata_ns_list.append({"name": vld_id_ref, - "vim-network-name": vim_network_name}) - # Case neither vim-network-name nor vim-network-id provided - else: - indata_ns_list.append({"name": vld_id_ref}) - if indata_ns_list: - indata_ns["vld"] = indata_ns_list - - # Creates Nsr objects - _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers, force) - nsrs_item = {"nsrId": _id_nsr} + 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) + 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} @@ -1070,6 +1111,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}) @@ -1080,7 +1123,7 @@ class NsiTopic(BaseTopic): except ValidationError as e: raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY) - def edit(self, session, _id, indata=None, kwargs=None, force=False, content=None): + def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -1091,14 +1134,15 @@ 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): """ Check that user has enter right parameters for the operation - :param session: + :param session: contains "username", "admin", "force", "public", "project_id", "set_project" :param operation: it can be: instantiate, terminate, action, TODO: update, heal :param indata: descriptor with the parameters of the operation :return: None @@ -1143,18 +1187,30 @@ class NsiLcmOpTopic(BaseTopic): } return nsilcmop - def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False): + 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): """ Performs a new operation over a ns :param rollback: list to append created items at database in case a rollback must to be done - :param session: contains the used login username and working project + :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 operation: it can be: instantiate, terminate, action, TODO: update, heal :param kwargs: used to override the indata descriptor :param headers: http request headers - :param force: If True avoid some dependence checks - :param make_public: Make the created item public to all projects :return: id of the nslcmops """ try: @@ -1165,9 +1221,10 @@ class NsiLcmOpTopic(BaseTopic): validate_input(indata, self.operation_schema[operation]) # get nsi from nsiInstanceId - _filter = BaseTopic._get_project_filter(session, write=True, show_all=False) + _filter = self._get_project_filter(session) _filter["_id"] = nsiInstanceId nsir = self.db.get_one("nsis", _filter) + del _filter["_id"] # initial checking if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED": @@ -1178,7 +1235,7 @@ class NsiLcmOpTopic(BaseTopic): raise EngineException("netslice_instance '{}' cannot be '{}' because it is not instantiated".format( nsiInstanceId, operation), HTTPStatus.CONFLICT) else: - if operation == "instantiate" and not indata.get("force"): + if operation == "instantiate" and not session["force"]: raise EngineException("netslice_instance '{}' cannot be '{}' because it is already instantiated". format(nsiInstanceId, operation), HTTPStatus.CONFLICT) @@ -1186,37 +1243,74 @@ 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 + _filter["_admin.nsrs-detailed-list.ANYINDEX.nsrId"] = nsr_item["nsrId"] + _filter["_admin.nsrs-detailed-list.ANYINDEX.nslcmop_instantiate.ne"] = None + _filter["_id.ne"] = nsiInstanceId + nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False) + if operation == "terminate": + _update = {"_admin.nsrs-detailed-list.{}.nslcmop_instantiate".format(index): None} + self.db.set_one("nsis", {"_id": nsir["_id"]}, _update) + + # looks the first nsi fulfilling the conditions but not being the current NSIR + if nsi: + nsi_admin_shared = nsi["_admin"]["nsrs-detailed-list"] + for nsi_nsr_item in nsi_admin_shared: + if nsi_nsr_item["nsd-id"] == nsr_item["nsd-id"] and nsi_nsr_item["shared"]: + self.add_shared_nsr_2vld(nsir, nsr_item) + nslcmops.append(nsi_nsr_item["nslcmop_instantiate"]) + _update = {"_admin.nsrs-detailed-list.{}".format(index): nsi_nsr_item} + self.db.set_one("nsis", {"_id": nsir["_id"]}, _update) + break + # continue to not create nslcmop since nsrs is shared and nsrs was created + continue + else: + self.add_shared_nsr_2vld(nsir, nsr_item) + + 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, + 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) + 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 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): + def delete(self, session, _id, dry_run=False): raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR) - def edit(self, session, _id, indata=None, kwargs=None, force=False, content=None): + def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR)