X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=2264c69787cbbac4a65e0b92b8067728efc42031;hb=refs%2Fchanges%2F43%2F10743%2F2;hp=cabfc1c9ab6718048119e91f037f971e9251ac13;hpb=28c13b65cd51c330da88e726a5301d9a60d113de;p=osm%2FNBI.git diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index cabfc1c..2264c69 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -233,7 +233,7 @@ class NsrTopic(BaseTopic): step = "filling nsr from input data" nsr_id = str(uuid4()) - nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id) + nsr_descriptor = self._create_nsr_descriptor_from_nsd(nsd, ns_request, nsr_id, session) # Create VNFRs needed_vnfds = {} @@ -306,7 +306,7 @@ class NsrTopic(BaseTopic): return ns_k8s_namespace - def _create_nsr_descriptor_from_nsd(self, nsd, ns_request, nsr_id): + def _create_nsr_descriptor_from_nsd(self, nsd, ns_request, nsr_id, session): now = time() additional_params, _ = self._format_additional_params(ns_request, descriptor=nsd) @@ -367,10 +367,7 @@ class NsrTopic(BaseTopic): "vnfd-id-ref": vnf_profile.get("vnfd-id") }) - vnfd = self.db.get_one("vnfds", - {"id": vnf_profile.get("vnfd-id")}, - fail_on_empty=True, - fail_on_more=True) + vnfd = self._get_vnfd_from_db(vnf_profile.get("vnfd-id"), session) for vdu in vnfd.get("vdu", ()): flavor_data = {} @@ -474,6 +471,7 @@ class NsrTopic(BaseTopic): "vnfd-ref": vnfd_id, "vnfd-id": vnfd["_id"], # not at OSM model, but useful "vim-account-id": None, + "vca-id": None, "vdur": [], "connection-point": [], "ip-address": None, # mgmt-interface filled by LCM @@ -547,6 +545,29 @@ class NsrTopic(BaseTopic): vnfd_mgmt_cp = vnfd.get("mgmt-cp") for vdu in vnfd.get("vdu", ()): + vdu_mgmt_cp = [] + try: + configs = vnfd.get("df")[0]["lcm-operations-configuration"]["operate-vnf-op-config"]["day1-2"] + vdu_config = utils.find_in_list(configs, lambda config: config["id"] == vdu["id"]) + except Exception: + vdu_config = None + + try: + vdu_instantiation_level = utils.find_in_list( + vnfd.get("df")[0]["instantiation-level"][0]["vdu-level"], + lambda a_vdu_profile: a_vdu_profile["vdu-id"] == vdu["id"] + ) + except Exception: + vdu_instantiation_level = None + + if vdu_config: + external_connection_ee = utils.filter_in_list( + vdu_config.get("execution-environment-list", []), + lambda ee: "external-connection-point-ref" in ee + ) + for ee in external_connection_ee: + vdu_mgmt_cp.append(ee["external-connection-point-ref"]) + additional_params, vdu_params = self._format_additional_params( ns_request, vnf_index, vdu_id=vdu["id"], descriptor=vnfd) vdur = { @@ -574,12 +595,6 @@ class NsrTopic(BaseTopic): "name": icp.get("id"), } - if "port-security-enabled" in icp: - vdu_icp["port-security-enabled"] = icp["port-security-enabled"] - - if "port-security-disable-strategy" in icp: - vdu_icp["port-security-disable-strategy"] = icp["port-security-disable-strategy"] - vdur["internal-connection-point"].append(vdu_icp) for iface in icp.get("virtual-network-interface-requirement", ()): @@ -587,6 +602,12 @@ class NsrTopic(BaseTopic): vdu_iface = {x: iface[x] for x in iface_fields if iface.get(x) is not None} vdu_iface["internal-connection-point-ref"] = vdu_icp["id"] + if "port-security-enabled" in icp: + vdu_iface["port-security-enabled"] = icp["port-security-enabled"] + + if "port-security-disable-strategy" in icp: + vdu_iface["port-security-disable-strategy"] = icp["port-security-disable-strategy"] + for ext_cp in vnfd.get("ext-cpd", ()): if not ext_cp.get("int-cpd"): continue @@ -594,11 +615,26 @@ class NsrTopic(BaseTopic): continue if icp["id"] == ext_cp["int-cpd"].get("cpd"): vdu_iface["external-connection-point-ref"] = ext_cp.get("id") + + if "port-security-enabled" in ext_cp: + vdu_iface["port-security-enabled"] = ( + ext_cp["port-security-enabled"] + ) + + if "port-security-disable-strategy" in ext_cp: + vdu_iface["port-security-disable-strategy"] = ( + ext_cp["port-security-disable-strategy"] + ) + break if vnfd_mgmt_cp and vdu_iface.get("external-connection-point-ref") == vnfd_mgmt_cp: vdu_iface["mgmt-vnf"] = True - vdu_iface["mgmt-interface"] = True # TODO change to mgmt-vdu + vdu_iface["mgmt-interface"] = True + + for ecp in vdu_mgmt_cp: + if vdu_iface.get("external-connection-point-ref") == ecp: + vdu_iface["mgmt-interface"] = True if iface.get("virtual-interface"): vdu_iface.update(deepcopy(iface["virtual-interface"])) @@ -662,7 +698,11 @@ class NsrTopic(BaseTopic): if nsr_flavor_desc: vdur["ns-flavor-id"] = nsr_flavor_desc["id"] - count = int(vdu.get("count", 1)) + if vdu_instantiation_level: + count = vdu_instantiation_level.get("number-of-instances") + else: + count = 1 + for index in range(0, count): vdur = deepcopy(vdur) for iface in vdur["interfaces"]: @@ -745,18 +785,20 @@ class NsLcmOpTopic(BaseTopic): descriptor_configuration = utils.find_in_list( configs, lambda config: config["id"] == indata["vdu_id"] - ).get("config-primitive") + ) elif indata.get("kdu_name"): self._check_valid_kdu(vnfd, indata["kdu_name"]) descriptor_configuration = utils.find_in_list( configs, lambda config: config["id"] == indata.get("kdu_name") - ).get("config-primitive") + ) else: descriptor_configuration = utils.find_in_list( configs, lambda config: config["id"] == vnfd["id"] - ).get("config-primitive") + ) + if descriptor_configuration is not None: + descriptor_configuration = descriptor_configuration.get("config-primitive") else: # use a NSD descriptor_configuration = nsd.get("ns-configuration", {}).get("config-primitive") @@ -1130,12 +1172,15 @@ class NsLcmOpTopic(BaseTopic): # update vim-account-id vim_account = indata["vimAccountId"] + vca_id = indata.get("vcaId") # 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") # 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")): @@ -1198,6 +1243,10 @@ class NsLcmOpTopic(BaseTopic): vnfr_update["vim-account-id"] = vim_account vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id") + if vca_id: + vnfr_update["vca-id"] = vca_id + vnfr_update_rollback["vca-id"] = vnfr.get("vca-id") + # get pdu ifaces_forcing_vim_network = self._look_for_pdu(session, rollback, vnfr, vim_account, vnfr_update, vnfr_update_rollback)