X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=28e3386527db038e365d8d494f7cbf6f1b59d9cd;hp=b9d929d6011d5b655428fd6b114f4221100b9d50;hb=c37b384ffcbc4963da849f202d6590f86ab060b4;hpb=eb8e4f7ca33fa567ba1db92b738fd709e08ae5af diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index b9d929d..28e3386 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -21,6 +21,7 @@ from copy import copy, deepcopy from validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale, nsi_instantiate from base_topic import BaseTopic, EngineException, get_iterable from descriptor_topics import DescriptorTopic +from yaml import safe_dump __author__ = "Alfonso Tierno " @@ -74,6 +75,7 @@ class NsrTopic(BaseTopic): if dry_run: return + self.fs.file_delete(_id, ignore_non_exist=True) v = self.db.del_one("nsrs", {"_id": _id}) self.db.del_list("nslcmops", {"nsInstanceId": _id}) self.db.del_list("vnfrs", {"nsr-id-ref": _id}) @@ -83,6 +85,61 @@ class NsrTopic(BaseTopic): self._send_msg("deleted", {"_id": _id}) return v + @staticmethod + def _format_ns_request(ns_request): + formated_request = copy(ns_request) + formated_request.pop("additionalParamsForNs", None) + formated_request.pop("additionalParamsForVnf", None) + return formated_request + + @staticmethod + def _format_addional_params(ns_request, member_vnf_index=None, descriptor=None): + """ + Get and format user additional params for NS or VNF + :param ns_request: User instantiation additional parameters + :param member_vnf_index: None for extract NS params, or member_vnf_index to extract VNF params + :param descriptor: If not None it check that needed parameters of descriptor are supplied + :return: a formated copy of additional params or None if not supplied + """ + additional_params = None + if not member_vnf_index: + additional_params = copy(ns_request.get("additionalParamsForNs")) + where_ = "additionalParamsForNs" + elif ns_request.get("additionalParamsForVnf"): + for additionalParamsForVnf in get_iterable(ns_request.get("additionalParamsForVnf")): + if additionalParamsForVnf["member-vnf-index"] == member_vnf_index: + additional_params = copy(additionalParamsForVnf.get("additionalParams")) + where_ = "additionalParamsForVnf[member-vnf-index={}]".format( + additionalParamsForVnf["member-vnf-index"]) + break + if additional_params: + for k, v in additional_params.items(): + if not isinstance(k, str): + raise EngineException("Invalid param at {}:{}. Only string keys are allowed".format(where_, k)) + if "." in k or "$" in k: + raise EngineException("Invalid param at {}:{}. Keys must not contain dots or $".format(where_, k)) + if isinstance(v, (dict, tuple, list)): + additional_params[k] = "!!yaml " + safe_dump(v) + + if descriptor: + # check that enough parameters are supplied for the initial-config-primitive + # TODO: check for cloud-init + if member_vnf_index: + if descriptor.get("vnf-configuration"): + for initial_primitive in get_iterable( + descriptor["vnf-configuration"].get("initial-config-primitive")): + for param in get_iterable(initial_primitive.get("parameter")): + if param["value"].startswith("<") and param["value"].endswith(">"): + if param["value"] in ("", ""): + continue + if not additional_params or param["value"][1:-1] not in additional_params: + raise EngineException("Parameter '{}' needed for vnfd[id={}]:vnf-configuration:" + "initial-config-primitive[name={}] not supplied". + format(param["value"], descriptor["id"], + initial_primitive["name"])) + + return additional_params + def new(self, rollback, session, indata=None, kwargs=None, headers=None, force=False, make_public=False): """ Creates a new nsr into database. It also creates needed vnfrs @@ -110,6 +167,7 @@ class NsrTopic(BaseTopic): nsd = self.db.get_one("nsds", _filter) nsr_id = str(uuid4()) + now = time() step = "filling nsr from input data" nsr_descriptor = { @@ -134,7 +192,8 @@ class NsrTopic(BaseTopic): "nsd-name-ref": nsd["name"], "operational-events": [], # "id", "timestamp", "description", "event", "nsd-ref": nsd["id"], - "instantiate_params": ns_request, + "instantiate_params": self._format_ns_request(ns_request), + "additionalParamsForNs": self._format_addional_params(ns_request), "ns-instance-config-ref": nsr_id, "id": nsr_id, "_id": nsr_id, @@ -170,6 +229,8 @@ class NsrTopic(BaseTopic): "_id": vnfr_id, "nsr-id-ref": nsr_id, "member-vnf-index-ref": member_vnf["member-vnf-index"], + "additionalParamsForVnf": self._format_addional_params(ns_request, member_vnf["member-vnf-index"], + vnfd), "created-time": now, # "vnfd": vnfd, # at OSM model.but removed to avoid data duplication TODO: revise "vnfd-ref": vnfd_id, @@ -277,6 +338,10 @@ class NsrTopic(BaseTopic): self.format_on_new(nsr_descriptor, session["project_id"], make_public=make_public) self.db.create("nsrs", nsr_descriptor) rollback.append({"topic": "nsrs", "_id": nsr_id}) + + step = "creating nsr temporal folder" + self.fs.mkdir(nsr_id) + return nsr_id except Exception as e: self.logger.exception("Exception {} at NsrTopic.new()".format(e), exc_info=True) @@ -707,6 +772,25 @@ class NsiTopic(BaseTopic): def __init__(self, db, fs, msg): BaseTopic.__init__(self, db, fs, msg) + @staticmethod + def _format_ns_request(ns_request): + formated_request = copy(ns_request) + # TODO: Add request params + return formated_request + + @staticmethod + def _format_addional_params(ns_request, member_vnf_index=None, descriptor=None): + """ + Get and format user additional params for NS or VNF + :param ns_request: User instantiation additional parameters + :param member_vnf_index: None for extract NS params, or member_vnf_index to extract VNF params + :param descriptor: If not None it check that needed parameters of descriptor are supplied + :return: a formated copy of additional params or None if not supplied + """ + additional_params = None + # TODO: Check aditional params + return additional_params + def _check_descriptor_dependencies(self, session, descriptor): """ Check that the dependent descriptors exist on a new descriptor or edition @@ -846,7 +930,7 @@ class NsiTopic(BaseTopic): if ins_param.get("id") == netslice_vld["nss-ref"]: if ins_param.get("vimAccountId"): nsi_vld["vimAccountId"] = ins_param["vimAccountId"] - # Adding vim-network-name defined by the user to vld + # 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"]: @@ -854,6 +938,8 @@ class NsiTopic(BaseTopic): 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_descriptor["_admin"]["netslice-vld"] = nsi_vlds @@ -904,26 +990,39 @@ class NsiTopic(BaseTopic): del copy_ns_param["id"] indata_ns.update(copy_ns_param) # TODO: Improve network selection via networkID + # 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 vld_id_ref in nsd["connection-point"]: - name = vld_id_ref["vld-id-ref"] - vnm = nsi_vld.get("vim-network-name") - if type(vnm) is not dict: - vnm = {slice_request.get("vimAccountId"): vnm} - if vld_id_ref["name"] == nsi_vld["nsd-connection-point-ref"]: - if list(vnm.values())[0] is None: - networkName = "default" + 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: - networkName = str(list(vnm.values())[0]) - # VIMNetworkName = NetSliceName-NetworkName - vimnetname = str(slice_request["nsiName"]) + "-" + networkName - indata_ns_list.append({"name": name, "vim-network-name": vimnetname}) - indata_ns["vld"] = indata_ns_list - + indata_ns_list.append({"name": vld_id_ref}) + if indata_ns_list: + indata_ns["vld"] = indata_ns_list + + # Creates Nsr objects _id_nsr = NsrTopic.new(self, rollback, session, indata_ns, kwargs, headers, force) nsrs_item = {"nsrId": _id_nsr} nsrs_list.append(nsrs_item)