X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=39d98342cb2bcef6de376271a4aeab289bd89587;hp=14861336b3c570817b9a0d5dbda92f7a64c07f99;hb=03fb584dd3fcdf9dca6f4a17d9d74fdf0d8c786f;hpb=5758955b7b394517ff5caf5506a4400cdc5aa372 diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 1486133..39d9834 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -14,6 +14,7 @@ # limitations under the License. # import logging +import json from uuid import uuid4 from http import HTTPStatus from time import time @@ -239,14 +240,16 @@ class NsrTopic(BaseTopic): where_, k ) ) - if "." in k or "$" in k: + if "$" in k: raise EngineException( - "Invalid param at {}:{}. Keys must not contain dots or $".format( + "Invalid param at {}:{}. Keys must not contain $ symbol".format( where_, k ) ) if isinstance(v, (dict, tuple, list)): additional_params[k] = "!!yaml " + safe_dump(v) + if kdu_name: + additional_params = json.dumps(additional_params) if descriptor: for df in descriptor.get("df", []): @@ -334,7 +337,7 @@ class NsrTopic(BaseTopic): # Create VNFRs needed_vnfds = {} # TODO: Change for multiple df support - vnf_profiles = nsd.get("df", [[]])[0].get("vnf-profile", ()) + vnf_profiles = nsd.get("df", [{}])[0].get("vnf-profile", ()) for vnfp in vnf_profiles: vnfd_id = vnfp.get("vnfd-id") vnf_index = vnfp.get("id") @@ -474,11 +477,11 @@ class NsrTopic(BaseTopic): "ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove "flavor": [], "image": [], + "affinity-or-anti-affinity-group": [], } 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("virtual-link-desc"): nsr_vld = deepcopy(nsd.get("virtual-link-desc", [])) @@ -589,6 +592,16 @@ class NsrTopic(BaseTopic): image_data = self._get_image_data_from_vnfd(vnfd, alt_image) self._add_image_to_nsr(nsr_descriptor, image_data) + # Add Affinity or Anti-affinity group information to NSR + vdu_profiles = vnfd.get("df", [[]])[0].get("vdu-profile", ()) + ag_prefix_name = "{}-{}".format(nsr_descriptor["name"][:16], vnf_profile.get("id")[:16]) + + for vdu_profile in vdu_profiles: + ag_data = {} + for ag in vdu_profile.get("affinity-or-anti-affinity-group", ()): + ag_data = self._get_affinity_or_anti_affinity_group_data_from_vnfd(vnfd, ag["id"]) + self._add_affinity_or_anti_affinity_group_to_nsr(nsr_descriptor, ag_data, ag_prefix_name) + for vld in nsr_vld: vld["vnfd-connection-point-ref"] = all_vld_connection_point_data.get( vld.get("id"), [] @@ -598,6 +611,39 @@ class NsrTopic(BaseTopic): return nsr_descriptor + def _get_affinity_or_anti_affinity_group_data_from_vnfd(self, vnfd, ag_id): + """ + Gets affinity-or-anti-affinity-group info from df and returns the desired affinity group + """ + affinity_or_anti_affinity_group = utils.find_in_list( + vnfd.get("df", [[]])[0].get("affinity-or-anti-affinity-group", ()), lambda ag: ag["id"] == ag_id + ) + ag_data = {} + if affinity_or_anti_affinity_group and affinity_or_anti_affinity_group.get("id"): + ag_data["ag-id"] = affinity_or_anti_affinity_group["id"] + if affinity_or_anti_affinity_group and affinity_or_anti_affinity_group.get("type"): + ag_data["type"] = affinity_or_anti_affinity_group["type"] + if affinity_or_anti_affinity_group and affinity_or_anti_affinity_group.get("scope"): + ag_data["scope"] = affinity_or_anti_affinity_group["scope"] + return ag_data + + def _add_affinity_or_anti_affinity_group_to_nsr(self, nsr_descriptor, ag_data, ag_prefix_name): + """ + Adds affinity-or-anti-affinity-group to nsr checking first it is not already added + """ + ag = next( + ( + f + for f in nsr_descriptor["affinity-or-anti-affinity-group"] + if all(f.get(k) == ag_data[k] for k in ag_data) + ), + None, + ) + if not ag: + ag_data["id"] = str(len(nsr_descriptor["affinity-or-anti-affinity-group"])) + ag_data["name"] = "{}-{}-{}".format(ag_prefix_name, ag_data["ag-id"][:32], ag_data.get("id") or 0) + nsr_descriptor["affinity-or-anti-affinity-group"].append(ag_data) + def _get_image_data_from_vnfd(self, vnfd, sw_image_id): sw_image_desc = utils.find_in_list( vnfd.get("sw-image-desc", ()), lambda sw: sw["id"] == sw_image_id @@ -710,9 +756,14 @@ class NsrTopic(BaseTopic): if kdu_params and kdu_params.get("k8s-namespace"): kdu_k8s_namespace = kdu_params["k8s-namespace"] + kdu_deployment_name = "" + if kdu_params and kdu_params.get("kdu-deployment-name"): + kdu_deployment_name = kdu_params.get("kdu-deployment-name") + kdur = { "additionalParams": additional_params, "k8s-namespace": kdu_k8s_namespace, + "kdu-deployment-name": kdu_deployment_name, "kdu-name": kdu["name"], # TODO "name": "" Name of the VDU in the VIM "ip-address": None, # mgmt-interface filled by LCM @@ -762,6 +813,14 @@ class NsrTopic(BaseTopic): additional_params, vdu_params = self._format_additional_params( ns_request, vnf_index, vdu_id=vdu["id"], descriptor=vnfd ) + + try: + vdu_virtual_storage_descriptors = utils.filter_in_list( + vnfd.get("virtual-storage-desc", []), + lambda stg_desc: stg_desc["id"] in vdu["virtual-storage-desc"] + ) + except Exception: + vdu_virtual_storage_descriptors = [] vdur = { "vdu-id-ref": vdu["id"], # TODO "name": "" Name of the VDU in the VIM @@ -771,6 +830,7 @@ class NsrTopic(BaseTopic): "interfaces": [], "additionalParams": additional_params, "vdu-name": vdu["name"], + "virtual-storages": vdu_virtual_storage_descriptors } if vdu_params and vdu_params.get("config-units"): vdur["config-units"] = vdu_params["config-units"] @@ -925,6 +985,31 @@ class NsrTopic(BaseTopic): if nsr_flavor_desc: vdur["ns-flavor-id"] = nsr_flavor_desc["id"] + # Adding Affinity groups information to vdur + try: + ags_vdu_profile = utils.find_in_list( + vnfd.get("df")[0]["vdu-profile"], + lambda a_vdu: a_vdu["id"] == vdu["id"], + ) + except Exception: + ags_vdu_profile = None + + if ags_vdu_profile: + ags_ids = [] + for ag in ags_vdu_profile.get("affinity-or-anti-affinity-group", ()): + vdu_ag = utils.find_in_list( + ags_vdu_profile.get("affinity-or-anti-affinity-group", ()), + lambda ag_fp: ag_fp["id"] == ag["id"], + ) + nsr_ags_data = utils.find_in_list( + nsr_descriptor["affinity-or-anti-affinity-group"], + lambda nsr_ag: ( + nsr_ag.get("ag-id") == vdu_ag.get("id") + ), + ) + ags_ids.append(nsr_ags_data["id"]) + vdur["affinity-or-anti-affinity-group-id"] = ags_ids + if vdu_instantiation_level: count = vdu_instantiation_level.get("number-of-instances") else: @@ -933,9 +1018,9 @@ class NsrTopic(BaseTopic): for index in range(0, count): vdur = deepcopy(vdur) for iface in vdur["interfaces"]: - if iface.get("ip-address"): + if iface.get("ip-address") and index != 0: iface["ip-address"] = increment_ip_mac(iface["ip-address"]) - if iface.get("mac-address"): + if iface.get("mac-address") and index != 0: iface["mac-address"] = increment_ip_mac(iface["mac-address"]) vdur["_id"] = str(uuid4()) @@ -1321,6 +1406,18 @@ class NsLcmOpTopic(BaseTopic): ) vim_accounts.append(vim_account) + def _get_vim_account(self, vim_id: str, session): + try: + db_filter = self._get_project_filter(session) + db_filter["_id"] = vim_id + return self.db.get_one("vim_accounts", db_filter) + except Exception: + raise EngineException( + "Invalid vimAccountId='{}' not present for the project".format( + vim_id + ) + ) + def _check_valid_wim_account(self, wim_account, wim_accounts, session): if not isinstance(wim_account, str): return @@ -1583,6 +1680,68 @@ class NsLcmOpTopic(BaseTopic): # TODO check that this forcing is not incompatible with other forcing return ifaces_forcing_vim_network + def _update_vnfrs_from_nsd(self, nsr): + try: + nsr_id = nsr["_id"] + nsd = nsr["nsd"] + + step = "Getting vnf_profiles from nsd" + vnf_profiles = nsd.get("df", [{}])[0].get("vnf-profile", ()) + vld_fixed_ip_connection_point_data = {} + + step = "Getting ip-address info from vnf_profile if it exists" + for vnfp in vnf_profiles: + # Checking ip-address info from nsd.vnf_profile and storing + for vlc in vnfp.get("virtual-link-connectivity", ()): + for cpd in vlc.get("constituent-cpd-id", ()): + if cpd.get("ip-address"): + step = "Storing ip-address info" + vld_fixed_ip_connection_point_data.update({vlc.get("virtual-link-profile-id") + '.' + cpd.get("constituent-base-element-id"): { + "vnfd-connection-point-ref": cpd.get( + "constituent-cpd-id"), + "ip-address": cpd.get( + "ip-address")}}) + + # Inserting ip address to vnfr + if len(vld_fixed_ip_connection_point_data) > 0: + step = "Getting vnfrs" + vnfrs = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) + for item in vld_fixed_ip_connection_point_data.keys(): + step = "Filtering vnfrs" + vnfr = next(filter(lambda vnfr: vnfr["member-vnf-index-ref"] == item.split('.')[1], vnfrs), None) + if vnfr: + vnfr_update = {} + for vdur_index, vdur in enumerate(vnfr["vdur"]): + for iface_index, iface in enumerate(vdur["interfaces"]): + step = "Looking for matched interface" + if ( + iface.get("external-connection-point-ref") + == vld_fixed_ip_connection_point_data[item].get("vnfd-connection-point-ref") and + iface.get("ns-vld-id") == item.split('.')[0] + + ): + vnfr_update_text = "vdur.{}.interfaces.{}".format( + vdur_index, iface_index + ) + step = "Storing info in order to update vnfr" + vnfr_update[ + vnfr_update_text + ".ip-address" + ] = increment_ip_mac( + vld_fixed_ip_connection_point_data[item].get("ip-address"), + vdur.get("count-index", 0), ) + vnfr_update[vnfr_update_text + ".fixed-ip"] = True + + step = "updating vnfr at database" + self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, vnfr_update) + except ( + ValidationError, + EngineException, + DbException, + MsgException, + FsException, + ) as e: + raise type(e)("{} while '{}'".format(e, step), http_code=e.http_code) + def _update_vnfrs(self, session, rollback, nsr, indata): # get vnfr nsr_id = nsr["_id"] @@ -1595,15 +1754,14 @@ class NsLcmOpTopic(BaseTopic): # update vim-account-id vim_account = indata["vimAccountId"] - vca_id = indata.get("vcaId") + vca_id = self._get_vim_account(vim_account, session).get("vca") # check instantiate parameters for vnf_inst_params in get_iterable(indata.get("vnf")): if vnf_inst_params["member-vnf-index"] != member_vnf_index: continue if vnf_inst_params.get("vimAccountId"): vim_account = vnf_inst_params.get("vimAccountId") - if vnf_inst_params.get("vcaId"): - vca_id = vnf_inst_params.get("vcaId") + vca_id = self._get_vim_account(vim_account, session).get("vca") # get vnf.vdu.interface instantiation params to update vnfr.vdur.interfaces ip, mac for vdu_inst_param in get_iterable(vnf_inst_params.get("vdu")): @@ -1901,8 +2059,13 @@ class NsLcmOpTopic(BaseTopic): HTTPStatus.CONFLICT, ) self._check_ns_operation(session, nsr, operation, indata) + if (indata.get("primitive_params")): + indata["primitive_params"] = json.dumps(indata["primitive_params"]) + elif (indata.get("additionalParamsForVnf")): + indata["additionalParamsForVnf"] = json.dumps(indata["additionalParamsForVnf"]) if operation == "instantiate": + self._update_vnfrs_from_nsd(nsr) self._update_vnfrs(session, rollback, nsr, indata) nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata)