X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=809578ed25755dbd3f0b60fa69b77569c5743317;hp=aba441ff38dc780a69d08f6b3694a9d744a11ef0;hb=08ddb14b077121ffced28e41c441fef31b6bb6a1;hpb=b4844abca6fd9f8a7cf45fdc168d3606d2c34c39 diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index aba441f..809578e 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -31,6 +31,7 @@ __author__ = "Alfonso Tierno " 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,6 +54,7 @@ class NsrTopic(BaseTopic): def format_on_new(content, project_id=None, make_public=False): BaseTopic.format_on_new(content, project_id=project_id, make_public=make_public) content["_admin"]["nsState"] = "NOT_INSTANTIATED" + return None def check_conflict_on_del(self, session, _id, db_content): """ @@ -180,6 +182,7 @@ 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) @@ -226,7 +229,7 @@ class NsrTopic(BaseTopic): "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 @@ -360,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) @@ -373,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) @@ -515,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"): @@ -534,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")): @@ -761,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) @@ -774,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 @@ -796,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) @@ -974,12 +990,12 @@ 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 = self._get_project_filter(session) @@ -1066,14 +1082,15 @@ class NsiTopic(BaseTopic): # Is the nss shared and instantiated? _filter["_admin.nsrs-detailed-list.ANYINDEX.shared"] = True _filter["_admin.nsrs-detailed-list.ANYINDEX.nsd-id"] = service["nsd-ref"] + _filter["_admin.nsrs-detailed-list.ANYINDEX.nss-id"] = service["id"] nsi = self.db.get_one("nsis", _filter, fail_on_empty=False, fail_on_more=False) - if nsi and service.get("is-shared-nss"): nsrs_detailed_list = nsi["_admin"]["nsrs-detailed-list"] for nsrs_detailed_item in nsrs_detailed_list: if nsrs_detailed_item["nsd-id"] == service["nsd-ref"]: - _id_nsr = nsrs_detailed_item["nsrId"] - break + if nsrs_detailed_item["nss-id"] == service["id"]: + _id_nsr = nsrs_detailed_item["nsrId"] + break for netslice_subnet in nsi["_admin"]["netslice-subnet"]: if netslice_subnet["nss-id"] == service["id"]: indata_ns = netslice_subnet @@ -1088,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: @@ -1099,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) @@ -1116,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: @@ -1182,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 @@ -1207,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 @@ -1217,12 +1235,12 @@ 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 + # get nsi from netsliceInstanceId _filter = self._get_project_filter(session) - _filter["_id"] = nsiInstanceId + _filter["_id"] = netsliceInstanceId nsir = self.db.get_one("nsis", _filter) del _filter["_id"] @@ -1233,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 @@ -1247,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, + _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 - + _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"] @@ -1275,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 @@ -1297,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)