X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=f4d4c73b9431cc8cd876267f8538f383061bc9a1;hp=8ca35d06343f8346042ec36608c48890a7e5e630;hb=b5a2ead0edbe78a72d44f70bdfea087e9d2856b4;hpb=f318b3045ae5e005f6241ec170ea943c92cc67d6 diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 8ca35d0..f4d4c73 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -18,7 +18,8 @@ from uuid import uuid4 from http import HTTPStatus from time import time from copy import copy, deepcopy -from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate +from osm_nbi.validation import validate_input, ValidationError, ns_instantiate, ns_terminate, ns_action, ns_scale,\ + nsi_instantiate from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get # from descriptor_topics import DescriptorTopic from yaml import safe_dump @@ -33,6 +34,7 @@ __author__ = "Alfonso Tierno " class NsrTopic(BaseTopic): topic = "nsrs" topic_msg = "ns" + quota_name = "ns_instances" schema_new = ns_instantiate def __init__(self, db, fs, msg, auth): @@ -120,15 +122,16 @@ class NsrTopic(BaseTopic): return formated_request @staticmethod - def _format_addional_params(ns_request, member_vnf_index=None, vdu_id=None, kdu_name=None, descriptor=None): + def _format_additional_params(ns_request, member_vnf_index=None, vdu_id=None, kdu_name=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 formatted copy of additional params or None if not supplied + :return: tuple with a formatted copy of additional params or None if not supplied, plus other parameters """ additional_params = None + other_params = None if not member_vnf_index: additional_params = copy(ns_request.get("additionalParamsForNs")) where_ = "additionalParamsForNs" @@ -137,9 +140,12 @@ class NsrTopic(BaseTopic): item = next((x for x in ns_request["additionalParamsForVnf"] if x["member-vnf-index"] == member_vnf_index), None) if item: + if not vdu_id and not kdu_name: + other_params = item additional_params = copy(item.get("additionalParams")) or {} if vdu_id and item.get("additionalParamsForVdu"): item_vdu = next((x for x in item["additionalParamsForVdu"] if x["vdu_id"] == vdu_id), None) + other_params = item_vdu if item_vdu and item_vdu.get("additionalParams"): where_ += ".additionalParamsForVdu[vdu_id={}]".format(vdu_id) additional_params = item_vdu["additionalParams"] @@ -147,6 +153,7 @@ class NsrTopic(BaseTopic): additional_params = {} if item.get("additionalParamsForKdu"): item_kdu = next((x for x in item["additionalParamsForKdu"] if x["kdu_name"] == kdu_name), None) + other_params = item_kdu if item_kdu and item_kdu.get("additionalParams"): where_ += ".additionalParamsForKdu[kdu_name={}]".format(kdu_name) additional_params = item_kdu["additionalParams"] @@ -191,7 +198,7 @@ class NsrTopic(BaseTopic): format(param["value"], descriptor["id"], initial_primitive["name"])) - return additional_params or None + return additional_params or None, other_params or None def new(self, rollback, session, indata=None, kwargs=None, headers=None): """ @@ -216,17 +223,32 @@ class NsrTopic(BaseTopic): self._update_input_with_kwargs(ns_request, kwargs) self._validate_input_new(ns_request, session["force"]) - # look for nsr + # look for nsd step = "getting nsd id='{}' from database".format(ns_request.get("nsdId")) _filter = self._get_project_filter(session) _filter["_id"] = ns_request["nsdId"] nsd = self.db.get_one("nsds", _filter) del _filter["_id"] + # check NSD is not disabled + step = "checking nsdOperationalState" + if nsd["_admin"]["operationalState"] == "DISABLED": + raise EngineException("nsd with id '{}' is DISABLED, and thus cannot be used to create " + "a network service".format(ns_request["nsdId"]), http_code=HTTPStatus.CONFLICT) + nsr_id = str(uuid4()) now = time() step = "filling nsr from input data" + additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd) + + # use for k8s-namespace from ns_request or additionalParamsForNs. By default, the project_id + ns_k8s_namespace = session["project_id"][0] if session["project_id"] else None + if ns_request and ns_request.get("k8s-namespace"): + ns_k8s_namespace = ns_request["k8s-namespace"] + if additional_params and additional_params.get("k8s-namespace"): + ns_k8s_namespace = additional_params["k8s-namespace"] + nsr_descriptor = { "name": ns_request["nsName"], "name-ref": ns_request["nsName"], @@ -240,7 +262,8 @@ class NsrTopic(BaseTopic): "deploymentStatus": None, "configurationStatus": None, "vcaStatus": None, - "nsd": nsd, + "nsd": {k: v for k, v in nsd.items() if k in ("vld", "_id", "id", "constituent-vnfd", "name", + "ns-configuration")}, "datacenter": ns_request["vimAccountId"], "resource-orchestrator": "osmopenmano", "description": ns_request.get("nsDescription", ""), @@ -260,7 +283,7 @@ class NsrTopic(BaseTopic): "nsd-id": nsd["_id"], "vnfd-id": [], "instantiate_params": self._format_ns_request(ns_request), - "additionalParamsForNs": self._format_addional_params(ns_request, descriptor=nsd), + "additionalParamsForNs": additional_params, "ns-instance-config-ref": nsr_id, "id": nsr_id, "_id": nsr_id, @@ -268,12 +291,12 @@ class NsrTopic(BaseTopic): "ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove } ns_request["nsr_id"] = nsr_id + if ns_request and ns_request.get("config-units"): + nsr_descriptor["config-units"] = ns_request["config-units"] + # Create vld if nsd.get("vld"): - nsr_descriptor["vld"] = [] - for nsd_vld in nsd.get("vld"): - nsr_descriptor["vld"].append( - {key: nsd_vld[key] for key in ("id", "vim-network-name", "vim-network-id") if key in nsd_vld}) + nsr_descriptor["vld"] = nsd["vld"] # Create VNFR needed_vnfds = {} @@ -294,13 +317,15 @@ class NsrTopic(BaseTopic): step = "filling vnfr vnfd-id='{}' constituent-vnfd='{}'".format( member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"]) vnfr_id = str(uuid4()) + additional_params, vnf_params = self._format_additional_params(ns_request, + member_vnf["member-vnf-index"], + descriptor=vnfd) vnfr_descriptor = { "id": vnfr_id, "_id": vnfr_id, "nsr-id-ref": nsr_id, "member-vnf-index-ref": member_vnf["member-vnf-index"], - "additionalParamsForVnf": self._format_addional_params(ns_request, member_vnf["member-vnf-index"], - descriptor=vnfd), + "additionalParamsForVnf": additional_params, "created-time": now, # "vnfd": vnfd, # at OSM model.but removed to avoid data duplication TODO: revise "vnfd-ref": vnfd_id, @@ -310,6 +335,12 @@ class NsrTopic(BaseTopic): "connection-point": [], "ip-address": None, # mgmt-interface filled by LCM } + vnf_k8s_namespace = ns_k8s_namespace + if vnf_params: + if vnf_params.get("k8s-namespace"): + vnf_k8s_namespace = vnf_params["k8s-namespace"] + if vnf_params.get("config-units"): + vnfr_descriptor["config-units"] = vnf_params["config-units"] # Create vld if vnfd.get("internal-vld"): @@ -356,18 +387,35 @@ class NsrTopic(BaseTopic): break # update kdus for kdu in get_iterable(vnfd.get("kdu")): - kdur = {x: kdu[x] for x in kdu if x in ("helm-chart", "juju-bundle")} - kdur["kdu-name"] = kdu["name"] - # TODO "name": "" Name of the VDU in the VIM - kdur["ip-address"] = None # mgmt-interface filled by LCM - kdur["k8s-cluster"] = {} - kdur["additionalParams"] = self._format_addional_params(ns_request, member_vnf["member-vnf-index"], - kdu_name=kdu["name"], descriptor=vnfd) + additional_params, kdu_params = self._format_additional_params(ns_request, + member_vnf["member-vnf-index"], + kdu_name=kdu["name"], + descriptor=vnfd) + kdu_k8s_namespace = vnf_k8s_namespace + kdu_model = kdu_params.get("kdu_model") if kdu_params else None + if kdu_params and kdu_params.get("k8s-namespace"): + kdu_k8s_namespace = kdu_params["k8s-namespace"] + + kdur = { + "additionalParams": additional_params, + "k8s-namespace": kdu_k8s_namespace, + "kdu-name": kdu["name"], + # TODO "name": "" Name of the VDU in the VIM + "ip-address": None, # mgmt-interface filled by LCM + "k8s-cluster": {}, + } + if kdu_params and kdu_params.get("config-units"): + kdur["config-units"] = kdu_params["config-units"] + for k8s_type in ("helm-chart", "juju-bundle"): + if kdu.get(k8s_type): + kdur[k8s_type] = kdu_model or kdu[k8s_type] if not vnfr_descriptor.get("kdur"): vnfr_descriptor["kdur"] = [] vnfr_descriptor["kdur"].append(kdur) for vdu in vnfd.get("vdu", ()): + additional_params, vdu_params = self._format_additional_params( + ns_request, member_vnf["member-vnf-index"], vdu_id=vdu["id"], descriptor=vnfd) vdur = { "vdu-id-ref": vdu["id"], # TODO "name": "" Name of the VDU in the VIM @@ -375,11 +423,15 @@ class NsrTopic(BaseTopic): # "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM "internal-connection-point": [], "interfaces": [], - "additionalParams": self._format_addional_params(ns_request, member_vnf["member-vnf-index"], - vdu_id=vdu["id"], descriptor=vnfd) + "additionalParams": additional_params } + if vdu_params and vdu_params.get("config-units"): + vdur["config-units"] = vdu_params["config-units"] + if deep_get(vdu, ("supplemental-boot-data", "boot-data-drive")): + vdur["boot-data-drive"] = vdu["supplemental-boot-data"]["boot-data-drive"] if vdu.get("pdu-type"): vdur["pdu-type"] = vdu["pdu-type"] + vdur["name"] = vdu["pdu-type"] # TODO volumes: name, volume-id for icp in vdu.get("internal-connection-point", ()): vdu_icp = { @@ -454,7 +506,7 @@ class NsrTopic(BaseTopic): return nsr_id, None except (ValidationError, EngineException, DbException, MsgException, FsException) as e: - raise type(e)("{} while '{}".format(e, step), http_code=e.http_code) + raise type(e)("{} while '{}'".format(e, step), http_code=e.http_code) def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -485,7 +537,7 @@ class NsLcmOpTopic(BaseTopic): "instantiate": ns_instantiate, "action": ns_action, "scale": ns_scale, - "terminate": None, + "terminate": ns_terminate, } def __init__(self, db, fs, msg, auth): @@ -565,7 +617,7 @@ class NsLcmOpTopic(BaseTopic): for in_ivld in get_iterable(in_vnfd.get("internal-vld")): for ivld in get_iterable(vnfd.get("internal-vld")): - if in_ivld["name"] == ivld["name"] or in_ivld["name"] == ivld["id"]: + if in_ivld["name"] in (ivld["id"], ivld.get("name")): for in_icp in get_iterable(in_ivld.get("internal-connection-point")): for icp in ivld["internal-connection-point"]: if in_icp["id-ref"] == icp["id-ref"]: @@ -575,7 +627,7 @@ class NsLcmOpTopic(BaseTopic): "='{}']:internal-connection-point[id-ref:'{}'] is not present at " "vnfd:internal-vld:name/id:internal-connection-point" .format(in_vnf["member-vnf-index"], in_ivld["name"], - in_icp["id-ref"], vnfd["id"])) + in_icp["id-ref"])) break else: raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'" @@ -759,12 +811,13 @@ class NsLcmOpTopic(BaseTopic): vnfr_update[iface_text + ".{}".format(k)] = v vnfr_update_rollback[iface_text + ".{}".format(k)] = vdur_interface.get(v) if pdu_interface.get("ip-address"): - if vdur_interface.get("mgmt-interface"): + if vdur_interface.get("mgmt-interface") or vdur_interface.get("mgmt-vnf"): vnfr_update_rollback[vdu_text + ".ip-address"] = vdur.get("ip-address") vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"] if vdur_interface.get("mgmt-vnf"): vnfr_update_rollback["ip-address"] = vnfr.get("ip-address") vnfr_update["ip-address"] = pdu_interface["ip-address"] + vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"] if pdu_interface.get("vim-network-name") or pdu_interface.get("vim-network-id"): ifaces_forcing_vim_network.append({ "name": vdur_interface.get("vnf-vld-id") or vdur_interface.get("ns-vld-id"), @@ -983,7 +1036,7 @@ class NsLcmOpTopic(BaseTopic): try: # Override descriptor with query string kwargs - self._update_input_with_kwargs(indata, kwargs) + self._update_input_with_kwargs(indata, kwargs, yaml_format=True) operation = indata["lcmOperationType"] nsInstanceId = indata["nsInstanceId"] @@ -1038,6 +1091,7 @@ class NsLcmOpTopic(BaseTopic): class NsiTopic(BaseTopic): topic = "nsis" topic_msg = "nsi" + quota_name = "slice_instances" def __init__(self, db, fs, msg, auth): BaseTopic.__init__(self, db, fs, msg, auth) @@ -1217,6 +1271,12 @@ class NsiTopic(BaseTopic): nstd = self.db.get_one("nsts", _filter) del _filter["_id"] + # check NSD is not disabled + step = "checking operationalState" + if nstd["_admin"]["operationalState"] == "DISABLED": + raise EngineException("nst with id '{}' is DISABLED, and thus cannot be used to create " + "a network slice".format(slice_request["nstId"]), http_code=HTTPStatus.CONFLICT) + nstd.pop("_admin", None) nstd_id = nstd.pop("_id", None) nsi_id = str(uuid4()) @@ -1388,7 +1448,9 @@ class NsiLcmOpTopic(BaseTopic): if nstId == netslice_subnet["id"]: nsd_id = netslice_subnet["nsd-ref"] if nsd_id not in nsds: - nsds[nsd_id] = self.db.get_one("nsds", {"id": nsd_id}) + _filter = self._get_project_filter(session) + _filter["id"] = nsd_id + nsds[nsd_id] = self.db.get_one("nsds", _filter) return nsds[nsd_id] else: raise EngineException("Invalid parameter nstId='{}' is not one of the " @@ -1505,12 +1567,15 @@ class NsiLcmOpTopic(BaseTopic): 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"] = netsliceInstanceId + indata_ns = { + "lcmOperationType": operation, + "nsInstanceId": service["_id"], + # Including netslice_id in the ns instantiate Operation + "netsliceInstanceId": netsliceInstanceId, + } + if operation == "instantiate": + indata_ns.update(service["instantiate_params"]) + # 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,